diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3e71214f8c8db..74219c0491ac1 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
-# Start from the official PHP 8.2 image with Apache
-FROM php:8.2-apache-bookworm
+# Start from the official PHP 8.3 image with Apache
+FROM php:8.3-apache-bookworm
 
 # Install system dependencies, Node.js, Composer, and Cypress dependencies
 RUN apt-get update && apt-get install -y \
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 1b8b296ebfb4d..be67d08896bee 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,16 +1,31 @@
 Contributing to the Joomla! CMS™
-===============
-You are welcome to submit a contribution for review and possible inclusion in the Joomla! CMS but, before it will be accepted, we ask that you follow these simple guidelines:
+================================
 
-* If you have a feature request, then please open a discussion to define the feature request and discuss possible solutions. Discussions can be converted into issues when the request is defined sufficiently that a developer can start coding the feature. In this process you will get feedback from the maintainers, if the feature is something for the Joomla core distribution or not.
+You are welcome to submit a contribution for review and possible inclusion in the Joomla! CMS but,
+before it will be accepted, we ask that you follow these simple guidelines:
 
-* If you have found a bug, open an issue on our [Issue Tracker](https://issues.joomla.org/) or here on GitHub. If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue for you so you do not have to create an issue, if you are creating a pull request.
+* If you have a feature request, then please open a discussion to define the feature request and discuss possible solutions.
+  Discussions can be converted into issues when the request is defined sufficiently that a developer can start coding the feature.
+  In this process you will get feedback from the maintainers, if the feature is something for the Joomla core distribution or not.
+
+* If you have found a bug, open an issue on our [Issue Tracker](https://issues.joomla.org/) or here on GitHub.
+  If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue
+  for you so you do not have to create an issue, if you are creating a pull request.
 
 * Follow the [Joomla! Coding Standards](https://manual.joomla.org/docs/get-started/codestyle) for code contributions.
 
-* When filing an issue or opening a Pull Request(PR), please include a clear title and description. The title should be a short summary of the issue. For example, `Invalid Query in com_admin`. All issues and PRs should include a description with as much detail as possible. If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission.
+* When filing an issue or opening a Pull Request(PR), please include a clear title and description.
+  The title should be a short summary of the issue. For example, `Invalid Query in com_admin`. All issues and PRs
+  should include a description with as much detail as possible. If it is a PR, include what the issue is, what the
+  PR is addressing, testing instructions and environmental information (PHP version, database driver and version,
+  and other data you can retrieve from your site's system information view) in case the issue is specific to certain
+  environments. If additional information is needed, please be prepared to provide it as our community members
+  review your submission.
 
-* Report security issues to the Joomla! Security Strike Team (JSST) at security@joomla.org or use the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues. Find [here](https://github.com/joomla/joomla-cms?tab=security-ov-file#readme) more information about the [Security Policies and Procedures](https://github.com/joomla/joomla-cms?tab=security-ov-file#readme).
+* Report security issues to the Joomla! Security Strike Team (JSST) at security@joomla.org or use
+  the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker
+  for security issues. Find [here](https://github.com/joomla/joomla-cms?tab=security-ov-file#readme) more information
+  about the [Security Policies and Procedures](https://github.com/joomla/joomla-cms?tab=security-ov-file#readme).
 
 * Please follow our [Generative AI policy](https://developer.joomla.org/generative-ai-policy.html) when using AI to contribute to the Joomla! project
 
@@ -19,7 +34,6 @@ Please be patient as not all items will be viewed or tested immediately (remembe
 #### Branches
 Bug fixing PRs should be made to the `5.4-dev` branch. Merged bugfixes will be upmerged into the current branches. New features that do not break backwards compatibility should be made to the `6.2-dev`.
 
-
 | Branch  | Purpose                                                                                                      |
 |---------|--------------------------------------------------------------------------------------------------------------|
 | 5.4-dev | Branch for the current 5.x Joomla version.                                                                   |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 13f3c38c8bcc6..50194981e0087 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,6 +20,11 @@ jobs:
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        id: cache-webauthn
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Install PHP dependencies
         if: steps.cache-php.outputs.cache-hit != 'true'
         run: |
@@ -45,11 +50,18 @@ jobs:
             node_modules
             media
             installation/template/css
-          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/media_source/**', 'administrator/components/com_media/resources/**', 'installation/template/scss/**') }}
+            installation/template/images
+            installation/template/js
+            installation/template/scss
+          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/build.mjs', 'build/build-modules-js/**', 'media_source/**') }}
       - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Build assets
         if: steps.cache-assets.outputs.cache-hit != 'true'
         run: npm ci
@@ -65,9 +77,11 @@ jobs:
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Check PHP code style
-        env:
-          PHP_CS_FIXER_IGNORE_ENV: true
         run: |
           set -e
           ./libraries/vendor/bin/php-cs-fixer fix -vvv --diff
@@ -99,7 +113,10 @@ jobs:
             node_modules
             media
             installation/template/css
-          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/media_source/**', 'administrator/components/com_media/resources/**', 'installation/template/scss/**') }}
+            installation/template/images
+            installation/template/js
+            installation/template/scss
+          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/build.mjs', 'build/build-modules-js/**', 'media_source/**') }}
       - name: Check code style
         run: npm run ${{ matrix.check }}
 
@@ -114,6 +131,10 @@ jobs:
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Run PHPstan
         run: |
           set -e
@@ -135,13 +156,17 @@ jobs:
     needs: [code-style-php]
     strategy:
       matrix:
-        php_version: ['8.1', '8.2', '8.3', '8.4', '8.5']
+        php_version: ['8.3', '8.4', '8.5']
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: libraries/vendor
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Run Unit tests
         run: ./libraries/vendor/bin/phpunit --testsuite Unit
 
@@ -152,7 +177,7 @@ jobs:
     needs: [code-style-php]
     strategy:
       matrix:
-        php_version: ['8.1', '8.2', '8.3', '8.4', '8.5']
+        php_version: ['8.3', '8.4', '8.5']
         config:
           - my_version: '9'
             engine: 'mysqli'
@@ -191,7 +216,11 @@ jobs:
       - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: libraries/vendor
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Run Integration tests
         env:
           JTEST_DB_ENGINE: ${{ matrix.config.engine }}
@@ -234,14 +263,19 @@ jobs:
     needs: [code-style-php]
     strategy:
       matrix:
-        php_version: ['8.1', '8.2', '8.3', '8.4', '8.5']
+        php_version: ['8.3', '8.4', '8.5']
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         id: cache-php-windows
         with:
           path: libraries/vendor
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        id: cache-webauthn-windows
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - name: Setup PHP
         uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2.37.1
         with:
@@ -260,13 +294,17 @@ jobs:
     needs: [code-style-php]
     strategy:
       matrix:
-        php_version: ['8.1', '8.2', '8.3', '8.4', '8.5']
+        php_version: ['8.3', '8.4', '8.5']
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: libraries/vendor
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - uses: shogo82148/actions-setup-mysql@c80f44ab210a360ef966c5b9f48a2ae21123b533 # v1.51.0
         with:
           mysql-version: "mariadb-10.4"
@@ -304,7 +342,10 @@ jobs:
             node_modules
             media
             installation/template/css
-          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/media_source/**', 'administrator/components/com_media/resources/**', 'installation/template/scss/**') }}
+            installation/template/images
+            installation/template/js
+            installation/template/scss
+          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/build.mjs', 'build/build-modules-js/**', 'media_source/**') }}
       - uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         id: cache-cypress
         with:
@@ -337,7 +378,7 @@ jobs:
             db_engine: mysqli
             db_host: mysql
             my_version: '8.4'
-          - php_version: '8.1'
+          - php_version: '8.3'
             test_group: cmysql
             db_engine: mysqli
             db_host: mysql
@@ -347,12 +388,12 @@ jobs:
             db_engine: mysqli
             db_host: maria
             maria_version: '12.0'
-          - php_version: '8.1'
+          - php_version: '8.3'
             test_group: cmaria
             db_engine: mysqli
             db_host: maria
             maria_version: '10.4'
-          - php_version: '8.1'
+          - php_version: '8.3'
             test_group: cpostgres
             db_engine: pgsql
             db_host: postgres
@@ -370,13 +411,20 @@ jobs:
         with:
           path: libraries/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
+      - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
+        with:
+          path: plugins/system/webauthn/fido.jwt
+          key: ${{ runner.os }}-webauthn-${{ hashFiles('composer.lock') }}
       - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
             node_modules
             media
             installation/template/css
-          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/media_source/**', 'administrator/components/com_media/resources/**', 'installation/template/scss/**') }}
+            installation/template/images
+            installation/template/js
+            installation/template/scss
+          key: ${{ runner.os }}-node-${{ hashFiles('package-lock.json', 'build/build.mjs', 'build/build-modules-js/**', 'media_source/**') }}
       - uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         with:
           path: |
diff --git a/.github/workflows/create-translation-pull-request-v6.yml b/.github/workflows/create-translation-pull-request-v6.yml
index 9a4b73c4ba987..fa61039c8d267 100644
--- a/.github/workflows/create-translation-pull-request-v6.yml
+++ b/.github/workflows/create-translation-pull-request-v6.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   JOOMLA_MAJOR_VERSION: 6
-  JOOMLA_MINOR_VERSION: '6.0'
+  JOOMLA_MINOR_VERSION: '6.1'
 
 permissions:
   contents: read
@@ -31,6 +31,7 @@ jobs:
         with:
           ref: translation6
           fetch-depth: 0
+          token: ${{ secrets.PAT_WORKFLOW }}
       - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version: 24
diff --git a/.github/workflows/typos.toml b/.github/workflows/typos.toml
index 1dedd5d9f2ef7..a1929444ab8a4 100644
--- a/.github/workflows/typos.toml
+++ b/.github/workflows/typos.toml
@@ -6,10 +6,9 @@
 [files]
 extend-exclude = [
     "/templates/system/*.html",
-    "/administrator/components/com_admin/sql/*",
-    "/build/media_source/vendor/tinymce/langs/*",
     "/installation/language/*",
-    "includes/*.html",
+    "!/installation/language/en-GB/",
+    "/includes/*.html",
     "/plugins/sampledata/testing/*",
 ]
 
@@ -44,11 +43,5 @@ vertexes="vertexes"         # Valid spelling waiting fix https://github.com/crat
 wheres="wheres"             # $wheres in modules\mod_related_items\src\Helper\RelatedItemsHelper.php
 wrkarounds="wrkarounds"     # Used as method parameter $wrkarounds in Joomla\CMS\Cache\Controller controller classes
 
-# deprecated strings can be removed in 6.0
-configurated="configurated"
-discernable="discernable"
-hilight="hilight"
-mis="mis"
-
 # deprecated strings can be removed in 7.0
 LANUAGES="LANUAGES"
diff --git a/.gitignore b/.gitignore
index 8098b5d5c3dfc..f5779ad143dc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,9 @@
 .docker
 /docker-compose.yml
 /nbproject
+/.devcontainer
+/.github
+/.vscode
 
 # Local System Files (i.e. cache, logs, etc.)
 /administrator/cache
@@ -23,6 +26,9 @@
 
 # Template CSS files generated by NPM
 /installation/template/css
+/installation/template/images
+/installation/template/js
+/installation/template/scss
 
 # Test Related Files
 /phpunit.xml
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index b188dd552c400..f8340f09f679f 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @package    Joomla.Site
  *
@@ -10,7 +11,7 @@
  * This is the configuration file for php-cs-fixer
  *
  * @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
- * @link https://mlocati.github.io/php-cs-fixer-configurator/#version:3.0
+ * @link https://mlocati.github.io/php-cs-fixer-configurator/#version:3.95
  *
  *
  * If you would like to run the automated clean up, then open a command line and type one of the commands below
@@ -29,39 +30,75 @@
  *        ./libraries/vendor/bin/php-cs-fixer fix administrator/index.php
  */
 
+declare(strict_types=1);
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Config\RuleCustomisationPolicyInterface;
+use PhpCsFixer\Finder;
+
 // Add all the core Joomla folders
-$finder = PhpCsFixer\Finder::create()
-    ->in(
-        [
-            __DIR__ . '/administrator',
-            __DIR__ . '/api',
-            __DIR__ . '/build',
-            __DIR__ . '/cache',
-            __DIR__ . '/cli',
-            __DIR__ . '/components',
-            __DIR__ . '/includes',
-            __DIR__ . '/installation',
-            __DIR__ . '/language',
-            __DIR__ . '/libraries/src',
-            __DIR__ . '/modules',
-            __DIR__ . '/plugins',
-            __DIR__ . '/templates',
-            __DIR__ . '/tests',
-        ]
-    )
-    // Ignore template files as PHP CS fixer can't handle them properly
-    // https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/3702#issuecomment-396717120
-    ->notPath('/tmpl/')
-    ->notPath('/layouts/')
-    ->notPath('/cassiopeia/')
-    ->notPath('/atum/')
-    // Ignore psr12 scripts because they contain invalid syntax
-    ->notPath('/psr12/')
-    ->notName('github_rebase.php');
+$finder = (new Finder())
+    ->in(__DIR__)
+    ->exclude([
+        'administrator/cache',
+        'administrator/logs',
+        'build/psr12',
+        'node_modules',
+        'libraries/php-encryption',
+        'libraries/phpass',
+    ])
+    ->notPath([
+        'configuration.php',
+    ])
+;
+
+final class JoomlaPolicy implements RuleCustomisationPolicyInterface
+{
+    public function getPolicyVersionForCache(): string
+    {
+        return hash_file('xxh128', __FILE__);
+    }
+
+    public function getRuleCustomisers(): array
+    {
+        $disableLayoutFile = [
+            'binary_operator_spaces',
+            'native_function_invocation',
+            'no_trailing_whitespace_in_comment',
+            'single_space_around_construct',
+            'statement_indentation',
+            // @todo Remove in next major version to avoid having to update too many template overrides.
+            'braces_position',
+            'combine_consecutive_issets',
+            'no_spaces_after_function_name',
+            'no_unneeded_control_parentheses',
+            'single_line_after_imports',
+            'spaces_inside_parentheses',
+            'ternary_operator_spaces',
+            'trailing_comma_in_multiline',
+        ];
+
+        $ruleCustomisers = [];
+        foreach ($disableLayoutFile as $rule) {
+            $ruleCustomisers[$rule] = static function (\SplFileInfo $file): bool {
+                return !self::isLayoutFile($file);
+            };
+        }
+
+        return $ruleCustomisers;
+    }
+
+    private static function isLayoutFile(\SplFileInfo $file): bool
+    {
+        return str_contains($file->getPathname(), \DIRECTORY_SEPARATOR . 'tmpl' . \DIRECTORY_SEPARATOR)
+            || str_contains($file->getPathname(), \DIRECTORY_SEPARATOR . 'layouts' . \DIRECTORY_SEPARATOR)
+            || str_contains($file->getPathname(), \DIRECTORY_SEPARATOR . 'templates' . \DIRECTORY_SEPARATOR . 'atum' . \DIRECTORY_SEPARATOR)
+            || str_contains($file->getPathname(), \DIRECTORY_SEPARATOR . 'templates' . \DIRECTORY_SEPARATOR . 'cassiopeia' . \DIRECTORY_SEPARATOR)
+            || str_contains($file->getPathname(), \DIRECTORY_SEPARATOR . 'templates' . \DIRECTORY_SEPARATOR . 'cassiopeia_extended' . \DIRECTORY_SEPARATOR);
+    }
+}
 
-$config = new PhpCsFixer\Config();
-$config
-    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
+$config = (new Config())
     ->setRiskyAllowed(true)
     ->setHideProgress(false)
     ->setUsingCache(false)
@@ -101,6 +138,8 @@
             'no_useless_sprintf'                               => true,
         ]
     )
-    ->setFinder($finder);
+    ->setRuleCustomisationPolicy(new JoomlaPolicy())
+    ->setFinder($finder)
+;
 
 return $config;
diff --git a/README.md b/README.md
index 1deecedd6be93..eb5272cd9269d 100644
--- a/README.md
+++ b/README.md
@@ -1,35 +1,39 @@
 Joomla! CMS™
-====================
+============
 
-Build Status
-------------
+## The Joomla! 6.2 branch is under heavy development and not all links in this document are available yet
+
+## Build Status
 
 | Actions                                                                                                                                         | PHP                                                                           | Node                                                                                 | npm                                                                              |
 |-------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
-| [![Build Status](https://github.com/joomla/joomla-cms/actions/workflows/ci.yml/badge.svg?branch=5.4-dev)](https://github.com/joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V20.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v10.1.0-green)](https://nodejs.org/en/) |
+| [![Build Status](https://github.com/joomla/joomla-cms/actions/workflows/ci.yml/badge.svg?branch=6.2-dev)](https://github.com/joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.3.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V20.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v10.1.0-green)](https://nodejs.org/en/) |
+
+## Overview
 
-Overview
----------------------
-* This is the source of Joomla! 5.x.
+* This is the source of Joomla! 6.x.
 * Joomla's [Official website](https://www.joomla.org).
-* Joomla! 5.4 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_5.4_version_history).
-* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/5.4-dev).
+* Joomla! 6.2 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_6.2_version_history).
+* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/6.2-dev).
+* Release Managers responsible for Joomla! 6.2
+  * Charvi Mehra @charvimehradu
+  * Martin Kopp @MacJoom
+
+## What is Joomla?
 
-What is Joomla?
----------------------
 * [Joomla!](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
 * It is a simple and powerful web server application which requires a server with PHP and either MySQL, MariaDB or PostgreSQL to run. You can find [full technical requirements here](https://downloads.joomla.org/technical-requirements).
 * Joomla! is **free and Open Source software** distributed under the GNU General Public License version 2 or later.
 
-Looking for an installable package?
----------------------
+## Looking for an installable package?
+
 Joomla is not installable out of the box from this repository, please use:
 - For the latest stable package: https://downloads.joomla.org
 - For a nightly package: https://developer.joomla.org/nightly-builds.html
 
-How to get a working installation from the source
----------------------
-For detailed instructions please visit https://docs.joomla.org/Special:MyLanguage/J5.x:Setting_Up_Your_Local_Environment
+## How to get a working installation from the source
+
+For detailed instructions please visit https://guide.joomla.org/user-manual/hosting/local-environment-setup
 
 You will need:
 - PHP - basically the same as you need for running a Joomla Site, but you need the cli (command line interface) Version (see https://docs.joomla.org/Special:MyLanguage/Configuring_a_LAMPP_server_for_PHP_development)
@@ -46,9 +50,9 @@ git clone https://github.com/joomla/joomla-cms.git
 ```bash
 cd joomla-cms
 ```
-- Go to the 5.4-dev branch:
+- Go to the 6.2-dev branch:
 ```bash
-git checkout 5.4-dev
+git checkout 6.2-dev
 ```
 - Install all the needed composer packages:
 ```bash
@@ -64,8 +68,8 @@ Joomla creates a cache of the namespaces of its extensions in `JOOMLA_ROOT/admin
 extensions are created, deleted or removed in git then this file needs to be recreated. You can simply delete the file
 and it will be regenerated on the next call to Joomla.
 
-Do you want to improve Joomla?
---------------------
+## Do you want to improve Joomla?
+
 * Where to [request a feature](https://issues.joomla.org)?
 * How do you [report a bug](https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues) on the [Issue Tracker](https://issues.joomla.org)?
 * How to [submit code](https://manual.joomla.org/docs/get-started/git/) to the Joomla CMS using a Pull Request?
@@ -74,22 +78,21 @@ Do you want to improve Joomla?
 * Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).
 * Provide a translation for Joomla: [Joomla Crowdin Project](https://joomla.crowdin.com/cms)
 
-Which branch should my Pull Request target?
---------------------
+## Which branch should my Pull Request target?
+
 Using a simple classification keeps the project **stable**, **transparent**, and **easy** for everyone to contribute.
 
-| Type of change | What it means | Target branch |
-|---|---|---|
+| Type of change | What it means | Target branch                                                                                                                       |
+|---|---|-------------------------------------------------------------------------------------------------------------------------------------|
 | **Bug / Patch release** | The change fixes an actual error. The software crashes, produces the wrong result, or behaves contrary to its specification. It can be resolved without large‑scale refactoring or new functionality. | **[5.4-dev](https://github.com/joomla/joomla-cms/tree/5.4-dev)** (6.1-dev) **\*** |
-| **Feature / Minor release** | Anything that isn’t a strict bug – new behavior, refactoring, performance improvements, enhancements, UI tweaks, etc. These changes are bundled together for the next minor version. | **[6.2-dev](https://github.com/joomla/joomla-cms/tree/6.2-dev)** |
+| **Feature / Minor release** | Anything that isn’t a strict bug – new behavior, refactoring, performance improvements, enhancements, UI tweaks, etc. These changes are bundled together for the next minor version. | **[6.2-dev](https://github.com/joomla/joomla-cms/tree/6.2-dev)**                                                                    |
 
-**\*** All bugs that already exist in version 5.4.x should be fixed in `5.4-dev`. Only bugs that are introduced for the first time in version 6.x should target the [`6.1-dev`](https://github.com/joomla/joomla-cms/tree/6.1-dev) branch.
+**\*** All bugs that already exist in version 5.4.x or 6.1.x should be fixed in `5.4-dev` or `6.1-dev`. Only bugs that are introduced for the first time in version 6.2.x should target the [`6.2-dev`](https://github.com/joomla/joomla-cms/tree/6.2-dev) branch.
 
 A member of the maintainer or bug squad team confirms the classification and sets the appropriate labels when a PR is opened. If a PR is opened in the wrong branch, a maintainer will simply ask you to retarget it to the proper branch.
 
+## Copyright
 
-Copyright
----------------------
 * (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
 * Distributed under the GNU General Public License version 2 or later
 * See [License details](https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses)
diff --git a/README.txt b/README.txt
index 83358afc09258..ab7dee5dd7256 100644
--- a/README.txt
+++ b/README.txt
@@ -1,10 +1,16 @@
 Joomla! CMS™
 
+The Joomla! 6.2 branch is under heavy development and not all links in this document are available yet
+------------------------------------------------------------------------------------------------------
+
 1- Overview
-	* This is a Joomla! 5.x installation/upgrade package.
+	* This is a Joomla! 6.x installation/upgrade package.
 	* Joomla! Official site: https://www.joomla.org
-	* Joomla! 5.4 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_5.4_version_history
-	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/5.4-dev
+	* Joomla! 6.2 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_6.2_version_history
+	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/6.2-dev
+	* Release Managers responsible for Joomla! 6.2
+		* Charvi Mehra @charvimehradu
+		* Martin Kopp @MacJoom
 
 2- What is Joomla?
 	* Joomla! is a Content Management System (CMS) which enables you to build websites and powerful online applications.
@@ -20,10 +26,10 @@ Joomla! CMS™
 4- How to find a Joomla! translation?
 	* Repository of accredited language packs: https://downloads.joomla.org/language-packs
 	* You can also add languages directly to your website via your Joomla! administration panel: https://docs.joomla.org/Special:MyLanguage/J5.x:Setup_a_Multilingual_Site/Installing_New_Language
-	* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/Special:MyLanguage/J5.x:Setup_a_Multilingual_Site
+	* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/Special:MyLanguage/J6.x:Setup_a_Multilingual_Site
 
 5- Learn Joomla!
-	* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/Special:MyLanguage/J5.x:Getting_Started_with_Joomla!
+	* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/Special:MyLanguage/J6.x:Getting_Started_with_Joomla!
 	* Before installing, read the beginners guide: https://docs.joomla.org/Special:MyLanguage/Portal:Beginners
 
 6- What are the benefits of Joomla?
@@ -48,15 +54,17 @@ Joomla! CMS™
 
 10- Where can you get support and help?
 	* The Joomla! Documentation: https://docs.joomla.org/Special:MyLanguage/Main_Page
+	* Developer Documentation: https://manual.joomla.org/docs/
 	* FAQ Frequently Asked Questions: https://docs.joomla.org/Special:MyLanguage/Category:FAQ
 	* Find the information you need: https://docs.joomla.org/Special:MyLanguage/Start_here
 	* Find help and other users: https://www.joomla.org/about-joomla/create-and-share.html
 	* Post questions at our forums: https://forum.joomla.org
 	* Joomla! Resources Directory (JRD): https://community.joomla.org/service-providers-directory/
 
-11- Do you already have a Joomla! site that's not built with Joomla! 5.x ?
-	* What's new in Joomla! 5.x: https://www.joomla.org/5
-	* What are the main differences between 4.x and 5.x? https://docs.joomla.org/Special:MyLanguage/What_are_the_major_differences_between_Joomla!_4.x_and_5.x
+11- Do you already have a Joomla! site that's not built with Joomla! 6.x ?
+	* What's new in Joomla! 6.x: https://www.joomla.org/6
+	* What are the main differences between 5.x and 6.x? https://docs.joomla.org/Special:MyLanguage/What_are_the_major_differences_between_Joomla!_5.x_and_6.x
+	* How to migrate from 5.x to 6.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_5.x_to_6.x_Step_by_Step_Migration
 	* How to migrate from 4.x to 5.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_4.x_to_5.x_Step_by_Step_Migration
 	* How to migrate from 3.x to 4.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_3.x_to_4.x_Step_by_Step_Migration
 	* How to migrate from 2.5.x to 3.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_2.5_to_3.x_Step_by_Step_Migration
diff --git a/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php b/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php
index 5ac21098a147a..6e37e8d828ad8 100644
--- a/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php
+++ b/administrator/components/com_actionlogs/src/Controller/ActionlogsController.php
@@ -14,13 +14,13 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Event\ActionLog\AfterLogExportEvent;
-use Joomla\CMS\Input\Input;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
 use Joomla\Component\Actionlogs\Administrator\Model\ActionlogsModel;
+use Joomla\Input\Input;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -38,11 +38,11 @@ class ActionlogsController extends AdminController
      * Constructor.
      *
      * @param   array                 $config   An optional associative array of configuration settings.
-     *                                         Recognized key values include 'name', 'default_task', 'model_path', and
-     *                                         'view_path' (this list is not meant to be comprehensive).
+     *                                          Recognized key values include 'name', 'default_task', 'model_path', and
+     *                                          'view_path' (this list is not meant to be comprehensive).
      * @param   ?MVCFactoryInterface  $factory  The factory.
-     * @param   CMSApplication        $app      The Application for the dispatcher
-     * @param   Input                 $input    Input
+     * @param   ?CMSApplication       $app      The Application for the dispatcher
+     * @param   ?Input                $input    Input
      *
      * @since   3.9.0
      *
diff --git a/administrator/components/com_actionlogs/src/Field/ExtensionField.php b/administrator/components/com_actionlogs/src/Field/ExtensionField.php
index 49ec4a0a6d123..63220ade7e0b9 100644
--- a/administrator/components/com_actionlogs/src/Field/ExtensionField.php
+++ b/administrator/components/com_actionlogs/src/Field/ExtensionField.php
@@ -44,7 +44,7 @@ class ExtensionField extends ListField
     public function getOptions()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('extension'))
             ->from($db->quoteName('#__action_logs'))
             ->order($db->quoteName('extension'));
diff --git a/administrator/components/com_actionlogs/src/Field/LogcreatorField.php b/administrator/components/com_actionlogs/src/Field/LogcreatorField.php
index d7d5c516dba87..0925ddbc108a0 100644
--- a/administrator/components/com_actionlogs/src/Field/LogcreatorField.php
+++ b/administrator/components/com_actionlogs/src/Field/LogcreatorField.php
@@ -59,7 +59,7 @@ protected function getOptions()
             $db = $this->getDatabase();
 
             // Construct the query
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('u.id', 'value'))
                 ->select($db->quoteName('u.username', 'text'))
                 ->from($db->quoteName('#__users', 'u'))
diff --git a/administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php b/administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php
index f211355b965d1..14100b4f8c542 100644
--- a/administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php
+++ b/administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php
@@ -60,7 +60,7 @@ public function __construct($form = null)
         parent::__construct($form);
 
         // Load the required language
-        $lang = Factory::getLanguage();
+        $lang = Factory::getApplication()->getLanguage();
         $lang->load('com_actionlogs', JPATH_ADMINISTRATOR);
     }
 }
diff --git a/administrator/components/com_actionlogs/src/Field/LogtypeField.php b/administrator/components/com_actionlogs/src/Field/LogtypeField.php
index 6aae799f0c2b2..ba2eb4569b152 100644
--- a/administrator/components/com_actionlogs/src/Field/LogtypeField.php
+++ b/administrator/components/com_actionlogs/src/Field/LogtypeField.php
@@ -45,7 +45,7 @@ class LogtypeField extends ListField
     public function getOptions()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension'))
             ->from($db->quoteName('#__action_logs_extensions'));
 
diff --git a/administrator/components/com_actionlogs/src/Field/PlugininfoField.php b/administrator/components/com_actionlogs/src/Field/PlugininfoField.php
index b1c3ac45f3a81..2b62df3e5b8bd 100644
--- a/administrator/components/com_actionlogs/src/Field/PlugininfoField.php
+++ b/administrator/components/com_actionlogs/src/Field/PlugininfoField.php
@@ -44,7 +44,7 @@ class PlugininfoField extends FormField
     protected function getInput()
     {
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('folder') . ' = ' . $db->quote('actionlog'))
diff --git a/administrator/components/com_actionlogs/src/Field/UserlogtypeField.php b/administrator/components/com_actionlogs/src/Field/UserlogtypeField.php
index c821e5fb67a4e..4849e0379dccd 100644
--- a/administrator/components/com_actionlogs/src/Field/UserlogtypeField.php
+++ b/administrator/components/com_actionlogs/src/Field/UserlogtypeField.php
@@ -45,7 +45,7 @@ public function getOptions()
     {
         $db    = $this->getDatabase();
         $user  = Factory::getApplication()->getIdentity();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extensions'))
             ->from($db->quoteName('#__action_logs_users'))
             ->where($db->quoteName('user_id') . ' = :userid')
diff --git a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
index 98d884a22dc7a..f592770b1ea90 100644
--- a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
+++ b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
@@ -13,8 +13,8 @@
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Router\Route;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Filesystem\Path;
 use Joomla\String\StringHelper;
 
@@ -100,7 +100,7 @@ public static function loadTranslationFiles($extension)
             return;
         }
 
-        $lang   = Factory::getLanguage();
+        $lang   = Factory::getApplication()->getLanguage();
         $source = '';
 
         switch (substr($extension, 0, 3)) {
@@ -145,26 +145,6 @@ public static function loadTranslationFiles($extension)
         $cache[$extension] = true;
     }
 
-    /**
-     * Get parameters to be
-     *
-     * @param   string  $context  The context of the content
-     *
-     * @return  mixed  An object contains content type parameters, or null if not found
-     *
-     * @since   3.9.0
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Use the action log config model instead
-     *              Example: Factory::getApplication()->bootComponent('actionlogs')->getMVCFactory()
-     *                       ->createModel('ActionlogConfig', 'Administrator')->getLogContentTypeParams($context);
-     */
-    public static function getLogContentTypeParams($context)
-    {
-        return Factory::getApplication()->bootComponent('actionlogs')->getMVCFactory()
-            ->createModel('ActionlogConfig', 'Administrator')->getLogContentTypeParams($context);
-    }
-
     /**
      * Get human readable log message for a User Action Log
      *
@@ -232,7 +212,7 @@ public static function getHumanReadableLogMessage($log, $generateLinks = true)
      * @param   string     $contentType
      * @param   integer    $id
      * @param   string     $urlVar
-     * @param   CMSObject  $object
+     * @param   \stdClass  $object
      *
      * @return  string  Link to the content item
      *
@@ -280,11 +260,11 @@ public static function loadActionLogPluginsLanguage()
         }
         $loaded = true;
 
-        $lang = Factory::getLanguage();
-        $db   = Factory::getDbo();
+        $lang = Factory::getApplication()->getLanguage();
+        $db   = Factory::getContainer()->get(DatabaseInterface::class);
 
         // Get all (both enabled and disabled) actionlog plugins
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php
index 9ff7c98f3dafb..f772f5f29659a 100644
--- a/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php
+++ b/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php
@@ -35,7 +35,7 @@ class ActionlogConfigModel extends BaseDatabaseModel
     public function getLogContentTypeParams(string $context): ?\stdClass
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('a.*')
             ->from($db->quoteName('#__action_log_config', 'a'))
             ->where($db->quoteName('a.type_alias') . ' = :context')
diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogModel.php
index 0f7e5dafa86a3..c4fd19f0a77b8 100644
--- a/administrator/components/com_actionlogs/src/Model/ActionlogModel.php
+++ b/administrator/components/com_actionlogs/src/Model/ActionlogModel.php
@@ -13,8 +13,12 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\User\UserFactoryAwareInterface;
@@ -32,9 +36,11 @@
  *
  * @since  3.9.0
  */
-class ActionlogModel extends BaseDatabaseModel implements UserFactoryAwareInterface
+class ActionlogModel extends BaseDatabaseModel implements UserFactoryAwareInterface, MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * Function to add logs to the database
@@ -123,7 +129,7 @@ protected function sendNotificationEmails($messages, $username, $context)
         $app   = Factory::getApplication();
         $lang  = $app->getLanguage();
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query
             ->select($db->quoteName(['u.email', 'l.extensions']))
@@ -160,13 +166,14 @@ protected function sendNotificationEmails($messages, $username, $context)
         $tempPlain = [];
 
         foreach ($messages as $message) {
-            $m              = [];
-            $m['extension'] = Text::_($extension);
-            $m['message']   = ActionlogsHelper::getHumanReadableLogMessage($message);
-            $tzOffset       = Factory::getApplication()->get('offset');
-            $m['date']      = HTMLHelper::_('date', $message->log_date, 'Y-m-d H:i:s T', $tzOffset);
-            $m['username']  = $username;
-            $temp[]         = $m;
+            $m               = [];
+            $m['extension']  = Text::_($extension);
+            $m['message']    = ActionlogsHelper::getHumanReadableLogMessage($message);
+            $tzOffset        = Factory::getApplication()->get('offset');
+            $m['date']       = HTMLHelper::_('date', $message->log_date, 'Y-m-d H:i:s T', $tzOffset);
+            $m['ip_address'] = Text::_($message->ip_address);
+            $m['username']   = $username;
+            $temp[]          = $m;
 
             // copy replacement tags array and set non-HTML message.
             $mPlain            = array_merge([], $m);
@@ -181,7 +188,12 @@ protected function sendNotificationEmails($messages, $username, $context)
             'messages' => $tempPlain,
         ];
 
-        $mailer = new MailTemplate('com_actionlogs.notification', $app->getLanguage()->getTag());
+        $mailer = new MailTemplate(
+            'com_actionlogs.notification',
+            $app->getLanguage()->getTag(),
+            $this->getMailerFactory()->createMailer(),
+            $this->getLanguageFactory()
+        );
         $mailer->addTemplateData($templateData);
         $mailer->addTemplateData($templateDataPlain, true);
 
diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php
index ca6c2a8289912..d02610f132f7b 100644
--- a/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php
+++ b/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php
@@ -90,7 +90,7 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('a.*')
             ->select($db->quoteName('u.name'))
             ->from($db->quoteName('#__action_logs', 'a'))
@@ -212,7 +212,7 @@ private function buildDateRange($range)
                 $dStart->setTime(0, 0, 0);
 
                 // Now change the timezone back to UTC.
-                $tz = new \DateTimeZone('GMT');
+                $tz = new \DateTimeZone('UTC');
                 $dStart->setTimezone($tz);
                 break;
         }
@@ -234,7 +234,7 @@ public function getLogsForItem($extension, $itemId)
     {
         $itemId = (int) $itemId;
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->select('a.*')
             ->select($db->quoteName('u.name'))
             ->from($db->quoteName('#__action_logs', 'a'))
@@ -307,7 +307,7 @@ public function getLogDataAsIterator($pks = null)
     private function getLogDataQuery($pks = null)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('a.*')
             ->select($db->quoteName('u.name'))
             ->from($db->quoteName('#__action_logs', 'a'))
@@ -334,7 +334,7 @@ public function delete(&$pks)
     {
         $keys  = ArrayHelper::toInteger($pks);
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__action_logs'))
             ->whereIn($db->quoteName('id'), $keys);
         $db->setQuery($query);
diff --git a/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php b/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php
index 6e20d3a76dac2..0e1b817fe69ed 100644
--- a/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php
+++ b/administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php
@@ -11,14 +11,10 @@
 namespace Joomla\Component\Actionlogs\Administrator\View\Actionlogs;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\GenericDataException;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Pagination\Pagination;
+use Joomla\CMS\MVC\View\ListView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
-use Joomla\Component\Actionlogs\Administrator\Model\ActionlogsModel;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -29,48 +25,8 @@
  *
  * @since  3.9.0
  */
-class HtmlView extends BaseHtmlView
+class HtmlView extends ListView
 {
-    /**
-     * An array of items.
-     *
-     * @var    array
-     * @since  3.9.0
-     */
-    protected $items;
-
-    /**
-     * The model state
-     *
-     * @var    array
-     * @since  3.9.0
-     */
-    protected $state;
-
-    /**
-     * The pagination object
-     *
-     * @var    Pagination
-     * @since  3.9.0
-     */
-    protected $pagination;
-
-    /**
-     * Form object for search filters
-     *
-     * @var    Form
-     * @since  3.9.0
-     */
-    public $filterForm;
-
-    /**
-     * The active search filters
-     *
-     * @var    array
-     * @since  3.9.0
-     */
-    public $activeFilters;
-
     /**
      * Setting if the IP column should be shown
      *
@@ -88,39 +44,41 @@ class HtmlView extends BaseHtmlView
     protected $dateRelative = false;
 
     /**
-     * Method to display the view.
+     * Constructor
      *
-     * @param   string  $tpl  A template file to load. [optional]
+     * @param   array  $config  An optional associative array of configuration settings.
      *
-     * @return  void
+     * @since 6.0.0
+     */
+    public function __construct(array $config)
+    {
+        if (empty($config['option'])) {
+            $config['option'] = 'com_actionlogs';
+        }
+
+        $config['toolbar_title'] = 'COM_ACTIONLOGS_MANAGER_USERLOGS';
+        $config['toolbar_icon']  = 'list-2 actionlog';
+
+        parent::__construct($config);
+    }
+
+    /**
+     * Prepare view data
      *
-     * @since   3.9.0
+     * @return  void
      *
-     * @throws  \Exception
+     * @since 6.0.0
      */
-    public function display($tpl = null)
+    protected function initializeView()
     {
-        /** @var ActionlogsModel $model */
-        $model               = $this->getModel();
-        $this->items         = $model->getItems();
-        $this->state         = $model->getState();
-        $this->pagination    = $model->getPagination();
-        $this->filterForm    = $model->getFilterForm();
-        $this->activeFilters = $model->getActiveFilters();
+        parent::initializeView();
+
         $params              = ComponentHelper::getParams('com_actionlogs');
         $this->showIpColumn  = (bool) $params->get('ip_logging', 0);
         $this->dateRelative  = (bool) $params->get('date_relative', 1);
 
-        if (\count($errors = $model->getErrors())) {
-            throw new GenericDataException(implode("\n", $errors), 500);
-        }
-
-        $this->addToolbar();
-
         // Load all actionlog plugins language files
         ActionlogsHelper::loadActionLogPluginsLanguage();
-
-        parent::display($tpl);
     }
 
     /**
@@ -133,6 +91,7 @@ public function display($tpl = null)
     protected function addToolbar()
     {
         ToolbarHelper::title(Text::_('COM_ACTIONLOGS_MANAGER_USERLOGS'), 'icon-list-2');
+
         $toolbar = $this->getDocument()->getToolbar();
 
         $toolbar->standardButton('download', 'COM_ACTIONLOGS_EXPORT_CSV', 'actionlogs.exportSelectedLogs')
diff --git a/administrator/components/com_actionlogs/tmpl/actionlogs/default.php b/administrator/components/com_actionlogs/tmpl/actionlogs/default.php
index e0f9d0bf806b1..3261fb5568df4 100644
--- a/administrator/components/com_actionlogs/tmpl/actionlogs/default.php
+++ b/administrator/components/com_actionlogs/tmpl/actionlogs/default.php
@@ -15,9 +15,8 @@
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Actionlogs\Administrator\Helper\ActionlogsHelper;
-use Joomla\Component\Actionlogs\Administrator\View\Actionlogs\HtmlView;
 
-/** @var HtmlView $this */
+/** @var \Joomla\Component\Actionlogs\Administrator\View\Actionlogs\HtmlView $this */
 
 $listOrder  = $this->escape($this->state->get('list.ordering'));
 $listDirn   = $this->escape($this->state->get('list.direction'));
@@ -118,9 +117,8 @@
             <?php echo $this->pagination->getListFooter(); ?>
 
         <?php endif;?>
-        <input type="hidden" name="task" value="" />
-        <input type="hidden" name="boxchecked" value="0" />
-        <?php echo HTMLHelper::_('form.token'); ?>
+
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </div>
 </form>
 <form action="<?php echo Route::_('index.php?option=com_actionlogs&view=actionlogs'); ?>" method="post" name="exportForm" id="exportForm">
diff --git a/administrator/components/com_admin/postinstall/behindproxy.php b/administrator/components/com_admin/postinstall/behindproxy.php
index 241eeaf1bc574..48d0278731a0a 100644
--- a/administrator/components/com_admin/postinstall/behindproxy.php
+++ b/administrator/components/com_admin/postinstall/behindproxy.php
@@ -38,11 +38,7 @@ function admin_postinstall_behindproxy_condition()
         return true;
     }
 
-    if (\array_key_exists('HTTP_CLIENT_IP', $_SERVER) && !empty($_SERVER['HTTP_CLIENT_IP'])) {
-        return true;
-    }
-
-    return false;
+    return !empty($_SERVER['HTTP_CLIENT_IP']);
 }
 
 
diff --git a/administrator/components/com_admin/postinstall/languageaccess340.php b/administrator/components/com_admin/postinstall/languageaccess340.php
index 32ec165e056c0..e62736d0c8539 100644
--- a/administrator/components/com_admin/postinstall/languageaccess340.php
+++ b/administrator/components/com_admin/postinstall/languageaccess340.php
@@ -30,7 +30,7 @@
 function admin_postinstall_languageaccess340_condition()
 {
     $db    = Factory::getDbo();
-    $query = $db->getQuery(true)
+    $query = $db->createQuery()
         ->select($db->quoteName('access'))
         ->from($db->quoteName('#__languages'))
         ->where($db->quoteName('access') . ' = ' . $db->quote('0'));
@@ -38,11 +38,6 @@ function admin_postinstall_languageaccess340_condition()
     $db->execute();
     $numRows = $db->getNumRows();
 
-    if (isset($numRows) && $numRows != 0) {
-        // We have rows here so we have at minimum one row with access set to 0
-        return true;
-    }
-
-    // All good the query return nothing.
-    return false;
+    // Return true if we have have at minimum one row with access set to 0
+    return $numRows > 0;
 }
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index e0ddda6c73b19..eb77c91dab6b1 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -10,19 +10,15 @@
  * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Application\ApplicationHelper;
-use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Extension\ExtensionHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Table\Table;
-use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Table\Asset;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Folder;
-use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -174,7 +170,7 @@ protected function clearStatsCache()
         try {
             // Get the params for the stats plugin
             $params = $db->setQuery(
-                $db->getQuery(true)
+                $db->createQuery()
                     ->select($db->quoteName('params'))
                     ->from($db->quoteName('#__extensions'))
                     ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -196,7 +192,7 @@ protected function clearStatsCache()
 
         $params = json_encode($params);
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__extensions'))
             ->set($db->quoteName('params') . ' = ' . $db->quote($params))
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -264,7 +260,7 @@ protected function updateDatabaseMysql()
 
     /**
      * Uninstall extensions and optionally migrate their parameters when
-     * updating from a version older than 5.0.1.
+     * updating from a version older than 6.0.0.
      *
      * @return  void
      *
@@ -272,8 +268,8 @@ protected function updateDatabaseMysql()
      */
     protected function uninstallExtensions()
     {
-        // Don't uninstall extensions when not updating from a version older than 5.0.1
-        if (empty($this->fromVersion) || version_compare($this->fromVersion, '5.0.1', 'ge')) {
+        // Don't uninstall extensions when not updating from a version older than 6.0.0
+        if (empty($this->fromVersion) || version_compare($this->fromVersion, '6.0.0', 'ge')) {
             return true;
         }
 
@@ -287,20 +283,19 @@ protected function uninstallExtensions()
              * 'client_id'    => Field `client_id` in the `#__extensions` table
              * 'pre_function' => Name of an optional migration function to be called before
              *                   uninstalling, `null` if not used.
+             * Examples:
+             * ['type' => 'plugin', 'element' => 'demotasks', 'folder' => 'task', 'client_id' => 0, 'pre_function' => null],
+             * ['type' => 'plugin', 'element' => 'compat', 'folder' => 'system', 'client_id' => 0, 'pre_function' => 'migrateCompatPlugin'],
              */
-            ['type' => 'plugin', 'element' => 'demotasks', 'folder' => 'task', 'client_id' => 0, 'pre_function' => null],
-            ['type' => 'plugin', 'element' => 'compat', 'folder' => 'system', 'client_id' => 0, 'pre_function' => 'migrateCompatPlugin'],
-            ['type' => 'plugin', 'element' => 'logrotation', 'folder' => 'system', 'client_id' => 0, 'pre_function' => 'migrateLogRotationPlugin'],
-            ['type' => 'plugin', 'element' => 'recaptcha', 'folder' => 'captcha', 'client_id' => 0, 'pre_function' => null],
-            ['type' => 'plugin', 'element' => 'sessiongc', 'folder' => 'system', 'client_id' => 0, 'pre_function' => 'migrateSessionGCPlugin'],
-            ['type' => 'plugin', 'element' => 'updatenotification', 'folder' => 'system', 'client_id' => 0, 'pre_function' => 'migrateUpdatenotificationPlugin'],
+            // Uninstall the old joomla 5 compatibility plugin
+            ['type' => 'plugin', 'element' => 'compat', 'folder' => 'behaviour', 'client_id' => 0, 'pre_function' => null],
         ];
 
         $db = Factory::getDbo();
 
         foreach ($extensions as $extension) {
             $row = $db->setQuery(
-                $db->getQuery(true)
+                $db->createQuery()
                     ->select('*')
                     ->from($db->quoteName('#__extensions'))
                     ->where($db->quoteName('type') . ' = ' . $db->quote($extension['type']))
@@ -324,7 +319,7 @@ protected function uninstallExtensions()
 
                 // Unlock and unprotect the plugin so we can uninstall it
                 $db->setQuery(
-                    $db->getQuery(true)
+                    $db->createQuery()
                         ->update($db->quoteName('#__extensions'))
                         ->set($db->quoteName('locked') . ' = 0')
                         ->set($db->quoteName('protected') . ' = 0')
@@ -345,162 +340,6 @@ protected function uninstallExtensions()
         }
     }
 
-    /**
-     * Migrate plugin parameters of obsolete compat system plugin to compat behaviour plugin
-     *
-     * @param   \stdClass  $rowOld  Object with the obsolete plugin's record in the `#__extensions` table
-     *
-     * @return  void
-     *
-     * @since   5.0.0
-     */
-    private function migrateCompatPlugin($rowOld)
-    {
-        $db = Factory::getDbo();
-
-        $db->setQuery(
-            $db->getQuery(true)
-                ->update($db->quoteName('#__extensions'))
-                ->set($db->quoteName('enabled') . ' = :enabled')
-                ->set($db->quoteName('params') . ' = :params')
-                ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-                ->where($db->quoteName('element') . ' = ' . $db->quote('compat'))
-                ->where($db->quoteName('folder') . ' = ' . $db->quote('behaviour'))
-                ->where($db->quoteName('client_id') . ' = 0')
-                ->bind(':enabled', $rowOld->enabled, ParameterType::INTEGER)
-                ->bind(':params', $rowOld->params)
-        )->execute();
-    }
-
-    /**
-     * This method is for migration for old logrotation system plugin migration to task.
-     *
-     * @param   \stdClass  $data  Object with the extension's record in the `#__extensions` table
-     *
-     * @return  void
-     *
-     * @since   5.0.0
-     */
-    private function migrateLogRotationPlugin($data)
-    {
-        if (!$data->enabled) {
-            return;
-        }
-
-        /** @var \Joomla\Component\Scheduler\Administrator\Extension\SchedulerComponent $component */
-        $component = Factory::getApplication()->bootComponent('com_scheduler');
-
-        /** @var \Joomla\Component\Scheduler\Administrator\Model\TaskModel $model */
-        $model = $component->getMVCFactory()->createModel('Task', 'Administrator', ['ignore_request' => true]);
-
-        // Get the timeout, as configured in plg_system_logrotation
-        $params       = new Registry($data->params);
-        $cachetimeout = (int) $params->get('cachetimeout', 30);
-        $lastrun      = (int) $params->get('lastrun', time());
-
-        $task = [
-            'title'           => 'Rotate Logs',
-            'type'            => 'rotation.logs',
-            'execution_rules' => [
-                'rule-type'     => 'interval-days',
-                'interval-days' => $cachetimeout,
-                'exec-time'     => gmdate('H:i', $lastrun),
-                'exec-day'      => gmdate('d'),
-            ],
-            'state'  => 1,
-            'params' => [
-                'logstokeep' => $params->get('logstokeep', 1),
-            ],
-        ];
-        $model->save($task);
-    }
-
-    /**
-     * This method is for migration for old updatenotification system plugin migration to task.
-     *
-     * @param   \stdClass  $data  Object with the extension's record in the `#__extensions` table
-     *
-     * @return  void
-     *
-     * @since   5.0.0
-     */
-    private function migrateSessionGCPlugin($data)
-    {
-        if (!$data->enabled) {
-            return;
-        }
-
-        // Get the plugin parameters
-        $params = new Registry($data->params);
-
-        /** @var \Joomla\Component\Scheduler\Administrator\Extension\SchedulerComponent $component */
-        $component = Factory::getApplication()->bootComponent('com_scheduler');
-
-        /** @var \Joomla\Component\Scheduler\Administrator\Model\TaskModel $model */
-        $model = $component->getMVCFactory()->createModel('Task', 'Administrator', ['ignore_request' => true]);
-        $task  = [
-            'title'           => 'Session GC',
-            'type'            => 'session.gc',
-            'execution_rules' => [
-                'rule-type'      => 'interval-hours',
-                'interval-hours' => 24,
-                'exec-time'      => gmdate('H:i'),
-                'exec-day'       => gmdate('d'),
-            ],
-            'state'  => 1,
-            'params' => [
-                'enable_session_gc'          => $params->get('enable_session_gc', 1),
-                'enable_session_metadata_gc' => $params->get('enable_session_metadata_gc', 1),
-            ],
-        ];
-        $model->save($task);
-    }
-
-    /**
-     * This method is for migration for old updatenotification system plugin migration to task.
-     *
-     * @param   \stdClass  $data  Object with the extension's record in the `#__extensions` table
-     *
-     * @return  void
-     *
-     * @since   5.0.0
-     */
-    private function migrateUpdatenotificationPlugin($data)
-    {
-        if (!$data->enabled) {
-            return;
-        }
-
-        // Get the timeout for Joomla! updates, as configured in com_installer's component parameters
-        $component    = ComponentHelper::getComponent('com_installer');
-        $paramsc      = $component->getParams();
-        $cachetimeout = (int) $paramsc->get('cachetimeout', 6);
-        $params       = new Registry($data->params);
-        $lastrun      = (int) $params->get('lastrun', time());
-
-        /** @var \Joomla\Component\Scheduler\Administrator\Extension\SchedulerComponent $component */
-        $component = Factory::getApplication()->bootComponent('com_scheduler');
-
-        /** @var \Joomla\Component\Scheduler\Administrator\Model\TaskModel $model */
-        $model = $component->getMVCFactory()->createModel('Task', 'Administrator', ['ignore_request' => true]);
-        $task  = [
-            'title'           => 'Update Notification',
-            'type'            => 'update.notification',
-            'execution_rules' => [
-                'rule-type'      => 'interval-hours',
-                'interval-hours' => $cachetimeout,
-                'exec-time'      => gmdate('H:i', $lastrun),
-                'exec-day'       => gmdate('d'),
-            ],
-            'state'  => 1,
-            'params' => [
-                'email'             => $params->get('email', ''),
-                'language_override' => $params->get('language_override', ''),
-            ],
-        ];
-        $model->save($task);
-    }
-
     /**
      * Update the manifest caches
      *
@@ -512,7 +351,7 @@ protected function updateManifestCaches()
 
         // Attempt to refresh manifest caches
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from('#__extensions');
 
@@ -575,1915 +414,643 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
         ];
 
         $files = [
-            // From 4.4 to 5.0
-            '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion.sql',
-            '/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion_optional.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-03-05.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-05-15.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-19.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-29.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-08-29.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-03-09.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-03-30.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-04-15.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-04-22.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-05-20.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-06-29.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-07-13.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-09-13.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-09-22.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-10-06.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2019-10-17.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-02-02.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-03-10.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-03-25.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-05-29.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-09-27.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-12-20.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-04-22.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-04-27.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-05-30.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-06-04.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-08-13.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.0-2021-08-17.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.3-2021-09-04.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.3-2021-09-05.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.0.6-2021-12-23.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.1.0-2021-11-20.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.1.0-2021-11-28.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.1.0-2021-12-29.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.1.0-2022-01-08.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.1.0-2022-01-19.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.1.0-2022-01-24.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.1.1-2022-02-20.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.1.3-2022-04-07.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.1.3-2022-04-08.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-05-15.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-06-15.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-06-19.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-06-22.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.2.0-2022-07-07.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.2.1-2022-08-23.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.2.3-2022-09-07.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.2.7-2022-12-29.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.2.9-2023-03-07.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.0-2022-09-23.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.0-2022-11-06.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.0-2023-01-30.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.0-2023-02-15.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.0-2023-02-25.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.0-2023-03-07.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.0-2023-03-09.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.0-2023-03-10.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.0-2023-03-28.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.0-2023-03-29.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.2-2023-03-31.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.2-2023-05-03.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.3.2-2023-05-20.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.4.0-2023-05-08.sql',
-            '/administrator/components/com_admin/sql/updates/mysql/4.4.0-2023-09-13.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-03-05.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-05-15.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-19.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-29.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-08-29.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-03-09.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-03-30.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-04-15.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-04-22.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-05-20.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-06-29.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-07-13.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-09-13.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-09-22.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-10-06.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2019-10-17.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-02-02.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-03-10.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-03-25.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-05-29.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-08-01.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-09-27.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-12-20.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-04-22.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-04-27.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-05-30.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-06-04.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-08-13.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2021-08-17.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.3-2021-09-04.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.3-2021-09-05.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.0.6-2021-12-23.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.1.0-2021-11-20.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.1.0-2021-11-28.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.1.0-2021-12-29.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.1.0-2022-01-08.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.1.0-2022-01-19.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.1.0-2022-01-24.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.1.1-2022-02-20.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.1.3-2022-04-07.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.1.3-2022-04-08.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-05-15.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-06-19.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-06-22.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.2.0-2022-07-07.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.2.1-2022-08-23.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.2.3-2022-09-07.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.2.7-2022-12-29.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.2.9-2023-03-07.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.0-2022-09-23.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.0-2022-11-06.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.0-2023-01-30.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.0-2023-02-15.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.0-2023-02-25.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.0-2023-03-07.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.0-2023-03-09.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.0-2023-03-10.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.0-2023-03-28.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.0-2023-03-29.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.2-2023-03-31.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.2-2023-05-03.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.3.2-2023-05-20.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.4.0-2023-05-08.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.4.0-2023-09-13.sql',
-            '/libraries/src/Schema/ChangeItem/SqlsrvChangeItem.php',
-            '/libraries/vendor/beberlei/assert/lib/Assert/Assert.php',
-            '/libraries/vendor/beberlei/assert/lib/Assert/Assertion.php',
-            '/libraries/vendor/beberlei/assert/lib/Assert/AssertionChain.php',
-            '/libraries/vendor/beberlei/assert/lib/Assert/AssertionFailedException.php',
-            '/libraries/vendor/beberlei/assert/lib/Assert/functions.php',
-            '/libraries/vendor/beberlei/assert/lib/Assert/InvalidArgumentException.php',
-            '/libraries/vendor/beberlei/assert/lib/Assert/LazyAssertion.php',
-            '/libraries/vendor/beberlei/assert/lib/Assert/LazyAssertionException.php',
-            '/libraries/vendor/beberlei/assert/LICENSE',
-            '/libraries/vendor/google/recaptcha/ARCHITECTURE.md',
-            '/libraries/vendor/jfcherng/php-color-output/src/helpers.php',
-            '/libraries/vendor/joomla/filter/PATCHES.txt',
-            '/libraries/vendor/joomla/ldap/LICENSE',
-            '/libraries/vendor/joomla/ldap/src/LdapClient.php',
-            '/libraries/vendor/laminas/laminas-zendframework-bridge/config/replacements.php',
-            '/libraries/vendor/laminas/laminas-zendframework-bridge/COPYRIGHT.md',
-            '/libraries/vendor/laminas/laminas-zendframework-bridge/LICENSE.md',
-            '/libraries/vendor/laminas/laminas-zendframework-bridge/src/autoload.php',
-            '/libraries/vendor/laminas/laminas-zendframework-bridge/src/Autoloader.php',
-            '/libraries/vendor/laminas/laminas-zendframework-bridge/src/ConfigPostProcessor.php',
-            '/libraries/vendor/laminas/laminas-zendframework-bridge/src/Module.php',
-            '/libraries/vendor/laminas/laminas-zendframework-bridge/src/Replacements.php',
-            '/libraries/vendor/laminas/laminas-zendframework-bridge/src/RewriteRules.php',
-            '/libraries/vendor/lcobucci/jwt/compat/class-aliases.php',
-            '/libraries/vendor/lcobucci/jwt/compat/json-exception-polyfill.php',
-            '/libraries/vendor/lcobucci/jwt/compat/lcobucci-clock-polyfill.php',
-            '/libraries/vendor/lcobucci/jwt/src/Claim.php',
-            '/libraries/vendor/lcobucci/jwt/src/Claim/Basic.php',
-            '/libraries/vendor/lcobucci/jwt/src/Claim/EqualsTo.php',
-            '/libraries/vendor/lcobucci/jwt/src/Claim/Factory.php',
-            '/libraries/vendor/lcobucci/jwt/src/Claim/GreaterOrEqualsTo.php',
-            '/libraries/vendor/lcobucci/jwt/src/Claim/LesserOrEqualsTo.php',
-            '/libraries/vendor/lcobucci/jwt/src/Claim/Validatable.php',
-            '/libraries/vendor/lcobucci/jwt/src/Parsing/Decoder.php',
-            '/libraries/vendor/lcobucci/jwt/src/Parsing/Encoder.php',
-            '/libraries/vendor/lcobucci/jwt/src/Signature.php',
-            '/libraries/vendor/lcobucci/jwt/src/Signer/BaseSigner.php',
-            '/libraries/vendor/lcobucci/jwt/src/Signer/Keychain.php',
-            '/libraries/vendor/lcobucci/jwt/src/ValidationData.php',
-            '/libraries/vendor/nyholm/psr7/LICENSE',
-            '/libraries/vendor/nyholm/psr7/phpstan-baseline.neon',
-            '/libraries/vendor/nyholm/psr7/psalm.baseline.xml',
-            '/libraries/vendor/nyholm/psr7/src/Factory/HttplugFactory.php',
-            '/libraries/vendor/nyholm/psr7/src/Factory/Psr17Factory.php',
-            '/libraries/vendor/nyholm/psr7/src/MessageTrait.php',
-            '/libraries/vendor/nyholm/psr7/src/Request.php',
-            '/libraries/vendor/nyholm/psr7/src/RequestTrait.php',
-            '/libraries/vendor/nyholm/psr7/src/Response.php',
-            '/libraries/vendor/nyholm/psr7/src/ServerRequest.php',
-            '/libraries/vendor/nyholm/psr7/src/Stream.php',
-            '/libraries/vendor/nyholm/psr7/src/StreamTrait.php',
-            '/libraries/vendor/nyholm/psr7/src/UploadedFile.php',
-            '/libraries/vendor/nyholm/psr7/src/Uri.php',
-            '/libraries/vendor/psr/log/Psr/Log/AbstractLogger.php',
-            '/libraries/vendor/psr/log/Psr/Log/InvalidArgumentException.php',
-            '/libraries/vendor/psr/log/Psr/Log/LoggerAwareInterface.php',
-            '/libraries/vendor/psr/log/Psr/Log/LoggerAwareTrait.php',
-            '/libraries/vendor/psr/log/Psr/Log/LoggerInterface.php',
-            '/libraries/vendor/psr/log/Psr/Log/LoggerTrait.php',
-            '/libraries/vendor/psr/log/Psr/Log/LogLevel.php',
-            '/libraries/vendor/psr/log/Psr/Log/NullLogger.php',
-            '/libraries/vendor/ramsey/uuid/LICENSE',
-            '/libraries/vendor/ramsey/uuid/src/BinaryUtils.php',
-            '/libraries/vendor/ramsey/uuid/src/Builder/DefaultUuidBuilder.php',
-            '/libraries/vendor/ramsey/uuid/src/Builder/DegradedUuidBuilder.php',
-            '/libraries/vendor/ramsey/uuid/src/Builder/UuidBuilderInterface.php',
-            '/libraries/vendor/ramsey/uuid/src/Codec/CodecInterface.php',
-            '/libraries/vendor/ramsey/uuid/src/Codec/GuidStringCodec.php',
-            '/libraries/vendor/ramsey/uuid/src/Codec/OrderedTimeCodec.php',
-            '/libraries/vendor/ramsey/uuid/src/Codec/StringCodec.php',
-            '/libraries/vendor/ramsey/uuid/src/Codec/TimestampFirstCombCodec.php',
-            '/libraries/vendor/ramsey/uuid/src/Codec/TimestampLastCombCodec.php',
-            '/libraries/vendor/ramsey/uuid/src/Converter/Number/BigNumberConverter.php',
-            '/libraries/vendor/ramsey/uuid/src/Converter/Number/DegradedNumberConverter.php',
-            '/libraries/vendor/ramsey/uuid/src/Converter/NumberConverterInterface.php',
-            '/libraries/vendor/ramsey/uuid/src/Converter/Time/BigNumberTimeConverter.php',
-            '/libraries/vendor/ramsey/uuid/src/Converter/Time/DegradedTimeConverter.php',
-            '/libraries/vendor/ramsey/uuid/src/Converter/Time/PhpTimeConverter.php',
-            '/libraries/vendor/ramsey/uuid/src/Converter/TimeConverterInterface.php',
-            '/libraries/vendor/ramsey/uuid/src/DegradedUuid.php',
-            '/libraries/vendor/ramsey/uuid/src/Exception/InvalidUuidStringException.php',
-            '/libraries/vendor/ramsey/uuid/src/Exception/UnsatisfiedDependencyException.php',
-            '/libraries/vendor/ramsey/uuid/src/Exception/UnsupportedOperationException.php',
-            '/libraries/vendor/ramsey/uuid/src/FeatureSet.php',
-            '/libraries/vendor/ramsey/uuid/src/functions.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/CombGenerator.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/DefaultTimeGenerator.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/MtRandGenerator.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/OpenSslGenerator.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/PeclUuidRandomGenerator.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/PeclUuidTimeGenerator.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/RandomBytesGenerator.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/RandomGeneratorFactory.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/RandomGeneratorInterface.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/RandomLibAdapter.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/SodiumRandomGenerator.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/TimeGeneratorFactory.php',
-            '/libraries/vendor/ramsey/uuid/src/Generator/TimeGeneratorInterface.php',
-            '/libraries/vendor/ramsey/uuid/src/Provider/Node/FallbackNodeProvider.php',
-            '/libraries/vendor/ramsey/uuid/src/Provider/Node/RandomNodeProvider.php',
-            '/libraries/vendor/ramsey/uuid/src/Provider/Node/SystemNodeProvider.php',
-            '/libraries/vendor/ramsey/uuid/src/Provider/NodeProviderInterface.php',
-            '/libraries/vendor/ramsey/uuid/src/Provider/Time/FixedTimeProvider.php',
-            '/libraries/vendor/ramsey/uuid/src/Provider/Time/SystemTimeProvider.php',
-            '/libraries/vendor/ramsey/uuid/src/Provider/TimeProviderInterface.php',
-            '/libraries/vendor/ramsey/uuid/src/Uuid.php',
-            '/libraries/vendor/ramsey/uuid/src/UuidFactory.php',
-            '/libraries/vendor/ramsey/uuid/src/UuidFactoryInterface.php',
-            '/libraries/vendor/ramsey/uuid/src/UuidInterface.php',
-            '/libraries/vendor/spomky-labs/base64url/LICENSE',
-            '/libraries/vendor/spomky-labs/base64url/src/Base64Url.php',
-            '/libraries/vendor/spomky-labs/cbor-php/src/ByteStringWithChunkObject.php',
-            '/libraries/vendor/spomky-labs/cbor-php/src/InfiniteListObject.php',
-            '/libraries/vendor/spomky-labs/cbor-php/src/InfiniteMapObject.php',
-            '/libraries/vendor/spomky-labs/cbor-php/src/SignedIntegerObject.php',
-            '/libraries/vendor/spomky-labs/cbor-php/src/Tag/EpochTag.php',
-            '/libraries/vendor/spomky-labs/cbor-php/src/Tag/PositiveBigIntegerTag.php',
-            '/libraries/vendor/spomky-labs/cbor-php/src/Tag/TagObjectManager.php',
-            '/libraries/vendor/spomky-labs/cbor-php/src/TagObject.php',
-            '/libraries/vendor/spomky-labs/cbor-php/src/TextStringWithChunkObject.php',
-            '/libraries/vendor/symfony/polyfill-php72/bootstrap.php',
-            '/libraries/vendor/symfony/polyfill-php72/LICENSE',
-            '/libraries/vendor/symfony/polyfill-php72/Php72.php',
-            '/libraries/vendor/symfony/polyfill-php73/bootstrap.php',
-            '/libraries/vendor/symfony/polyfill-php73/LICENSE',
-            '/libraries/vendor/symfony/polyfill-php73/Php73.php',
-            '/libraries/vendor/symfony/polyfill-php73/Resources/stubs/JsonException.php',
-            '/libraries/vendor/symfony/polyfill-php80/bootstrap.php',
-            '/libraries/vendor/symfony/polyfill-php80/LICENSE',
-            '/libraries/vendor/symfony/polyfill-php80/Php80.php',
-            '/libraries/vendor/symfony/polyfill-php80/PhpToken.php',
-            '/libraries/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php',
-            '/libraries/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
-            '/libraries/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php',
-            '/libraries/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
-            '/libraries/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php',
-            '/libraries/vendor/symfony/polyfill-php81/bootstrap.php',
-            '/libraries/vendor/symfony/polyfill-php81/LICENSE',
-            '/libraries/vendor/symfony/polyfill-php81/Php81.php',
-            '/libraries/vendor/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php',
-            '/libraries/vendor/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php',
-            '/libraries/vendor/web-auth/cose-lib/src/Verifier.php',
-            '/libraries/vendor/web-auth/metadata-service/src/AuthenticatorStatus.php',
-            '/libraries/vendor/web-auth/metadata-service/src/BiometricAccuracyDescriptor.php',
-            '/libraries/vendor/web-auth/metadata-service/src/BiometricStatusReport.php',
-            '/libraries/vendor/web-auth/metadata-service/src/CodeAccuracyDescriptor.php',
-            '/libraries/vendor/web-auth/metadata-service/src/DisplayPNGCharacteristicsDescriptor.php',
-            '/libraries/vendor/web-auth/metadata-service/src/DistantSingleMetadata.php',
-            '/libraries/vendor/web-auth/metadata-service/src/DistantSingleMetadataFactory.php',
-            '/libraries/vendor/web-auth/metadata-service/src/EcdaaTrustAnchor.php',
-            '/libraries/vendor/web-auth/metadata-service/src/ExtensionDescriptor.php',
-            '/libraries/vendor/web-auth/metadata-service/src/MetadataService.php',
-            '/libraries/vendor/web-auth/metadata-service/src/MetadataServiceFactory.php',
-            '/libraries/vendor/web-auth/metadata-service/src/MetadataStatement.php',
-            '/libraries/vendor/web-auth/metadata-service/src/MetadataStatementFetcher.php',
-            '/libraries/vendor/web-auth/metadata-service/src/MetadataTOCPayload.php',
-            '/libraries/vendor/web-auth/metadata-service/src/MetadataTOCPayloadEntry.php',
-            '/libraries/vendor/web-auth/metadata-service/src/PatternAccuracyDescriptor.php',
-            '/libraries/vendor/web-auth/metadata-service/src/RgbPaletteEntry.php',
-            '/libraries/vendor/web-auth/metadata-service/src/RogueListEntry.php',
-            '/libraries/vendor/web-auth/metadata-service/src/SimpleMetadataStatementRepository.php',
-            '/libraries/vendor/web-auth/metadata-service/src/SingleMetadata.php',
-            '/libraries/vendor/web-auth/metadata-service/src/StatusReport.php',
-            '/libraries/vendor/web-auth/metadata-service/src/VerificationMethodANDCombinations.php',
-            '/libraries/vendor/web-auth/metadata-service/src/VerificationMethodDescriptor.php',
-            '/libraries/vendor/web-auth/metadata-service/src/Version.php',
-            '/libraries/vendor/web-auth/webauthn-lib/src/Server.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/RSA.php',
-            '/media/com_templates/js/admin-template-compare-es5.js',
-            '/media/com_templates/js/admin-template-compare-es5.min.js',
-            '/media/com_templates/js/admin-template-compare-es5.min.js.gz',
-            '/media/com_templates/js/admin-template-compare.js',
-            '/media/com_templates/js/admin-template-compare.min.js',
-            '/media/com_templates/js/admin-template-compare.min.js.gz',
-            '/media/com_users/js/admin-users-mail-es5.js',
-            '/media/com_users/js/admin-users-mail-es5.min.js',
-            '/media/com_users/js/admin-users-mail-es5.min.js.gz',
-            '/media/com_users/js/admin-users-mail.js',
-            '/media/com_users/js/admin-users-mail.min.js',
-            '/media/com_users/js/admin-users-mail.min.js.gz',
-            '/media/vendor/fontawesome-free/scss/_larger.scss',
-            '/media/vendor/fontawesome-free/webfonts/fa-brands-400.eot',
-            '/media/vendor/fontawesome-free/webfonts/fa-brands-400.svg',
-            '/media/vendor/fontawesome-free/webfonts/fa-brands-400.woff',
-            '/media/vendor/fontawesome-free/webfonts/fa-regular-400.eot',
-            '/media/vendor/fontawesome-free/webfonts/fa-regular-400.svg',
-            '/media/vendor/fontawesome-free/webfonts/fa-regular-400.woff',
-            '/media/vendor/fontawesome-free/webfonts/fa-solid-900.eot',
-            '/media/vendor/fontawesome-free/webfonts/fa-solid-900.svg',
-            '/media/vendor/fontawesome-free/webfonts/fa-solid-900.woff',
-            '/media/vendor/tinymce/plugins/bbcode/index.js',
-            '/media/vendor/tinymce/plugins/bbcode/plugin.js',
-            '/media/vendor/tinymce/plugins/bbcode/plugin.min.js',
-            '/media/vendor/tinymce/plugins/bbcode/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/colorpicker/index.js',
-            '/media/vendor/tinymce/plugins/colorpicker/plugin.js',
-            '/media/vendor/tinymce/plugins/colorpicker/plugin.min.js',
-            '/media/vendor/tinymce/plugins/colorpicker/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/contextmenu/index.js',
-            '/media/vendor/tinymce/plugins/contextmenu/plugin.js',
-            '/media/vendor/tinymce/plugins/contextmenu/plugin.min.js',
-            '/media/vendor/tinymce/plugins/contextmenu/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/fullpage/index.js',
-            '/media/vendor/tinymce/plugins/fullpage/plugin.js',
-            '/media/vendor/tinymce/plugins/fullpage/plugin.min.js',
-            '/media/vendor/tinymce/plugins/fullpage/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/hr/index.js',
-            '/media/vendor/tinymce/plugins/hr/plugin.js',
-            '/media/vendor/tinymce/plugins/hr/plugin.min.js',
-            '/media/vendor/tinymce/plugins/hr/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/imagetools/index.js',
-            '/media/vendor/tinymce/plugins/imagetools/plugin.js',
-            '/media/vendor/tinymce/plugins/imagetools/plugin.min.js',
-            '/media/vendor/tinymce/plugins/imagetools/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/legacyoutput/index.js',
-            '/media/vendor/tinymce/plugins/legacyoutput/plugin.js',
-            '/media/vendor/tinymce/plugins/legacyoutput/plugin.min.js',
-            '/media/vendor/tinymce/plugins/legacyoutput/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/noneditable/index.js',
-            '/media/vendor/tinymce/plugins/noneditable/plugin.js',
-            '/media/vendor/tinymce/plugins/noneditable/plugin.min.js',
-            '/media/vendor/tinymce/plugins/noneditable/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/paste/index.js',
-            '/media/vendor/tinymce/plugins/paste/plugin.js',
-            '/media/vendor/tinymce/plugins/paste/plugin.min.js',
-            '/media/vendor/tinymce/plugins/paste/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/print/index.js',
-            '/media/vendor/tinymce/plugins/print/plugin.js',
-            '/media/vendor/tinymce/plugins/print/plugin.min.js',
-            '/media/vendor/tinymce/plugins/print/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/spellchecker/index.js',
-            '/media/vendor/tinymce/plugins/spellchecker/plugin.js',
-            '/media/vendor/tinymce/plugins/spellchecker/plugin.min.js',
-            '/media/vendor/tinymce/plugins/spellchecker/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/tabfocus/index.js',
-            '/media/vendor/tinymce/plugins/tabfocus/plugin.js',
-            '/media/vendor/tinymce/plugins/tabfocus/plugin.min.js',
-            '/media/vendor/tinymce/plugins/tabfocus/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/template/index.js',
-            '/media/vendor/tinymce/plugins/template/plugin.js',
-            '/media/vendor/tinymce/plugins/template/plugin.min.js',
-            '/media/vendor/tinymce/plugins/template/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/textcolor/index.js',
-            '/media/vendor/tinymce/plugins/textcolor/plugin.js',
-            '/media/vendor/tinymce/plugins/textcolor/plugin.min.js',
-            '/media/vendor/tinymce/plugins/textcolor/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/textpattern/index.js',
-            '/media/vendor/tinymce/plugins/textpattern/plugin.js',
-            '/media/vendor/tinymce/plugins/textpattern/plugin.min.js',
-            '/media/vendor/tinymce/plugins/textpattern/plugin.min.js.gz',
-            '/media/vendor/tinymce/plugins/toc/index.js',
-            '/media/vendor/tinymce/plugins/toc/plugin.js',
-            '/media/vendor/tinymce/plugins/toc/plugin.min.js',
-            '/media/vendor/tinymce/plugins/toc/plugin.min.js.gz',
-            '/media/vendor/tinymce/skins/ui/oxide-dark/content.mobile.css',
-            '/media/vendor/tinymce/skins/ui/oxide-dark/content.mobile.min.css',
-            '/media/vendor/tinymce/skins/ui/oxide-dark/content.mobile.min.css.gz',
-            '/media/vendor/tinymce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff',
-            '/media/vendor/tinymce/skins/ui/oxide-dark/skin.mobile.css',
-            '/media/vendor/tinymce/skins/ui/oxide-dark/skin.mobile.min.css',
-            '/media/vendor/tinymce/skins/ui/oxide-dark/skin.mobile.min.css.gz',
-            '/media/vendor/tinymce/skins/ui/oxide/content.mobile.css',
-            '/media/vendor/tinymce/skins/ui/oxide/content.mobile.min.css',
-            '/media/vendor/tinymce/skins/ui/oxide/content.mobile.min.css.gz',
-            '/media/vendor/tinymce/skins/ui/oxide/fonts/tinymce-mobile.woff',
-            '/media/vendor/tinymce/skins/ui/oxide/skin.mobile.css',
-            '/media/vendor/tinymce/skins/ui/oxide/skin.mobile.min.css',
-            '/media/vendor/tinymce/skins/ui/oxide/skin.mobile.min.css.gz',
-            '/media/vendor/tinymce/themes/mobile/index.js',
-            '/media/vendor/tinymce/themes/mobile/theme.js',
-            '/media/vendor/tinymce/themes/mobile/theme.min.js',
-            '/media/vendor/tinymce/themes/mobile/theme.min.js.gz',
-            '/plugins/multifactorauth/webauthn/src/Hotfix/AndroidKeyAttestationStatementSupport.php',
-            '/plugins/multifactorauth/webauthn/src/Hotfix/FidoU2FAttestationStatementSupport.php',
-            '/plugins/multifactorauth/webauthn/src/Hotfix/Server.php',
-            '/plugins/system/webauthn/src/Hotfix/AndroidKeyAttestationStatementSupport.php',
-            '/plugins/system/webauthn/src/Hotfix/FidoU2FAttestationStatementSupport.php',
-            '/plugins/system/webauthn/src/Hotfix/Server.php',
-            // From 5.0.0-alpha1 to 5.0.0-alpha2
-            '/libraries/vendor/jfcherng/php-diff/src/languages/readme.txt',
-            '/media/com_actionlogs/js/admin-actionlogs-default-es5.js',
-            '/media/com_actionlogs/js/admin-actionlogs-default-es5.min.js',
-            '/media/com_actionlogs/js/admin-actionlogs-default-es5.min.js.gz',
-            '/media/com_admin/js/admin-help-es5.js',
-            '/media/com_admin/js/admin-help-es5.min.js',
-            '/media/com_admin/js/admin-help-es5.min.js.gz',
-            '/media/com_associations/js/admin-associations-default-es5.js',
-            '/media/com_associations/js/admin-associations-default-es5.min.js',
-            '/media/com_associations/js/admin-associations-default-es5.min.js.gz',
-            '/media/com_associations/js/admin-associations-modal-es5.js',
-            '/media/com_associations/js/admin-associations-modal-es5.min.js',
-            '/media/com_associations/js/admin-associations-modal-es5.min.js.gz',
-            '/media/com_associations/js/associations-edit-es5.js',
-            '/media/com_associations/js/associations-edit-es5.min.js',
-            '/media/com_associations/js/associations-edit-es5.min.js.gz',
-            '/media/com_banners/js/admin-banner-edit-es5.js',
-            '/media/com_banners/js/admin-banner-edit-es5.min.js',
-            '/media/com_banners/js/admin-banner-edit-es5.min.js.gz',
-            '/media/com_cache/js/admin-cache-default-es5.js',
-            '/media/com_cache/js/admin-cache-default-es5.min.js',
-            '/media/com_cache/js/admin-cache-default-es5.min.js.gz',
-            '/media/com_categories/js/shared-categories-accordion-es5.js',
-            '/media/com_categories/js/shared-categories-accordion-es5.min.js',
-            '/media/com_categories/js/shared-categories-accordion-es5.min.js.gz',
-            '/media/com_config/js/config-default-es5.js',
-            '/media/com_config/js/config-default-es5.min.js',
-            '/media/com_config/js/config-default-es5.min.js.gz',
-            '/media/com_config/js/config-filters-es5.js',
-            '/media/com_config/js/config-filters-es5.min.js',
-            '/media/com_config/js/config-filters-es5.min.js.gz',
-            '/media/com_config/js/modules-default-es5.js',
-            '/media/com_config/js/modules-default-es5.min.js',
-            '/media/com_config/js/modules-default-es5.min.js.gz',
-            '/media/com_config/js/templates-default-es5.js',
-            '/media/com_config/js/templates-default-es5.min.js',
-            '/media/com_config/js/templates-default-es5.min.js.gz',
-            '/media/com_contact/js/admin-contacts-modal-es5.js',
-            '/media/com_contact/js/admin-contacts-modal-es5.min.js',
-            '/media/com_contact/js/admin-contacts-modal-es5.min.js.gz',
-            '/media/com_contact/js/contacts-list-es5.js',
-            '/media/com_contact/js/contacts-list-es5.min.js',
-            '/media/com_contact/js/contacts-list-es5.min.js.gz',
-            '/media/com_content/js/admin-article-pagebreak-es5.js',
-            '/media/com_content/js/admin-article-pagebreak-es5.min.js',
-            '/media/com_content/js/admin-article-pagebreak-es5.min.js.gz',
-            '/media/com_content/js/admin-article-readmore-es5.js',
-            '/media/com_content/js/admin-article-readmore-es5.min.js',
-            '/media/com_content/js/admin-article-readmore-es5.min.js.gz',
-            '/media/com_content/js/admin-articles-default-batch-footer-es5.js',
-            '/media/com_content/js/admin-articles-default-batch-footer-es5.min.js',
-            '/media/com_content/js/admin-articles-default-batch-footer-es5.min.js.gz',
-            '/media/com_content/js/admin-articles-default-stage-footer-es5.js',
-            '/media/com_content/js/admin-articles-default-stage-footer-es5.min.js',
-            '/media/com_content/js/admin-articles-default-stage-footer-es5.min.js.gz',
-            '/media/com_content/js/admin-articles-modal-es5.js',
-            '/media/com_content/js/admin-articles-modal-es5.min.js',
-            '/media/com_content/js/admin-articles-modal-es5.min.js.gz',
-            '/media/com_content/js/articles-list-es5.js',
-            '/media/com_content/js/articles-list-es5.min.js',
-            '/media/com_content/js/articles-list-es5.min.js.gz',
-            '/media/com_content/js/articles-status-es5.js',
-            '/media/com_content/js/articles-status-es5.min.js',
-            '/media/com_content/js/articles-status-es5.min.js.gz',
-            '/media/com_content/js/form-edit-es5.js',
-            '/media/com_content/js/form-edit-es5.min.js',
-            '/media/com_content/js/form-edit-es5.min.js.gz',
-            '/media/com_contenthistory/js/admin-compare-compare-es5.js',
-            '/media/com_contenthistory/js/admin-compare-compare-es5.min.js',
-            '/media/com_contenthistory/js/admin-compare-compare-es5.min.js.gz',
-            '/media/com_contenthistory/js/admin-history-modal-es5.js',
-            '/media/com_contenthistory/js/admin-history-modal-es5.min.js',
-            '/media/com_contenthistory/js/admin-history-modal-es5.min.js.gz',
-            '/media/com_contenthistory/js/admin-history-versions-es5.js',
-            '/media/com_contenthistory/js/admin-history-versions-es5.min.js',
-            '/media/com_contenthistory/js/admin-history-versions-es5.min.js.gz',
-            '/media/com_cpanel/js/admin-add_module-es5.js',
-            '/media/com_cpanel/js/admin-add_module-es5.min.js',
-            '/media/com_cpanel/js/admin-add_module-es5.min.js.gz',
-            '/media/com_cpanel/js/admin-cpanel-default-es5.js',
-            '/media/com_cpanel/js/admin-cpanel-default-es5.min.js',
-            '/media/com_cpanel/js/admin-cpanel-default-es5.min.js.gz',
-            '/media/com_cpanel/js/admin-system-loader-es5.js',
-            '/media/com_cpanel/js/admin-system-loader-es5.min.js',
-            '/media/com_cpanel/js/admin-system-loader-es5.min.js.gz',
-            '/media/com_fields/js/admin-field-changecontext-es5.js',
-            '/media/com_fields/js/admin-field-changecontext-es5.min.js',
-            '/media/com_fields/js/admin-field-changecontext-es5.min.js.gz',
-            '/media/com_fields/js/admin-field-edit-es5.js',
-            '/media/com_fields/js/admin-field-edit-es5.min.js',
-            '/media/com_fields/js/admin-field-edit-es5.min.js.gz',
-            '/media/com_fields/js/admin-field-typehaschanged-es5.js',
-            '/media/com_fields/js/admin-field-typehaschanged-es5.min.js',
-            '/media/com_fields/js/admin-field-typehaschanged-es5.min.js.gz',
-            '/media/com_fields/js/admin-fields-default-batch-es5.js',
-            '/media/com_fields/js/admin-fields-default-batch-es5.min.js',
-            '/media/com_fields/js/admin-fields-default-batch-es5.min.js.gz',
-            '/media/com_fields/js/admin-fields-modal-es5.js',
-            '/media/com_fields/js/admin-fields-modal-es5.min.js',
-            '/media/com_fields/js/admin-fields-modal-es5.min.js.gz',
-            '/media/com_finder/js/debug-es5.js',
-            '/media/com_finder/js/debug-es5.min.js',
-            '/media/com_finder/js/debug-es5.min.js.gz',
-            '/media/com_finder/js/filters-es5.js',
-            '/media/com_finder/js/filters-es5.min.js',
-            '/media/com_finder/js/filters-es5.min.js.gz',
-            '/media/com_finder/js/finder-edit-es5.js',
-            '/media/com_finder/js/finder-edit-es5.min.js',
-            '/media/com_finder/js/finder-edit-es5.min.js.gz',
-            '/media/com_finder/js/finder-es5.js',
-            '/media/com_finder/js/finder-es5.min.js',
-            '/media/com_finder/js/finder-es5.min.js.gz',
-            '/media/com_finder/js/indexer-es5.js',
-            '/media/com_finder/js/indexer-es5.min.js',
-            '/media/com_finder/js/indexer-es5.min.js.gz',
-            '/media/com_finder/js/maps-es5.js',
-            '/media/com_finder/js/maps-es5.min.js',
-            '/media/com_finder/js/maps-es5.min.js.gz',
-            '/media/com_installer/js/changelog-es5.js',
-            '/media/com_installer/js/changelog-es5.min.js',
-            '/media/com_installer/js/changelog-es5.min.js.gz',
-            '/media/com_installer/js/installer-es5.js',
-            '/media/com_installer/js/installer-es5.min.js',
-            '/media/com_installer/js/installer-es5.min.js.gz',
-            '/media/com_joomlaupdate/js/admin-update-default-es5.js',
-            '/media/com_joomlaupdate/js/admin-update-default-es5.min.js',
-            '/media/com_joomlaupdate/js/admin-update-default-es5.min.js.gz',
-            '/media/com_joomlaupdate/js/default-es5.js',
-            '/media/com_joomlaupdate/js/default-es5.min.js',
-            '/media/com_joomlaupdate/js/default-es5.min.js.gz',
-            '/media/com_languages/js/admin-language-edit-change-flag-es5.js',
-            '/media/com_languages/js/admin-language-edit-change-flag-es5.min.js',
-            '/media/com_languages/js/admin-language-edit-change-flag-es5.min.js.gz',
-            '/media/com_languages/js/admin-override-edit-refresh-searchstring-es5.js',
-            '/media/com_languages/js/admin-override-edit-refresh-searchstring-es5.min.js',
-            '/media/com_languages/js/admin-override-edit-refresh-searchstring-es5.min.js.gz',
-            '/media/com_languages/js/overrider-es5.js',
-            '/media/com_languages/js/overrider-es5.min.js',
-            '/media/com_languages/js/overrider-es5.min.js.gz',
-            '/media/com_mails/js/admin-email-template-edit-es5.js',
-            '/media/com_mails/js/admin-email-template-edit-es5.min.js',
-            '/media/com_mails/js/admin-email-template-edit-es5.min.js.gz',
-            '/media/com_media/js/edit-images-es5.js',
-            '/media/com_media/js/edit-images-es5.min.js',
-            '/media/com_media/js/edit-images-es5.min.js.gz',
-            '/media/com_media/js/media-manager-es5.js',
-            '/media/com_media/js/media-manager-es5.min.js',
-            '/media/com_media/js/media-manager-es5.min.js.gz',
-            '/media/com_menus/js/admin-item-edit-es5.js',
-            '/media/com_menus/js/admin-item-edit-es5.min.js',
-            '/media/com_menus/js/admin-item-edit-es5.min.js.gz',
-            '/media/com_menus/js/admin-item-edit_container-es5.js',
-            '/media/com_menus/js/admin-item-edit_container-es5.min.js',
-            '/media/com_menus/js/admin-item-edit_container-es5.min.js.gz',
-            '/media/com_menus/js/admin-item-edit_modules-es5.js',
-            '/media/com_menus/js/admin-item-edit_modules-es5.min.js',
-            '/media/com_menus/js/admin-item-edit_modules-es5.min.js.gz',
-            '/media/com_menus/js/admin-item-modal-es5.js',
-            '/media/com_menus/js/admin-item-modal-es5.min.js',
-            '/media/com_menus/js/admin-item-modal-es5.min.js.gz',
-            '/media/com_menus/js/admin-items-modal-es5.js',
-            '/media/com_menus/js/admin-items-modal-es5.min.js',
-            '/media/com_menus/js/admin-items-modal-es5.min.js.gz',
-            '/media/com_menus/js/admin-menus-default-es5.js',
-            '/media/com_menus/js/admin-menus-default-es5.min.js',
-            '/media/com_menus/js/admin-menus-default-es5.min.js.gz',
-            '/media/com_menus/js/default-batch-body-es5.js',
-            '/media/com_menus/js/default-batch-body-es5.min.js',
-            '/media/com_menus/js/default-batch-body-es5.min.js.gz',
-            '/media/com_modules/js/admin-module-edit-es5.js',
-            '/media/com_modules/js/admin-module-edit-es5.min.js',
-            '/media/com_modules/js/admin-module-edit-es5.min.js.gz',
-            '/media/com_modules/js/admin-module-edit_assignment-es5.js',
-            '/media/com_modules/js/admin-module-edit_assignment-es5.min.js',
-            '/media/com_modules/js/admin-module-edit_assignment-es5.min.js.gz',
-            '/media/com_modules/js/admin-module-search-es5.js',
-            '/media/com_modules/js/admin-module-search-es5.min.js',
-            '/media/com_modules/js/admin-module-search-es5.min.js.gz',
-            '/media/com_modules/js/admin-modules-modal-es5.js',
-            '/media/com_modules/js/admin-modules-modal-es5.min.js',
-            '/media/com_modules/js/admin-modules-modal-es5.min.js.gz',
-            '/media/com_modules/js/admin-select-modal-es5.js',
-            '/media/com_modules/js/admin-select-modal-es5.min.js',
-            '/media/com_modules/js/admin-select-modal-es5.min.js.gz',
-            '/media/com_scheduler/js/admin-view-run-test-task-es5.js',
-            '/media/com_scheduler/js/admin-view-run-test-task-es5.min.js',
-            '/media/com_scheduler/js/admin-view-run-test-task-es5.min.js.gz',
-            '/media/com_scheduler/js/admin-view-select-task-search-es5.js',
-            '/media/com_scheduler/js/admin-view-select-task-search-es5.min.js',
-            '/media/com_scheduler/js/admin-view-select-task-search-es5.min.js.gz',
-            '/media/com_scheduler/js/scheduler-config-es5.js',
-            '/media/com_scheduler/js/scheduler-config-es5.min.js',
-            '/media/com_scheduler/js/scheduler-config-es5.min.js.gz',
-            '/media/com_tags/js/tag-default-es5.js',
-            '/media/com_tags/js/tag-default-es5.min.js',
-            '/media/com_tags/js/tag-default-es5.min.js.gz',
-            '/media/com_tags/js/tag-list-es5.js',
-            '/media/com_tags/js/tag-list-es5.min.js',
-            '/media/com_tags/js/tag-list-es5.min.js.gz',
-            '/media/com_tags/js/tags-default-es5.js',
-            '/media/com_tags/js/tags-default-es5.min.js',
-            '/media/com_tags/js/tags-default-es5.min.js.gz',
-            '/media/com_templates/js/admin-template-compare-es5.js',
-            '/media/com_templates/js/admin-template-compare-es5.min.js',
-            '/media/com_templates/js/admin-template-compare-es5.min.js.gz',
-            '/media/com_templates/js/admin-template-toggle-assignment-es5.js',
-            '/media/com_templates/js/admin-template-toggle-assignment-es5.min.js',
-            '/media/com_templates/js/admin-template-toggle-assignment-es5.min.js.gz',
-            '/media/com_templates/js/admin-template-toggle-switch-es5.js',
-            '/media/com_templates/js/admin-template-toggle-switch-es5.min.js',
-            '/media/com_templates/js/admin-template-toggle-switch-es5.min.js.gz',
-            '/media/com_templates/js/admin-templates-default-es5.js',
-            '/media/com_templates/js/admin-templates-default-es5.min.js',
-            '/media/com_templates/js/admin-templates-default-es5.min.js.gz',
-            '/media/com_users/js/admin-users-groups-es5.js',
-            '/media/com_users/js/admin-users-groups-es5.min.js',
-            '/media/com_users/js/admin-users-groups-es5.min.js.gz',
-            '/media/com_users/js/admin-users-mail-es5.js',
-            '/media/com_users/js/admin-users-mail-es5.min.js',
-            '/media/com_users/js/admin-users-mail-es5.min.js.gz',
-            '/media/com_users/js/two-factor-focus-es5.js',
-            '/media/com_users/js/two-factor-focus-es5.min.js',
-            '/media/com_users/js/two-factor-focus-es5.min.js.gz',
-            '/media/com_users/js/two-factor-list-es5.js',
-            '/media/com_users/js/two-factor-list-es5.min.js',
-            '/media/com_users/js/two-factor-list-es5.min.js.gz',
-            '/media/com_workflow/js/admin-items-workflow-buttons-es5.js',
-            '/media/com_workflow/js/admin-items-workflow-buttons-es5.min.js',
-            '/media/com_workflow/js/admin-items-workflow-buttons-es5.min.js.gz',
-            '/media/com_wrapper/js/iframe-height-es5.js',
-            '/media/com_wrapper/js/iframe-height-es5.min.js',
-            '/media/com_wrapper/js/iframe-height-es5.min.js.gz',
-            '/media/layouts/js/joomla/form/field/category-change-es5.js',
-            '/media/layouts/js/joomla/form/field/category-change-es5.min.js',
-            '/media/layouts/js/joomla/form/field/category-change-es5.min.js.gz',
-            '/media/layouts/js/joomla/html/batch/batch-copymove-es5.js',
-            '/media/layouts/js/joomla/html/batch/batch-copymove-es5.min.js',
-            '/media/layouts/js/joomla/html/batch/batch-copymove-es5.min.js.gz',
-            '/media/mod_login/js/admin-login-es5.js',
-            '/media/mod_login/js/admin-login-es5.min.js',
-            '/media/mod_login/js/admin-login-es5.min.js.gz',
-            '/media/mod_menu/js/admin-menu-es5.js',
-            '/media/mod_menu/js/admin-menu-es5.min.js',
-            '/media/mod_menu/js/admin-menu-es5.min.js.gz',
-            '/media/mod_menu/js/menu-es5.js',
-            '/media/mod_menu/js/menu-es5.min.js',
-            '/media/mod_menu/js/menu-es5.min.js.gz',
-            '/media/mod_multilangstatus/js/admin-multilangstatus-es5.js',
-            '/media/mod_multilangstatus/js/admin-multilangstatus-es5.min.js',
-            '/media/mod_multilangstatus/js/admin-multilangstatus-es5.min.js.gz',
-            '/media/mod_quickicon/js/quickicon-es5.js',
-            '/media/mod_quickicon/js/quickicon-es5.min.js',
-            '/media/mod_quickicon/js/quickicon-es5.min.js.gz',
-            '/media/mod_sampledata/js/sampledata-process-es5.js',
-            '/media/mod_sampledata/js/sampledata-process-es5.min.js',
-            '/media/mod_sampledata/js/sampledata-process-es5.min.js.gz',
-            '/media/plg_captcha_recaptcha/js/recaptcha-es5.js',
-            '/media/plg_captcha_recaptcha/js/recaptcha-es5.min.js',
-            '/media/plg_captcha_recaptcha/js/recaptcha-es5.min.js.gz',
-            '/media/plg_captcha_recaptcha_invisible/js/recaptcha-es5.js',
-            '/media/plg_captcha_recaptcha_invisible/js/recaptcha-es5.min.js',
-            '/media/plg_captcha_recaptcha_invisible/js/recaptcha-es5.min.js.gz',
-            '/media/plg_editors_codemirror/js/joomla-editor-codemirror-es5.js',
-            '/media/plg_editors_codemirror/js/joomla-editor-codemirror-es5.min.js',
-            '/media/plg_editors_codemirror/js/joomla-editor-codemirror-es5.min.js.gz',
-            '/media/plg_editors_none/js/joomla-editor-none-es5.js',
-            '/media/plg_editors_none/js/joomla-editor-none-es5.min.js',
-            '/media/plg_editors_none/js/joomla-editor-none-es5.min.js.gz',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/plugin-es5.js',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/plugin-es5.min.js',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/plugin-es5.min.js.gz',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/source-es5.js',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/source-es5.min.js',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/source-es5.min.js.gz',
-            '/media/plg_editors_tinymce/js/tinymce-builder-es5.js',
-            '/media/plg_editors_tinymce/js/tinymce-builder-es5.min.js',
-            '/media/plg_editors_tinymce/js/tinymce-builder-es5.min.js.gz',
-            '/media/plg_editors_tinymce/js/tinymce-es5.js',
-            '/media/plg_editors_tinymce/js/tinymce-es5.min.js',
-            '/media/plg_editors_tinymce/js/tinymce-es5.min.js.gz',
-            '/media/plg_installer_folderinstaller/js/folderinstaller-es5.js',
-            '/media/plg_installer_folderinstaller/js/folderinstaller-es5.min.js',
-            '/media/plg_installer_folderinstaller/js/folderinstaller-es5.min.js.gz',
-            '/media/plg_installer_packageinstaller/js/packageinstaller-es5.js',
-            '/media/plg_installer_packageinstaller/js/packageinstaller-es5.min.js',
-            '/media/plg_installer_packageinstaller/js/packageinstaller-es5.min.js.gz',
-            '/media/plg_installer_urlinstaller/js/urlinstaller-es5.js',
-            '/media/plg_installer_urlinstaller/js/urlinstaller-es5.min.js',
-            '/media/plg_installer_urlinstaller/js/urlinstaller-es5.min.js.gz',
-            '/media/plg_installer_webinstaller/js/client-es5.js',
-            '/media/plg_installer_webinstaller/js/client-es5.min.js',
-            '/media/plg_installer_webinstaller/js/client-es5.min.js.gz',
-            '/media/plg_media-action_crop/js/crop-es5.js',
-            '/media/plg_media-action_crop/js/crop-es5.min.js',
-            '/media/plg_media-action_crop/js/crop-es5.min.js.gz',
-            '/media/plg_media-action_resize/js/resize-es5.js',
-            '/media/plg_media-action_resize/js/resize-es5.min.js',
-            '/media/plg_media-action_resize/js/resize-es5.min.js.gz',
-            '/media/plg_media-action_rotate/js/rotate-es5.js',
-            '/media/plg_media-action_rotate/js/rotate-es5.min.js',
-            '/media/plg_media-action_rotate/js/rotate-es5.min.js.gz',
-            '/media/plg_multifactorauth_totp/js/setup-es5.js',
-            '/media/plg_multifactorauth_totp/js/setup-es5.min.js',
-            '/media/plg_multifactorauth_totp/js/setup-es5.min.js.gz',
-            '/media/plg_multifactorauth_webauthn/js/webauthn-es5.js',
-            '/media/plg_multifactorauth_webauthn/js/webauthn-es5.min.js',
-            '/media/plg_multifactorauth_webauthn/js/webauthn-es5.min.js.gz',
-            '/media/plg_quickicon_eos/js/snooze-es5.js',
-            '/media/plg_quickicon_eos/js/snooze-es5.min.js',
-            '/media/plg_quickicon_eos/js/snooze-es5.min.js.gz',
-            '/media/plg_quickicon_extensionupdate/js/extensionupdatecheck-es5.js',
-            '/media/plg_quickicon_extensionupdate/js/extensionupdatecheck-es5.min.js',
-            '/media/plg_quickicon_extensionupdate/js/extensionupdatecheck-es5.min.js.gz',
-            '/media/plg_quickicon_joomlaupdate/js/jupdatecheck-es5.js',
-            '/media/plg_quickicon_joomlaupdate/js/jupdatecheck-es5.min.js',
-            '/media/plg_quickicon_joomlaupdate/js/jupdatecheck-es5.min.js.gz',
-            '/media/plg_quickicon_overridecheck/js/overridecheck-es5.js',
-            '/media/plg_quickicon_overridecheck/js/overridecheck-es5.min.js',
-            '/media/plg_quickicon_overridecheck/js/overridecheck-es5.min.js.gz',
-            '/media/plg_quickicon_privacycheck/js/privacycheck-es5.js',
-            '/media/plg_quickicon_privacycheck/js/privacycheck-es5.min.js',
-            '/media/plg_quickicon_privacycheck/js/privacycheck-es5.min.js.gz',
-            '/media/plg_system_debug/js/debug-es5.js',
-            '/media/plg_system_debug/js/debug-es5.min.js',
-            '/media/plg_system_debug/js/debug-es5.min.js.gz',
-            '/media/plg_system_guidedtours/js/guidedtours-es5.js',
-            '/media/plg_system_guidedtours/js/guidedtours-es5.min.js',
-            '/media/plg_system_guidedtours/js/guidedtours-es5.min.js.gz',
-            '/media/plg_system_jooa11y/js/jooa11y-es5.js',
-            '/media/plg_system_jooa11y/js/jooa11y-es5.min.js',
-            '/media/plg_system_jooa11y/js/jooa11y-es5.min.js.gz',
-            '/media/plg_system_schedulerunner/js/run-schedule-es5.js',
-            '/media/plg_system_schedulerunner/js/run-schedule-es5.min.js',
-            '/media/plg_system_schedulerunner/js/run-schedule-es5.min.js.gz',
-            '/media/plg_system_shortcut/js/shortcut-es5.js',
-            '/media/plg_system_shortcut/js/shortcut-es5.min.js',
-            '/media/plg_system_shortcut/js/shortcut-es5.min.js.gz',
-            '/media/plg_system_stats/js/stats-es5.js',
-            '/media/plg_system_stats/js/stats-es5.min.js',
-            '/media/plg_system_stats/js/stats-es5.min.js.gz',
-            '/media/plg_system_stats/js/stats-message-es5.js',
-            '/media/plg_system_stats/js/stats-message-es5.min.js',
-            '/media/plg_system_stats/js/stats-message-es5.min.js.gz',
-            '/media/plg_system_webauthn/js/login-es5.js',
-            '/media/plg_system_webauthn/js/login-es5.min.js',
-            '/media/plg_system_webauthn/js/login-es5.min.js.gz',
-            '/media/plg_system_webauthn/js/management-es5.js',
-            '/media/plg_system_webauthn/js/management-es5.min.js',
-            '/media/plg_system_webauthn/js/management-es5.min.js.gz',
-            '/media/plg_user_token/js/token-es5.js',
-            '/media/plg_user_token/js/token-es5.min.js',
-            '/media/plg_user_token/js/token-es5.min.js.gz',
-            '/media/system/js/core-es5.js',
-            '/media/system/js/core-es5.min.js',
-            '/media/system/js/core-es5.min.js.gz',
-            '/media/system/js/draggable-es5.js',
-            '/media/system/js/draggable-es5.min.js',
-            '/media/system/js/draggable-es5.min.js.gz',
-            '/media/system/js/fields/joomla-field-color-slider-es5.js',
-            '/media/system/js/fields/joomla-field-color-slider-es5.min.js',
-            '/media/system/js/fields/joomla-field-color-slider-es5.min.js.gz',
-            '/media/system/js/fields/joomla-field-fancy-select-es5.js',
-            '/media/system/js/fields/joomla-field-fancy-select-es5.min.js',
-            '/media/system/js/fields/joomla-field-fancy-select-es5.min.js.gz',
-            '/media/system/js/fields/joomla-field-media-es5.js',
-            '/media/system/js/fields/joomla-field-media-es5.min.js',
-            '/media/system/js/fields/joomla-field-media-es5.min.js.gz',
-            '/media/system/js/fields/joomla-field-module-order-es5.js',
-            '/media/system/js/fields/joomla-field-module-order-es5.min.js',
-            '/media/system/js/fields/joomla-field-module-order-es5.min.js.gz',
-            '/media/system/js/fields/joomla-field-permissions-es5.js',
-            '/media/system/js/fields/joomla-field-permissions-es5.min.js',
-            '/media/system/js/fields/joomla-field-permissions-es5.min.js.gz',
-            '/media/system/js/fields/joomla-field-send-test-mail-es5.js',
-            '/media/system/js/fields/joomla-field-send-test-mail-es5.min.js',
-            '/media/system/js/fields/joomla-field-send-test-mail-es5.min.js.gz',
-            '/media/system/js/fields/joomla-field-simple-color-es5.js',
-            '/media/system/js/fields/joomla-field-simple-color-es5.min.js',
-            '/media/system/js/fields/joomla-field-simple-color-es5.min.js.gz',
-            '/media/system/js/fields/joomla-field-subform-es5.js',
-            '/media/system/js/fields/joomla-field-subform-es5.min.js',
-            '/media/system/js/fields/joomla-field-subform-es5.min.js.gz',
-            '/media/system/js/fields/joomla-field-user-es5.js',
-            '/media/system/js/fields/joomla-field-user-es5.min.js',
-            '/media/system/js/fields/joomla-field-user-es5.min.js.gz',
-            '/media/system/js/fields/joomla-media-select-es5.js',
-            '/media/system/js/fields/joomla-media-select-es5.min.js',
-            '/media/system/js/fields/joomla-media-select-es5.min.js.gz',
-            '/media/system/js/fields/passwordstrength-es5.js',
-            '/media/system/js/fields/passwordstrength-es5.min.js',
-            '/media/system/js/fields/passwordstrength-es5.min.js.gz',
-            '/media/system/js/fields/passwordview-es5.js',
-            '/media/system/js/fields/passwordview-es5.min.js',
-            '/media/system/js/fields/passwordview-es5.min.js.gz',
-            '/media/system/js/fields/select-colour-es5.js',
-            '/media/system/js/fields/select-colour-es5.min.js',
-            '/media/system/js/fields/select-colour-es5.min.js.gz',
-            '/media/system/js/fields/validate-es5.js',
-            '/media/system/js/fields/validate-es5.min.js',
-            '/media/system/js/fields/validate-es5.min.js.gz',
-            '/media/system/js/highlight-es5.js',
-            '/media/system/js/highlight-es5.min.js',
-            '/media/system/js/highlight-es5.min.js.gz',
-            '/media/system/js/inlinehelp-es5.js',
-            '/media/system/js/inlinehelp-es5.min.js',
-            '/media/system/js/inlinehelp-es5.min.js.gz',
-            '/media/system/js/joomla-core-loader-es5.js',
-            '/media/system/js/joomla-core-loader-es5.min.js',
-            '/media/system/js/joomla-core-loader-es5.min.js.gz',
-            '/media/system/js/joomla-hidden-mail-es5.js',
-            '/media/system/js/joomla-hidden-mail-es5.min.js',
-            '/media/system/js/joomla-hidden-mail-es5.min.js.gz',
-            '/media/system/js/joomla-toolbar-button-es5.js',
-            '/media/system/js/joomla-toolbar-button-es5.min.js',
-            '/media/system/js/joomla-toolbar-button-es5.min.js.gz',
-            '/media/system/js/keepalive-es5.js',
-            '/media/system/js/keepalive-es5.min.js',
-            '/media/system/js/keepalive-es5.min.js.gz',
-            '/media/system/js/list-view-es5.js',
-            '/media/system/js/list-view-es5.min.js',
-            '/media/system/js/list-view-es5.min.js.gz',
-            '/media/system/js/messages-es5.js',
-            '/media/system/js/messages-es5.min.js',
-            '/media/system/js/messages-es5.min.js.gz',
-            '/media/system/js/multiselect-es5.js',
-            '/media/system/js/multiselect-es5.min.js',
-            '/media/system/js/multiselect-es5.min.js.gz',
-            '/media/system/js/searchtools-es5.js',
-            '/media/system/js/searchtools-es5.min.js',
-            '/media/system/js/searchtools-es5.min.js.gz',
-            '/media/system/js/showon-es5.js',
-            '/media/system/js/showon-es5.min.js',
-            '/media/system/js/showon-es5.min.js.gz',
-            '/media/system/js/table-columns-es5.js',
-            '/media/system/js/table-columns-es5.min.js',
-            '/media/system/js/table-columns-es5.min.js.gz',
-            '/media/templates/administrator/atum/js/template-es5.js',
-            '/media/templates/administrator/atum/js/template-es5.min.js',
-            '/media/templates/administrator/atum/js/template-es5.min.js.gz',
-            '/media/templates/site/cassiopeia/js/mod_menu/menu-metismenu-es5.js',
-            '/media/templates/site/cassiopeia/js/mod_menu/menu-metismenu-es5.min.js',
-            '/media/templates/site/cassiopeia/js/mod_menu/menu-metismenu-es5.min.js.gz',
-            '/media/vendor/bootstrap/js/bootstrap-es5.js',
-            '/media/vendor/bootstrap/js/bootstrap-es5.min.js',
-            '/media/vendor/bootstrap/js/bootstrap-es5.min.js.gz',
-            '/media/vendor/joomla-custom-elements/js/joomla-alert-es5.js',
-            '/media/vendor/joomla-custom-elements/js/joomla-alert-es5.min.js',
-            '/media/vendor/joomla-custom-elements/js/joomla-alert-es5.min.js.gz',
-            '/media/vendor/joomla-custom-elements/js/joomla-tab-es5.js',
-            '/media/vendor/joomla-custom-elements/js/joomla-tab-es5.min.js',
-            '/media/vendor/joomla-custom-elements/js/joomla-tab-es5.min.js.gz',
-            '/media/vendor/mediaelement/js/mediaelement-flash-audio-ogg.swf',
-            '/media/vendor/mediaelement/js/mediaelement-flash-audio.swf',
-            '/media/vendor/mediaelement/js/mediaelement-flash-video-hls.swf',
-            '/media/vendor/mediaelement/js/mediaelement-flash-video-mdash.swf',
-            '/media/vendor/mediaelement/js/mediaelement-flash-video.swf',
-            '/plugins/editors-xtd/pagebreak/pagebreak.php',
-            // From 5.0.0-alpha2 to 5.0.0-alpha3
-            '/libraries/classmap.php',
-            '/libraries/extensions.classmap.php',
-            '/media/vendor/codemirror/addon/comment/comment.js',
-            '/media/vendor/codemirror/addon/comment/comment.min.js',
-            '/media/vendor/codemirror/addon/comment/comment.min.js.gz',
-            '/media/vendor/codemirror/addon/comment/continuecomment.js',
-            '/media/vendor/codemirror/addon/comment/continuecomment.min.js',
-            '/media/vendor/codemirror/addon/comment/continuecomment.min.js.gz',
-            '/media/vendor/codemirror/addon/dialog/dialog.css',
-            '/media/vendor/codemirror/addon/dialog/dialog.js',
-            '/media/vendor/codemirror/addon/dialog/dialog.min.js',
-            '/media/vendor/codemirror/addon/dialog/dialog.min.js.gz',
-            '/media/vendor/codemirror/addon/display/autorefresh.js',
-            '/media/vendor/codemirror/addon/display/autorefresh.min.js',
-            '/media/vendor/codemirror/addon/display/autorefresh.min.js.gz',
-            '/media/vendor/codemirror/addon/display/fullscreen.css',
-            '/media/vendor/codemirror/addon/display/fullscreen.js',
-            '/media/vendor/codemirror/addon/display/fullscreen.min.js',
-            '/media/vendor/codemirror/addon/display/fullscreen.min.js.gz',
-            '/media/vendor/codemirror/addon/display/panel.js',
-            '/media/vendor/codemirror/addon/display/panel.min.js',
-            '/media/vendor/codemirror/addon/display/panel.min.js.gz',
-            '/media/vendor/codemirror/addon/display/placeholder.js',
-            '/media/vendor/codemirror/addon/display/placeholder.min.js',
-            '/media/vendor/codemirror/addon/display/placeholder.min.js.gz',
-            '/media/vendor/codemirror/addon/display/rulers.js',
-            '/media/vendor/codemirror/addon/display/rulers.min.js',
-            '/media/vendor/codemirror/addon/display/rulers.min.js.gz',
-            '/media/vendor/codemirror/addon/edit/closebrackets.js',
-            '/media/vendor/codemirror/addon/edit/closebrackets.min.js',
-            '/media/vendor/codemirror/addon/edit/closebrackets.min.js.gz',
-            '/media/vendor/codemirror/addon/edit/closetag.js',
-            '/media/vendor/codemirror/addon/edit/closetag.min.js',
-            '/media/vendor/codemirror/addon/edit/closetag.min.js.gz',
-            '/media/vendor/codemirror/addon/edit/continuelist.js',
-            '/media/vendor/codemirror/addon/edit/continuelist.min.js',
-            '/media/vendor/codemirror/addon/edit/continuelist.min.js.gz',
-            '/media/vendor/codemirror/addon/edit/matchbrackets.js',
-            '/media/vendor/codemirror/addon/edit/matchbrackets.min.js',
-            '/media/vendor/codemirror/addon/edit/matchbrackets.min.js.gz',
-            '/media/vendor/codemirror/addon/edit/matchtags.js',
-            '/media/vendor/codemirror/addon/edit/matchtags.min.js',
-            '/media/vendor/codemirror/addon/edit/matchtags.min.js.gz',
-            '/media/vendor/codemirror/addon/edit/trailingspace.js',
-            '/media/vendor/codemirror/addon/edit/trailingspace.min.js',
-            '/media/vendor/codemirror/addon/edit/trailingspace.min.js.gz',
-            '/media/vendor/codemirror/addon/fold/brace-fold.js',
-            '/media/vendor/codemirror/addon/fold/brace-fold.min.js',
-            '/media/vendor/codemirror/addon/fold/brace-fold.min.js.gz',
-            '/media/vendor/codemirror/addon/fold/comment-fold.js',
-            '/media/vendor/codemirror/addon/fold/comment-fold.min.js',
-            '/media/vendor/codemirror/addon/fold/comment-fold.min.js.gz',
-            '/media/vendor/codemirror/addon/fold/foldcode.js',
-            '/media/vendor/codemirror/addon/fold/foldcode.min.js',
-            '/media/vendor/codemirror/addon/fold/foldcode.min.js.gz',
-            '/media/vendor/codemirror/addon/fold/foldgutter.css',
-            '/media/vendor/codemirror/addon/fold/foldgutter.js',
-            '/media/vendor/codemirror/addon/fold/foldgutter.min.js',
-            '/media/vendor/codemirror/addon/fold/foldgutter.min.js.gz',
-            '/media/vendor/codemirror/addon/fold/indent-fold.js',
-            '/media/vendor/codemirror/addon/fold/indent-fold.min.js',
-            '/media/vendor/codemirror/addon/fold/indent-fold.min.js.gz',
-            '/media/vendor/codemirror/addon/fold/markdown-fold.js',
-            '/media/vendor/codemirror/addon/fold/markdown-fold.min.js',
-            '/media/vendor/codemirror/addon/fold/markdown-fold.min.js.gz',
-            '/media/vendor/codemirror/addon/fold/xml-fold.js',
-            '/media/vendor/codemirror/addon/fold/xml-fold.min.js',
-            '/media/vendor/codemirror/addon/fold/xml-fold.min.js.gz',
-            '/media/vendor/codemirror/addon/hint/anyword-hint.js',
-            '/media/vendor/codemirror/addon/hint/anyword-hint.min.js',
-            '/media/vendor/codemirror/addon/hint/anyword-hint.min.js.gz',
-            '/media/vendor/codemirror/addon/hint/css-hint.js',
-            '/media/vendor/codemirror/addon/hint/css-hint.min.js',
-            '/media/vendor/codemirror/addon/hint/css-hint.min.js.gz',
-            '/media/vendor/codemirror/addon/hint/html-hint.js',
-            '/media/vendor/codemirror/addon/hint/html-hint.min.js',
-            '/media/vendor/codemirror/addon/hint/html-hint.min.js.gz',
-            '/media/vendor/codemirror/addon/hint/javascript-hint.js',
-            '/media/vendor/codemirror/addon/hint/javascript-hint.min.js',
-            '/media/vendor/codemirror/addon/hint/javascript-hint.min.js.gz',
-            '/media/vendor/codemirror/addon/hint/show-hint.css',
-            '/media/vendor/codemirror/addon/hint/show-hint.js',
-            '/media/vendor/codemirror/addon/hint/show-hint.min.js',
-            '/media/vendor/codemirror/addon/hint/show-hint.min.js.gz',
-            '/media/vendor/codemirror/addon/hint/sql-hint.js',
-            '/media/vendor/codemirror/addon/hint/sql-hint.min.js',
-            '/media/vendor/codemirror/addon/hint/sql-hint.min.js.gz',
-            '/media/vendor/codemirror/addon/hint/xml-hint.js',
-            '/media/vendor/codemirror/addon/hint/xml-hint.min.js',
-            '/media/vendor/codemirror/addon/hint/xml-hint.min.js.gz',
-            '/media/vendor/codemirror/addon/lint/coffeescript-lint.js',
-            '/media/vendor/codemirror/addon/lint/coffeescript-lint.min.js',
-            '/media/vendor/codemirror/addon/lint/coffeescript-lint.min.js.gz',
-            '/media/vendor/codemirror/addon/lint/css-lint.js',
-            '/media/vendor/codemirror/addon/lint/css-lint.min.js',
-            '/media/vendor/codemirror/addon/lint/css-lint.min.js.gz',
-            '/media/vendor/codemirror/addon/lint/html-lint.js',
-            '/media/vendor/codemirror/addon/lint/html-lint.min.js',
-            '/media/vendor/codemirror/addon/lint/html-lint.min.js.gz',
-            '/media/vendor/codemirror/addon/lint/javascript-lint.js',
-            '/media/vendor/codemirror/addon/lint/javascript-lint.min.js',
-            '/media/vendor/codemirror/addon/lint/javascript-lint.min.js.gz',
-            '/media/vendor/codemirror/addon/lint/json-lint.js',
-            '/media/vendor/codemirror/addon/lint/json-lint.min.js',
-            '/media/vendor/codemirror/addon/lint/json-lint.min.js.gz',
-            '/media/vendor/codemirror/addon/lint/lint.css',
-            '/media/vendor/codemirror/addon/lint/lint.js',
-            '/media/vendor/codemirror/addon/lint/lint.min.js',
-            '/media/vendor/codemirror/addon/lint/lint.min.js.gz',
-            '/media/vendor/codemirror/addon/lint/yaml-lint.js',
-            '/media/vendor/codemirror/addon/lint/yaml-lint.min.js',
-            '/media/vendor/codemirror/addon/lint/yaml-lint.min.js.gz',
-            '/media/vendor/codemirror/addon/merge/merge.css',
-            '/media/vendor/codemirror/addon/merge/merge.js',
-            '/media/vendor/codemirror/addon/merge/merge.min.js',
-            '/media/vendor/codemirror/addon/merge/merge.min.js.gz',
-            '/media/vendor/codemirror/addon/mode/loadmode.js',
-            '/media/vendor/codemirror/addon/mode/loadmode.min.js',
-            '/media/vendor/codemirror/addon/mode/loadmode.min.js.gz',
-            '/media/vendor/codemirror/addon/mode/multiplex.js',
-            '/media/vendor/codemirror/addon/mode/multiplex.min.js',
-            '/media/vendor/codemirror/addon/mode/multiplex.min.js.gz',
-            '/media/vendor/codemirror/addon/mode/multiplex_test.js',
-            '/media/vendor/codemirror/addon/mode/multiplex_test.min.js',
-            '/media/vendor/codemirror/addon/mode/multiplex_test.min.js.gz',
-            '/media/vendor/codemirror/addon/mode/overlay.js',
-            '/media/vendor/codemirror/addon/mode/overlay.min.js',
-            '/media/vendor/codemirror/addon/mode/overlay.min.js.gz',
-            '/media/vendor/codemirror/addon/mode/simple.js',
-            '/media/vendor/codemirror/addon/mode/simple.min.js',
-            '/media/vendor/codemirror/addon/mode/simple.min.js.gz',
-            '/media/vendor/codemirror/addon/runmode/colorize.js',
-            '/media/vendor/codemirror/addon/runmode/colorize.min.js',
-            '/media/vendor/codemirror/addon/runmode/colorize.min.js.gz',
-            '/media/vendor/codemirror/addon/runmode/runmode-standalone.js',
-            '/media/vendor/codemirror/addon/runmode/runmode-standalone.min.js',
-            '/media/vendor/codemirror/addon/runmode/runmode-standalone.min.js.gz',
-            '/media/vendor/codemirror/addon/runmode/runmode.js',
-            '/media/vendor/codemirror/addon/runmode/runmode.min.js',
-            '/media/vendor/codemirror/addon/runmode/runmode.min.js.gz',
-            '/media/vendor/codemirror/addon/runmode/runmode.node.js',
-            '/media/vendor/codemirror/addon/runmode/runmode.node.min.js',
-            '/media/vendor/codemirror/addon/runmode/runmode.node.min.js.gz',
-            '/media/vendor/codemirror/addon/scroll/annotatescrollbar.js',
-            '/media/vendor/codemirror/addon/scroll/annotatescrollbar.min.js',
-            '/media/vendor/codemirror/addon/scroll/annotatescrollbar.min.js.gz',
-            '/media/vendor/codemirror/addon/scroll/scrollpastend.js',
-            '/media/vendor/codemirror/addon/scroll/scrollpastend.min.js',
-            '/media/vendor/codemirror/addon/scroll/scrollpastend.min.js.gz',
-            '/media/vendor/codemirror/addon/scroll/simplescrollbars.css',
-            '/media/vendor/codemirror/addon/scroll/simplescrollbars.js',
-            '/media/vendor/codemirror/addon/scroll/simplescrollbars.min.js',
-            '/media/vendor/codemirror/addon/scroll/simplescrollbars.min.js.gz',
-            '/media/vendor/codemirror/addon/search/jump-to-line.js',
-            '/media/vendor/codemirror/addon/search/jump-to-line.min.js',
-            '/media/vendor/codemirror/addon/search/jump-to-line.min.js.gz',
-            '/media/vendor/codemirror/addon/search/match-highlighter.js',
-            '/media/vendor/codemirror/addon/search/match-highlighter.min.js',
-            '/media/vendor/codemirror/addon/search/match-highlighter.min.js.gz',
-            '/media/vendor/codemirror/addon/search/matchesonscrollbar.css',
-            '/media/vendor/codemirror/addon/search/matchesonscrollbar.js',
-            '/media/vendor/codemirror/addon/search/matchesonscrollbar.min.js',
-            '/media/vendor/codemirror/addon/search/matchesonscrollbar.min.js.gz',
-            '/media/vendor/codemirror/addon/search/search.js',
-            '/media/vendor/codemirror/addon/search/search.min.js',
-            '/media/vendor/codemirror/addon/search/search.min.js.gz',
-            '/media/vendor/codemirror/addon/search/searchcursor.js',
-            '/media/vendor/codemirror/addon/search/searchcursor.min.js',
-            '/media/vendor/codemirror/addon/search/searchcursor.min.js.gz',
-            '/media/vendor/codemirror/addon/selection/active-line.js',
-            '/media/vendor/codemirror/addon/selection/active-line.min.js',
-            '/media/vendor/codemirror/addon/selection/active-line.min.js.gz',
-            '/media/vendor/codemirror/addon/selection/mark-selection.js',
-            '/media/vendor/codemirror/addon/selection/mark-selection.min.js',
-            '/media/vendor/codemirror/addon/selection/mark-selection.min.js.gz',
-            '/media/vendor/codemirror/addon/selection/selection-pointer.js',
-            '/media/vendor/codemirror/addon/selection/selection-pointer.min.js',
-            '/media/vendor/codemirror/addon/selection/selection-pointer.min.js.gz',
-            '/media/vendor/codemirror/addon/tern/tern.css',
-            '/media/vendor/codemirror/addon/tern/tern.js',
-            '/media/vendor/codemirror/addon/tern/tern.min.js',
-            '/media/vendor/codemirror/addon/tern/tern.min.js.gz',
-            '/media/vendor/codemirror/addon/tern/worker.js',
-            '/media/vendor/codemirror/addon/tern/worker.min.js',
-            '/media/vendor/codemirror/addon/tern/worker.min.js.gz',
-            '/media/vendor/codemirror/addon/wrap/hardwrap.js',
-            '/media/vendor/codemirror/addon/wrap/hardwrap.min.js',
-            '/media/vendor/codemirror/addon/wrap/hardwrap.min.js.gz',
-            '/media/vendor/codemirror/keymap/emacs.js',
-            '/media/vendor/codemirror/keymap/emacs.min.js',
-            '/media/vendor/codemirror/keymap/emacs.min.js.gz',
-            '/media/vendor/codemirror/keymap/sublime.js',
-            '/media/vendor/codemirror/keymap/sublime.min.js',
-            '/media/vendor/codemirror/keymap/sublime.min.js.gz',
-            '/media/vendor/codemirror/keymap/vim.js',
-            '/media/vendor/codemirror/keymap/vim.min.js',
-            '/media/vendor/codemirror/keymap/vim.min.js.gz',
-            '/media/vendor/codemirror/lib/addons.css',
-            '/media/vendor/codemirror/lib/addons.js',
-            '/media/vendor/codemirror/lib/addons.min.js',
-            '/media/vendor/codemirror/lib/addons.min.js.gz',
-            '/media/vendor/codemirror/lib/codemirror.css',
-            '/media/vendor/codemirror/lib/codemirror.js',
-            '/media/vendor/codemirror/lib/codemirror.min.js',
-            '/media/vendor/codemirror/lib/codemirror.min.js.gz',
-            '/media/vendor/codemirror/mode/apl/apl.js',
-            '/media/vendor/codemirror/mode/apl/apl.min.js',
-            '/media/vendor/codemirror/mode/apl/apl.min.js.gz',
-            '/media/vendor/codemirror/mode/asciiarmor/asciiarmor.js',
-            '/media/vendor/codemirror/mode/asciiarmor/asciiarmor.min.js',
-            '/media/vendor/codemirror/mode/asciiarmor/asciiarmor.min.js.gz',
-            '/media/vendor/codemirror/mode/asn.1/asn.1.js',
-            '/media/vendor/codemirror/mode/asn.1/asn.1.min.js',
-            '/media/vendor/codemirror/mode/asn.1/asn.1.min.js.gz',
-            '/media/vendor/codemirror/mode/asterisk/asterisk.js',
-            '/media/vendor/codemirror/mode/asterisk/asterisk.min.js',
-            '/media/vendor/codemirror/mode/asterisk/asterisk.min.js.gz',
-            '/media/vendor/codemirror/mode/brainfuck/brainfuck.js',
-            '/media/vendor/codemirror/mode/brainfuck/brainfuck.min.js',
-            '/media/vendor/codemirror/mode/brainfuck/brainfuck.min.js.gz',
-            '/media/vendor/codemirror/mode/clike/clike.js',
-            '/media/vendor/codemirror/mode/clike/clike.min.js',
-            '/media/vendor/codemirror/mode/clike/clike.min.js.gz',
-            '/media/vendor/codemirror/mode/clojure/clojure.js',
-            '/media/vendor/codemirror/mode/clojure/clojure.min.js',
-            '/media/vendor/codemirror/mode/clojure/clojure.min.js.gz',
-            '/media/vendor/codemirror/mode/cmake/cmake.js',
-            '/media/vendor/codemirror/mode/cmake/cmake.min.js',
-            '/media/vendor/codemirror/mode/cmake/cmake.min.js.gz',
-            '/media/vendor/codemirror/mode/cobol/cobol.js',
-            '/media/vendor/codemirror/mode/cobol/cobol.min.js',
-            '/media/vendor/codemirror/mode/cobol/cobol.min.js.gz',
-            '/media/vendor/codemirror/mode/coffeescript/coffeescript.js',
-            '/media/vendor/codemirror/mode/coffeescript/coffeescript.min.js',
-            '/media/vendor/codemirror/mode/coffeescript/coffeescript.min.js.gz',
-            '/media/vendor/codemirror/mode/commonlisp/commonlisp.js',
-            '/media/vendor/codemirror/mode/commonlisp/commonlisp.min.js',
-            '/media/vendor/codemirror/mode/commonlisp/commonlisp.min.js.gz',
-            '/media/vendor/codemirror/mode/crystal/crystal.js',
-            '/media/vendor/codemirror/mode/crystal/crystal.min.js',
-            '/media/vendor/codemirror/mode/crystal/crystal.min.js.gz',
-            '/media/vendor/codemirror/mode/css/css.js',
-            '/media/vendor/codemirror/mode/css/css.min.js',
-            '/media/vendor/codemirror/mode/css/css.min.js.gz',
-            '/media/vendor/codemirror/mode/cypher/cypher.js',
-            '/media/vendor/codemirror/mode/cypher/cypher.min.js',
-            '/media/vendor/codemirror/mode/cypher/cypher.min.js.gz',
-            '/media/vendor/codemirror/mode/d/d.js',
-            '/media/vendor/codemirror/mode/d/d.min.js',
-            '/media/vendor/codemirror/mode/d/d.min.js.gz',
-            '/media/vendor/codemirror/mode/dart/dart.js',
-            '/media/vendor/codemirror/mode/dart/dart.min.js',
-            '/media/vendor/codemirror/mode/dart/dart.min.js.gz',
-            '/media/vendor/codemirror/mode/diff/diff.js',
-            '/media/vendor/codemirror/mode/diff/diff.min.js',
-            '/media/vendor/codemirror/mode/diff/diff.min.js.gz',
-            '/media/vendor/codemirror/mode/django/django.js',
-            '/media/vendor/codemirror/mode/django/django.min.js',
-            '/media/vendor/codemirror/mode/django/django.min.js.gz',
-            '/media/vendor/codemirror/mode/dockerfile/dockerfile.js',
-            '/media/vendor/codemirror/mode/dockerfile/dockerfile.min.js',
-            '/media/vendor/codemirror/mode/dockerfile/dockerfile.min.js.gz',
-            '/media/vendor/codemirror/mode/dtd/dtd.js',
-            '/media/vendor/codemirror/mode/dtd/dtd.min.js',
-            '/media/vendor/codemirror/mode/dtd/dtd.min.js.gz',
-            '/media/vendor/codemirror/mode/dylan/dylan.js',
-            '/media/vendor/codemirror/mode/dylan/dylan.min.js',
-            '/media/vendor/codemirror/mode/dylan/dylan.min.js.gz',
-            '/media/vendor/codemirror/mode/ebnf/ebnf.js',
-            '/media/vendor/codemirror/mode/ebnf/ebnf.min.js',
-            '/media/vendor/codemirror/mode/ebnf/ebnf.min.js.gz',
-            '/media/vendor/codemirror/mode/ecl/ecl.js',
-            '/media/vendor/codemirror/mode/ecl/ecl.min.js',
-            '/media/vendor/codemirror/mode/ecl/ecl.min.js.gz',
-            '/media/vendor/codemirror/mode/eiffel/eiffel.js',
-            '/media/vendor/codemirror/mode/eiffel/eiffel.min.js',
-            '/media/vendor/codemirror/mode/eiffel/eiffel.min.js.gz',
-            '/media/vendor/codemirror/mode/elm/elm.js',
-            '/media/vendor/codemirror/mode/elm/elm.min.js',
-            '/media/vendor/codemirror/mode/elm/elm.min.js.gz',
-            '/media/vendor/codemirror/mode/erlang/erlang.js',
-            '/media/vendor/codemirror/mode/erlang/erlang.min.js',
-            '/media/vendor/codemirror/mode/erlang/erlang.min.js.gz',
-            '/media/vendor/codemirror/mode/factor/factor.js',
-            '/media/vendor/codemirror/mode/factor/factor.min.js',
-            '/media/vendor/codemirror/mode/factor/factor.min.js.gz',
-            '/media/vendor/codemirror/mode/fcl/fcl.js',
-            '/media/vendor/codemirror/mode/fcl/fcl.min.js',
-            '/media/vendor/codemirror/mode/fcl/fcl.min.js.gz',
-            '/media/vendor/codemirror/mode/forth/forth.js',
-            '/media/vendor/codemirror/mode/forth/forth.min.js',
-            '/media/vendor/codemirror/mode/forth/forth.min.js.gz',
-            '/media/vendor/codemirror/mode/fortran/fortran.js',
-            '/media/vendor/codemirror/mode/fortran/fortran.min.js',
-            '/media/vendor/codemirror/mode/fortran/fortran.min.js.gz',
-            '/media/vendor/codemirror/mode/gas/gas.js',
-            '/media/vendor/codemirror/mode/gas/gas.min.js',
-            '/media/vendor/codemirror/mode/gas/gas.min.js.gz',
-            '/media/vendor/codemirror/mode/gfm/gfm.js',
-            '/media/vendor/codemirror/mode/gfm/gfm.min.js',
-            '/media/vendor/codemirror/mode/gfm/gfm.min.js.gz',
-            '/media/vendor/codemirror/mode/gherkin/gherkin.js',
-            '/media/vendor/codemirror/mode/gherkin/gherkin.min.js',
-            '/media/vendor/codemirror/mode/gherkin/gherkin.min.js.gz',
-            '/media/vendor/codemirror/mode/go/go.js',
-            '/media/vendor/codemirror/mode/go/go.min.js',
-            '/media/vendor/codemirror/mode/go/go.min.js.gz',
-            '/media/vendor/codemirror/mode/groovy/groovy.js',
-            '/media/vendor/codemirror/mode/groovy/groovy.min.js',
-            '/media/vendor/codemirror/mode/groovy/groovy.min.js.gz',
-            '/media/vendor/codemirror/mode/haml/haml.js',
-            '/media/vendor/codemirror/mode/haml/haml.min.js',
-            '/media/vendor/codemirror/mode/haml/haml.min.js.gz',
-            '/media/vendor/codemirror/mode/handlebars/handlebars.js',
-            '/media/vendor/codemirror/mode/handlebars/handlebars.min.js',
-            '/media/vendor/codemirror/mode/handlebars/handlebars.min.js.gz',
-            '/media/vendor/codemirror/mode/haskell-literate/haskell-literate.js',
-            '/media/vendor/codemirror/mode/haskell-literate/haskell-literate.min.js',
-            '/media/vendor/codemirror/mode/haskell-literate/haskell-literate.min.js.gz',
-            '/media/vendor/codemirror/mode/haskell/haskell.js',
-            '/media/vendor/codemirror/mode/haskell/haskell.min.js',
-            '/media/vendor/codemirror/mode/haskell/haskell.min.js.gz',
-            '/media/vendor/codemirror/mode/haxe/haxe.js',
-            '/media/vendor/codemirror/mode/haxe/haxe.min.js',
-            '/media/vendor/codemirror/mode/haxe/haxe.min.js.gz',
-            '/media/vendor/codemirror/mode/htmlembedded/htmlembedded.js',
-            '/media/vendor/codemirror/mode/htmlembedded/htmlembedded.min.js',
-            '/media/vendor/codemirror/mode/htmlembedded/htmlembedded.min.js.gz',
-            '/media/vendor/codemirror/mode/htmlmixed/htmlmixed.js',
-            '/media/vendor/codemirror/mode/htmlmixed/htmlmixed.min.js',
-            '/media/vendor/codemirror/mode/htmlmixed/htmlmixed.min.js.gz',
-            '/media/vendor/codemirror/mode/http/http.js',
-            '/media/vendor/codemirror/mode/http/http.min.js',
-            '/media/vendor/codemirror/mode/http/http.min.js.gz',
-            '/media/vendor/codemirror/mode/idl/idl.js',
-            '/media/vendor/codemirror/mode/idl/idl.min.js',
-            '/media/vendor/codemirror/mode/idl/idl.min.js.gz',
-            '/media/vendor/codemirror/mode/javascript/javascript.js',
-            '/media/vendor/codemirror/mode/javascript/javascript.min.js',
-            '/media/vendor/codemirror/mode/javascript/javascript.min.js.gz',
-            '/media/vendor/codemirror/mode/jinja2/jinja2.js',
-            '/media/vendor/codemirror/mode/jinja2/jinja2.min.js',
-            '/media/vendor/codemirror/mode/jinja2/jinja2.min.js.gz',
-            '/media/vendor/codemirror/mode/jsx/jsx.js',
-            '/media/vendor/codemirror/mode/jsx/jsx.min.js',
-            '/media/vendor/codemirror/mode/jsx/jsx.min.js.gz',
-            '/media/vendor/codemirror/mode/julia/julia.js',
-            '/media/vendor/codemirror/mode/julia/julia.min.js',
-            '/media/vendor/codemirror/mode/julia/julia.min.js.gz',
-            '/media/vendor/codemirror/mode/livescript/livescript.js',
-            '/media/vendor/codemirror/mode/livescript/livescript.min.js',
-            '/media/vendor/codemirror/mode/livescript/livescript.min.js.gz',
-            '/media/vendor/codemirror/mode/lua/lua.js',
-            '/media/vendor/codemirror/mode/lua/lua.min.js',
-            '/media/vendor/codemirror/mode/lua/lua.min.js.gz',
-            '/media/vendor/codemirror/mode/markdown/markdown.js',
-            '/media/vendor/codemirror/mode/markdown/markdown.min.js',
-            '/media/vendor/codemirror/mode/markdown/markdown.min.js.gz',
-            '/media/vendor/codemirror/mode/mathematica/mathematica.js',
-            '/media/vendor/codemirror/mode/mathematica/mathematica.min.js',
-            '/media/vendor/codemirror/mode/mathematica/mathematica.min.js.gz',
-            '/media/vendor/codemirror/mode/mbox/mbox.js',
-            '/media/vendor/codemirror/mode/mbox/mbox.min.js',
-            '/media/vendor/codemirror/mode/mbox/mbox.min.js.gz',
-            '/media/vendor/codemirror/mode/meta.js',
-            '/media/vendor/codemirror/mode/meta.min.js',
-            '/media/vendor/codemirror/mode/meta.min.js.gz',
-            '/media/vendor/codemirror/mode/mirc/mirc.js',
-            '/media/vendor/codemirror/mode/mirc/mirc.min.js',
-            '/media/vendor/codemirror/mode/mirc/mirc.min.js.gz',
-            '/media/vendor/codemirror/mode/mllike/mllike.js',
-            '/media/vendor/codemirror/mode/mllike/mllike.min.js',
-            '/media/vendor/codemirror/mode/mllike/mllike.min.js.gz',
-            '/media/vendor/codemirror/mode/modelica/modelica.js',
-            '/media/vendor/codemirror/mode/modelica/modelica.min.js',
-            '/media/vendor/codemirror/mode/modelica/modelica.min.js.gz',
-            '/media/vendor/codemirror/mode/mscgen/mscgen.js',
-            '/media/vendor/codemirror/mode/mscgen/mscgen.min.js',
-            '/media/vendor/codemirror/mode/mscgen/mscgen.min.js.gz',
-            '/media/vendor/codemirror/mode/mumps/mumps.js',
-            '/media/vendor/codemirror/mode/mumps/mumps.min.js',
-            '/media/vendor/codemirror/mode/mumps/mumps.min.js.gz',
-            '/media/vendor/codemirror/mode/nginx/nginx.js',
-            '/media/vendor/codemirror/mode/nginx/nginx.min.js',
-            '/media/vendor/codemirror/mode/nginx/nginx.min.js.gz',
-            '/media/vendor/codemirror/mode/nsis/nsis.js',
-            '/media/vendor/codemirror/mode/nsis/nsis.min.js',
-            '/media/vendor/codemirror/mode/nsis/nsis.min.js.gz',
-            '/media/vendor/codemirror/mode/ntriples/ntriples.js',
-            '/media/vendor/codemirror/mode/ntriples/ntriples.min.js',
-            '/media/vendor/codemirror/mode/ntriples/ntriples.min.js.gz',
-            '/media/vendor/codemirror/mode/octave/octave.js',
-            '/media/vendor/codemirror/mode/octave/octave.min.js',
-            '/media/vendor/codemirror/mode/octave/octave.min.js.gz',
-            '/media/vendor/codemirror/mode/oz/oz.js',
-            '/media/vendor/codemirror/mode/oz/oz.min.js',
-            '/media/vendor/codemirror/mode/oz/oz.min.js.gz',
-            '/media/vendor/codemirror/mode/pascal/pascal.js',
-            '/media/vendor/codemirror/mode/pascal/pascal.min.js',
-            '/media/vendor/codemirror/mode/pascal/pascal.min.js.gz',
-            '/media/vendor/codemirror/mode/pegjs/pegjs.js',
-            '/media/vendor/codemirror/mode/pegjs/pegjs.min.js',
-            '/media/vendor/codemirror/mode/pegjs/pegjs.min.js.gz',
-            '/media/vendor/codemirror/mode/perl/perl.js',
-            '/media/vendor/codemirror/mode/perl/perl.min.js',
-            '/media/vendor/codemirror/mode/perl/perl.min.js.gz',
-            '/media/vendor/codemirror/mode/php/php.js',
-            '/media/vendor/codemirror/mode/php/php.min.js',
-            '/media/vendor/codemirror/mode/php/php.min.js.gz',
-            '/media/vendor/codemirror/mode/pig/pig.js',
-            '/media/vendor/codemirror/mode/pig/pig.min.js',
-            '/media/vendor/codemirror/mode/pig/pig.min.js.gz',
-            '/media/vendor/codemirror/mode/powershell/powershell.js',
-            '/media/vendor/codemirror/mode/powershell/powershell.min.js',
-            '/media/vendor/codemirror/mode/powershell/powershell.min.js.gz',
-            '/media/vendor/codemirror/mode/properties/properties.js',
-            '/media/vendor/codemirror/mode/properties/properties.min.js',
-            '/media/vendor/codemirror/mode/properties/properties.min.js.gz',
-            '/media/vendor/codemirror/mode/protobuf/protobuf.js',
-            '/media/vendor/codemirror/mode/protobuf/protobuf.min.js',
-            '/media/vendor/codemirror/mode/protobuf/protobuf.min.js.gz',
-            '/media/vendor/codemirror/mode/pug/pug.js',
-            '/media/vendor/codemirror/mode/pug/pug.min.js',
-            '/media/vendor/codemirror/mode/pug/pug.min.js.gz',
-            '/media/vendor/codemirror/mode/puppet/puppet.js',
-            '/media/vendor/codemirror/mode/puppet/puppet.min.js',
-            '/media/vendor/codemirror/mode/puppet/puppet.min.js.gz',
-            '/media/vendor/codemirror/mode/python/python.js',
-            '/media/vendor/codemirror/mode/python/python.min.js',
-            '/media/vendor/codemirror/mode/python/python.min.js.gz',
-            '/media/vendor/codemirror/mode/q/q.js',
-            '/media/vendor/codemirror/mode/q/q.min.js',
-            '/media/vendor/codemirror/mode/q/q.min.js.gz',
-            '/media/vendor/codemirror/mode/r/r.js',
-            '/media/vendor/codemirror/mode/r/r.min.js',
-            '/media/vendor/codemirror/mode/r/r.min.js.gz',
-            '/media/vendor/codemirror/mode/rpm/changes/index.html',
-            '/media/vendor/codemirror/mode/rpm/rpm.js',
-            '/media/vendor/codemirror/mode/rpm/rpm.min.js',
-            '/media/vendor/codemirror/mode/rpm/rpm.min.js.gz',
-            '/media/vendor/codemirror/mode/rst/rst.js',
-            '/media/vendor/codemirror/mode/rst/rst.min.js',
-            '/media/vendor/codemirror/mode/rst/rst.min.js.gz',
-            '/media/vendor/codemirror/mode/ruby/ruby.js',
-            '/media/vendor/codemirror/mode/ruby/ruby.min.js',
-            '/media/vendor/codemirror/mode/ruby/ruby.min.js.gz',
-            '/media/vendor/codemirror/mode/rust/rust.js',
-            '/media/vendor/codemirror/mode/rust/rust.min.js',
-            '/media/vendor/codemirror/mode/rust/rust.min.js.gz',
-            '/media/vendor/codemirror/mode/sas/sas.js',
-            '/media/vendor/codemirror/mode/sas/sas.min.js',
-            '/media/vendor/codemirror/mode/sas/sas.min.js.gz',
-            '/media/vendor/codemirror/mode/sass/sass.js',
-            '/media/vendor/codemirror/mode/sass/sass.min.js',
-            '/media/vendor/codemirror/mode/sass/sass.min.js.gz',
-            '/media/vendor/codemirror/mode/scheme/scheme.js',
-            '/media/vendor/codemirror/mode/scheme/scheme.min.js',
-            '/media/vendor/codemirror/mode/scheme/scheme.min.js.gz',
-            '/media/vendor/codemirror/mode/shell/shell.js',
-            '/media/vendor/codemirror/mode/shell/shell.min.js',
-            '/media/vendor/codemirror/mode/shell/shell.min.js.gz',
-            '/media/vendor/codemirror/mode/sieve/sieve.js',
-            '/media/vendor/codemirror/mode/sieve/sieve.min.js',
-            '/media/vendor/codemirror/mode/sieve/sieve.min.js.gz',
-            '/media/vendor/codemirror/mode/slim/slim.js',
-            '/media/vendor/codemirror/mode/slim/slim.min.js',
-            '/media/vendor/codemirror/mode/slim/slim.min.js.gz',
-            '/media/vendor/codemirror/mode/smalltalk/smalltalk.js',
-            '/media/vendor/codemirror/mode/smalltalk/smalltalk.min.js',
-            '/media/vendor/codemirror/mode/smalltalk/smalltalk.min.js.gz',
-            '/media/vendor/codemirror/mode/smarty/smarty.js',
-            '/media/vendor/codemirror/mode/smarty/smarty.min.js',
-            '/media/vendor/codemirror/mode/smarty/smarty.min.js.gz',
-            '/media/vendor/codemirror/mode/solr/solr.js',
-            '/media/vendor/codemirror/mode/solr/solr.min.js',
-            '/media/vendor/codemirror/mode/solr/solr.min.js.gz',
-            '/media/vendor/codemirror/mode/soy/soy.js',
-            '/media/vendor/codemirror/mode/soy/soy.min.js',
-            '/media/vendor/codemirror/mode/soy/soy.min.js.gz',
-            '/media/vendor/codemirror/mode/sparql/sparql.js',
-            '/media/vendor/codemirror/mode/sparql/sparql.min.js',
-            '/media/vendor/codemirror/mode/sparql/sparql.min.js.gz',
-            '/media/vendor/codemirror/mode/spreadsheet/spreadsheet.js',
-            '/media/vendor/codemirror/mode/spreadsheet/spreadsheet.min.js',
-            '/media/vendor/codemirror/mode/spreadsheet/spreadsheet.min.js.gz',
-            '/media/vendor/codemirror/mode/sql/sql.js',
-            '/media/vendor/codemirror/mode/sql/sql.min.js',
-            '/media/vendor/codemirror/mode/sql/sql.min.js.gz',
-            '/media/vendor/codemirror/mode/stex/stex.js',
-            '/media/vendor/codemirror/mode/stex/stex.min.js',
-            '/media/vendor/codemirror/mode/stex/stex.min.js.gz',
-            '/media/vendor/codemirror/mode/stylus/stylus.js',
-            '/media/vendor/codemirror/mode/stylus/stylus.min.js',
-            '/media/vendor/codemirror/mode/stylus/stylus.min.js.gz',
-            '/media/vendor/codemirror/mode/swift/swift.js',
-            '/media/vendor/codemirror/mode/swift/swift.min.js',
-            '/media/vendor/codemirror/mode/swift/swift.min.js.gz',
-            '/media/vendor/codemirror/mode/tcl/tcl.js',
-            '/media/vendor/codemirror/mode/tcl/tcl.min.js',
-            '/media/vendor/codemirror/mode/tcl/tcl.min.js.gz',
-            '/media/vendor/codemirror/mode/textile/textile.js',
-            '/media/vendor/codemirror/mode/textile/textile.min.js',
-            '/media/vendor/codemirror/mode/textile/textile.min.js.gz',
-            '/media/vendor/codemirror/mode/tiddlywiki/tiddlywiki.css',
-            '/media/vendor/codemirror/mode/tiddlywiki/tiddlywiki.js',
-            '/media/vendor/codemirror/mode/tiddlywiki/tiddlywiki.min.js',
-            '/media/vendor/codemirror/mode/tiddlywiki/tiddlywiki.min.js.gz',
-            '/media/vendor/codemirror/mode/tiki/tiki.css',
-            '/media/vendor/codemirror/mode/tiki/tiki.js',
-            '/media/vendor/codemirror/mode/tiki/tiki.min.js',
-            '/media/vendor/codemirror/mode/tiki/tiki.min.js.gz',
-            '/media/vendor/codemirror/mode/toml/toml.js',
-            '/media/vendor/codemirror/mode/toml/toml.min.js',
-            '/media/vendor/codemirror/mode/toml/toml.min.js.gz',
-            '/media/vendor/codemirror/mode/tornado/tornado.js',
-            '/media/vendor/codemirror/mode/tornado/tornado.min.js',
-            '/media/vendor/codemirror/mode/tornado/tornado.min.js.gz',
-            '/media/vendor/codemirror/mode/troff/troff.js',
-            '/media/vendor/codemirror/mode/troff/troff.min.js',
-            '/media/vendor/codemirror/mode/troff/troff.min.js.gz',
-            '/media/vendor/codemirror/mode/ttcn-cfg/ttcn-cfg.js',
-            '/media/vendor/codemirror/mode/ttcn-cfg/ttcn-cfg.min.js',
-            '/media/vendor/codemirror/mode/ttcn-cfg/ttcn-cfg.min.js.gz',
-            '/media/vendor/codemirror/mode/ttcn/ttcn.js',
-            '/media/vendor/codemirror/mode/ttcn/ttcn.min.js',
-            '/media/vendor/codemirror/mode/ttcn/ttcn.min.js.gz',
-            '/media/vendor/codemirror/mode/turtle/turtle.js',
-            '/media/vendor/codemirror/mode/turtle/turtle.min.js',
-            '/media/vendor/codemirror/mode/turtle/turtle.min.js.gz',
-            '/media/vendor/codemirror/mode/twig/twig.js',
-            '/media/vendor/codemirror/mode/twig/twig.min.js',
-            '/media/vendor/codemirror/mode/twig/twig.min.js.gz',
-            '/media/vendor/codemirror/mode/vb/vb.js',
-            '/media/vendor/codemirror/mode/vb/vb.min.js',
-            '/media/vendor/codemirror/mode/vb/vb.min.js.gz',
-            '/media/vendor/codemirror/mode/vbscript/vbscript.js',
-            '/media/vendor/codemirror/mode/vbscript/vbscript.min.js',
-            '/media/vendor/codemirror/mode/vbscript/vbscript.min.js.gz',
-            '/media/vendor/codemirror/mode/velocity/velocity.js',
-            '/media/vendor/codemirror/mode/velocity/velocity.min.js',
-            '/media/vendor/codemirror/mode/velocity/velocity.min.js.gz',
-            '/media/vendor/codemirror/mode/verilog/verilog.js',
-            '/media/vendor/codemirror/mode/verilog/verilog.min.js',
-            '/media/vendor/codemirror/mode/verilog/verilog.min.js.gz',
-            '/media/vendor/codemirror/mode/vhdl/vhdl.js',
-            '/media/vendor/codemirror/mode/vhdl/vhdl.min.js',
-            '/media/vendor/codemirror/mode/vhdl/vhdl.min.js.gz',
-            '/media/vendor/codemirror/mode/vue/vue.js',
-            '/media/vendor/codemirror/mode/vue/vue.min.js',
-            '/media/vendor/codemirror/mode/vue/vue.min.js.gz',
-            '/media/vendor/codemirror/mode/wast/wast.js',
-            '/media/vendor/codemirror/mode/wast/wast.min.js',
-            '/media/vendor/codemirror/mode/wast/wast.min.js.gz',
-            '/media/vendor/codemirror/mode/webidl/webidl.js',
-            '/media/vendor/codemirror/mode/webidl/webidl.min.js',
-            '/media/vendor/codemirror/mode/webidl/webidl.min.js.gz',
-            '/media/vendor/codemirror/mode/xml/xml.js',
-            '/media/vendor/codemirror/mode/xml/xml.min.js',
-            '/media/vendor/codemirror/mode/xml/xml.min.js.gz',
-            '/media/vendor/codemirror/mode/xquery/xquery.js',
-            '/media/vendor/codemirror/mode/xquery/xquery.min.js',
-            '/media/vendor/codemirror/mode/xquery/xquery.min.js.gz',
-            '/media/vendor/codemirror/mode/yacas/yacas.js',
-            '/media/vendor/codemirror/mode/yacas/yacas.min.js',
-            '/media/vendor/codemirror/mode/yacas/yacas.min.js.gz',
-            '/media/vendor/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js',
-            '/media/vendor/codemirror/mode/yaml-frontmatter/yaml-frontmatter.min.js',
-            '/media/vendor/codemirror/mode/yaml-frontmatter/yaml-frontmatter.min.js.gz',
-            '/media/vendor/codemirror/mode/yaml/yaml.js',
-            '/media/vendor/codemirror/mode/yaml/yaml.min.js',
-            '/media/vendor/codemirror/mode/yaml/yaml.min.js.gz',
-            '/media/vendor/codemirror/mode/z80/z80.js',
-            '/media/vendor/codemirror/mode/z80/z80.min.js',
-            '/media/vendor/codemirror/mode/z80/z80.min.js.gz',
-            '/media/vendor/codemirror/theme/3024-day.css',
-            '/media/vendor/codemirror/theme/3024-night.css',
-            '/media/vendor/codemirror/theme/abbott.css',
-            '/media/vendor/codemirror/theme/abcdef.css',
-            '/media/vendor/codemirror/theme/ambiance-mobile.css',
-            '/media/vendor/codemirror/theme/ambiance.css',
-            '/media/vendor/codemirror/theme/ayu-dark.css',
-            '/media/vendor/codemirror/theme/ayu-mirage.css',
-            '/media/vendor/codemirror/theme/base16-dark.css',
-            '/media/vendor/codemirror/theme/base16-light.css',
-            '/media/vendor/codemirror/theme/bespin.css',
-            '/media/vendor/codemirror/theme/blackboard.css',
-            '/media/vendor/codemirror/theme/cobalt.css',
-            '/media/vendor/codemirror/theme/colorforth.css',
-            '/media/vendor/codemirror/theme/darcula.css',
-            '/media/vendor/codemirror/theme/dracula.css',
-            '/media/vendor/codemirror/theme/duotone-dark.css',
-            '/media/vendor/codemirror/theme/duotone-light.css',
-            '/media/vendor/codemirror/theme/eclipse.css',
-            '/media/vendor/codemirror/theme/elegant.css',
-            '/media/vendor/codemirror/theme/erlang-dark.css',
-            '/media/vendor/codemirror/theme/gruvbox-dark.css',
-            '/media/vendor/codemirror/theme/hopscotch.css',
-            '/media/vendor/codemirror/theme/icecoder.css',
-            '/media/vendor/codemirror/theme/idea.css',
-            '/media/vendor/codemirror/theme/isotope.css',
-            '/media/vendor/codemirror/theme/juejin.css',
-            '/media/vendor/codemirror/theme/lesser-dark.css',
-            '/media/vendor/codemirror/theme/liquibyte.css',
-            '/media/vendor/codemirror/theme/lucario.css',
-            '/media/vendor/codemirror/theme/material-darker.css',
-            '/media/vendor/codemirror/theme/material-ocean.css',
-            '/media/vendor/codemirror/theme/material-palenight.css',
-            '/media/vendor/codemirror/theme/material.css',
-            '/media/vendor/codemirror/theme/mbo.css',
-            '/media/vendor/codemirror/theme/mdn-like.css',
-            '/media/vendor/codemirror/theme/midnight.css',
-            '/media/vendor/codemirror/theme/monokai.css',
-            '/media/vendor/codemirror/theme/moxer.css',
-            '/media/vendor/codemirror/theme/neat.css',
-            '/media/vendor/codemirror/theme/neo.css',
-            '/media/vendor/codemirror/theme/night.css',
-            '/media/vendor/codemirror/theme/nord.css',
-            '/media/vendor/codemirror/theme/oceanic-next.css',
-            '/media/vendor/codemirror/theme/panda-syntax.css',
-            '/media/vendor/codemirror/theme/paraiso-dark.css',
-            '/media/vendor/codemirror/theme/paraiso-light.css',
-            '/media/vendor/codemirror/theme/pastel-on-dark.css',
-            '/media/vendor/codemirror/theme/railscasts.css',
-            '/media/vendor/codemirror/theme/rubyblue.css',
-            '/media/vendor/codemirror/theme/seti.css',
-            '/media/vendor/codemirror/theme/shadowfox.css',
-            '/media/vendor/codemirror/theme/solarized.css',
-            '/media/vendor/codemirror/theme/ssms.css',
-            '/media/vendor/codemirror/theme/the-matrix.css',
-            '/media/vendor/codemirror/theme/tomorrow-night-bright.css',
-            '/media/vendor/codemirror/theme/tomorrow-night-eighties.css',
-            '/media/vendor/codemirror/theme/ttcn.css',
-            '/media/vendor/codemirror/theme/twilight.css',
-            '/media/vendor/codemirror/theme/vibrant-ink.css',
-            '/media/vendor/codemirror/theme/xq-dark.css',
-            '/media/vendor/codemirror/theme/xq-light.css',
-            '/media/vendor/codemirror/theme/yeti.css',
-            '/media/vendor/codemirror/theme/yonce.css',
-            '/media/vendor/codemirror/theme/zenburn.css',
-            '/plugins/editors/codemirror/fonts.json',
-            '/plugins/editors/codemirror/layouts/editors/codemirror/element.php',
-            '/plugins/editors/codemirror/layouts/editors/codemirror/styles.php',
-            '/plugins/editors/codemirror/src/Field/FontsField.php',
-            // From 5.0.0-alpha3 to 5.0.0-alpha4
-            '/libraries/src/Event/Application/DeamonForkEvent.php',
-            '/libraries/src/Event/Application/DeamonReceiveSignalEvent.php',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/plugin.js',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/plugin.min.js',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/plugin.min.js.gz',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/source.css',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/source.html',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/source.js',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/source.min.css',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/source.min.css.gz',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/source.min.js',
-            '/media/plg_editors_tinymce/js/plugins/highlighter/source.min.js.gz',
-            '/media/plg_system_compat/es5.asset.json',
-            // From 5.0.0-alpha4 to 5.0.0-beta1
-            '/administrator/components/com_categories/tmpl/categories/default_batch_footer.php',
-            '/administrator/components/com_content/tmpl/articles/default_batch_footer.php',
-            '/administrator/language/en-GB/plg_twofactorauth_totp.ini',
-            '/administrator/language/en-GB/plg_twofactorauth_totp.sys.ini',
-            '/administrator/language/en-GB/plg_twofactorauth_yubikey.ini',
-            '/administrator/language/en-GB/plg_twofactorauth_yubikey.sys.ini',
-            '/media/com_contenthistory/js/admin-history-versions.js',
-            '/media/com_contenthistory/js/admin-history-versions.min.js',
-            '/media/com_contenthistory/js/admin-history-versions.min.js.gz',
-            // From 5.0.0-beta1 to 5.0.0-beta2
-            '/language/en-GB/lib_simplepie.sys.ini',
-            '/libraries/src/Cache/Storage/WincacheStorage.php',
-            // From 5.0.0-beta2 to 5.0.0-beta3
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/AbstractString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/AbstractTime.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/ASNObject.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Base128.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Composite/AttributeTypeAndValue.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Composite/RDNString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Composite/RelativeDistinguishedName.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Construct.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Exception/NotImplementedException.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Exception/ParserException.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/ExplicitlyTaggedObject.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Identifier.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/OID.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Parsable.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/TemplateParser.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/BitString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/BMPString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/Boolean.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/CharacterString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/Enumerated.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/GeneralizedTime.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/GeneralString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/GraphicString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/IA5String.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/Integer.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/NullObject.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/NumericString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/ObjectDescriptor.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/ObjectIdentifier.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/OctetString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/PrintableString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/RelativeObjectIdentifier.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/Sequence.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/Set.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/T61String.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/UniversalString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/UTCTime.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/UTF8String.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal/VisibleString.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/UnknownConstructedObject.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/UnknownObject.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/Utility/BigInteger.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/Utility/BigIntegerBcmath.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/Utility/BigIntegerGmp.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/AlgorithmIdentifier.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/CertificateExtensions.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/CertificateSubject.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/CSR/Attributes.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/CSR/CSR.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/PrivateKey.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/PublicKey.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/SAN/DNSName.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/SAN/IPAddress.php',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/SAN/SubjectAlternativeNames.php',
-            '/libraries/vendor/fgrosse/phpasn1/LICENSE',
-            '/libraries/vendor/stella-maris/clock/LICENSE.md',
-            '/libraries/vendor/stella-maris/clock/src/ClockInterface.php',
-            '/media/com_scheduler/css/admin-view-select-task.css',
-            '/media/com_scheduler/css/admin-view-select-task.min.css',
-            '/media/com_scheduler/css/admin-view-select-task.min.css.gz',
-            '/media/system/css/calendar-jos.css',
-            '/media/system/css/calendar-jos.min.css',
-            '/media/system/css/calendar-jos.min.css.gz',
-            '/media/system/css/debug.css',
-            '/media/system/css/debug.min.css',
-            '/media/system/css/debug.min.css.gz',
-            '/media/system/css/frontediting.css',
-            '/media/system/css/frontediting.min.css',
-            '/media/system/css/frontediting.min.css.gz',
-            '/media/system/css/mootree.css',
-            '/media/system/css/mootree.min.css',
-            '/media/system/css/mootree.min.css.gz',
-            '/media/system/css/mootree_rtl.css',
-            '/media/system/css/mootree_rtl.min.css',
-            '/media/system/css/mootree_rtl.min.css.gz',
-            '/media/system/css/sortablelist.css',
-            '/media/system/css/sortablelist.min.css',
-            '/media/system/css/sortablelist.min.css.gz',
-            // From 5.0.0 to 5.1.0-alpha1
-            '/administrator/components/com_banners/tmpl/banners/default_batch_footer.php',
-            '/administrator/components/com_contact/tmpl/contacts/default_batch_footer.php',
-            '/administrator/components/com_fields/tmpl/fields/default_batch_footer.php',
-            '/administrator/components/com_fields/tmpl/groups/default_batch_footer.php',
-            '/administrator/components/com_menus/tmpl/items/default_batch_footer.php',
-            '/administrator/components/com_modules/tmpl/modules/default_batch_footer.php',
-            '/administrator/components/com_newsfeeds/tmpl/newsfeeds/default_batch_footer.php',
-            '/administrator/components/com_tags/tmpl/tags/default_batch_footer.php',
-            '/administrator/components/com_users/tmpl/users/default_batch_footer.php',
-            // From 5.1.0-alpha3 to 5.1.0-alpha4
-            '/administrator/components/com_redirect/tmpl/links/default_batch_footer.php',
-            '/modules/mod_banners/mod_banners.php',
-            // From 5.1.0-alpha4 to 5.1.0-beta1
-            '/administrator/modules/mod_custom/mod_custom.php',
-            '/administrator/modules/mod_frontend/mod_frontend.php',
-            '/administrator/modules/mod_latestactions/mod_latestactions.php',
-            '/administrator/modules/mod_loginsupport/mod_loginsupport.php',
-            '/administrator/modules/mod_messages/mod_messages.php',
-            '/administrator/modules/mod_multilangstatus/mod_multilangstatus.php',
-            '/administrator/modules/mod_sampledata/mod_sampledata.php',
-            '/administrator/modules/mod_stats_admin/mod_stats_admin.php',
-            '/administrator/modules/mod_title/mod_title.php',
-            '/administrator/modules/mod_toolbar/mod_toolbar.php',
-            '/administrator/modules/mod_user/mod_user.php',
-            '/administrator/modules/mod_version/mod_version.php',
-            '/libraries/vendor/web-token/jwt-core/Algorithm.php',
-            '/libraries/vendor/web-token/jwt-core/AlgorithmManager.php',
-            '/libraries/vendor/web-token/jwt-core/AlgorithmManagerFactory.php',
-            '/libraries/vendor/web-token/jwt-core/JWK.php',
-            '/libraries/vendor/web-token/jwt-core/JWKSet.php',
-            '/libraries/vendor/web-token/jwt-core/JWT.php',
-            '/libraries/vendor/web-token/jwt-core/LICENSE',
-            '/libraries/vendor/web-token/jwt-core/Util/BigInteger.php',
-            '/libraries/vendor/web-token/jwt-core/Util/ECKey.php',
-            '/libraries/vendor/web-token/jwt-core/Util/ECSignature.php',
-            '/libraries/vendor/web-token/jwt-core/Util/Hash.php',
-            '/libraries/vendor/web-token/jwt-core/Util/JsonConverter.php',
-            '/libraries/vendor/web-token/jwt-core/Util/KeyChecker.php',
-            '/libraries/vendor/web-token/jwt-core/Util/RSAKey.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/ECDSA.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/ES256.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/ES384.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/ES512.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-eddsa/EdDSA.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/Blake2b.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/ES256K.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/HS1.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/HS256_64.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/RS1.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/HMAC.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/HS256.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/HS384.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/HS512.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-none/None.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/PS256.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/PS384.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/PS512.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/RS256.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/RS384.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/RS512.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/RSAPKCS1.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/RSAPSS.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/Util/RSA.php',
-            '/libraries/vendor/web-token/jwt-signature/Algorithm/MacAlgorithm.php',
-            '/libraries/vendor/web-token/jwt-signature/Algorithm/SignatureAlgorithm.php',
-            '/libraries/vendor/web-token/jwt-signature/JWS.php',
-            '/libraries/vendor/web-token/jwt-signature/JWSBuilder.php',
-            '/libraries/vendor/web-token/jwt-signature/JWSBuilderFactory.php',
-            '/libraries/vendor/web-token/jwt-signature/JWSLoader.php',
-            '/libraries/vendor/web-token/jwt-signature/JWSLoaderFactory.php',
-            '/libraries/vendor/web-token/jwt-signature/JWSTokenSupport.php',
-            '/libraries/vendor/web-token/jwt-signature/JWSVerifier.php',
-            '/libraries/vendor/web-token/jwt-signature/JWSVerifierFactory.php',
-            '/libraries/vendor/web-token/jwt-signature/LICENSE',
-            '/libraries/vendor/web-token/jwt-signature/Serializer/CompactSerializer.php',
-            '/libraries/vendor/web-token/jwt-signature/Serializer/JSONFlattenedSerializer.php',
-            '/libraries/vendor/web-token/jwt-signature/Serializer/JSONGeneralSerializer.php',
-            '/libraries/vendor/web-token/jwt-signature/Serializer/JWSSerializer.php',
-            '/libraries/vendor/web-token/jwt-signature/Serializer/JWSSerializerManager.php',
-            '/libraries/vendor/web-token/jwt-signature/Serializer/JWSSerializerManagerFactory.php',
-            '/libraries/vendor/web-token/jwt-signature/Serializer/Serializer.php',
-            '/libraries/vendor/web-token/jwt-signature/Signature.php',
-            '/media/plg_system_jooa11y/css/jooa11y.css',
-            '/media/plg_system_jooa11y/css/jooa11y.min.css',
-            '/media/plg_system_jooa11y/css/jooa11y.min.css.gz',
-            '/media/plg_system_jooa11y/scss/jooa11y.scss',
-            '/media/vendor/joomla-a11y-checker/LICENSE.md',
-            '/modules/mod_feed/mod_feed.php',
-            '/modules/mod_languages/mod_languages.php',
-            '/modules/mod_stats/mod_stats.php',
-            '/modules/mod_syndicate/mod_syndicate.php',
-            '/modules/mod_tags_popular/mod_tags_popular.php',
-            '/modules/mod_tags_similar/mod_tags_similar.php',
-            '/modules/mod_wrapper/mod_wrapper.php',
-            // From 5.1.0-beta1 to 5.1.0-beta2
-            '/administrator/modules/mod_login/mod_login.php',
-            '/libraries/src/Event/Router/AfterInitialiseRouterEvent.php',
-            '/libraries/src/Event/Router/RouterEvent.php',
-            '/libraries/src/Http/HttpFactoryInterface.php',
-            '/libraries/src/Service/Provider/Http.php',
-            '/libraries/vendor/web-token/jwt-experimental/ContentEncryption/A128CCM_16_128.php',
-            '/libraries/vendor/web-token/jwt-experimental/ContentEncryption/A128CCM_16_64.php',
-            '/libraries/vendor/web-token/jwt-experimental/ContentEncryption/A128CCM_64_128.php',
-            '/libraries/vendor/web-token/jwt-experimental/ContentEncryption/A128CCM_64_64.php',
-            '/libraries/vendor/web-token/jwt-experimental/ContentEncryption/A256CCM_16_128.php',
-            '/libraries/vendor/web-token/jwt-experimental/ContentEncryption/A256CCM_16_64.php',
-            '/libraries/vendor/web-token/jwt-experimental/ContentEncryption/A256CCM_64_128.php',
-            '/libraries/vendor/web-token/jwt-experimental/ContentEncryption/A256CCM_64_64.php',
-            '/libraries/vendor/web-token/jwt-experimental/ContentEncryption/AESCCM.php',
-            '/libraries/vendor/web-token/jwt-experimental/KeyEncryption/A128CTR.php',
-            '/libraries/vendor/web-token/jwt-experimental/KeyEncryption/A192CTR.php',
-            '/libraries/vendor/web-token/jwt-experimental/KeyEncryption/A256CTR.php',
-            '/libraries/vendor/web-token/jwt-experimental/KeyEncryption/AESCTR.php',
-            '/libraries/vendor/web-token/jwt-experimental/KeyEncryption/Chacha20Poly1305.php',
-            '/libraries/vendor/web-token/jwt-experimental/KeyEncryption/RSAOAEP384.php',
-            '/libraries/vendor/web-token/jwt-experimental/KeyEncryption/RSAOAEP512.php',
-            '/libraries/vendor/web-token/jwt-experimental/LICENSE',
-            '/libraries/vendor/web-token/jwt-experimental/Signature/Blake2b.php',
-            '/libraries/vendor/web-token/jwt-experimental/Signature/ES256K.php',
-            '/libraries/vendor/web-token/jwt-experimental/Signature/HS1.php',
-            '/libraries/vendor/web-token/jwt-experimental/Signature/HS256_64.php',
-            '/libraries/vendor/web-token/jwt-experimental/Signature/RS1.php',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa/LICENSE',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-eddsa/LICENSE',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-experimental/LICENSE',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-hmac/LICENSE',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-none/LICENSE',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/LICENSE',
-            // From 5.1.0-beta2 to 5.1.0-rc1
-            '/administrator/components/com_admin/sql/updates/mysql/4.4.4-2024-03-28.sql',
-            '/administrator/components/com_admin/sql/updates/postgresql/4.4.4-2024-03-28.sql',
-            '/administrator/modules/mod_post_installation_messages/mod_post_installation_messages.php',
-            '/media/vendor/punycode/LICENSE-MIT.txt',
-            // From 5.1.0 to 5.1.1
-            '/libraries/vendor/cweagans/composer-patches/LICENSE.md',
-            '/libraries/vendor/cweagans/composer-patches/src/PatchEvent.php',
-            '/libraries/vendor/cweagans/composer-patches/src/PatchEvents.php',
-            '/libraries/vendor/cweagans/composer-patches/src/Patches.php',
-            '/libraries/vendor/cweagans/composer-patches/tests/PatchEventTest.php',
-            '/libraries/vendor/laminas/laminas-diactoros/PATCHES.txt',
-            // From 5.1.2 to 5.1.3
-            '/libraries/vendor/joomla/application/rector.php',
-            '/libraries/vendor/joomla/console/.drone.jsonnet',
-            '/libraries/vendor/joomla/console/.drone.yml',
-            '/libraries/vendor/joomla/database/.drone.jsonnet',
-            '/libraries/vendor/joomla/database/.drone.yml',
-            '/libraries/vendor/joomla/database/phpunit.appveyor_sql2012sp1.xml.dist',
-            '/libraries/vendor/joomla/database/phpunit.appveyor_sql2014.xml.dist',
-            '/libraries/vendor/joomla/database/phpunit.appveyor_sql2017.xml.dist',
-            '/libraries/vendor/joomla/database/phpunit.mariadb.xml.dist',
-            '/libraries/vendor/joomla/database/phpunit.mysql.xml.dist',
-            '/libraries/vendor/joomla/database/phpunit.mysqli.xml.dist',
-            '/libraries/vendor/joomla/database/phpunit.pgsql.xml.dist',
-            '/libraries/vendor/joomla/database/phpunit.sqlite.xml.dist',
-            '/libraries/vendor/joomla/database/phpunit.sqlsrv.xml.dist',
-            '/libraries/vendor/joomla/session/.drone.jsonnet',
-            '/libraries/vendor/joomla/session/.drone.yml',
-            // From 5.2.0-alpha2 to 5.2.0-alpha3
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/FontAwesome.otf',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.eot',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.svg',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.ttf',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.woff2',
-            // From 5.2.1 to 5.3.0-alpha1
-            '/media/system/css/joomla-core-loader.css',
-            '/media/system/css/joomla-core-loader.min.css',
-            '/media/system/css/joomla-core-loader.min.css.gz',
-            '/media/system/scss/joomla-core-loader.scss',
-            // From 5.3.0-alpha2 to 5.3.0-alpha3
-            '/administrator/components/com_scheduler/src/Table/LogsTable.php',
-            '/media/system/css/system-site-offline_rtl.css',
-            '/media/system/css/system-site-offline_rtl.min.css',
-            '/media/system/css/system-site-offline_rtl.min.css.gz',
-            '/media/system/scss/system-site-offline_rtl.scss',
-            // From 5.3.0-alpha3 to 5.3.0-beta1
-            '/administrator/modules/mod_feed/mod_feed.php',
-            '/administrator/modules/mod_privacy_status/mod_privacy_status.php',
-            '/libraries/vendor/guzzlehttp/promises/src/functions.php',
-            '/libraries/vendor/guzzlehttp/promises/src/functions_include.php',
-            '/libraries/vendor/maximebf/debugbar/LICENSE',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/CacheCacheCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/DoctrineCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/MonologCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/NamespacedTwigProfileCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Propel2Collector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/PropelCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/SlimCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftLogCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer/SwiftMailCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Symfony/SymfonyMailCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/DebugTwigExtension.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/DumpTwigExtension.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/MeasureTwigExtension.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/MeasureTwigNode.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/MeasureTwigTokenParser.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TimeableTwigExtensionProfiler.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigEnvironment.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TraceableTwigTemplate.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig/TwigCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/TwigProfileCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/AggregatedCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/AssetProvider.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/ConfigCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/DataCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/DataCollectorInterface.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/ExceptionsCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/LocalizationCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MemoryCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MessagesAggregateInterface.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/MessagesCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/ObjectCountCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/PDOCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDO.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TraceablePDOStatement.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO/TracedStatement.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PhpInfoCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/Renderable.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/RequestDataCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/TimeDataCollector.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatter.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DataFormatterInterface.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/DebugBarVarDumper.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/HasDataFormatter.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/HasXdebugLinks.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper/DebugBarHtmlDumper.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DebugBar.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DebugBarException.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/HttpDriverInterface.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/JavascriptRenderer.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/OpenHandler.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/PhpHttpDriver.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/RequestIdGenerator.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/RequestIdGeneratorInterface.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/debugbar.css',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/debugbar.js',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/openhandler.css',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/openhandler.js',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/css/font-awesome.min.css',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/highlight.pack.js',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/styles/github.css',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/jquery/dist/jquery.min.js',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets.css',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets.js',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.css',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/mails/widget.js',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.css',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries/widget.js',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.css',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/templates/widget.js',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/StandardDebugBar.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/FileStorage.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/MemcachedStorage.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/pdo_storage_schema.sql',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/PdoStorage.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/RedisStorage.php',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage/StorageInterface.php',
-            // From 5.3.0-beta3 to 5.3.0-rc1
-            '/libraries/vendor/joomla/http/.drone.jsonnet',
-            '/libraries/vendor/joomla/http/.drone.yml',
-            '/libraries/vendor/joomla/oauth1/.drone.jsonnet',
-            '/libraries/vendor/joomla/oauth1/.drone.yml',
-            '/libraries/vendor/joomla/oauth2/.drone.jsonnet',
-            '/libraries/vendor/joomla/oauth2/.drone.yml',
-            '/libraries/vendor/joomla/router/.drone.jsonnet',
-            '/libraries/vendor/joomla/router/.drone.yml',
-            '/libraries/vendor/joomla/string/.drone.jsonnet',
-            '/libraries/vendor/joomla/string/.drone.yml',
-            '/libraries/vendor/joomla/uri/.drone.jsonnet',
-            '/libraries/vendor/joomla/uri/.drone.yml',
-            '/libraries/vendor/joomla/utilities/.drone.jsonnet',
-            '/libraries/vendor/joomla/utilities/.drone.yml',
-            // From 5.3.0-rc1 to 5.3.0-rc2
-            '/libraries/vendor/algo26-matthias/idna-convert/Dockerfile',
-            '/libraries/vendor/algo26-matthias/idna-convert/compose.yml',
-            '/libraries/vendor/algo26-matthias/idna-convert/src/Exception/Std3AsciiRulesViolationException.php',
-            '/libraries/vendor/algo26-matthias/idna-convert/src/TranscodeUnicode/ByteLengthTrait.php',
-            // From 5.4.0-alpha2 to 5.4.0-alpha3
+            // From 5.x to 6.0
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-03-11.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-03-17.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-12.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-25.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-29.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-21.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-26.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-28.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-29.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-30.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-02.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-06.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-09.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-11.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.1.0-2023-11-28.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-01-04.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-02-10.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-02-24.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-02-25.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-03-08.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-03-28.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.1.1-2024-04-18.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-07-02.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-07-19.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-08-22.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-09-17.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.2.2-2024-09-24.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.2.3-2025-01-09.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-10-13.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-10-26.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-12-09.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-12-19.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-02-09.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-02-22.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-03-14.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.3.4-2025-09-19.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.4.0-2025-04-23.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.4.0-2025-05-10.sql',
+            '/administrator/components/com_admin/sql/updates/mysql/5.4.0-2025-08-02.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-03-11.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-03-17.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-12.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-25.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-29.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-21.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-26.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-28.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-29.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-30.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-02.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-06.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-09.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-11.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2023-11-28.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-02-10.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-02-24.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-02-25.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-03-08.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-03-28.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.1.1-2024-04-18.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-07-02.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-07-19.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-08-22.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-09-17.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.2.2-2024-09-24.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.2.3-2025-01-09.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-10-26.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-12-09.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-12-19.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-02-09.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-02-22.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-03-14.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.3.1-2025-04-27.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.3.4-2025-09-19.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-04-23.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-05-10.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-08-02.sql',
+            '/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-10-07.sql',
+            '/administrator/components/com_content/forms/filter_featured.xml',
+            '/administrator/components/com_content/tmpl/featured/default.php',
+            '/administrator/components/com_content/tmpl/featured/default.xml',
+            '/administrator/components/com_content/tmpl/featured/default_stage_body.php',
+            '/administrator/components/com_content/tmpl/featured/default_stage_footer.php',
+            '/administrator/components/com_content/tmpl/featured/emptystate.php',
+            '/administrator/components/com_finder/helpers/indexer/adapter.php',
+            '/administrator/components/com_finder/helpers/indexer/helper.php',
+            '/administrator/components/com_finder/helpers/indexer/parser.php',
+            '/administrator/components/com_finder/helpers/indexer/query.php',
+            '/administrator/components/com_finder/helpers/indexer/result.php',
+            '/administrator/components/com_finder/helpers/indexer/taxonomy.php',
+            '/administrator/components/com_finder/helpers/indexer/token.php',
+            '/libraries/src/Application/BaseApplication.php',
+            '/libraries/src/Application/CLI/CliInput.php',
+            '/libraries/src/Application/CLI/CliOutput.php',
+            '/libraries/src/Application/CLI/ColorStyle.php',
+            '/libraries/src/Application/CLI/Output/Processor/ColorProcessor.php',
+            '/libraries/src/Application/CLI/Output/Processor/ProcessorInterface.php',
+            '/libraries/src/Application/CLI/Output/Stdout.php',
+            '/libraries/src/Application/CLI/Output/Xml.php',
+            '/libraries/src/Application/CliApplication.php',
+            '/libraries/src/Filesystem/File.php',
+            '/libraries/src/Filesystem/FilesystemHelper.php',
+            '/libraries/src/Filesystem/Folder.php',
+            '/libraries/src/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini',
+            '/libraries/src/Filesystem/Patcher.php',
+            '/libraries/src/Filesystem/Path.php',
+            '/libraries/src/Filesystem/Stream.php',
+            '/libraries/src/Filesystem/Streams/StreamString.php',
+            '/libraries/src/Filesystem/Support/StringController.php',
+            '/libraries/src/Input/Cookie.php',
+            '/libraries/src/Input/Files.php',
+            '/libraries/src/Input/Input.php',
+            '/libraries/src/Input/Json.php',
+            '/libraries/vendor/symfony/polyfill-iconv/bootstrap.php',
+            '/libraries/vendor/symfony/polyfill-iconv/bootstrap80.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Iconv.php',
+            '/libraries/vendor/symfony/polyfill-iconv/LICENSE',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.big5.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp037.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp1006.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp1026.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp424.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp437.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp500.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp737.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp775.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp850.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp852.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp855.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp856.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp857.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp860.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp861.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp862.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp863.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp864.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp865.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp866.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp869.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp874.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp875.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp932.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp936.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp949.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.cp950.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-1.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-10.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-11.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-13.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-14.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-15.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-16.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-2.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-3.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-4.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-5.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-6.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-7.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-8.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.iso-8859-9.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.koi8-r.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.koi8-u.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.us-ascii.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.windows-1250.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.windows-1251.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.windows-1252.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.windows-1253.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.windows-1254.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.windows-1255.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.windows-1256.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.windows-1257.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/from.windows-1258.php',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset/translit.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/LICENSE',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Assertable.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Behavior.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Collectable.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Exception.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Helper.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Interceptor/ConjunctionInterceptor.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Interceptor/PharExtensionInterceptor.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Interceptor/PharMetaDataInterceptor.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Manager.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Phar/Container.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Phar/DeserializationException.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Phar/Manifest.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Phar/Reader.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Phar/ReaderException.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Phar/Stub.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/PharStreamWrapper.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Resolvable.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Resolver/PharInvocation.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Resolver/PharInvocationCollection.php',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Resolver/PharInvocationResolver.php',
+            '/libraries/vendor/voku/portable-ascii/.deepsource.toml',
+            '/libraries/vendor/voku/portable-ascii/LICENSE.txt',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/ASCII.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/ascii_by_languages.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/ascii_extras_by_languages.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/ascii_language_max_key.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/ascii_ord.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x000.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x001.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x002.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x003.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x004.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x005.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x006.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x007.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x009.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x00a.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x00b.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x00c.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x00d.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x00e.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x00f.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x010.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x011.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x012.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x013.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x014.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x015.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x016.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x017.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x018.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x01d.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x01e.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x01f.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x020.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x021.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x022.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x023.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x024.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x025.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x026.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x027.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x028.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x029.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x02a.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x02c.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x02e.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x02f.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x030.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x031.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x032.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x033.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x04d.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x04e.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x04f.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x050.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x051.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x052.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x053.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x054.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x055.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x056.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x057.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x058.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x059.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x05a.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x05b.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x05c.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x05d.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x05e.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x05f.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x060.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x061.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x062.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x063.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x064.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x065.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x066.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x067.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x068.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x069.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x06a.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x06b.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x06c.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x06d.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x06e.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x06f.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x070.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x071.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x072.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x073.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x074.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x075.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x076.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x077.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x078.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x079.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x07a.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x07b.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x07c.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x07d.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x07e.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x07f.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x080.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x081.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x082.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x083.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x084.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x085.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x086.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x087.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x088.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x089.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x08a.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x08b.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x08c.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x08d.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x08e.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x08f.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x090.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x091.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x092.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x093.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x094.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x095.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x096.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x097.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x098.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x099.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x09a.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x09b.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x09c.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x09d.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x09e.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x09f.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0a0.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0a1.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0a2.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0a3.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0a4.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0ac.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0ad.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0ae.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0af.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0b0.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0b1.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0b2.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0b3.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0b4.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0b5.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0b6.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0b7.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0b8.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0b9.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0ba.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0bb.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0bc.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0bd.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0be.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0bf.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0c0.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0c1.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0c2.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0c3.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0c4.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0c5.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0c6.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0c7.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0c8.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0c9.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0ca.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0cb.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0cc.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0cd.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0ce.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0cf.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0d0.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0d1.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0d2.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0d3.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0d4.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0d5.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0d6.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0d7.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0f9.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0fa.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0fb.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0fc.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0fd.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0fe.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x0ff.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x1d4.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x1d5.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x1d6.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x1d7.php',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data/x1f1.php',
+            '/libraries/vendor/voku/portable-utf8/.deepsource.toml',
+            '/libraries/vendor/voku/portable-utf8/bootstrap.php',
+            '/libraries/vendor/voku/portable-utf8/LICENSE-APACHE',
+            '/libraries/vendor/voku/portable-utf8/LICENSE-GPL',
+            '/libraries/vendor/voku/portable-utf8/src/voku/helper/Bootup.php',
+            '/libraries/vendor/voku/portable-utf8/src/voku/helper/data/caseFolding_full.php',
+            '/libraries/vendor/voku/portable-utf8/src/voku/helper/data/chr.php',
+            '/libraries/vendor/voku/portable-utf8/src/voku/helper/data/emoji.php',
+            '/libraries/vendor/voku/portable-utf8/src/voku/helper/data/encodings.php',
+            '/libraries/vendor/voku/portable-utf8/src/voku/helper/data/ord.php',
+            '/libraries/vendor/voku/portable-utf8/src/voku/helper/data/transliterator_list.php',
+            '/libraries/vendor/voku/portable-utf8/src/voku/helper/data/utf8_fix.php',
+            '/libraries/vendor/voku/portable-utf8/src/voku/helper/data/win1252_to_utf8.php',
+            '/libraries/vendor/voku/portable-utf8/src/voku/helper/UTF8.php',
+            '/media/legacy/joomla.asset.json',
+            '/media/legacy/js/jquery-noconflict.js',
+            '/media/legacy/js/jquery-noconflict.min.js',
+            '/media/legacy/js/jquery-noconflict.min.js.gz',
+            '/media/legacy/js/tabs-state.js',
+            '/media/legacy/js/tabs-state.min.js',
+            '/media/legacy/js/tabs-state.min.js.gz',
+            // From 6.0.0-alpha2 to 6.0.0-alpha3
             '/administrator/modules/mod_menu/mod_menu.php',
             '/modules/mod_random_image/mod_random_image.php',
-            // From 5.4.0-alpha3 to 5.4.0-beta1
+            // From 6.0.0-alpha3 to 6.0.0-beta1
             '/administrator/modules/mod_latest/mod_latest.php',
             '/administrator/modules/mod_logged/mod_logged.php',
+            '/administrator/modules/mod_popular/mod_popular.php',
             '/administrator/modules/mod_privacy_dashboard/mod_privacy_dashboard.php',
             '/administrator/modules/mod_submenu/mod_submenu.php',
+            '/libraries/src/Adapter/Adapter.php',
+            '/libraries/src/Adapter/AdapterInstance.php',
+            '/libraries/src/MVC/Model/DatabaseAwareTrait.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php',
+            '/libraries/vendor/joomla/database/src/Query/LimitableInterface.php',
+            '/libraries/vendor/joomla/database/src/Query/PreparableInterface.php',
+            '/libraries/vendor/joomla/string/src/phputf8/LICENSE',
+            '/libraries/vendor/joomla/string/src/phputf8/mbstring/core.php',
+            '/libraries/vendor/joomla/string/src/phputf8/native/core.php',
+            '/libraries/vendor/joomla/string/src/phputf8/ord.php',
+            '/libraries/vendor/joomla/string/src/phputf8/README',
+            '/libraries/vendor/joomla/string/src/phputf8/str_ireplace.php',
+            '/libraries/vendor/joomla/string/src/phputf8/str_pad.php',
+            '/libraries/vendor/joomla/string/src/phputf8/str_split.php',
+            '/libraries/vendor/joomla/string/src/phputf8/strcasecmp.php',
+            '/libraries/vendor/joomla/string/src/phputf8/strcspn.php',
+            '/libraries/vendor/joomla/string/src/phputf8/stristr.php',
+            '/libraries/vendor/joomla/string/src/phputf8/strrev.php',
+            '/libraries/vendor/joomla/string/src/phputf8/strspn.php',
+            '/libraries/vendor/joomla/string/src/phputf8/substr_replace.php',
+            '/libraries/vendor/joomla/string/src/phputf8/trim.php',
+            '/libraries/vendor/joomla/string/src/phputf8/ucfirst.php',
+            '/libraries/vendor/joomla/string/src/phputf8/ucwords.php',
+            '/libraries/vendor/joomla/string/src/phputf8/utf8.php',
+            '/libraries/vendor/joomla/string/src/phputf8/utils/ascii.php',
+            '/libraries/vendor/joomla/string/src/phputf8/utils/bad.php',
+            '/libraries/vendor/joomla/string/src/phputf8/utils/patterns.php',
+            '/libraries/vendor/joomla/string/src/phputf8/utils/position.php',
+            '/libraries/vendor/joomla/string/src/phputf8/utils/specials.php',
+            '/libraries/vendor/joomla/string/src/phputf8/utils/unicode.php',
+            '/libraries/vendor/joomla/string/src/phputf8/utils/validation.php',
+            '/libraries/vendor/laminas/laminas-diactoros/src/functions/create_uploaded_file.legacy.php',
+            '/libraries/vendor/laminas/laminas-diactoros/src/functions/marshal_headers_from_sapi.legacy.php',
+            '/libraries/vendor/laminas/laminas-diactoros/src/functions/marshal_method_from_sapi.legacy.php',
+            '/libraries/vendor/laminas/laminas-diactoros/src/functions/marshal_protocol_version_from_sapi.legacy.php',
+            '/libraries/vendor/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.legacy.php',
+            '/libraries/vendor/laminas/laminas-diactoros/src/functions/marshal_uri_from_sapi.php',
+            '/libraries/vendor/laminas/laminas-diactoros/src/functions/normalize_server.legacy.php',
+            '/libraries/vendor/laminas/laminas-diactoros/src/functions/normalize_uploaded_files.legacy.php',
+            '/libraries/vendor/laminas/laminas-diactoros/src/functions/parse_cookie_header.legacy.php',
+            '/libraries/vendor/laminas/laminas-diactoros/src/PhpInputStream.php',
+            '/libraries/vendor/lcobucci/clock/renovate.json',
+            '/libraries/vendor/symfony/http-client/Internal/AmpBody.php',
+            '/libraries/vendor/symfony/http-client/Internal/AmpClientState.php',
+            '/libraries/vendor/symfony/http-client/Internal/AmpListener.php',
+            '/libraries/vendor/symfony/http-client/Internal/AmpResolver.php',
+            '/libraries/vendor/symfony/http-client/Internal/LegacyHttplugInterface.php',
+            '/libraries/vendor/symfony/http-client/Response/AmpResponse.php',
+            '/libraries/vendor/symfony/polyfill-php83/bootstrap.php',
+            '/libraries/vendor/symfony/polyfill-php83/bootstrap81.php',
+            '/libraries/vendor/symfony/polyfill-php83/LICENSE',
+            '/libraries/vendor/symfony/polyfill-php83/Php83.php',
+            '/libraries/vendor/symfony/polyfill-php83/Resources/stubs/DateError.php',
+            '/libraries/vendor/symfony/polyfill-php83/Resources/stubs/DateException.php',
+            '/libraries/vendor/symfony/polyfill-php83/Resources/stubs/DateInvalidOperationException.php',
+            '/libraries/vendor/symfony/polyfill-php83/Resources/stubs/DateInvalidTimeZoneException.php',
+            '/libraries/vendor/symfony/polyfill-php83/Resources/stubs/DateMalformedIntervalStringException.php',
+            '/libraries/vendor/symfony/polyfill-php83/Resources/stubs/DateMalformedPeriodStringException.php',
+            '/libraries/vendor/symfony/polyfill-php83/Resources/stubs/DateMalformedStringException.php',
+            '/libraries/vendor/symfony/polyfill-php83/Resources/stubs/DateObjectError.php',
+            '/libraries/vendor/symfony/polyfill-php83/Resources/stubs/DateRangeError.php',
+            '/libraries/vendor/symfony/polyfill-php83/Resources/stubs/Override.php',
+            '/libraries/vendor/symfony/polyfill-php83/Resources/stubs/SQLite3Exception.php',
+            '/media/legacy/js/ajax-chosen.js',
+            '/media/legacy/js/ajax-chosen.min.js',
+            '/media/legacy/js/ajax-chosen.min.js.gz',
+            '/media/legacy/js/joomla-chosen.js',
+            '/media/legacy/js/joomla-chosen.min.js',
+            '/media/legacy/js/joomla-chosen.min.js.gz',
+            '/media/system/js/fields/tag.js',
+            '/media/system/js/fields/tag.min.js',
+            '/media/system/js/fields/tag.min.js.gz',
+            '/media/templates/site/cassiopeia/scss/vendor/_chosen.scss',
+            '/media/vendor/chosen/css/chosen-sprite.png',
+            '/media/vendor/chosen/css/chosen-sprite@2x.png',
+            '/media/vendor/chosen/css/chosen.css',
+            '/media/vendor/chosen/js/chosen.jquery.js',
+            '/media/vendor/chosen/js/chosen.jquery.min.js',
+            '/media/vendor/chosen/js/chosen.jquery.min.js.gz',
+            '/media/vendor/tinymce/langs/af.js',
+            '/media/vendor/tinymce/langs/af.min.js',
+            '/media/vendor/tinymce/langs/af.min.js.gz',
+            '/media/vendor/tinymce/langs/bg.js',
+            '/media/vendor/tinymce/langs/bg.min.js',
+            '/media/vendor/tinymce/langs/bg.min.js.gz',
+            '/media/vendor/tinymce/langs/fo.js',
+            '/media/vendor/tinymce/langs/fo.min.js',
+            '/media/vendor/tinymce/langs/fo.min.js.gz',
+            '/media/vendor/tinymce/langs/fr.js',
+            '/media/vendor/tinymce/langs/fr.min.js',
+            '/media/vendor/tinymce/langs/fr.min.js.gz',
+            '/media/vendor/tinymce/langs/he.js',
+            '/media/vendor/tinymce/langs/he.min.js',
+            '/media/vendor/tinymce/langs/he.min.js.gz',
+            '/media/vendor/tinymce/langs/hu.js',
+            '/media/vendor/tinymce/langs/hu.min.js',
+            '/media/vendor/tinymce/langs/hu.min.js.gz',
+            '/media/vendor/tinymce/langs/ka.js',
+            '/media/vendor/tinymce/langs/ka.min.js',
+            '/media/vendor/tinymce/langs/ka.min.js.gz',
+            '/media/vendor/tinymce/langs/km.js',
+            '/media/vendor/tinymce/langs/km.min.js',
+            '/media/vendor/tinymce/langs/km.min.js.gz',
+            '/media/vendor/tinymce/langs/ko.js',
+            '/media/vendor/tinymce/langs/ko.min.js',
+            '/media/vendor/tinymce/langs/ko.min.js.gz',
+            '/media/vendor/tinymce/langs/lb.js',
+            '/media/vendor/tinymce/langs/lb.min.js',
+            '/media/vendor/tinymce/langs/lb.min.js.gz',
+            '/media/vendor/tinymce/langs/mk.js',
+            '/media/vendor/tinymce/langs/mk.min.js',
+            '/media/vendor/tinymce/langs/mk.min.js.gz',
+            '/media/vendor/tinymce/langs/ms.js',
+            '/media/vendor/tinymce/langs/ms.min.js',
+            '/media/vendor/tinymce/langs/ms.min.js.gz',
+            '/media/vendor/tinymce/langs/nb.js',
+            '/media/vendor/tinymce/langs/nb.min.js',
+            '/media/vendor/tinymce/langs/nb.min.js.gz',
+            '/media/vendor/tinymce/langs/readme.md',
+            '/media/vendor/tinymce/langs/si-LK.js',
+            '/media/vendor/tinymce/langs/si-LK.min.js',
+            '/media/vendor/tinymce/langs/si-LK.min.js.gz',
+            '/media/vendor/tinymce/langs/sl.js',
+            '/media/vendor/tinymce/langs/sl.min.js',
+            '/media/vendor/tinymce/langs/sl.min.js.gz',
+            '/media/vendor/tinymce/langs/sv.js',
+            '/media/vendor/tinymce/langs/sv.min.js',
+            '/media/vendor/tinymce/langs/sv.min.js.gz',
+            '/media/vendor/tinymce/langs/sw.js',
+            '/media/vendor/tinymce/langs/sw.min.js',
+            '/media/vendor/tinymce/langs/sw.min.js.gz',
+            '/media/vendor/tinymce/langs/sy.js',
+            '/media/vendor/tinymce/langs/sy.min.js',
+            '/media/vendor/tinymce/langs/sy.min.js.gz',
+            '/media/vendor/tinymce/langs/th.js',
+            '/media/vendor/tinymce/langs/th.min.js',
+            '/media/vendor/tinymce/langs/th.min.js.gz',
+            '/media/vendor/tinymce/license.txt',
+            '/media/vendor/webcomponentsjs/js/webcomponents-bundle.js',
+            '/media/vendor/webcomponentsjs/js/webcomponents-bundle.min.js',
+            '/media/vendor/webcomponentsjs/js/webcomponents-bundle.min.js.gz',
+            '/media/vendor/webcomponentsjs/LICENSE.md',
             '/modules/mod_finder/mod_finder.php',
             '/modules/mod_login/mod_login.php',
             '/modules/mod_menu/mod_menu.php',
             '/modules/mod_whosonline/mod_whosonline.php',
-            // From 5.4.2 to 5.4.3
+            // From 6.0.0-beta2 to 6.0.0-beta3
+            '/media/templates/site/cassiopeia/css/global/colors_custom.css',
+            '/media/templates/site/cassiopeia/css/global/colors_custom.min.css',
+            '/media/templates/site/cassiopeia/css/global/colors_custom.min.css.gz',
+            '/media/templates/site/cassiopeia/css/global/font_advanced.css',
+            '/media/templates/site/cassiopeia/css/global/font_advanced.min.css',
+            '/media/templates/site/cassiopeia/css/global/font_advanced.min.css.gz',
+            '/media/templates/site/cassiopeia/scss/global/colors_custom.scss',
+            '/media/templates/site/cassiopeia/scss/global/font_advanced.scss',
+            // From 6.0.0-beta3 to 6.0.0-rc1
+            '/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_2.ini',
+            '/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_2_steps.ini',
+            '/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_3.ini',
+            '/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_3_steps.ini',
+            '/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4.ini',
+            '/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4_steps.ini',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/CachedWordInflector.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/GenericLanguageInflectorFactory.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Inflector.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/InflectorFactory.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Language.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/LanguageInflectorFactory.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/NoopWordInflector.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English/Inflectible.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English/InflectorFactory.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English/Rules.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English/Uninflected.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French/Inflectible.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French/InflectorFactory.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French/Rules.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French/Uninflected.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal/Inflectible.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal/InflectorFactory.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal/Rules.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal/Uninflected.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Pattern.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Patterns.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/Inflectible.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/InflectorFactory.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/Rules.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese/Uninflected.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Ruleset.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/Inflectible.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/InflectorFactory.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/Rules.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish/Uninflected.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Substitution.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Substitutions.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Transformation.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Transformations.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/Inflectible.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/InflectorFactory.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/Rules.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish/Uninflected.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Word.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/RulesetInflector.php',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/WordInflector.php',
+            '/media/com_guidedtours/images/5_2/enhancedtourheader.png',
+            '/media/com_guidedtours/images/5_2/mailtemplate.png',
+            '/media/com_guidedtours/images/5_3/filesdirectory.jpg',
+            '/media/com_guidedtours/images/5_4/automated-updates.jpg',
+            // From 6.1.0-alpha1 to 6.1.0-alpha2
+            '/libraries/vendor/symfony/var-dumper/Cloner/Internal/NoDefault.php',
+            '/libraries/vendor/webmozart/assert/LICENSE',
+            '/libraries/vendor/webmozart/assert/src/Assert.php',
+            '/libraries/vendor/webmozart/assert/src/InvalidArgumentException.php',
+            '/libraries/vendor/webmozart/assert/src/Mixin.php',
+            // From 6.1.0-alpha2 to 6.1.0-alpha3
+            '/build.xml',
+            // From 6.0.2 to 6.0.3
             '/libraries/vendor/symfony/http-client-contracts/Test/Fixtures/web/index.php',
             '/libraries/vendor/symfony/http-client-contracts/Test/HttpClientTestCase.php',
             '/libraries/vendor/symfony/http-client-contracts/Test/TestHttpServer.php',
@@ -2493,309 +1060,300 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/libraries/vendor/symfony/translation-contracts/Test/TranslatorTest.php',
             '/libraries/vendor/symfony/validator/Test/ConstraintValidatorTestCase.php',
             '/libraries/vendor/symfony/var-dumper/Test/VarDumperTestTrait.php',
-            // From 5.4.3 to 5.4.4
+            // From 6.1.0-alpha3 to 6.1.0-beta1
+            '/media/vendor/tinymce/langs/cy.js',
+            '/media/vendor/tinymce/langs/cy.min.js',
+            '/media/vendor/tinymce/langs/cy.min.js.gz',
+            '/media/vendor/tinymce/langs/dv.js',
+            '/media/vendor/tinymce/langs/dv.min.js',
+            '/media/vendor/tinymce/langs/dv.min.js.gz',
+            '/media/vendor/tinymce/langs/ga.js',
+            '/media/vendor/tinymce/langs/ga.min.js',
+            '/media/vendor/tinymce/langs/ga.min.js.gz',
+            '/media/vendor/tinymce/langs/ku.js',
+            '/media/vendor/tinymce/langs/ku.min.js',
+            '/media/vendor/tinymce/langs/ku.min.js.gz',
+            '/media/vendor/tinymce/langs/ky.js',
+            '/media/vendor/tinymce/langs/ky.min.js',
+            '/media/vendor/tinymce/langs/ky.min.js.gz',
+            '/media/vendor/tinymce/langs/sq.js',
+            '/media/vendor/tinymce/langs/sq.min.js',
+            '/media/vendor/tinymce/langs/sq.min.js.gz',
+            '/media/vendor/tinymce/langs/uz.js',
+            '/media/vendor/tinymce/langs/uz.min.js',
+            '/media/vendor/tinymce/langs/uz.min.js.gz',
+            '/media/vendor/tinymce/langs/zh-SG.js',
+            '/media/vendor/tinymce/langs/zh-SG.min.js',
+            '/media/vendor/tinymce/langs/zh-SG.min.js.gz',
+            // From 6.0.3 to 6.0.4
             '/media/system/css/fields/calendar-rtl.css',
             '/media/system/css/fields/calendar-rtl.min.css',
             '/media/system/css/fields/calendar-rtl.min.css.gz',
-            // From 5.4.7 to 5.4.8
+            // From 6.1.0-beta1 to 6.1.0-beta2
+            '/libraries/vendor/altcha-org/altcha/phpstan-baseline.neon',
+            '/libraries/vendor/altcha-org/altcha/tests/AltchaTest.php',
+            // From 6.1.1 to 6.2.0-alpha1
+            '/administrator/components/com_workflow/resources/scripts/app/Event.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/app/WorkflowGraphApi.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/components/App.vue',
+            '/administrator/components/com_workflow/resources/scripts/components/Titlebar.vue',
+            '/administrator/components/com_workflow/resources/scripts/components/canvas/ControlsPanel.vue',
+            '/administrator/components/com_workflow/resources/scripts/components/canvas/CustomControls.vue',
+            '/administrator/components/com_workflow/resources/scripts/components/canvas/WorkflowCanvas.vue',
+            '/administrator/components/com_workflow/resources/scripts/components/edges/CustomEdge.vue',
+            '/administrator/components/com_workflow/resources/scripts/components/nodes/StageNode.vue',
+            '/administrator/components/com_workflow/resources/scripts/plugins/Notifications.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/plugins/translate.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/store/actions.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/store/getters.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/store/mutations.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/store/plugins/persisted-state.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/store/state.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/store/store.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/utils/accessibility-fixer.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/utils/edges.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/utils/focus-utils.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/utils/keyboard-manager.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/utils/positioning.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/utils/utils.es6.js',
+            '/administrator/components/com_workflow/resources/scripts/workflowgraph.es6.js',
+            '/media/index.html',
+            '/media/vendor/accessibility/js/accessibility.js',
+            '/media/vendor/tinymce/icons/default/index.js',
+            '/media/vendor/tinymce/langs/ar-SA.min.js',
+            '/media/vendor/tinymce/langs/ar-SA.min.js.gz',
+            '/media/vendor/tinymce/langs/ar.min.js',
+            '/media/vendor/tinymce/langs/ar.min.js.gz',
+            '/media/vendor/tinymce/langs/az.min.js',
+            '/media/vendor/tinymce/langs/az.min.js.gz',
+            '/media/vendor/tinymce/langs/be.min.js',
+            '/media/vendor/tinymce/langs/be.min.js.gz',
+            '/media/vendor/tinymce/langs/bg-BG.min.js',
+            '/media/vendor/tinymce/langs/bg-BG.min.js.gz',
+            '/media/vendor/tinymce/langs/bn-BD.min.js',
+            '/media/vendor/tinymce/langs/bn-BD.min.js.gz',
+            '/media/vendor/tinymce/langs/ca.min.js',
+            '/media/vendor/tinymce/langs/ca.min.js.gz',
+            '/media/vendor/tinymce/langs/cs.min.js',
+            '/media/vendor/tinymce/langs/cs.min.js.gz',
+            '/media/vendor/tinymce/langs/da.min.js',
+            '/media/vendor/tinymce/langs/da.min.js.gz',
+            '/media/vendor/tinymce/langs/de.min.js',
+            '/media/vendor/tinymce/langs/de.min.js.gz',
+            '/media/vendor/tinymce/langs/el.min.js',
+            '/media/vendor/tinymce/langs/el.min.js.gz',
+            '/media/vendor/tinymce/langs/eo.min.js',
+            '/media/vendor/tinymce/langs/eo.min.js.gz',
+            '/media/vendor/tinymce/langs/es-MX.min.js',
+            '/media/vendor/tinymce/langs/es-MX.min.js.gz',
+            '/media/vendor/tinymce/langs/es.min.js',
+            '/media/vendor/tinymce/langs/es.min.js.gz',
+            '/media/vendor/tinymce/langs/et.min.js',
+            '/media/vendor/tinymce/langs/et.min.js.gz',
+            '/media/vendor/tinymce/langs/eu.min.js',
+            '/media/vendor/tinymce/langs/eu.min.js.gz',
+            '/media/vendor/tinymce/langs/fa.min.js',
+            '/media/vendor/tinymce/langs/fa.min.js.gz',
+            '/media/vendor/tinymce/langs/fi.min.js',
+            '/media/vendor/tinymce/langs/fi.min.js.gz',
+            '/media/vendor/tinymce/langs/fr-FR.min.js',
+            '/media/vendor/tinymce/langs/fr-FR.min.js.gz',
+            '/media/vendor/tinymce/langs/gl.min.js',
+            '/media/vendor/tinymce/langs/gl.min.js.gz',
+            '/media/vendor/tinymce/langs/he-IL.min.js',
+            '/media/vendor/tinymce/langs/he-IL.min.js.gz',
+            '/media/vendor/tinymce/langs/hr.min.js',
+            '/media/vendor/tinymce/langs/hr.min.js.gz',
+            '/media/vendor/tinymce/langs/hu-HU.min.js',
+            '/media/vendor/tinymce/langs/hu-HU.min.js.gz',
+            '/media/vendor/tinymce/langs/hy.min.js',
+            '/media/vendor/tinymce/langs/hy.min.js.gz',
+            '/media/vendor/tinymce/langs/id.min.js',
+            '/media/vendor/tinymce/langs/id.min.js.gz',
+            '/media/vendor/tinymce/langs/is-IS.min.js',
+            '/media/vendor/tinymce/langs/is-IS.min.js.gz',
+            '/media/vendor/tinymce/langs/it.min.js',
+            '/media/vendor/tinymce/langs/it.min.js.gz',
+            '/media/vendor/tinymce/langs/ja.min.js',
+            '/media/vendor/tinymce/langs/ja.min.js.gz',
+            '/media/vendor/tinymce/langs/ka-GE.min.js',
+            '/media/vendor/tinymce/langs/ka-GE.min.js.gz',
+            '/media/vendor/tinymce/langs/kab.min.js',
+            '/media/vendor/tinymce/langs/kab.min.js.gz',
+            '/media/vendor/tinymce/langs/kk.min.js',
+            '/media/vendor/tinymce/langs/kk.min.js.gz',
+            '/media/vendor/tinymce/langs/ko-KR.min.js',
+            '/media/vendor/tinymce/langs/ko-KR.min.js.gz',
+            '/media/vendor/tinymce/langs/lt.min.js',
+            '/media/vendor/tinymce/langs/lt.min.js.gz',
+            '/media/vendor/tinymce/langs/lv.min.js',
+            '/media/vendor/tinymce/langs/lv.min.js.gz',
+            '/media/vendor/tinymce/langs/nb-NO.min.js',
+            '/media/vendor/tinymce/langs/nb-NO.min.js.gz',
+            '/media/vendor/tinymce/langs/ne.min.js',
+            '/media/vendor/tinymce/langs/ne.min.js.gz',
+            '/media/vendor/tinymce/langs/nl-BE.min.js',
+            '/media/vendor/tinymce/langs/nl-BE.min.js.gz',
+            '/media/vendor/tinymce/langs/nl.min.js',
+            '/media/vendor/tinymce/langs/nl.min.js.gz',
+            '/media/vendor/tinymce/langs/oc.min.js',
+            '/media/vendor/tinymce/langs/oc.min.js.gz',
+            '/media/vendor/tinymce/langs/pl.min.js',
+            '/media/vendor/tinymce/langs/pl.min.js.gz',
+            '/media/vendor/tinymce/langs/pt-BR.min.js',
+            '/media/vendor/tinymce/langs/pt-BR.min.js.gz',
+            '/media/vendor/tinymce/langs/pt-PT.min.js',
+            '/media/vendor/tinymce/langs/pt-PT.min.js.gz',
+            '/media/vendor/tinymce/langs/ro.min.js',
+            '/media/vendor/tinymce/langs/ro.min.js.gz',
+            '/media/vendor/tinymce/langs/ru.min.js',
+            '/media/vendor/tinymce/langs/ru.min.js.gz',
+            '/media/vendor/tinymce/langs/sk.min.js',
+            '/media/vendor/tinymce/langs/sk.min.js.gz',
+            '/media/vendor/tinymce/langs/sl-SI.min.js',
+            '/media/vendor/tinymce/langs/sl-SI.min.js.gz',
+            '/media/vendor/tinymce/langs/sr.min.js',
+            '/media/vendor/tinymce/langs/sr.min.js.gz',
+            '/media/vendor/tinymce/langs/sv-SE.min.js',
+            '/media/vendor/tinymce/langs/sv-SE.min.js.gz',
+            '/media/vendor/tinymce/langs/ta.min.js',
+            '/media/vendor/tinymce/langs/ta.min.js.gz',
+            '/media/vendor/tinymce/langs/tg.min.js',
+            '/media/vendor/tinymce/langs/tg.min.js.gz',
+            '/media/vendor/tinymce/langs/th-TH.min.js',
+            '/media/vendor/tinymce/langs/th-TH.min.js.gz',
+            '/media/vendor/tinymce/langs/tr.min.js',
+            '/media/vendor/tinymce/langs/tr.min.js.gz',
+            '/media/vendor/tinymce/langs/ug.min.js',
+            '/media/vendor/tinymce/langs/ug.min.js.gz',
+            '/media/vendor/tinymce/langs/uk.min.js',
+            '/media/vendor/tinymce/langs/uk.min.js.gz',
+            '/media/vendor/tinymce/langs/vi.min.js',
+            '/media/vendor/tinymce/langs/vi.min.js.gz',
+            '/media/vendor/tinymce/langs/zh-CN.min.js',
+            '/media/vendor/tinymce/langs/zh-CN.min.js.gz',
+            '/media/vendor/tinymce/langs/zh-HK.min.js',
+            '/media/vendor/tinymce/langs/zh-HK.min.js.gz',
+            '/media/vendor/tinymce/langs/zh-MO.min.js',
+            '/media/vendor/tinymce/langs/zh-MO.min.js.gz',
+            '/media/vendor/tinymce/langs/zh-TW.min.js',
+            '/media/vendor/tinymce/langs/zh-TW.min.js.gz',
+            '/media/vendor/tinymce/models/dom/index.js',
+            '/media/vendor/tinymce/plugins/accordion/index.js',
+            '/media/vendor/tinymce/plugins/advlist/index.js',
+            '/media/vendor/tinymce/plugins/anchor/index.js',
+            '/media/vendor/tinymce/plugins/autolink/index.js',
+            '/media/vendor/tinymce/plugins/autoresize/index.js',
+            '/media/vendor/tinymce/plugins/autosave/index.js',
+            '/media/vendor/tinymce/plugins/charmap/index.js',
+            '/media/vendor/tinymce/plugins/code/index.js',
+            '/media/vendor/tinymce/plugins/codesample/index.js',
+            '/media/vendor/tinymce/plugins/directionality/index.js',
+            '/media/vendor/tinymce/plugins/emoticons/index.js',
+            '/media/vendor/tinymce/plugins/fullscreen/index.js',
+            '/media/vendor/tinymce/plugins/help/index.js',
+            '/media/vendor/tinymce/plugins/image/index.js',
+            '/media/vendor/tinymce/plugins/importcss/index.js',
+            '/media/vendor/tinymce/plugins/insertdatetime/index.js',
+            '/media/vendor/tinymce/plugins/link/index.js',
+            '/media/vendor/tinymce/plugins/lists/index.js',
+            '/media/vendor/tinymce/plugins/media/index.js',
+            '/media/vendor/tinymce/plugins/nonbreaking/index.js',
+            '/media/vendor/tinymce/plugins/pagebreak/index.js',
+            '/media/vendor/tinymce/plugins/preview/index.js',
+            '/media/vendor/tinymce/plugins/quickbars/index.js',
+            '/media/vendor/tinymce/plugins/save/index.js',
+            '/media/vendor/tinymce/plugins/searchreplace/index.js',
+            '/media/vendor/tinymce/plugins/table/index.js',
+            '/media/vendor/tinymce/plugins/visualblocks/index.js',
+            '/media/vendor/tinymce/plugins/visualchars/index.js',
+            '/media/vendor/tinymce/plugins/wordcount/index.js',
+            '/media/vendor/tinymce/themes/silver/index.js',
+            // From 6.2.0-alpha1 to 6.2.0-alpha2
+            '/administrator/help/en-GB/toc.json',
+            // From 6.1.1 to 6.1.2
+            '/libraries/vendor/algo26-matthias/idna-convert/Dockerfile',
+            '/libraries/vendor/algo26-matthias/idna-convert/compose.yml',
+            // From 6.1.2 to 6.1.3
             '/administrator/manifests/files/filepatcher.xml',
             '/filepatcher.php',
             '/filepatcher.xml',
             '/LICENSE',
             '/README.md',
+            // From 6.2.0-alpha3 to 6.2.0-beta1
+            '/media/vendor/tinymce/langs/bs.min.js',
+            '/media/vendor/tinymce/langs/bs.min.js.gz',
         ];
 
         $folders = [
-            // From 4.4 to 5.0
-            '/plugins/system/webauthn/src/Hotfix',
-            '/plugins/multifactorauth/webauthn/src/Hotfix',
-            '/media/vendor/tinymce/themes/mobile',
-            '/media/vendor/tinymce/skins/ui/oxide/fonts',
-            '/media/vendor/tinymce/skins/ui/oxide-dark/fonts',
-            '/media/vendor/tinymce/plugins/toc',
-            '/media/vendor/tinymce/plugins/textpattern',
-            '/media/vendor/tinymce/plugins/textcolor',
-            '/media/vendor/tinymce/plugins/template',
-            '/media/vendor/tinymce/plugins/tabfocus',
-            '/media/vendor/tinymce/plugins/spellchecker',
-            '/media/vendor/tinymce/plugins/print',
-            '/media/vendor/tinymce/plugins/paste',
-            '/media/vendor/tinymce/plugins/noneditable',
-            '/media/vendor/tinymce/plugins/legacyoutput',
-            '/media/vendor/tinymce/plugins/imagetools',
-            '/media/vendor/tinymce/plugins/hr',
-            '/media/vendor/tinymce/plugins/fullpage',
-            '/media/vendor/tinymce/plugins/contextmenu',
-            '/media/vendor/tinymce/plugins/colorpicker',
-            '/media/vendor/tinymce/plugins/bbcode',
-            '/libraries/vendor/symfony/polyfill-php81/Resources/stubs',
-            '/libraries/vendor/symfony/polyfill-php81/Resources',
-            '/libraries/vendor/symfony/polyfill-php81',
-            '/libraries/vendor/symfony/polyfill-php80/Resources/stubs',
-            '/libraries/vendor/symfony/polyfill-php80/Resources',
-            '/libraries/vendor/symfony/polyfill-php80',
-            '/libraries/vendor/symfony/polyfill-php73/Resources/stubs',
-            '/libraries/vendor/symfony/polyfill-php73/Resources',
-            '/libraries/vendor/symfony/polyfill-php73',
-            '/libraries/vendor/symfony/polyfill-php72',
-            '/libraries/vendor/spomky-labs/base64url/src',
-            '/libraries/vendor/spomky-labs/base64url',
-            '/libraries/vendor/ramsey/uuid/src/Provider/Time',
-            '/libraries/vendor/ramsey/uuid/src/Provider/Node',
-            '/libraries/vendor/ramsey/uuid/src/Provider',
-            '/libraries/vendor/ramsey/uuid/src/Generator',
-            '/libraries/vendor/ramsey/uuid/src/Exception',
-            '/libraries/vendor/ramsey/uuid/src/Converter/Time',
-            '/libraries/vendor/ramsey/uuid/src/Converter/Number',
-            '/libraries/vendor/ramsey/uuid/src/Converter',
-            '/libraries/vendor/ramsey/uuid/src/Codec',
-            '/libraries/vendor/ramsey/uuid/src/Builder',
-            '/libraries/vendor/ramsey/uuid/src',
-            '/libraries/vendor/ramsey/uuid',
-            '/libraries/vendor/ramsey',
-            '/libraries/vendor/psr/log/Psr/Log',
-            '/libraries/vendor/psr/log/Psr',
-            '/libraries/vendor/nyholm/psr7/src/Factory',
-            '/libraries/vendor/nyholm/psr7/src',
-            '/libraries/vendor/nyholm/psr7',
-            '/libraries/vendor/nyholm',
-            '/libraries/vendor/lcobucci/jwt/src/Parsing',
-            '/libraries/vendor/lcobucci/jwt/src/Claim',
-            '/libraries/vendor/lcobucci/jwt/compat',
-            '/libraries/vendor/laminas/laminas-zendframework-bridge/src',
-            '/libraries/vendor/laminas/laminas-zendframework-bridge/config',
-            '/libraries/vendor/laminas/laminas-zendframework-bridge',
-            '/libraries/vendor/joomla/ldap/src',
-            '/libraries/vendor/joomla/ldap',
-            '/libraries/vendor/beberlei/assert/lib/Assert',
-            '/libraries/vendor/beberlei/assert/lib',
-            '/libraries/vendor/beberlei/assert',
-            '/libraries/vendor/beberlei',
-            '/administrator/components/com_admin/sql/others/mysql',
-            '/administrator/components/com_admin/sql/others',
-            // From 5.0.0-alpha2 to 5.0.0-alpha3
-            '/plugins/editors/codemirror/src/Field',
-            '/media/vendor/codemirror/theme',
-            '/media/vendor/codemirror/mode/z80',
-            '/media/vendor/codemirror/mode/yaml-frontmatter',
-            '/media/vendor/codemirror/mode/yaml',
-            '/media/vendor/codemirror/mode/yacas',
-            '/media/vendor/codemirror/mode/xquery',
-            '/media/vendor/codemirror/mode/xml',
-            '/media/vendor/codemirror/mode/webidl',
-            '/media/vendor/codemirror/mode/wast',
-            '/media/vendor/codemirror/mode/vue',
-            '/media/vendor/codemirror/mode/vhdl',
-            '/media/vendor/codemirror/mode/verilog',
-            '/media/vendor/codemirror/mode/velocity',
-            '/media/vendor/codemirror/mode/vbscript',
-            '/media/vendor/codemirror/mode/vb',
-            '/media/vendor/codemirror/mode/twig',
-            '/media/vendor/codemirror/mode/turtle',
-            '/media/vendor/codemirror/mode/ttcn-cfg',
-            '/media/vendor/codemirror/mode/ttcn',
-            '/media/vendor/codemirror/mode/troff',
-            '/media/vendor/codemirror/mode/tornado',
-            '/media/vendor/codemirror/mode/toml',
-            '/media/vendor/codemirror/mode/tiki',
-            '/media/vendor/codemirror/mode/tiddlywiki',
-            '/media/vendor/codemirror/mode/textile',
-            '/media/vendor/codemirror/mode/tcl',
-            '/media/vendor/codemirror/mode/swift',
-            '/media/vendor/codemirror/mode/stylus',
-            '/media/vendor/codemirror/mode/stex',
-            '/media/vendor/codemirror/mode/sql',
-            '/media/vendor/codemirror/mode/spreadsheet',
-            '/media/vendor/codemirror/mode/sparql',
-            '/media/vendor/codemirror/mode/soy',
-            '/media/vendor/codemirror/mode/solr',
-            '/media/vendor/codemirror/mode/smarty',
-            '/media/vendor/codemirror/mode/smalltalk',
-            '/media/vendor/codemirror/mode/slim',
-            '/media/vendor/codemirror/mode/sieve',
-            '/media/vendor/codemirror/mode/shell',
-            '/media/vendor/codemirror/mode/scheme',
-            '/media/vendor/codemirror/mode/sass',
-            '/media/vendor/codemirror/mode/sas',
-            '/media/vendor/codemirror/mode/rust',
-            '/media/vendor/codemirror/mode/ruby',
-            '/media/vendor/codemirror/mode/rst',
-            '/media/vendor/codemirror/mode/rpm/changes',
-            '/media/vendor/codemirror/mode/rpm',
-            '/media/vendor/codemirror/mode/r',
-            '/media/vendor/codemirror/mode/q',
-            '/media/vendor/codemirror/mode/python',
-            '/media/vendor/codemirror/mode/puppet',
-            '/media/vendor/codemirror/mode/pug',
-            '/media/vendor/codemirror/mode/protobuf',
-            '/media/vendor/codemirror/mode/properties',
-            '/media/vendor/codemirror/mode/powershell',
-            '/media/vendor/codemirror/mode/pig',
-            '/media/vendor/codemirror/mode/php',
-            '/media/vendor/codemirror/mode/perl',
-            '/media/vendor/codemirror/mode/pegjs',
-            '/media/vendor/codemirror/mode/pascal',
-            '/media/vendor/codemirror/mode/oz',
-            '/media/vendor/codemirror/mode/octave',
-            '/media/vendor/codemirror/mode/ntriples',
-            '/media/vendor/codemirror/mode/nsis',
-            '/media/vendor/codemirror/mode/nginx',
-            '/media/vendor/codemirror/mode/mumps',
-            '/media/vendor/codemirror/mode/mscgen',
-            '/media/vendor/codemirror/mode/modelica',
-            '/media/vendor/codemirror/mode/mllike',
-            '/media/vendor/codemirror/mode/mirc',
-            '/media/vendor/codemirror/mode/mbox',
-            '/media/vendor/codemirror/mode/mathematica',
-            '/media/vendor/codemirror/mode/markdown',
-            '/media/vendor/codemirror/mode/lua',
-            '/media/vendor/codemirror/mode/livescript',
-            '/media/vendor/codemirror/mode/julia',
-            '/media/vendor/codemirror/mode/jsx',
-            '/media/vendor/codemirror/mode/jinja2',
-            '/media/vendor/codemirror/mode/javascript',
-            '/media/vendor/codemirror/mode/idl',
-            '/media/vendor/codemirror/mode/http',
-            '/media/vendor/codemirror/mode/htmlmixed',
-            '/media/vendor/codemirror/mode/htmlembedded',
-            '/media/vendor/codemirror/mode/haxe',
-            '/media/vendor/codemirror/mode/haskell-literate',
-            '/media/vendor/codemirror/mode/haskell',
-            '/media/vendor/codemirror/mode/handlebars',
-            '/media/vendor/codemirror/mode/haml',
-            '/media/vendor/codemirror/mode/groovy',
-            '/media/vendor/codemirror/mode/go',
-            '/media/vendor/codemirror/mode/gherkin',
-            '/media/vendor/codemirror/mode/gfm',
-            '/media/vendor/codemirror/mode/gas',
-            '/media/vendor/codemirror/mode/fortran',
-            '/media/vendor/codemirror/mode/forth',
-            '/media/vendor/codemirror/mode/fcl',
-            '/media/vendor/codemirror/mode/factor',
-            '/media/vendor/codemirror/mode/erlang',
-            '/media/vendor/codemirror/mode/elm',
-            '/media/vendor/codemirror/mode/eiffel',
-            '/media/vendor/codemirror/mode/ecl',
-            '/media/vendor/codemirror/mode/ebnf',
-            '/media/vendor/codemirror/mode/dylan',
-            '/media/vendor/codemirror/mode/dtd',
-            '/media/vendor/codemirror/mode/dockerfile',
-            '/media/vendor/codemirror/mode/django',
-            '/media/vendor/codemirror/mode/diff',
-            '/media/vendor/codemirror/mode/dart',
-            '/media/vendor/codemirror/mode/d',
-            '/media/vendor/codemirror/mode/cypher',
-            '/media/vendor/codemirror/mode/css',
-            '/media/vendor/codemirror/mode/crystal',
-            '/media/vendor/codemirror/mode/commonlisp',
-            '/media/vendor/codemirror/mode/coffeescript',
-            '/media/vendor/codemirror/mode/cobol',
-            '/media/vendor/codemirror/mode/cmake',
-            '/media/vendor/codemirror/mode/clojure',
-            '/media/vendor/codemirror/mode/clike',
-            '/media/vendor/codemirror/mode/brainfuck',
-            '/media/vendor/codemirror/mode/asterisk',
-            '/media/vendor/codemirror/mode/asn.1',
-            '/media/vendor/codemirror/mode/asciiarmor',
-            '/media/vendor/codemirror/mode/apl',
-            '/media/vendor/codemirror/mode',
-            '/media/vendor/codemirror/lib',
-            '/media/vendor/codemirror/keymap',
-            '/media/vendor/codemirror/addon/wrap',
-            '/media/vendor/codemirror/addon/tern',
-            '/media/vendor/codemirror/addon/selection',
-            '/media/vendor/codemirror/addon/search',
-            '/media/vendor/codemirror/addon/scroll',
-            '/media/vendor/codemirror/addon/runmode',
-            '/media/vendor/codemirror/addon/mode',
-            '/media/vendor/codemirror/addon/merge',
-            '/media/vendor/codemirror/addon/lint',
-            '/media/vendor/codemirror/addon/hint',
-            '/media/vendor/codemirror/addon/fold',
-            '/media/vendor/codemirror/addon/edit',
-            '/media/vendor/codemirror/addon/display',
-            '/media/vendor/codemirror/addon/dialog',
-            '/media/vendor/codemirror/addon/comment',
-            '/media/vendor/codemirror/addon',
-            // From 5.0.0-alpha3 to 5.0.0-alpha4
-            '/templates/system/incompatible.html,/includes',
-            '/templates/system/incompatible.html,',
-            '/media/plg_system_compat',
-            '/media/plg_editors_tinymce/js/plugins/highlighter',
-            // From 5.0.0-beta2 to 5.0.0-beta3
-            '/libraries/vendor/stella-maris/clock/src',
-            '/libraries/vendor/stella-maris/clock',
-            '/libraries/vendor/stella-maris',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/SAN',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509/CSR',
-            '/libraries/vendor/fgrosse/phpasn1/lib/X509',
-            '/libraries/vendor/fgrosse/phpasn1/lib/Utility',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Universal',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Exception',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1/Composite',
-            '/libraries/vendor/fgrosse/phpasn1/lib/ASN1',
-            '/libraries/vendor/fgrosse/phpasn1/lib',
-            '/libraries/vendor/fgrosse/phpasn1',
-            '/libraries/vendor/fgrosse',
-            // From 5.1.0-alpha4 to 5.1.0-beta1
-            '/media/vendor/joomla-a11y-checker',
-            '/media/plg_system_jooa11y/scss',
-            '/media/plg_system_jooa11y/css',
-            '/libraries/vendor/web-token/jwt-signature/Serializer',
-            '/libraries/vendor/web-token/jwt-signature/Algorithm',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa/Util',
-            '/libraries/vendor/web-token/jwt-signature',
-            '/libraries/vendor/web-token/jwt-core/Util',
-            '/libraries/vendor/web-token/jwt-core',
-            // From 5.1.0-beta1 to 5.1.0-beta2
-            '/libraries/vendor/web-token/signature-pack',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-rsa',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-none',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-hmac',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-experimental',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-eddsa',
-            '/libraries/vendor/web-token/jwt-signature-algorithm-ecdsa',
-            '/libraries/vendor/web-token/jwt-experimental/Signature',
-            '/libraries/vendor/web-token/jwt-experimental/KeyEncryption',
-            '/libraries/vendor/web-token/jwt-experimental/ContentEncryption',
-            '/libraries/vendor/web-token/jwt-experimental',
-            '/libraries/src/Event/Router',
-            // From 5.1.0-beta2 to 5.1.0-rc1
-            '/media/vendor/punycode',
-            // From 5.1.0 to 5.1.1
-            '/libraries/vendor/cweagans/composer-patches/tests',
-            '/libraries/vendor/cweagans/composer-patches/src',
-            '/libraries/vendor/cweagans/composer-patches',
-            '/libraries/vendor/cweagans',
-            // From 5.2.0-alpha2 to 5.2.0-alpha3
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts',
-            // From 5.3.0-alpha3 to 5.3.0-beta1
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Storage',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/templates',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/sqlqueries',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets/mails',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/widgets',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/jquery/dist',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/jquery',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs/styles',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/highlightjs',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/css',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter/VarDumper',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataFormatter',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector/PDO',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/DataCollector',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Twig',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/Symfony',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/SwiftMailer',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge',
-            '/libraries/vendor/maximebf/debugbar/src/DebugBar',
-            '/libraries/vendor/maximebf/debugbar/src',
-            '/libraries/vendor/maximebf/debugbar',
-            '/libraries/vendor/maximebf',
-            // From 5.4.2 to 5.4.3
+            // From 5.x to 6.0
+            '/libraries/vendor/voku/portable-utf8/src/voku/helper/data',
+            '/libraries/vendor/voku/portable-utf8/src/voku/helper',
+            '/libraries/vendor/voku/portable-utf8/src/voku',
+            '/libraries/vendor/voku/portable-utf8/src',
+            '/libraries/vendor/voku/portable-utf8',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper/data',
+            '/libraries/vendor/voku/portable-ascii/src/voku/helper',
+            '/libraries/vendor/voku/portable-ascii/src/voku',
+            '/libraries/vendor/voku/portable-ascii/src',
+            '/libraries/vendor/voku/portable-ascii',
+            '/libraries/vendor/voku',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Resolver',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Phar',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src/Interceptor',
+            '/libraries/vendor/typo3/phar-stream-wrapper/src',
+            '/libraries/vendor/typo3/phar-stream-wrapper',
+            '/libraries/vendor/typo3',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources/charset',
+            '/libraries/vendor/symfony/polyfill-iconv/Resources',
+            '/libraries/vendor/symfony/polyfill-iconv',
+            '/libraries/src/Filesystem/Support',
+            '/libraries/src/Filesystem/Streams',
+            '/libraries/src/Filesystem/Meta/language/en-GB',
+            '/libraries/src/Filesystem/Meta/language',
+            '/libraries/src/Filesystem/Meta',
+            '/libraries/src/Filesystem',
+            '/libraries/src/Application/CLI/Output/Processor',
+            '/libraries/src/Application/CLI/Output',
+            '/libraries/src/Application/CLI',
+            '/administrator/components/com_finder/helpers/indexer',
+            '/administrator/components/com_content/tmpl/featured',
+            // From 6.0.0-alpha3 to 6.0.0-beta1
+            '/media/vendor/webcomponentsjs/js',
+            '/media/vendor/webcomponentsjs',
+            '/media/vendor/chosen/js',
+            '/media/vendor/chosen/css',
+            '/media/vendor/chosen',
+            '/libraries/vendor/symfony/polyfill-php83/Resources/stubs',
+            '/libraries/vendor/symfony/polyfill-php83/Resources',
+            '/libraries/vendor/symfony/polyfill-php83',
+            '/libraries/vendor/joomla/string/src/phputf8/utils',
+            '/libraries/vendor/joomla/string/src/phputf8/native',
+            '/libraries/vendor/joomla/string/src/phputf8/mbstring',
+            '/libraries/vendor/joomla/string/src/phputf8',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Common/Inflector',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Common',
+            '/libraries/src/Adapter',
+            // From 6.0.0-beta3 to 6.0.0-rc1
+            '/media/com_guidedtours/images/5_4',
+            '/media/com_guidedtours/images/5_3',
+            '/media/com_guidedtours/images/5_2',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Turkish',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Spanish',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/Portuguese',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/NorwegianBokmal',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/French',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules/English',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector/Rules',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine/Inflector',
+            '/libraries/vendor/doctrine/inflector/lib/Doctrine',
+            '/libraries/vendor/doctrine/inflector/lib',
+            // From 6.1.0-alpha1 to 6.1.0-alpha2
+            '/libraries/vendor/webmozart/assert/src',
+            '/libraries/vendor/webmozart/assert',
+            '/libraries/vendor/webmozart',
+            '/libraries/vendor/symfony/var-dumper/Cloner/Internal',
+            // From 6.0.2 to 6.0.3
             '/libraries/vendor/symfony/var-dumper/Test',
             '/libraries/vendor/symfony/validator/Test',
             '/libraries/vendor/symfony/translation-contracts/Test',
@@ -2804,6 +1362,23 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/libraries/vendor/symfony/http-client-contracts/Test/Fixtures/web',
             '/libraries/vendor/symfony/http-client-contracts/Test/Fixtures',
             '/libraries/vendor/symfony/http-client-contracts/Test',
+            // From 6.1.0-beta1 to 6.1.0-beta2
+            '/libraries/vendor/altcha-org/altcha/tests',
+            // From 6.1.1 to 6.2.0-alpha1
+            '/administrator/components/com_workflow/resources/scripts/utils',
+            '/administrator/components/com_workflow/resources/scripts/store/plugins',
+            '/administrator/components/com_workflow/resources/scripts/store',
+            '/administrator/components/com_workflow/resources/scripts/plugins',
+            '/administrator/components/com_workflow/resources/scripts/components/nodes',
+            '/administrator/components/com_workflow/resources/scripts/components/edges',
+            '/administrator/components/com_workflow/resources/scripts/components/canvas',
+            '/administrator/components/com_workflow/resources/scripts/components',
+            '/administrator/components/com_workflow/resources/scripts/app',
+            '/administrator/components/com_workflow/resources/scripts',
+            '/administrator/components/com_workflow/resources',
+            // From 6.2.0-alpha1 to 6.2.0-alpha2
+            '/administrator/help/en-GB',
+            '/administrator/help',
         ];
 
         $status['files_checked']   = $files;
@@ -2839,13 +1414,6 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 
         $this->fixFilenameCasing();
 
-        /**
-         * Fix filesystem permissions when updating a new 5.2.0 installation.
-         *
-         * @todo: Remove in 6.0
-         */
-        $this->fixFilesystemPermissions();
-
         if ($suppressOutput === false && \count($status['folders_errors'])) {
             echo implode('<br>', $status['folders_errors']);
         }
@@ -2868,18 +1436,13 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
      */
     public function updateAssets($installer)
     {
-        // List all components added since 4.0
+        // List all components added since 6.0
         $newComponents = [
             // Components to be added here
-            'com_guidedtours',
-            'com_mails',
-            'com_scheduler',
-            'com_workflow',
         ];
 
         foreach ($newComponents as $component) {
-            /** @var \Joomla\CMS\Table\Asset $asset */
-            $asset = Table::getInstance('Asset');
+            $asset = new Asset(Factory::getDbo());
 
             if ($asset->loadByName($component)) {
                 continue;
@@ -2941,24 +1504,11 @@ public function postflight($action, $installer)
             return true;
         }
 
-        if (empty($this->fromVersion) || version_compare($this->fromVersion, '5.0.0', 'ge')) {
+        if (empty($this->fromVersion) || version_compare($this->fromVersion, '6.0.0', 'ge')) {
             return true;
         }
 
-        // Add here code which shall be executed only when updating from an older version than 5.0.0
-        if (!$this->migrateTinymceConfiguration()) {
-            return false;
-        }
-
-        if (!$this->migrateDeleteActionlogsConfiguration()) {
-            return false;
-        }
-
-        if (!$this->migratePrivacyconsentConfiguration()) {
-            return false;
-        }
-
-        $this->setGuidedToursUid();
+        // Add here code which shall be executed only when updating from an older version than 6.0.0
 
         // Refresh versionable assets cache.
         Factory::getApplication()->flushAssets();
@@ -2966,315 +1516,6 @@ public function postflight($action, $installer)
         return true;
     }
 
-    /**
-     * Migrate Deleteactionlogs plugin configuration
-     *
-     * @return  boolean  True on success
-     *
-     * @since   5.0.0
-     */
-    private function migrateDeleteActionlogsConfiguration(): bool
-    {
-        $db = Factory::getDbo();
-
-        try {
-            // Get the ActionLogs system plugin's parameters
-            $row = $db->setQuery(
-                $db->getQuery(true)
-                    ->select([$db->quotename('enabled'), $db->quoteName('params')])
-                    ->from($db->quoteName('#__extensions'))
-                    ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-                    ->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
-                    ->where($db->quoteName('element') . ' = ' . $db->quote('actionlogs'))
-            )->loadObject();
-        } catch (Exception $e) {
-            $this->collectError(__METHOD__, $e);
-
-            return false;
-        }
-
-        // If not existing or disabled there is nothing to migrate
-        if (!$row || !$row->enabled) {
-            return true;
-        }
-
-        $params = new Registry($row->params);
-
-        // If deletion of outdated logs was disabled there is nothing to migrate
-        if (!$params->get('logDeletePeriod', 0)) {
-            return true;
-        }
-
-        /** @var \Joomla\Component\Scheduler\Administrator\Extension\SchedulerComponent $component */
-        $component = Factory::getApplication()->bootComponent('com_scheduler');
-
-        /** @var \Joomla\Component\Scheduler\Administrator\Model\TaskModel $model */
-        $model = $component->getMVCFactory()->createModel('Task', 'Administrator', ['ignore_request' => true]);
-        $task  = [
-            'title'           => 'Delete Action Logs',
-            'type'            => 'delete.actionlogs',
-            'execution_rules' => [
-                'rule-type'      => 'interval-hours',
-                'interval-hours' => 24,
-                'exec-time'      => gmdate('H:i', $params->get('lastrun', time())),
-                'exec-day'       => gmdate('d'),
-            ],
-            'state'  => 1,
-            'params' => [
-                'logDeletePeriod' => $params->get('logDeletePeriod', 0),
-            ],
-        ];
-
-        try {
-            $model->save($task);
-        } catch (Exception $e) {
-            $this->collectError(__METHOD__, $e);
-
-            return false;
-        }
-
-        return true;
-    }
-    /**
-     * Migrate privacyconsents system plugin configuration
-     *
-     * @return  boolean  True on success
-     *
-     * @since   5.0.0
-     */
-    private function migratePrivacyconsentConfiguration(): bool
-    {
-        $db = Factory::getDbo();
-
-        try {
-            // Get the PrivacyConsent system plugin's parameters
-            $row = $db->setQuery(
-                $db->getQuery(true)
-                    ->select([$db->quotename('enabled'), $db->quoteName('params')])
-                    ->from($db->quoteName('#__extensions'))
-                    ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-                    ->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
-                    ->where($db->quoteName('element') . ' = ' . $db->quote('privacyconsent'))
-            )->loadObject();
-        } catch (Exception $e) {
-            $this->collectError(__METHOD__, $e);
-
-            return false;
-        }
-
-        // If not existing or disabled there is nothing to migrate
-        if (!$row || !$row->enabled) {
-            return true;
-        }
-
-        $params = new Registry($row->params);
-
-        // If consent expiration was disabled there is nothing to migrate
-        if (!$params->get('enabled', 0)) {
-            return true;
-        }
-
-        /** @var \Joomla\Component\Scheduler\Administrator\Extension\SchedulerComponent $component */
-        $component = Factory::getApplication()->bootComponent('com_scheduler');
-
-        /** @var \Joomla\Component\Scheduler\Administrator\Model\TaskModel $model */
-        $model = $component->getMVCFactory()->createModel('Task', 'Administrator', ['ignore_request' => true]);
-        $task  = [
-            'title'           => 'Privacy Consent',
-            'type'            => 'privacy.consent',
-            'execution_rules' => [
-                'rule-type'     => 'interval-days',
-                'interval-days' => $params->get('cachetimeout', 30),
-                'exec-time'     => gmdate('H:i', $params->get('lastrun', time())),
-                'exec-day'      => gmdate('d'),
-            ],
-            'state'  => 1,
-            'params' => [
-                'consentexpiration' => $params->get('consentexpiration', 360),
-                'remind'            => $params->get('remind', 30),
-            ],
-        ];
-
-        try {
-            $model->save($task);
-        } catch (Exception $e) {
-            $this->collectError(__METHOD__, $e);
-
-            return false;
-        }
-
-        // Refresh versionable assets cache.
-        Factory::getApplication()->flushAssets();
-
-        return true;
-    }
-
-    /**
-     * Migrate TinyMCE editor plugin configuration
-     *
-     * @return  boolean  True on success
-     *
-     * @since   5.0.0
-     */
-    private function migrateTinymceConfiguration(): bool
-    {
-        $db = Factory::getDbo();
-
-        try {
-            // Get the TinyMCE editor plugin's parameters
-            $params = $db->setQuery(
-                $db->getQuery(true)
-                    ->select($db->quoteName('params'))
-                    ->from($db->quoteName('#__extensions'))
-                    ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-                    ->where($db->quoteName('folder') . ' = ' . $db->quote('editors'))
-                    ->where($db->quoteName('element') . ' = ' . $db->quote('tinymce'))
-            )->loadResult();
-        } catch (Exception $e) {
-            $this->collectError(__METHOD__, $e);
-
-            return false;
-        }
-
-        $params = json_decode($params, true);
-
-        // If there are no toolbars there is nothing to migrate
-        if (!isset($params['configuration']['toolbars'])) {
-            return true;
-        }
-
-        // Each set has its own toolbar configuration
-        foreach ($params['configuration']['toolbars'] as $setIdx => $toolbarConfig) {
-            // Migrate menu items if there is a menu
-            if (isset($toolbarConfig['menu'])) {
-                /**
-                 * Replace array values with menu item names ("old name" -> "new name"):
-                 * "blockformats" -> "blocks"
-                 * "fontformats"  -> "fontfamily"
-                 * "fontsizes"    -> "fontsize"
-                 * "formats"      -> "styles"
-                 * "template"     -> "jtemplate"
-                 */
-                $search  = ['blockformats', 'fontformats', 'fontsizes', 'formats'];
-                $replace = ['blocks', 'fontfamily', 'fontsize', 'styles'];
-
-                // Don't redo the template
-                if (!\in_array('jtemplate', $params['configuration']['toolbars'][$setIdx]['menu'])) {
-                    $search[]  = 'template';
-                    $replace[] = 'jtemplate';
-                }
-
-                $params['configuration']['toolbars'][$setIdx]['menu'] = str_replace($search, $replace, $toolbarConfig['menu']);
-            }
-
-            // There could be no toolbar at all, or only toolbar1, or both toolbar1 and toolbar2
-            foreach (['toolbar1', 'toolbar2'] as $toolbarIdx) {
-                // Migrate toolbar buttons if that toolbar exists
-                if (isset($toolbarConfig[$toolbarIdx])) {
-                    /**
-                     * Replace array values with button names ("old name" -> "new name"):
-                     * "fontselect"     -> "fontfamily"
-                     * "fontsizeselect" -> "fontsize"
-                     * "formatselect"   -> "blocks"
-                     * "styleselect"    -> "styles"
-                     * "template"       -> "jtemplate"
-                     */
-                    $search  = ['fontselect', 'fontsizeselect', 'formatselect', 'styleselect'];
-                    $replace = ['fontfamily', 'fontsize', 'blocks', 'styles'];
-
-                    // Don't redo the template
-                    if (!\in_array('jtemplate', $params['configuration']['toolbars'][$setIdx][$toolbarIdx])) {
-                        $search[]  = 'template';
-                        $replace[] = 'jtemplate';
-                    }
-
-                    $params['configuration']['toolbars'][$setIdx][$toolbarIdx] = str_replace($search, $replace, $toolbarConfig[$toolbarIdx]);
-                }
-            }
-        }
-
-        $params = json_encode($params);
-
-        $query = $db->getQuery(true)
-            ->update($db->quoteName('#__extensions'))
-            ->set($db->quoteName('params') . ' = ' . $db->quote($params))
-            ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-            ->where($db->quoteName('folder') . ' = ' . $db->quote('editors'))
-            ->where($db->quoteName('element') . ' = ' . $db->quote('tinymce'));
-
-        try {
-            $db->setQuery($query)->execute();
-        } catch (Exception $e) {
-            $this->collectError(__METHOD__, $e);
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * setup Guided Tours Unique Identifiers
-     *
-     * @return  void
-     *
-     * @since   5.0.0
-     */
-    private function setGuidedToursUid()
-    {
-        /** @var \Joomla\Component\Cache\Administrator\Model\CacheModel $model */
-        $model = Factory::getApplication()->bootComponent('com_guidedtours')->getMVCFactory()
-            ->createModel('Tours', 'Administrator', ['ignore_request' => true]);
-
-        $items = $model->getItems();
-
-        foreach ($items as $item) {
-            // Set uid for tours where it is empty
-            if (empty($item->uid)) {
-                $tourItem = $model->getTable('Tour');
-                $tourItem->load($item->id);
-
-                // Tour follows Joomla naming convention
-                if (str_starts_with($tourItem->title, 'COM_GUIDEDTOURS_TOUR_') && str_ends_with($tourItem->title, '_TITLE')) {
-                    $uidTitle = 'joomla_' . str_replace('COM_GUIDEDTOURS_TOUR_', '', $tourItem->title);
-
-                    // Remove the last _TITLE part
-                    $pos = strrpos($uidTitle, '_TITLE');
-                    if ($pos !== false) {
-                        $uidTitle = substr($uidTitle, 0, $pos);
-                    }
-                } elseif (preg_match('#COM_(\w+)_TOUR_#', $tourItem->title) && str_ends_with($tourItem->title, '_TITLE')) {
-                    // Tour follows component naming pattern
-                    $uidTitle = preg_replace('#COM_(\w+)_TOUR_#', '$1.', $tourItem->title);
-
-                    // Remove the last _TITLE part
-                    $pos = strrpos($uidTitle, "_TITLE");
-                    if ($pos !== false) {
-                        $uidTitle = substr($uidTitle, 0, $pos);
-                    }
-                } else {
-                    $uri      = Uri::getInstance();
-                    $host     = $uri->toString(['host']);
-                    $host     = ApplicationHelper::stringURLSafe($host, $tourItem->language);
-                    $uidTitle = $host . ' ' . str_replace('COM_GUIDEDTOURS_TOUR_', '', $tourItem->title);
-                    // Remove the last _TITLE part
-                    if (str_ends_with($uidTitle, '_TITLE')) {
-                        $pos      = strrpos($uidTitle, '_TITLE');
-                        $uidTitle = substr($uidTitle, 0, $pos);
-                    }
-                }
-                // ApplicationHelper::stringURLSafe will replace a period (.) separator so we split the construction into multiple parts
-                $uidTitleParts = explode('.', $uidTitle);
-                array_walk($uidTitleParts, function (&$value, $key, $tourLanguage) {
-                    $value = ApplicationHelper::stringURLSafe($value, $tourLanguage);
-                }, $tourItem->language);
-                $tourItem->uid = implode('.', $uidTitleParts);
-
-                $tourItem->store();
-            }
-        }
-    }
-
     /**
      * Renames or removes incorrectly cased files.
      *
@@ -3285,11 +1526,7 @@ private function setGuidedToursUid()
     protected function fixFilenameCasing()
     {
         $files = [
-            // From 4.4 to 5.0
-            '/libraries/vendor/web-auth/cose-lib/src/Algorithm/Signature/EdDSA/ED256.php' => '/libraries/vendor/web-auth/cose-lib/src/Algorithm/Signature/EdDSA/Ed256.php',
-            '/libraries/vendor/web-auth/cose-lib/src/Algorithm/Signature/EdDSA/ED512.php' => '/libraries/vendor/web-auth/cose-lib/src/Algorithm/Signature/EdDSA/Ed512.php',
-            // From 5.0.0-alpha3 to 5.0.0-alpha4
-            '/plugins/schemaorg/blogposting/src/Extension/Blogposting.php' => '/plugins/schemaorg/blogposting/src/Extension/BlogPosting.php',
+            // From 5.x to 6.0
         ];
 
         foreach ($files as $old => $expected) {
@@ -3333,426 +1570,4 @@ protected function fixFilenameCasing()
             }
         }
     }
-
-    /**
-     * Fix filesystem permissions when updating a new 5.2.0 installation.
-     *
-     * @return  void
-     *
-     * @since   5.2.2
-     *
-     * @todo    6.0 Remove this method
-     *
-     * @deprecated  5.2.2 will be removed in 6.0 without replacement
-     */
-    protected function fixFilesystemPermissions()
-    {
-        // Don't do anything if not updating from a 5.2.0 or 5.2.1
-        if (
-            empty($this->fromVersion)
-            || version_compare($this->fromVersion, '5.2.0', 'lt')
-            || version_compare($this->fromVersion, '5.2.1', 'gt')
-        ) {
-            return;
-        }
-
-        // First check tmp folder if it has mode 777
-        if (decoct(fileperms(JPATH_ROOT . '/tmp') & 0777) === '777') {
-            // We are either on Windows where folders always have 777, or we have to fix permissions
-            @chmod(JPATH_ROOT . '/tmp', 0755);
-            clearstatcache(true, JPATH_ROOT . '/tmp');
-        }
-
-        // Check tmp folder again if it still has mode 777
-        if (decoct(fileperms(JPATH_ROOT . '/tmp') & 0777) === '777') {
-            // We are on Windows or chmod has no effect
-            return;
-        }
-
-        try {
-            // Using hard-coded string because a new language string would not be available in all cases
-            Log::add('Fixing permissions for files and folders.', Log::INFO, 'Update');
-        } catch (\RuntimeException) {
-            // Informational log only
-        }
-
-        $files = [
-            '/htaccess.txt',
-            '/index.php',
-            '/libraries/.htaccess',
-            '/libraries/vendor/jfcherng/php-diff/.phpstorm.meta.php',
-            '/libraries/vendor/joomla/http/.drone.jsonnet',
-            '/libraries/vendor/joomla/http/.drone.yml',
-            '/libraries/vendor/joomla/oauth1/.drone.jsonnet',
-            '/libraries/vendor/joomla/oauth1/.drone.yml',
-            '/libraries/vendor/joomla/oauth2/.drone.jsonnet',
-            '/libraries/vendor/joomla/oauth2/.drone.yml',
-            '/libraries/vendor/joomla/router/.drone.jsonnet',
-            '/libraries/vendor/joomla/router/.drone.yml',
-            '/libraries/vendor/joomla/string/.drone.jsonnet',
-            '/libraries/vendor/joomla/string/.drone.yml',
-            '/libraries/vendor/joomla/uri/.drone.jsonnet',
-            '/libraries/vendor/joomla/uri/.drone.yml',
-            '/libraries/vendor/joomla/utilities/.drone.jsonnet',
-            '/libraries/vendor/joomla/utilities/.drone.yml',
-            '/LICENSE.txt',
-            '/README.txt',
-            '/robots.txt',
-            '/robots.txt.dist',
-            '/tmp/index.html',
-            '/web.config.txt',
-        ];
-
-        $folders = [
-            '/administrator',
-            '/administrator/cache',
-            '/administrator/components',
-            '/administrator/help',
-            '/administrator/help/en-GB',
-            '/administrator/includes',
-            '/administrator/language',
-            '/administrator/language/en-GB',
-            '/administrator/language/overrides',
-            '/administrator/logs',
-            '/administrator/manifests',
-            '/administrator/manifests/files',
-            '/administrator/manifests/libraries',
-            '/administrator/manifests/packages',
-            '/administrator/modules',
-            '/administrator/templates',
-            '/api',
-            '/api/components',
-            '/api/includes',
-            '/api/language',
-            '/api/language/en-GB',
-            '/cache',
-            '/cli',
-            '/components',
-            '/images',
-            '/images/banners',
-            '/images/headers',
-            '/images/sampledata',
-            '/images/sampledata/cassiopeia',
-            '/includes',
-            '/language',
-            '/language/en-GB',
-            '/language/overrides',
-            '/layouts',
-            '/layouts/chromes',
-            '/layouts/libraries',
-            '/layouts/libraries/html',
-            '/layouts/libraries/html/bootstrap',
-            '/layouts/libraries/html/bootstrap/modal',
-            '/layouts/libraries/html/bootstrap/tab',
-            '/libraries',
-            '/libraries/php-encryption',
-            '/libraries/phpass',
-            '/media',
-            '/media/cache',
-            '/media/templates',
-            '/media/templates/administrator',
-            '/media/templates/site',
-            '/media/vendor',
-            '/modules',
-            '/plugins',
-            '/templates',
-        ];
-
-        $foldersRecursive = [
-            '/administrator/components/com_actionlogs',
-            '/administrator/components/com_admin',
-            '/administrator/components/com_ajax',
-            '/administrator/components/com_associations',
-            '/administrator/components/com_banners',
-            '/administrator/components/com_cache',
-            '/administrator/components/com_categories',
-            '/administrator/components/com_checkin',
-            '/administrator/components/com_config',
-            '/administrator/components/com_contact',
-            '/administrator/components/com_content',
-            '/administrator/components/com_contenthistory',
-            '/administrator/components/com_cpanel',
-            '/administrator/components/com_fields',
-            '/administrator/components/com_finder',
-            '/administrator/components/com_guidedtours',
-            '/administrator/components/com_installer',
-            '/administrator/components/com_joomlaupdate',
-            '/administrator/components/com_languages',
-            '/administrator/components/com_login',
-            '/administrator/components/com_mails',
-            '/administrator/components/com_media',
-            '/administrator/components/com_menus',
-            '/administrator/components/com_messages',
-            '/administrator/components/com_modules',
-            '/administrator/components/com_newsfeeds',
-            '/administrator/components/com_plugins',
-            '/administrator/components/com_postinstall',
-            '/administrator/components/com_privacy',
-            '/administrator/components/com_redirect',
-            '/administrator/components/com_scheduler',
-            '/administrator/components/com_tags',
-            '/administrator/components/com_templates',
-            '/administrator/components/com_users',
-            '/administrator/components/com_workflow',
-            '/administrator/components/com_wrapper',
-            '/administrator/modules/mod_custom',
-            '/administrator/modules/mod_feed',
-            '/administrator/modules/mod_frontend',
-            '/administrator/modules/mod_guidedtours',
-            '/administrator/modules/mod_latest',
-            '/administrator/modules/mod_latestactions',
-            '/administrator/modules/mod_logged',
-            '/administrator/modules/mod_login',
-            '/administrator/modules/mod_loginsupport',
-            '/administrator/modules/mod_menu',
-            '/administrator/modules/mod_messages',
-            '/administrator/modules/mod_multilangstatus',
-            '/administrator/modules/mod_popular',
-            '/administrator/modules/mod_post_installation_messages',
-            '/administrator/modules/mod_privacy_dashboard',
-            '/administrator/modules/mod_privacy_status',
-            '/administrator/modules/mod_quickicon',
-            '/administrator/modules/mod_sampledata',
-            '/administrator/modules/mod_stats_admin',
-            '/administrator/modules/mod_submenu',
-            '/administrator/modules/mod_title',
-            '/administrator/modules/mod_toolbar',
-            '/administrator/modules/mod_user',
-            '/administrator/modules/mod_version',
-            '/administrator/templates/atum',
-            '/administrator/templates/system',
-            '/api/components/com_banners',
-            '/api/components/com_categories',
-            '/api/components/com_config',
-            '/api/components/com_contact',
-            '/api/components/com_content',
-            '/api/components/com_contenthistory',
-            '/api/components/com_fields',
-            '/api/components/com_installer',
-            '/api/components/com_languages',
-            '/api/components/com_media',
-            '/api/components/com_menus',
-            '/api/components/com_messages',
-            '/api/components/com_modules',
-            '/api/components/com_newsfeeds',
-            '/api/components/com_plugins',
-            '/api/components/com_privacy',
-            '/api/components/com_redirect',
-            '/api/components/com_tags',
-            '/api/components/com_templates',
-            '/api/components/com_users',
-            '/components/com_ajax',
-            '/components/com_banners',
-            '/components/com_config',
-            '/components/com_contact',
-            '/components/com_content',
-            '/components/com_contenthistory',
-            '/components/com_fields',
-            '/components/com_finder',
-            '/components/com_media',
-            '/components/com_menus',
-            '/components/com_modules',
-            '/components/com_newsfeeds',
-            '/components/com_privacy',
-            '/components/com_tags',
-            '/components/com_users',
-            '/components/com_wrapper',
-            '/layouts/joomla',
-            '/layouts/plugins',
-            '/libraries/src',
-            '/libraries/vendor',
-            '/media/com_actionlogs',
-            '/media/com_admin',
-            '/media/com_associations',
-            '/media/com_banners',
-            '/media/com_cache',
-            '/media/com_categories',
-            '/media/com_config',
-            '/media/com_contact',
-            '/media/com_content',
-            '/media/com_contenthistory',
-            '/media/com_cpanel',
-            '/media/com_fields',
-            '/media/com_finder',
-            '/media/com_guidedtours',
-            '/media/com_installer',
-            '/media/com_joomlaupdate',
-            '/media/com_languages',
-            '/media/com_mails',
-            '/media/com_media',
-            '/media/com_menus',
-            '/media/com_modules',
-            '/media/com_scheduler',
-            '/media/com_tags',
-            '/media/com_templates',
-            '/media/com_users',
-            '/media/com_workflow',
-            '/media/com_wrapper',
-            '/media/layouts',
-            '/media/legacy',
-            '/media/mailto',
-            '/media/mod_articles',
-            '/media/mod_articles_news',
-            '/media/mod_languages',
-            '/media/mod_login',
-            '/media/mod_menu',
-            '/media/mod_quickicon',
-            '/media/mod_sampledata',
-            '/media/plg_behaviour_compat',
-            '/media/plg_captcha_recaptcha',
-            '/media/plg_captcha_recaptcha_invisible',
-            '/media/plg_content_vote',
-            '/media/plg_editors-xtd_image',
-            '/media/plg_editors_codemirror',
-            '/media/plg_editors_none',
-            '/media/plg_editors_tinymce',
-            '/media/plg_installer_folderinstaller',
-            '/media/plg_installer_packageinstaller',
-            '/media/plg_installer_urlinstaller',
-            '/media/plg_installer_webinstaller',
-            '/media/plg_media-action_crop',
-            '/media/plg_media-action_resize',
-            '/media/plg_media-action_rotate',
-            '/media/plg_multifactorauth_email',
-            '/media/plg_multifactorauth_fixed',
-            '/media/plg_multifactorauth_totp',
-            '/media/plg_multifactorauth_webauthn',
-            '/media/plg_multifactorauth_yubikey',
-            '/media/plg_quickicon_eos',
-            '/media/plg_quickicon_extensionupdate',
-            '/media/plg_quickicon_joomlaupdate',
-            '/media/plg_quickicon_overridecheck',
-            '/media/plg_quickicon_privacycheck',
-            '/media/plg_system_debug',
-            '/media/plg_system_guidedtours',
-            '/media/plg_system_jooa11y',
-            '/media/plg_system_schedulerunner',
-            '/media/plg_system_shortcut',
-            '/media/plg_system_stats',
-            '/media/plg_system_webauthn',
-            '/media/plg_user_token',
-            '/media/system',
-            '/media/templates/administrator/atum',
-            '/media/templates/site/cassiopeia',
-            '/media/vendor/accessibility',
-            '/media/vendor/awesomplete',
-            '/media/vendor/bootstrap',
-            '/media/vendor/choicesjs',
-            '/media/vendor/chosen',
-            '/media/vendor/codemirror',
-            '/media/vendor/cropperjs',
-            '/media/vendor/debugbar',
-            '/media/vendor/diff',
-            '/media/vendor/dragula',
-            '/media/vendor/es-module-shims',
-            '/media/vendor/focus-visible',
-            '/media/vendor/fontawesome-free',
-            '/media/vendor/hotkeysjs',
-            '/media/vendor/joomla-custom-elements',
-            '/media/vendor/jquery',
-            '/media/vendor/jquery-migrate',
-            '/media/vendor/mediaelement',
-            '/media/vendor/metismenujs',
-            '/media/vendor/minicolors',
-            '/media/vendor/qrcode',
-            '/media/vendor/roboto-fontface',
-            '/media/vendor/sa11y',
-            '/media/vendor/shepherdjs',
-            '/media/vendor/short-and-sweet',
-            '/media/vendor/skipto',
-            '/media/vendor/tinymce',
-            '/media/vendor/webcomponentsjs',
-            '/modules/mod_articles',
-            '/modules/mod_articles_archive',
-            '/modules/mod_articles_categories',
-            '/modules/mod_articles_category',
-            '/modules/mod_articles_latest',
-            '/modules/mod_articles_news',
-            '/modules/mod_articles_popular',
-            '/modules/mod_banners',
-            '/modules/mod_breadcrumbs',
-            '/modules/mod_custom',
-            '/modules/mod_feed',
-            '/modules/mod_finder',
-            '/modules/mod_footer',
-            '/modules/mod_languages',
-            '/modules/mod_login',
-            '/modules/mod_menu',
-            '/modules/mod_random_image',
-            '/modules/mod_related_items',
-            '/modules/mod_stats',
-            '/modules/mod_syndicate',
-            '/modules/mod_tags_popular',
-            '/modules/mod_tags_similar',
-            '/modules/mod_users_latest',
-            '/modules/mod_whosonline',
-            '/modules/mod_wrapper',
-            '/plugins/actionlog',
-            '/plugins/api-authentication',
-            '/plugins/authentication',
-            '/plugins/behaviour',
-            '/plugins/captcha',
-            '/plugins/content',
-            '/plugins/editors',
-            '/plugins/editors-xtd',
-            '/plugins/extension',
-            '/plugins/fields',
-            '/plugins/filesystem',
-            '/plugins/finder',
-            '/plugins/installer',
-            '/plugins/media-action',
-            '/plugins/multifactorauth',
-            '/plugins/privacy',
-            '/plugins/quickicon',
-            '/plugins/sampledata',
-            '/plugins/schemaorg',
-            '/plugins/system',
-            '/plugins/task',
-            '/plugins/user',
-            '/plugins/webservices',
-            '/plugins/workflow',
-            '/templates/cassiopeia',
-            '/templates/system',
-        ];
-
-        foreach ($files as $file) {
-            if (is_file(JPATH_ROOT . $file) && decoct(fileperms(JPATH_ROOT . $file) & 0777) === '777') {
-                @chmod(JPATH_ROOT . $file, 0644);
-            }
-        }
-
-        foreach ($folders as $folder) {
-            if (is_dir(JPATH_ROOT . $folder)) {
-                if (decoct(fileperms(JPATH_ROOT . $folder) & 0777) === '777') {
-                    @chmod(JPATH_ROOT . $folder, 0755);
-                }
-
-                foreach (Folder::files(JPATH_ROOT . $folder, '.', false, true) as $file) {
-                    if (decoct(fileperms($file) & 0777) === '777') {
-                        @chmod($file, 0644);
-                    }
-                }
-            }
-        }
-
-        foreach ($foldersRecursive as $parentFolder) {
-            if (is_dir(JPATH_ROOT . $parentFolder)) {
-                if (decoct(fileperms(JPATH_ROOT . $parentFolder) & 0777) === '777') {
-                    @chmod(JPATH_ROOT . $parentFolder, 0755);
-                }
-
-                foreach (Folder::folders(JPATH_ROOT . $parentFolder, '.', true, true) as $folder) {
-                    if (decoct(fileperms($folder) & 0777) === '777') {
-                        @chmod($folder, 0755);
-                    }
-                }
-
-                foreach (Folder::files(JPATH_ROOT . $parentFolder, '.', true, true) as $file) {
-                    if (decoct(fileperms($file) & 0777) === '777') {
-                        @chmod($file, 0644);
-                    }
-                }
-            }
-        }
-    }
 }
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-03-11.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-03-11.sql
deleted file mode 100644
index 59b59432ea959..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-03-11.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS `#__utf8_conversion`;
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-03-17.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-03-17.sql
deleted file mode 100644
index 4f6aa1f79b567..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-03-17.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM `#__scheduler_tasks` WHERE `type` = 'demoTask_r1.sleep';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-12.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-12.sql
deleted file mode 100644
index 882f857346fd7..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-12.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE `#__menu_types` ADD COLUMN `ordering` int NOT NULL DEFAULT 0 AFTER `client_id` /** CAN FAIL **/;
-UPDATE `#__menu_types` SET `ordering` = `id` WHERE `client_id` = 0;
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-25.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-25.sql
deleted file mode 100644
index 897a721bfd927..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-25.sql
+++ /dev/null
@@ -1,28 +0,0 @@
---
--- Table structure for table `#__schemaorg`
---
-
-CREATE TABLE IF NOT EXISTS `#__schemaorg` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `itemId` int unsigned,
-  `context` varchar(100),
-  `schemaType` varchar(100),
-  `schema` text,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci;
-
--- Add plugins to `#__extensions`
--- --------------------------------------------------------
--- The following INSERT statement has been modified to insert
--- core plugins with locked=1.
--- See https://github.com/joomla/joomla-cms/pull/45821 for details.
---
-INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
-(0, 'plg_schemaorg_blogposting', 'plugin', 'blogposting', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
-(0, 'plg_schemaorg_book', 'plugin', 'book', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
-(0, 'plg_schemaorg_event', 'plugin', 'event', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
-(0, 'plg_schemaorg_organization', 'plugin', 'organization', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
-(0, 'plg_schemaorg_person', 'plugin', 'person', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
-(0, 'plg_schemaorg_recipe', 'plugin', 'recipe', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 6, 0),
-(0, 'plg_schemaorg_jobposting', 'plugin', 'jobposting', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 7, 0),
-(0, 'plg_system_schemaorg', 'plugin', 'schemaorg', 'system', 0, 1, 1, 0, 1, '', '{}', '', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-21.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-21.sql
deleted file mode 100644
index 53a45aa687c0d..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-21.sql
+++ /dev/null
@@ -1,17 +0,0 @@
---
--- Attention: In the below SQL statements, the value of the filter is unescaped, i.e. uses "\\", while
--- in base.sql the same value is using "\\\\". This is expected because of how JSON_REPLACE works.
---
-UPDATE `#__extensions`
-   SET `params` = JSON_REPLACE(`params`, '$.filter' , '\\Joomla\\CMS\\Component\\ComponentHelper::filterText')
- WHERE `type` = 'plugin'
-   AND `folder` = 'fields'
-   AND `element` IN ('editor', 'text', 'textarea')
-   AND `params` <> ''
-   AND JSON_EXTRACT(`params`, '$.filter') = 'JComponentHelper::filterText';
-
-UPDATE `#__fields`
-   SET `fieldparams` = JSON_REPLACE(`fieldparams`, '$.filter' , '\\Joomla\\CMS\\Component\\ComponentHelper::filterText')
- WHERE `type` IN ('editor', 'text', 'textarea')
-   AND `fieldparams` <> ''
-   AND JSON_EXTRACT(`fieldparams`, '$.filter') = 'JComponentHelper::filterText';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-26.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-26.sql
deleted file mode 100644
index 61c645749148f..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-26.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- --------------------------------------------------------
--- The following INSERT statement has been modified to insert
--- this core plugin with locked=1.
--- See https://github.com/joomla/joomla-cms/pull/45821 for details.
---
-INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
-(0, 'plg_task_globalcheckin', 'plugin', 'globalcheckin', 'task', 0, 1, 1, 0, 1, '', '{}', '', 5, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-28.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-28.sql
deleted file mode 100644
index 34c1d727cb1e7..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-28.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-UPDATE `#__guidedtours` SET `extensions` = '["com_content","com_categories"]' WHERE `url` LIKE '%option=com_content%';
-UPDATE `#__guidedtours` SET `extensions` = '["com_content","com_categories"]' WHERE `url` LIKE '%option=com_categories%';
-UPDATE `#__guidedtours` SET `extensions` = '["com_menus"]' WHERE `url` LIKE '%com_menus%';
-UPDATE `#__guidedtours` SET `extensions` = '["com_tags"]' WHERE `url` LIKE '%com_tags%';
-UPDATE `#__guidedtours` SET `extensions` = '["com_banners"]' WHERE `url` LIKE '%com_banners%';
-UPDATE `#__guidedtours` SET `extensions` = '["com_contact"]' WHERE `url` LIKE '%com_contact%';
-UPDATE `#__guidedtours` SET `extensions` = '["com_newsfeeds"]' WHERE `url` LIKE '%com_newsfeeds%';
-UPDATE `#__guidedtours` SET `extensions` = '["com_finder"]' WHERE `url` LIKE '%com_finder%';
-UPDATE `#__guidedtours` SET `extensions` = '["com_users"]' WHERE `url` LIKE '%com_users%';
-
-UPDATE `#__update_sites`
-   SET `location` = 'https://update.joomla.org/language/translationlist_5.xml'
- WHERE `location` = 'https://update.joomla.org/language/translationlist_4.xml';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-29.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-29.sql
deleted file mode 100644
index 85790c1132a04..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-29.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-ALTER TABLE `#__guidedtours` ADD COLUMN `uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL AFTER `title`/** CAN FAIL **/;
-ALTER TABLE `#__guidedtours` ADD INDEX `idx_uid` (`uid`(191)) /** CAN FAIL **/;
-
-UPDATE `#__guidedtours` SET `uid` = 'joomla-guidedtours' WHERE `title` = 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_TITLE';
-UPDATE `#__guidedtours` SET `uid` = 'joomla-guidedtoursteps' WHERE `title` = 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_TITLE';
-UPDATE `#__guidedtours` SET `uid` = 'joomla-articles'  WHERE `title` = 'COM_GUIDEDTOURS_TOUR_ARTICLES_TITLE';
-UPDATE `#__guidedtours` SET `uid` = 'joomla-categories' WHERE `title` = 'COM_GUIDEDTOURS_TOUR_CATEGORIES_TITLE';
-UPDATE `#__guidedtours` SET `uid` = 'joomla-menus' WHERE `title` = 'COM_GUIDEDTOURS_TOUR_MENUS_TITLE';
-UPDATE `#__guidedtours` SET `uid` = 'joomla-tags' WHERE `title` = 'COM_GUIDEDTOURS_TOUR_TAGS_TITLE';
-UPDATE `#__guidedtours` SET `uid` = 'joomla-banners' WHERE `title` = 'COM_GUIDEDTOURS_TOUR_BANNERS_TITLE';
-UPDATE `#__guidedtours` SET `uid` = 'joomla-contacts' WHERE `title` = 'COM_GUIDEDTOURS_TOUR_CONTACTS_TITLE';
-UPDATE `#__guidedtours` SET `uid` = 'joomla-newsfeeds' WHERE `title` = 'COM_GUIDEDTOURS_TOUR_NEWSFEEDS_TITLE';
-UPDATE `#__guidedtours` SET `uid` = 'joomla-smartsearch' WHERE `title` = 'COM_GUIDEDTOURS_TOUR_SMARTSEARCH_TITLE';
-UPDATE `#__guidedtours` SET `uid` = 'joomla-users' WHERE `title` = 'COM_GUIDEDTOURS_TOUR_USERS_TITLE';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-30.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-30.sql
deleted file mode 100644
index 8b144004d1147..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-08-30.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `#__extensions`
-   SET `locked` = 0
- WHERE `type` = 'plugin' AND `element` = 'recaptcha_invisible' AND `folder` = 'captcha';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-02.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-02.sql
deleted file mode 100644
index 220f69cf47de2..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-02.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
-('plg_task_deleteactionlogs', 'plugin', 'deleteactionlogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0),
-('plg_task_privacyconsent', 'plugin', 'privacyconsent', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0),
-('plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0),
-('plg_task_sessiongc', 'plugin', 'sessiongc', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0),
-('plg_task_updatenotification', 'plugin', 'updatenotification', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0);
-
-INSERT INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subject`, `body`, `htmlbody`, `attachments`, `params`) VALUES
-('plg_task_privacyconsent.request.reminder', 'plg_task_privacyconsent', '', 'PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT', 'PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_BODY', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
-('plg_task_updatenotification.mail', 'plg_task_updatenotification', '', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_SUBJECT', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_BODY', '', '', '{"tags":["newversion","curversion","sitename","url","link","releasenews"]}');
-
-DELETE FROM `#__mail_templates` WHERE `template_id` IN ('plg_system_privacyconsent.request.reminder', 'plg_system_updatenotification.mail');
-
-DELETE FROM `#__postinstall_messages` WHERE `condition_file` = 'site://plugins/system/updatenotification/postinstall/updatecachetime.php';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-06.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-06.sql
deleted file mode 100644
index de42fa7b0b92f..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-06.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE `#__scheduler_tasks` SET `title` = 'Delete Action Logs' WHERE `type` = 'delete.actionlogs' AND `title` = 'DeleteActionLogs';
-UPDATE `#__scheduler_tasks` SET `title` = 'Privacy Consent' WHERE `type` = 'privacy.consent' AND `title` = 'PrivacyConsent';
-UPDATE `#__scheduler_tasks` SET `title` = 'Rotate Logs' WHERE `type` = 'rotation.logs' AND `title` = 'RotateLogs';
-UPDATE `#__scheduler_tasks` SET `title` = 'Session GC' WHERE `type` = 'session.gc' AND `title` = 'SessionGC';
-UPDATE `#__scheduler_tasks` SET `title` = 'Update Notification' WHERE `type` = 'update.notification' AND `title` = 'UpdateNotification';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-09.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-09.sql
deleted file mode 100644
index 9d90c87e0dd1a..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-09.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Add com_fields to action logs
-INSERT INTO `#__action_logs_extensions` (`extension`) VALUES ('com_fields');
-
-INSERT INTO `#__action_log_config` (`type_title`, `type_alias`, `id_holder`, `title_holder`, `table_name`, `text_prefix`) VALUES
-('field', 'com_fields.field', 'id', 'title', '#__fields', 'PLG_ACTIONLOG_JOOMLA');
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-11.sql b/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-11.sql
deleted file mode 100644
index 1a7eec216bb13..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-09-11.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE `#__extensions` SET `enabled` = 1 WHERE `type` = 'plugin' AND `element` = 'schedulerunner' AND `folder` = 'system';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2023-11-28.sql b/administrator/components/com_admin/sql/updates/mysql/5.1.0-2023-11-28.sql
deleted file mode 100644
index b29feba9fa8d8..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2023-11-28.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- --------------------------------------------------------
--- The following INSERT statement has been modified to insert
--- this core plugin with locked=1.
--- See https://github.com/joomla/joomla-cms/pull/45821 for details.
---
-INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
-(0, 'plg_schemaorg_article', 'plugin', 'article', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-01-04.sql b/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-01-04.sql
deleted file mode 100644
index 38f38ee1ec202..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-01-04.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__fields_values` MODIFY `value` MEDIUMTEXT;
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-02-10.sql b/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-02-10.sql
deleted file mode 100644
index 946516cde5104..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-02-10.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__guidedtour_steps` ADD COLUMN `params` text NULL /** CAN FAIL **/;
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-02-24.sql b/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-02-24.sql
deleted file mode 100644
index 3716a866f8d64..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-02-24.sql
+++ /dev/null
@@ -1,34 +0,0 @@
---
--- Table structure for table `#__tuf_metadata`
---
-
-CREATE TABLE IF NOT EXISTS `#__tuf_metadata` (
-  `id` int NOT NULL AUTO_INCREMENT,
-  `update_site_id` int DEFAULT 0,
-  `root` text DEFAULT NULL,
-  `targets` text DEFAULT NULL,
-  `snapshot` text DEFAULT NULL,
-  `timestamp` text DEFAULT NULL,
-  `mirrors` text DEFAULT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci COMMENT='Secure TUF Updates';
-
--- --------------------------------------------------------
--- The following INSERT statement has been modified to avoid an SQL error
--- when there is more than 1 update site for the Joomla core.
--- See https://github.com/joomla/joomla-cms/pull/43169 for details.
---
-INSERT INTO `#__tuf_metadata` (`update_site_id`, `root`)
-SELECT ue.`update_site_id`,
-       '{"signed":{"_type":"root","spec_version":"1.0","version":2,"expires":"2025-03-02T11:22:17Z","keys":{"07eb082f367c034a95878687f6648aa76d93652b6ee73e58817053d89af6c44f":{"keytype":"ed25519","scheme":"ed25519","keyid_hash_algorithms":["sha256","sha512"],"keyval":{"public":"9b2af2d9b9727227735253d795bd27ea8f0e294a5f3603e822dc5052b44802b9"}},"1b1b1dd55b2c1c7258714cf1c1ae06f23e4607b28c762d016a9d81c48ffe5669":{"keytype":"ed25519","scheme":"ed25519","keyid_hash_algorithms":["sha256","sha512"],"keyval":{"public":"a18e5ebabc19d5d5984b601a292ece61ba3662ab2d071dc520da5bd4f8948799"}},"2dcaf3d0e552f150792f7c636d45429246dcfa34ac35b46a44f5c87cd17d457e":{"keytype":"ed25519","scheme":"ed25519","keyid_hash_algorithms":["sha256","sha512"],"keyval":{"public":"cb0a7a131961a20edea051d6dc2b091fb650bd399bd8514adb67b3c60db9f8f9"}},"31dd7c7290d664c9b88c0dead2697175293ea7df81b7f24153a37370fd3901c3":{"keytype":"ed25519","scheme":"ed25519","keyid_hash_algorithms":["sha256","sha512"],"keyval":{"public":"589d029a68b470deff1ca16dbf3eea6b5b3fcba0ae7bb52c468abc7fb058b2a2"}},"9e41a9d62d94c6a1c8a304f62c5bd72d84a9f286f27e8327cedeacb09e5156cc":{"keytype":"ed25519","scheme":"ed25519","keyid_hash_algorithms":["sha256","sha512"],"keyval":{"public":"6043c8bacc76ac5c9750f45454dd865c6ca1fc57d69e14cc192cfd420f6a66a9"}}},"roles":{"root":{"keyids":["1b1b1dd55b2c1c7258714cf1c1ae06f23e4607b28c762d016a9d81c48ffe5669","2dcaf3d0e552f150792f7c636d45429246dcfa34ac35b46a44f5c87cd17d457e"],"threshold":1},"snapshot":{"keyids":["07eb082f367c034a95878687f6648aa76d93652b6ee73e58817053d89af6c44f","2dcaf3d0e552f150792f7c636d45429246dcfa34ac35b46a44f5c87cd17d457e"],"threshold":1},"targets":{"keyids":["31dd7c7290d664c9b88c0dead2697175293ea7df81b7f24153a37370fd3901c3"],"threshold":1},"timestamp":{"keyids":["9e41a9d62d94c6a1c8a304f62c5bd72d84a9f286f27e8327cedeacb09e5156cc"],"threshold":1}},"consistent_snapshot":true},"signatures":[{"keyid":"2dcaf3d0e552f150792f7c636d45429246dcfa34ac35b46a44f5c87cd17d457e","sig":"2a225a560ec0837b721d4c5e379fedbd3c7c9079a94e6b31e47e0184c8b95421b6036b4286c5d90f29ab4c468d79a712fdb65e96511394ceb3aa8e2b3983a501"},{"keyid":"1b1b1dd55b2c1c7258714cf1c1ae06f23e4607b28c762d016a9d81c48ffe5669","sig":"8ce0b2a7bdc1e6dcba12081f440510df0a593c072dcf591631c2dd0f456844a7da63be8e8ac31ffbddf42641fde84dc733a336031d182c2163b4c1eaf2117005"}]}'
-  FROM `#__update_sites_extensions` AS ue JOIN `#__extensions` AS e ON (e.`extension_id` = ue.`extension_id`)
- WHERE e.`type`='file' AND e.`element`='joomla';
-
--- --------------------------------------------------------
--- The following UPDATE statement has been modified to avoid an SQL error
--- when there is more than 1 update site for the Joomla core.
--- See https://github.com/joomla/joomla-cms/pull/42988 for details.
---
-UPDATE `#__update_sites`
-   SET `type` = 'tuf', `location` = 'https://update.joomla.org/cms/'
- WHERE `update_site_id` IN (SELECT ue.`update_site_id` FROM `#__update_sites_extensions` AS ue JOIN `#__extensions` AS e ON (e.`extension_id` = ue.`extension_id`) WHERE e.`type`='file' AND e.`element`='joomla');
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-02-25.sql b/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-02-25.sql
deleted file mode 100644
index 2819a1016ef08..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-02-25.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- --------------------------------------------------------
--- The following INSERT statement has been modified to insert
--- this core plugin with locked=1.
--- See https://github.com/joomla/joomla-cms/pull/45821 for details.
---
-INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
-(0, 'plg_schemaorg_custom', 'plugin', 'custom', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-03-08.sql b/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-03-08.sql
deleted file mode 100644
index 458403a3454a4..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-03-08.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-INSERT IGNORE INTO `#__guidedtour_steps` (`tour_id`, `title`, `published`, `description`, `ordering`, `position`, `target`, `type`, `interactive_type`, `url`, `created`, `created_by`, `modified`, `modified_by`, `language`) VALUES
-(0, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_MENUS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_MENUS_DESCRIPTION', 1, 'right', '#sidebarmenu', 0, 1, '', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*'),
-(0, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_QUICKACCESS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_QUICKACCESS_DESCRIPTION', 2, 'center', '', 0, 1, '', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*'),
-(0, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_NOTIFICATIONS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_NOTIFICATIONS_DESCRIPTION', 3, 'left', '.quickicons-for-update_quickicon .card', 0, 1, '', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*'),
-(0, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_TOPBAR_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_TOPBAR_DESCRIPTION', 4, 'bottom', '#header', 0, 1, '', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*'),
-(0, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_FINALWORDS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_FINALWORDS_DESCRIPTION', 5, 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, '*');
-
-ALTER TABLE `#__guidedtours` ADD COLUMN `autostart` int NOT NULL DEFAULT 0 /** CAN FAIL **/;
-
-INSERT IGNORE INTO `#__guidedtours` (`title`, `uid`, `description`, `ordering`, `extensions`, `url`, `created`, `created_by`, `modified`, `modified_by`, `published`, `language`, `access`, `autostart`) VALUES
-('COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_TITLE', 'joomla-welcome', 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_DESCRIPTION', 1, '["com_cpanel"]', 'administrator/index.php', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, 1, '*', 1, 0);
-
-UPDATE `#__guidedtour_steps` SET `tour_id` = LAST_INSERT_ID() WHERE `tour_id`=0;
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-03-28.sql b/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-03-28.sql
deleted file mode 100644
index e76716010f9fd..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.1.0-2024-03-28.sql
+++ /dev/null
@@ -1,12 +0,0 @@
---
--- Add post-installation message about Brotli compression in .htaccess
---
--- This statement had to be modified to prevent duplicate postinstall messages
--- when updating from 4.4.
--- See https://github.com/joomla/joomla-cms/pull/43182 for details.
---
-INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
-SELECT `extension_id`, 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_DESCRIPTION', '', 'com_admin', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccessbrotli.php', 'admin_postinstall_htaccessbrotli_condition', '5.1.0', 1
-  FROM `#__extensions`
- WHERE `name` = 'files_joomla'
-   AND (SELECT COUNT(a.`postinstall_message_id`) FROM `#__postinstall_messages` a WHERE a.`title_key` = 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE') = 0;
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.1.1-2024-04-18.sql b/administrator/components/com_admin/sql/updates/mysql/5.1.1-2024-04-18.sql
deleted file mode 100644
index 8e59290ac5607..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.1.1-2024-04-18.sql
+++ /dev/null
@@ -1,10 +0,0 @@
---
--- Add a default value for the colorScheme in the Atum template on Joomla update
--- only when a value is not already set.
--- New installs will have the default value set in the installation sql.
---
-
-UPDATE `#__template_styles`
-SET `params` = JSON_SET(`params`, '$.colorScheme', 'os')
-WHERE `template` = 'atum'
-AND JSON_EXTRACT(`params`, '$.colorScheme') IS NULL;
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-07-02.sql b/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-07-02.sql
deleted file mode 100644
index 23e79da2aad4d..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-07-02.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Add mod_articles module
-INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`) VALUES
-(0, 'mod_articles', 'module', 'mod_articles', '', 0, 1, 0, 0, 1, '', '', '');
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-07-19.sql b/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-07-19.sql
deleted file mode 100644
index 284938a777e2d..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-07-19.sql
+++ /dev/null
@@ -1,7 +0,0 @@
---
--- Add the Guided Tours selectable option to the User Action Logs
---
-INSERT INTO `#__action_logs_extensions` (`extension`) VALUES ('com_guidedtours');
-
-INSERT INTO `#__action_log_config` (`type_title`, `type_alias`, `id_holder`, `title_holder`, `table_name`, `text_prefix`) VALUES
-('guidedtour', 'com_guidedtours.state', 'id', 'title', '#__guidedtours', 'PLG_ACTIONLOG_JOOMLA');
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-08-22.sql b/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-08-22.sql
deleted file mode 100644
index 0876fa5024ede..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-08-22.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-INSERT INTO `#__guidedtours` (`title`, `description`, `extensions`, `url`, `published`, `language`, `note`, `access`, `uid`, `autostart`, `created`, `created_by`, `modified`, `modified_by`) VALUES
-('COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_DESCRIPTION', '["com_cpanel"]', 'administrator/index.php', 1, '*', '', 1, 'joomla-whatsnew-5-2', 1, CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0);
-INSERT INTO `#__guidedtour_steps` (`title`, `description`, `position`, `target`, `type`, `interactive_type`, `url`, `published`, `language`, `note`, `params`, `tour_id`, `created`, `created_by`, `modified`, `modified_by`)
-SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_STEP_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_STEP_0_DESCRIPTION', 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', 1, '*', '', '{"required":1,"requiredvalue":""}', MAX(`id`), CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0
-  FROM `#__guidedtours`
- WHERE `uid` = 'joomla-whatsnew-5-2';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-09-17.sql b/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-09-17.sql
deleted file mode 100644
index 26b21f399c57a..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-09-17.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-UPDATE `#__guidedtour_steps`
-SET `ordering` = `ordering` + 1
-WHERE `title` IN ('COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_SAVECLOSE_TITLE', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_CONGRATULATIONS_TITLE');
-
-INSERT INTO `#__guidedtour_steps` (`title`, `description`, `position`, `target`, `type`, `interactive_type`, `url`, `published`, `language`, `note`, `tour_id`, `created`, `created_by`, `modified`, `modified_by`, `ordering`)
-SELECT 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_AUTOSTART_TITLE', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_AUTOSTART_DESCRIPTION', 'bottom', '#jform_autostart0', 2, 3, '', 1, '*', '', `tour_id`, CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, `ordering` + 1
-  FROM `#__guidedtour_steps`
- WHERE `title` = 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_COMPONENT_TITLE';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.2.2-2024-09-24.sql b/administrator/components/com_admin/sql/updates/mysql/5.2.2-2024-09-24.sql
deleted file mode 100644
index 1592aba38893f..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.2.2-2024-09-24.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-UPDATE `#__assets` SET `title` = 'PUBLISH' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Publish';
-UPDATE `#__assets` SET `title` = 'UNPUBLISH' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Unpublish';
-UPDATE `#__assets` SET `title` = 'TRASH' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Trash';
-UPDATE `#__assets` SET `title` = 'ARCHIVE' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Archive';
-UPDATE `#__assets` SET `title` = 'FEATURE' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Feature';
-UPDATE `#__assets` SET `title` = 'UNFEATURE' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Unfeature';
-UPDATE `#__assets` SET `title` = 'PUBLISH_AND_FEATURE' WHERE `name` LIKE 'com_content.transition.%' AND `title` = 'Publish & Feature';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.2.3-2025-01-09.sql b/administrator/components/com_admin/sql/updates/mysql/5.2.3-2025-01-09.sql
deleted file mode 100644
index 8620500fb8c00..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.2.3-2025-01-09.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE `#__mail_templates`
-SET `params` = '{"tags":["messages","message","date","extension","username"]}'
-WHERE `template_id` = 'com_actionlogs.notification';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-10-13.sql b/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-10-13.sql
deleted file mode 100644
index 6db2da7c57115..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-10-13.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__fields` MODIFY `fieldparams` MEDIUMTEXT NOT NULL;
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-10-26.sql b/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-10-26.sql
deleted file mode 100644
index b2e6c94cd0fcf..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-10-26.sql
+++ /dev/null
@@ -1,20 +0,0 @@
---
--- Table structure for table `#__scheduler_logs`
---
-
-CREATE TABLE IF NOT EXISTS `#__scheduler_logs` (
-  `id` int unsigned NOT NULL AUTO_INCREMENT,
-  `taskname` varchar(255) NOT NULL DEFAULT '',
-  `tasktype` varchar(128) NOT NULL COMMENT 'unique identifier for job defined by plugin',
-  `duration` DECIMAL(5,3) NOT NULL,
-  `jobid` int UNSIGNED NOT NULL,
-  `taskid` int UNSIGNED NOT NULL,
-  `exitcode` int NOT NULL,
-  `lastdate` datetime COMMENT 'Timestamp of last run',
-  `nextdate` datetime COMMENT 'Timestamp of next (planned) run, referred for execution on trigger',
-  PRIMARY KEY (id),
-  KEY `idx_taskname` (`taskname`),
-  KEY `idx_tasktype` (`tasktype`),
-  KEY `idx_lastdate` (`lastdate`),
-  KEY `idx_nextdate` (`nextdate`)
-) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 DEFAULT COLLATE = utf8mb4_unicode_ci;
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-12-09.sql b/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-12-09.sql
deleted file mode 100644
index ba1c2228248ed..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-12-09.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO `#__action_log_config` (`type_title`, `type_alias`, `id_holder`, `title_holder`, `table_name`, `text_prefix`) VALUES
-('contact', 'com_contact.form', 'id', 'name', '#__contact_details', 'PLG_ACTIONLOG_JOOMLA');
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-12-19.sql b/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-12-19.sql
deleted file mode 100644
index ff569052be73d..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-12-19.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- --------------------------------------------------------
--- The following statement which was introduced with 5.3.0-alpha3
--- has been disabled as it was reverted with 5.3.0-beta1.
--- See https://github.com/joomla/joomla-cms/pull/44845 for details.
---
--- ALTER TABLE `#__action_logs_users` ADD COLUMN `exclude_self` tinyint NOT NULL DEFAULT 0;
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-02-09.sql b/administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-02-09.sql
deleted file mode 100644
index 55ae2550444fe..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-02-09.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `#__action_logs_users` DROP COLUMN `exclude_self` /** CAN FAIL **/;
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-02-22.sql b/administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-02-22.sql
deleted file mode 100644
index 426e088ca8979..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-02-22.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Add plg_extension_joomlaupdate plugin
-INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
-(0, 'plg_extension_joomlaupdate', 'plugin', 'joomlaupdate', 'extension', 0, 1, 1, 0, 1, '', '', '', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-03-14.sql b/administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-03-14.sql
deleted file mode 100644
index 2eedbb010e52d..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-03-14.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- disable autostart for the previous tour
-UPDATE `#__guidedtours` SET `autostart` = 0 WHERE `uid` = 'joomla-whatsnew-5-2';
-
-INSERT INTO `#__guidedtours` (`title`, `description`, `extensions`, `url`, `published`, `language`, `note`, `access`, `uid`, `autostart`, `created`, `created_by`, `modified`, `modified_by`) VALUES
-('COM_GUIDEDTOURS_TOUR_WHATSNEW_5_3_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_3_DESCRIPTION', '["com_cpanel"]', 'administrator/index.php', 1, '*', '', 1, 'joomla-whatsnew-5-3', 1, CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0);
-
-INSERT INTO `#__guidedtour_steps` (`title`, `description`, `position`, `target`, `type`, `interactive_type`, `url`, `published`, `language`, `note`, `params`, `tour_id`, `created`, `created_by`, `modified`, `modified_by`)
-SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_3_STEP_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_3_STEP_0_DESCRIPTION', 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', 1, '*', '', '"{\"required\":1,\"requiredvalue\":\"\"}"', MAX(`id`), CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0
-  FROM `#__guidedtours`
- WHERE `uid` = 'joomla-whatsnew-5-3';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.3.4-2025-09-19.sql b/administrator/components/com_admin/sql/updates/mysql/5.3.4-2025-09-19.sql
deleted file mode 100644
index cc18de1dfaf17..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.3.4-2025-09-19.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-UPDATE `#__content_types`
-SET `field_mappings` = JSON_SET(`field_mappings`, '$.common.core_created_user_id', 'created_by')
-WHERE `type_alias` = 'com_content.article';
-
-UPDATE `#__content_types`
-SET `field_mappings` = JSON_SET(`field_mappings`, '$.common.core_created_by_alias', 'created_by_alias')
-WHERE `type_alias` = 'com_content.article';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.4.0-2025-04-23.sql b/administrator/components/com_admin/sql/updates/mysql/5.4.0-2025-04-23.sql
deleted file mode 100644
index edad0d365e845..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.4.0-2025-04-23.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`)
-SELECT 0, 'plg_behaviour_compat6', 'plugin', 'compat6', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","legacy_classes":"1"}', '', -1, 0
-WHERE NOT EXISTS (SELECT * FROM `#__extensions` e WHERE e.`type` = 'plugin' AND e.`element` = 'compat6' AND e.`folder` = 'behaviour' AND e.`client_id` = 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.4.0-2025-05-10.sql b/administrator/components/com_admin/sql/updates/mysql/5.4.0-2025-05-10.sql
deleted file mode 100644
index bbf6f3453946e..0000000000000
--- a/administrator/components/com_admin/sql/updates/mysql/5.4.0-2025-05-10.sql
+++ /dev/null
@@ -1,27 +0,0 @@
-INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`)
-SELECT 0, 'plg_quickicon_autoupdate', 'plugin', 'autoupdate', 'quickicon', 0, 1, 1, 0, 1, '', '', '', -1, 0
-WHERE NOT EXISTS (SELECT * FROM `#__extensions` e WHERE e.`type` = 'plugin' AND e.`element` = 'autoupdate' AND e.`folder` = 'quickicon' AND e.`client_id` = 0);
-
-INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`)
-SELECT 0, 'plg_webservices_joomlaupdate', 'plugin', 'joomlaupdate', 'webservices', 0, 1, 1, 0, 1, '', '', '', -1, 0
-WHERE NOT EXISTS (SELECT * FROM `#__extensions` e WHERE e.`type` = 'plugin' AND e.`element` = 'joomlaupdate' AND e.`folder` = 'webservices' AND e.`client_id` = 0);
-
-INSERT IGNORE INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subject`, `body`, `htmlbody`, `attachments`, `params`) VALUES
-('com_joomlaupdate.update.success', 'com_joomlaupdate', '', 'COM_JOOMLAUPDATE_UPDATE_SUCCESS_MAIL_SUBJECT', 'COM_JOOMLAUPDATE_UPDATE_SUCCESS_MAIL_BODY', '', '', '{"tags":["newversion","oldversion","sitename","url"]}'),
-('com_joomlaupdate.update.failed', 'com_joomlaupdate', '', 'COM_JOOMLAUPDATE_UPDATE_FAILED_MAIL_SUBJECT', 'COM_JOOMLAUPDATE_UPDATE_FAILED_MAIL_BODY', '', '', '{"tags":["newversion","oldversion","sitename","url"]}');
-
--- add post-installation message for automated updates
-INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
-SELECT `extension_id`, 'COM_JOOMLAUPDATE_POSTINSTALL_MSG_AUTOMATED_UPDATES_TITLE', 'COM_JOOMLAUPDATE_POSTINSTALL_MSG_AUTOMATED_UPDATES_DESCRIPTION', 'COM_JOOMLAUPDATE_POSTINSTALL_MSG_AUTOMATED_UPDATES_ACTION', 'com_joomlaupdate', 1, 'action', 'admin://components/com_joomlaupdate/postinstall/autoupdate.php', 'com_joomlaupdate_postinstall_autoupdate_action', 'admin://components/com_joomlaupdate/postinstall/autoupdate.php', 'com_joomlaupdate_postinstall_autoupdate_condition', '5.4.0', 1 FROM `#__extensions` WHERE `name` = 'files_joomla';
-
--- disable autostart for the previous tour
-UPDATE `#__guidedtours` SET `autostart` = 0 WHERE `uid` = 'joomla-whatsnew-5-3';
-
-INSERT INTO `#__guidedtours` (`title`, `description`, `extensions`, `url`, `published`, `language`, `note`, `access`, `uid`, `autostart`, `created`, `created_by`, `modified`, `modified_by`)
-SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_4_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_4_DESCRIPTION', '["com_cpanel"]', 'administrator/index.php', 1, '*', '', 1, 'joomla-whatsnew-5-4', 1, CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0
-WHERE NOT EXISTS (SELECT * FROM `#__guidedtours` g WHERE g.`uid` = 'joomla-whatsnew-5-4');
-
-INSERT INTO `#__guidedtour_steps` (`title`, `description`, `position`, `target`, `type`, `interactive_type`, `url`, `published`, `language`, `note`, `params`, `tour_id`, `created`, `created_by`, `modified`, `modified_by`)
-SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_4_STEP_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_4_STEP_0_DESCRIPTION', 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', 1, '*', '', '"{\"required\":1,\"requiredvalue\":\"\"}"', MAX(`id`), CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0
-FROM `#__guidedtours`
-WHERE `uid` = 'joomla-whatsnew-5-4';
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.0.0-2024-08-11.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2024-08-11.sql
new file mode 100644
index 0000000000000..fa9269cf76003
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2024-08-11.sql
@@ -0,0 +1,6 @@
+-- Update link to featured
+
+UPDATE `#__menu`
+SET `link` = 'index.php?option=com_content&view=articles&filter[featured]=1'
+WHERE `link` = 'index.php?option=com_content&view=featured'
+AND `client_id` = 1;
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-03-25.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-03-25.sql
new file mode 100644
index 0000000000000..16ac7a6efe7f2
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-03-25.sql
@@ -0,0 +1,2 @@
+INSERT IGNORE INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subject`, `body`, `htmlbody`, `attachments`, `params`) VALUES
+('plg_content_joomla.newarticle', 'plg_content_joomla', '', 'PLG_CONTENT_JOOMLA_NEW_ARTICLE_SUBJECT', 'PLG_CONTENT_JOOMLA_NEW_ARTICLE_BODY', '', '', '{"tags":["sitename","name","email","title","url"]}');
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-05-20.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-05-20.sql
new file mode 100644
index 0000000000000..64bf420d9bcd1
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-05-20.sql
@@ -0,0 +1,3 @@
+UPDATE `#__extensions`
+   SET `params` = ''
+ WHERE `type` = 'plugin' AND `element` = 'stats' AND `folder` = 'system';
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.4.0-2025-08-02.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-08-02.sql
similarity index 100%
rename from administrator/components/com_admin/sql/updates/mysql/5.4.0-2025-08-02.sql
rename to administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-08-02.sql
diff --git a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-29.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-08-16.sql
similarity index 53%
rename from administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-29.sql
rename to administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-08-16.sql
index ba16b0157b838..893721d854feb 100644
--- a/administrator/components/com_admin/sql/updates/mysql/5.0.0-2023-07-29.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-08-16.sql
@@ -1,3 +1,3 @@
 INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`)
-SELECT 0, 'plg_behaviour_compat', 'plugin', 'compat', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","es5_assets":"1"}', '', -1, 0
-WHERE NOT EXISTS (SELECT * FROM `#__extensions` e WHERE e.`type` = 'plugin' AND e.`element` = 'compat' AND e.`folder` = 'behaviour' AND e.`client_id` = 0);
+SELECT 0, 'plg_fields_note', 'plugin', 'note', 'fields', 0, 1, 1, 0, 1, '', '{"class":"alert alert-info","heading":"h4"}', '', -1, 0
+WHERE NOT EXISTS (SELECT * FROM `#__extensions` e WHERE e.`type` = 'plugin' AND e.`element` = 'note' AND e.`folder` = 'fields' AND e.`client_id` = 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-08-17.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-08-17.sql
new file mode 100644
index 0000000000000..d3f9597ca175a
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-08-17.sql
@@ -0,0 +1,3 @@
+INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`)
+SELECT 0, 'plg_fields_number', 'plugin', 'number', 'fields', 0, 1, 1, 0, 1, '', '{"min":"1.0","max":"100.0","step":"0.1","currency":"0","position":"0","decimals":"2"}', '', -1, 0
+WHERE NOT EXISTS (SELECT * FROM `#__extensions` e WHERE e.`type` = 'plugin' AND e.`element` = 'number' AND e.`folder` = 'fields' AND e.`client_id` = 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-05.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-05.sql
new file mode 100644
index 0000000000000..f62641b6b130a
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-05.sql
@@ -0,0 +1,7 @@
+INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`)
+SELECT 0, 'cassiopeia_extended', 'template', 'cassiopeia_extended', '', 0, 1, 1, 0, 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","systemFontBody":"","systemFontHeading":"","colorName":"colors_standard","fluidContainer":"0","stickyHeader":"0","backTop":"0","colorSettings":"0","headerbg":"rgb(193, 205, 207)","headercolor":"rgb(23, 23, 23)","bodybg":"rgb(254, 254, 254)","bodycolor":"rgb(23, 23, 23)","linkcolor":"rgb(29, 121, 137)","linkcolorh":"rgb(14, 59, 67)","btnbg":"rgb(206, 60, 55)","btnbgh":"rgb(131, 35, 32)","btncolor":"rgb(254, 254, 254)","btncolorh":"rgb(254, 254, 254)","footerbg":"rgb(29, 121, 137)","footercolor":"rgb(254, 254, 254)","fontSettings":"0","bodysize":"1","h1size":"2","h2size":"1.7","h3size":"1.5"}', '', 0, 0
+WHERE NOT EXISTS (SELECT * FROM `#__extensions` e WHERE e.`type` = 'template' AND e.`element` = 'cassiopeia_extended' AND e.`client_id` = 0);
+
+INSERT INTO `#__template_styles` (`template`, `client_id`, `home`, `title`, `inheritable`, `parent`, `params`)
+SELECT 'cassiopeia_extended', 0, '0', 'Cassiopeia Extended - Default', 0, 'cassiopeia', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","systemFontBody":"","systemFontHeading":"","colorName":"colors_standard","fluidContainer":"0","stickyHeader":"0","backTop":"0","colorSettings":"0","headerbg":"rgb(193, 205, 207)","headercolor":"rgb(23, 23, 23)","bodybg":"rgb(254, 254, 254)","bodycolor":"rgb(23, 23, 23)","linkcolor":"rgb(29, 121, 137)","linkcolorh":"rgb(14, 59, 67)","btnbg":"rgb(206, 60, 55)","btnbgh":"rgb(131, 35, 32)","btncolor":"rgb(254, 254, 254)","btncolorh":"rgb(254, 254, 254)","footerbg":"rgb(29, 121, 137)","footercolor":"rgb(254, 254, 254)","fontSettings":"0","bodysize":"1","h1size":"2","h2size":"1.7","h3size":"1.5"}'
+WHERE NOT EXISTS (SELECT * FROM `#__template_styles` t WHERE t.`template` = 'cassiopeia_extended' AND t.`client_id` = 0 AND t.`inheritable` = 0 AND t.`parent` = 'cassiopeia');
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-16.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-16.sql
new file mode 100644
index 0000000000000..21c81bd3d6e09
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-16.sql
@@ -0,0 +1,6 @@
+-- uninstall previous what's new tours
+DELETE FROM `#__guidedtour_steps`
+ WHERE `tour_id` IN (SELECT `id` FROM `#__guidedtours` WHERE `uid` IN ('joomla-whatsnew-5-2', 'joomla-whatsnew-5-3', 'joomla-whatsnew-5-4'));
+
+DELETE FROM `#__guidedtours`
+ WHERE `uid` IN ('joomla-whatsnew-5-2', 'joomla-whatsnew-5-3', 'joomla-whatsnew-5-4');
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-17.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-17.sql
new file mode 100644
index 0000000000000..a7ca699f6695d
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-17.sql
@@ -0,0 +1,13 @@
+INSERT INTO `#__guidedtours` (`title`, `description`, `extensions`, `url`, `published`, `language`, `note`, `access`, `uid`, `autostart`, `created`, `created_by`, `modified`, `modified_by`)
+SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_DESCRIPTION', '["com_cpanel"]', 'administrator/index.php', 1, '*', '', 1, 'joomla-whatsnew-6-0', 1, CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0
+WHERE NOT EXISTS (SELECT * FROM `#__guidedtours` g WHERE g.`uid` = 'joomla-whatsnew-6-0');
+
+INSERT INTO `#__guidedtour_steps` (`title`, `description`, `position`, `target`, `type`, `interactive_type`, `url`, `published`, `language`, `note`, `params`, `created`, `created_by`, `modified`, `modified_by`, `tour_id`)
+SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_STEP_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_STEP_0_DESCRIPTION', 'center', '', 0, 1, '', 1, '*', '', '{"required":1,"requiredvalue":""}', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, MAX(`id`)
+  FROM `#__guidedtours`
+ WHERE `uid` = 'joomla-whatsnew-6-0';
+
+INSERT INTO `#__guidedtour_steps` (`title`, `description`, `position`, `target`, `type`, `interactive_type`, `url`, `published`, `language`, `note`, `params`, `created`, `created_by`, `modified`, `modified_by`, `tour_id`)
+SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_STEP_1_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_STEP_1_DESCRIPTION', 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', 1, '*', '', '"{\"required\":1,\"requiredvalue\":\"\"}"', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, MAX(`id`)
+  FROM `#__guidedtours`
+ WHERE `uid` = 'joomla-whatsnew-6-0';
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-23.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-23.sql
new file mode 100644
index 0000000000000..6e81551f3530f
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-23.sql
@@ -0,0 +1,3 @@
+UPDATE `#__update_sites`
+   SET `location` = 'https://update.joomla.org/language/translationlist_6.xml'
+ WHERE `location` = 'https://update.joomla.org/language/translationlist_5.xml';
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-26.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-26.sql
new file mode 100644
index 0000000000000..9ab43e38ab2b2
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-09-26.sql
@@ -0,0 +1,32 @@
+-- Update content types for lookup tags
+
+UPDATE `#__content_types`
+SET `content_history_options` = JSON_ARRAY_APPEND(
+	`content_history_options`,
+	'$.displayLookup',
+	JSON_OBJECT(
+		'sourceColumn', 'tags',
+		'targetTable', '#__tags',
+		'targetColumn', 'id',
+		'displayColumn', 'title'
+		)
+	)
+WHERE `type_alias` IN (
+		 'com_content.article',
+		 'com_contact.contact',
+		 'com_newsfeeds.newsfeed',
+		 'com_content.category',
+		 'com_contact.category',
+		 'com_newsfeeds.category',
+		 'com_banners.category',
+		 'com_users.category'
+	)
+AND NOT JSON_CONTAINS(
+	JSON_EXTRACT(`content_history_options`, '$.displayLookup'),
+	JSON_OBJECT(
+		'sourceColumn', 'tags',
+		'targetTable', '#__tags',
+		'targetColumn', 'id',
+		'displayColumn', 'title'
+		)
+	);
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-10-11.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-10-11.sql
new file mode 100644
index 0000000000000..18fbe9aaa21a6
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.0.0-2025-10-11.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `#__history`
+    ADD COLUMN `is_current` TINYINT NOT NULL DEFAULT 0 /** CAN FAIL **/;
+ALTER TABLE `#__history`
+    ADD COLUMN `is_legacy` TINYINT NOT NULL DEFAULT 0 /** CAN FAIL **/;
+UPDATE `#__history` SET `is_legacy` = 1;
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.0.1-2025-10-29.sql b/administrator/components/com_admin/sql/updates/mysql/6.0.1-2025-10-29.sql
new file mode 100644
index 0000000000000..677a4624912f5
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.0.1-2025-10-29.sql
@@ -0,0 +1,14 @@
+UPDATE `#__menu`
+SET `params` = JSON_SET(`params`,
+    JSON_UNQUOTE(JSON_SEARCH(`params`, 'one', ' ', NULL, '$.featured_categories[*]')),
+    ''
+    )
+WHERE JSON_VALID(`params`) = 1
+    AND JSON_SEARCH(`params`, 'one', ' ', NULL, '$.featured_categories[*]') IS NOT NULL
+    AND `type` = 'component'
+    AND `link` = 'index.php?option=com_content&view=featured';
+
+UPDATE `#__menu`
+SET `link` = REPLACE(`link`, '&catid[0]= ', '&catid[0]=')
+WHERE `type` = 'component'
+    AND `link` LIKE 'index.php?option=com_content&view=archive&catid[0]= %';
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.1.0-2025-10-30.sql b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2025-10-30.sql
new file mode 100644
index 0000000000000..34c0bbce1704c
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2025-10-30.sql
@@ -0,0 +1,8 @@
+--
+-- Add a template tag for ip_address on Joomla update.
+-- New installs will have the default value set in the installation support sql.
+--
+
+UPDATE `#__mail_templates`
+SET `params` = '{"tags":["messages","message","date","extension","username","ip_address"]}'
+WHERE `template_id` = 'com_actionlogs.notification';
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.1.0-2025-11-29.sql b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2025-11-29.sql
new file mode 100644
index 0000000000000..45073758a6543
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2025-11-29.sql
@@ -0,0 +1,3 @@
+INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`)
+SELECT 'plg_captcha_powcaptcha', 'plugin', 'powcaptcha', 'captcha', 0, 1, 1, 0, 1, '', '{}', '', 0, 0
+WHERE NOT EXISTS (SELECT * FROM `#__extensions` e WHERE e.`type` = 'plugin' AND e.`element` = 'powcaptcha' AND e.`folder` = 'captcha' AND e.`client_id` = 0);
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-01-29.sql b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-01-29.sql
new file mode 100644
index 0000000000000..a6d0c2bcd6ff4
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-01-29.sql
@@ -0,0 +1,7 @@
+-- --------------------------------------------------------
+-- The following statement which was introduced with 6.1.0-beta1
+-- has been disabled as it was replaced in 6.1.0-beta3 with
+-- a new statement in file "6.1.0-2026-03-10.sql".
+-- See https://github.com/joomla/joomla-cms/pull/47361 for details.
+--
+-- INSERT INTO `#__content_types` (`type_id`, `type_title`, `type_alias`, `table`, `rules`, `field_mappings`, `router`, `content_history_options`) VALUES (14, 'Module', 'com_modules.module', '{"special":{"dbtable":"#__modules","key":"id","type":"Module","prefix":"Joomla\\\\CMS\\\\Table\\\\"}}', '', '{}', '', '{"formFile":"administrator\\/components\\/com_modules\\/forms\\/module.xml", "hideFields":["checked_out", "checked_out_time", "publish_up", "publish_down"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"checked_out", "targetTable":"#__users", "targetColumn":"id", "displayColumn":"name"}]}');
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-02-06.sql b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-02-06.sql
new file mode 100644
index 0000000000000..3d262cb076b42
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-02-06.sql
@@ -0,0 +1,5 @@
+--
+-- Add position column to workflow stages table
+--
+
+ALTER TABLE `#__workflow_stages` ADD COLUMN `position` text NULL AFTER `default` /** CAN FAIL **/;
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-03-07.sql b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-03-07.sql
new file mode 100644
index 0000000000000..39da8437bb774
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-03-07.sql
@@ -0,0 +1,15 @@
+UPDATE `#__extensions`
+   SET `params` = JSON_REPLACE(`params`, '$.html_height' , '550px')
+ WHERE `type` = 'plugin'
+   AND `folder` = 'editors'
+   AND `element` = 'tinymce'
+   AND `params` <> ''
+   AND JSON_EXTRACT(`params`, '$.html_height') = '550';
+
+UPDATE `#__extensions`
+   SET `params` = JSON_REPLACE(`params`, '$.html_width' , '100%')
+ WHERE `type` = 'plugin'
+   AND `folder` = 'editors'
+   AND `element` = 'tinymce'
+   AND `params` <> ''
+   AND JSON_EXTRACT(`params`, '$.html_width') = '750';
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-03-10.sql b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-03-10.sql
new file mode 100644
index 0000000000000..491171e27e291
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-03-10.sql
@@ -0,0 +1,13 @@
+-- --------------------------------------------------------
+-- The following statement replaces the statement which has been disabled
+-- in file "6.1.0-2026-01-29.sql" with 6.1.0-beta3.
+-- See https://github.com/joomla/joomla-cms/pull/47361 for details.
+--
+INSERT INTO `#__content_types` (`type_title`, `type_alias`, `table`, `rules`, `field_mappings`, `router`, `content_history_options`)
+SELECT 'Module', 'com_modules.module', '{"special":{"dbtable":"#__modules","key":"id","type":"Module","prefix":"Joomla\\\\CMS\\\\Table\\\\"}}', '', '{}', ''
+     , '{"formFile":"administrator\\/components\\/com_modules\\/forms\\/module.xml", "hideFields":["checked_out", "checked_out_time", "publish_up", "publish_down"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"checked_out", "targetTable":"#__users", "targetColumn":"id", "displayColumn":"name"}]}'
+WHERE NOT EXISTS (
+  SELECT * FROM `#__content_types` c
+   WHERE c.`type_title` = 'Module' AND c.`type_alias` = 'com_modules.module'
+     AND c.`table` = '{"special":{"dbtable":"#__modules","key":"id","type":"Module","prefix":"Joomla\\\\CMS\\\\Table\\\\"}}'
+);
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-03-13.sql b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-03-13.sql
new file mode 100644
index 0000000000000..66538a79b3bd8
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.1.0-2026-03-13.sql
@@ -0,0 +1,11 @@
+-- disable autostart for the previous tour
+UPDATE `#__guidedtours` SET `autostart` = 0 WHERE `uid` = 'joomla-whatsnew-6-0';
+
+INSERT INTO `#__guidedtours` (`title`, `description`, `extensions`, `url`, `published`, `language`, `note`, `access`, `uid`, `autostart`, `created`, `created_by`, `modified`, `modified_by`)
+SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_1_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_1_DESCRIPTION', '["com_cpanel"]', 'administrator/index.php', 1, '*', '', 1, 'joomla-whatsnew-6-1', 1, CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0
+ WHERE NOT EXISTS (SELECT * FROM `#__guidedtours` g WHERE g.`uid` = 'joomla-whatsnew-6-1');
+
+INSERT INTO `#__guidedtour_steps` (`title`, `description`, `position`, `target`, `type`, `interactive_type`, `url`, `published`, `language`, `note`, `params`, `created`, `created_by`, `modified`, `modified_by`, `tour_id`)
+SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_1_STEP_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_1_STEP_0_DESCRIPTION', 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', 1, '*', '', '{"required":1,"requiredvalue":""}', CURRENT_TIMESTAMP(), 0, CURRENT_TIMESTAMP(), 0, MAX(`id`)
+  FROM `#__guidedtours`
+ WHERE `uid` = 'joomla-whatsnew-6-1';
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.2.0-2026-07-21.sql b/administrator/components/com_admin/sql/updates/mysql/6.2.0-2026-07-21.sql
new file mode 100644
index 0000000000000..0f3ee94db4d88
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.2.0-2026-07-21.sql
@@ -0,0 +1,5 @@
+--
+-- Add security column to updates table
+--
+
+ALTER TABLE `#__updates` ADD COLUMN `security` TINYINT NULL DEFAULT NULL AFTER `extra_query` /** CAN FAIL **/;
diff --git a/administrator/components/com_admin/sql/updates/mysql/6.2.0-2026-08-05.sql b/administrator/components/com_admin/sql/updates/mysql/6.2.0-2026-08-05.sql
new file mode 100644
index 0000000000000..d60598ce27279
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/6.2.0-2026-08-05.sql
@@ -0,0 +1,9 @@
+--
+-- Add show_subcat_image param to com_content
+--
+
+UPDATE `#__extensions`
+SET `params` = JSON_SET(`params`, '$.show_subcat_image', '0')
+WHERE `element` = 'com_content'
+  AND `type` = 'component'
+  AND JSON_EXTRACT(`params`, '$.show_subcat_image') IS NULL;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-03-11.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-03-11.sql
deleted file mode 100644
index b214d01a96e05..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-03-11.sql
+++ /dev/null
@@ -1 +0,0 @@
-DROP TABLE IF EXISTS "#__utf8_conversion";
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-03-17.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-03-17.sql
deleted file mode 100644
index c3bb4daede595..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-03-17.sql
+++ /dev/null
@@ -1 +0,0 @@
-DELETE FROM "#__scheduler_tasks" WHERE "type" = 'demoTask_r1.sleep';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-12.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-12.sql
deleted file mode 100644
index 0c83e0d5360fd..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-12.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE "#__menu_types" ADD COLUMN "ordering" int NOT NULL DEFAULT 0 /** CAN FAIL **/;
-UPDATE "#__menu_types" SET "ordering" = "id" WHERE "client_id" = 0;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-25.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-25.sql
deleted file mode 100644
index 851076bf0110d..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-25.sql
+++ /dev/null
@@ -1,28 +0,0 @@
---
--- Table structure for table "#__schemaorg"
---
-
-CREATE TABLE IF NOT EXISTS "#__schemaorg" (
-  "id" serial NOT NULL,
-  "itemId" bigint,
-  "context" varchar(100),
-  "schemaType" varchar(100),
-  "schema" text,
-  PRIMARY KEY ("id")
-);
-
--- Add plugins to "#__extensions"
--- --------------------------------------------------------
--- The following INSERT statement has been modified to insert
--- core plugins with locked=1.
--- See https://github.com/joomla/joomla-cms/pull/45821 for details.
---
-INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
-(0, 'plg_schemaorg_blogposting', 'plugin', 'blogposting', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
-(0, 'plg_schemaorg_book', 'plugin', 'book', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
-(0, 'plg_schemaorg_event', 'plugin', 'event', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
-(0, 'plg_schemaorg_organization', 'plugin', 'organization', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
-(0, 'plg_schemaorg_person', 'plugin', 'person', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 5, 0),
-(0, 'plg_schemaorg_recipe', 'plugin', 'recipe', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 6, 0),
-(0, 'plg_schemaorg_jobposting', 'plugin', 'jobposting', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 7, 0),
-(0, 'plg_system_schemaorg', 'plugin', 'schemaorg', 'system', 0, 1, 1, 0, 1, '', '{}', '', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-21.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-21.sql
deleted file mode 100644
index bcca1d7e0835f..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-21.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-UPDATE "#__extensions"
-   SET "params" = jsonb_set("params"::jsonb, '{filter}' , '"\\\\Joomla\\\\CMS\\\\Component\\\\ComponentHelper::filterText"')
- WHERE "type" = 'plugin'
-   AND "folder" = 'fields'
-   AND "element" IN ('editor', 'text', 'textarea')
-   AND "params" <> ''
-   AND "params"::jsonb->>'filter' = 'JComponentHelper::filterText';
-
-UPDATE "#__fields"
-   SET "fieldparams" = jsonb_set("fieldparams"::jsonb, '{filter}' , '"\\\\Joomla\\\\CMS\\\\Component\\\\ComponentHelper::filterText"')
- WHERE "type" IN ('editor', 'text', 'textarea')
-   AND "fieldparams" <> ''
-   AND "fieldparams"::jsonb->>'filter' = 'JComponentHelper::filterText';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-26.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-26.sql
deleted file mode 100644
index 8ac88dde34fc5..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-26.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- --------------------------------------------------------
--- The following INSERT statement has been modified to insert
--- this core plugin with locked=1.
--- See https://github.com/joomla/joomla-cms/pull/45821 for details.
---
-INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
-(0, 'plg_task_globalcheckin', 'plugin', 'globalcheckin', 'task', 0, 1, 1, 0, 1, '', '{}', '', 5, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-28.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-28.sql
deleted file mode 100644
index 252410f0e0baa..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-28.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-
-UPDATE "#__guidedtours" SET "extensions" = '["com_content","com_categories"]' WHERE "url" LIKE '%option=com_content%';
-UPDATE "#__guidedtours" SET "extensions" = '["com_content","com_categories"]' WHERE "url" LIKE '%option=com_categories%';
-UPDATE "#__guidedtours" SET "extensions" = '["com_menus"]' WHERE "url" LIKE '%com_menus%';
-UPDATE "#__guidedtours" SET "extensions" = '["com_tags"]' WHERE "url" LIKE '%com_tags%';
-UPDATE "#__guidedtours" SET "extensions" = '["com_banners"]' WHERE "url" LIKE '%com_banners%';
-UPDATE "#__guidedtours" SET "extensions" = '["com_contact"]' WHERE "url" LIKE '%com_contact%';
-UPDATE "#__guidedtours" SET "extensions" = '["com_newsfeeds"]' WHERE "url" LIKE '%com_newsfeeds%';
-UPDATE "#__guidedtours" SET "extensions" = '["com_finder"]' WHERE "url" LIKE '%com_finder%';
-UPDATE "#__guidedtours" SET "extensions" = '["com_users"]' WHERE "url" LIKE '%com_users%';
-
-UPDATE "#__update_sites"
-   SET "location" = 'https://update.joomla.org/language/translationlist_5.xml'
- WHERE "location" = 'https://update.joomla.org/language/translationlist_4.xml';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-29.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-29.sql
deleted file mode 100644
index 21666a58eb649..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-29.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-ALTER TABLE "#__guidedtours" ADD COLUMN "uid" varchar(255) DEFAULT '' NOT NULL /** CAN FAIL **/;
-CREATE INDEX "#__guidedtours_idx_uid" ON "#__guidedtours" ("uid") /** CAN FAIL **/;
-
-UPDATE "#__guidedtours" SET "uid" = 'joomla-guidedtours' WHERE "title" = 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_TITLE';
-UPDATE "#__guidedtours" SET "uid" = 'joomla-guidedtoursteps' WHERE "title" = 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURSTEPS_TITLE';
-UPDATE "#__guidedtours" SET "uid" = 'joomla-articles'  WHERE "title" = 'COM_GUIDEDTOURS_TOUR_ARTICLES_TITLE';
-UPDATE "#__guidedtours" SET "uid" = 'joomla-categories' WHERE "title" = 'COM_GUIDEDTOURS_TOUR_CATEGORIES_TITLE';
-UPDATE "#__guidedtours" SET "uid" = 'joomla-menus' WHERE "title" = 'COM_GUIDEDTOURS_TOUR_MENUS_TITLE';
-UPDATE "#__guidedtours" SET "uid" = 'joomla-tags' WHERE "title" = 'COM_GUIDEDTOURS_TOUR_TAGS_TITLE';
-UPDATE "#__guidedtours" SET "uid" = 'joomla-banners' WHERE "title" = 'COM_GUIDEDTOURS_TOUR_BANNERS_TITLE';
-UPDATE "#__guidedtours" SET "uid" = 'joomla-contacts' WHERE "title" = 'COM_GUIDEDTOURS_TOUR_CONTACTS_TITLE';
-UPDATE "#__guidedtours" SET "uid" = 'joomla-newsfeeds' WHERE "title" = 'COM_GUIDEDTOURS_TOUR_NEWSFEEDS_TITLE';
-UPDATE "#__guidedtours" SET "uid" = 'joomla-smartsearch' WHERE "title" = 'COM_GUIDEDTOURS_TOUR_SMARTSEARCH_TITLE';
-UPDATE "#__guidedtours" SET "uid" = 'joomla-users' WHERE "title" = 'COM_GUIDEDTOURS_TOUR_USERS_TITLE';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-30.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-30.sql
deleted file mode 100644
index 6cdba7c66ee3c..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-08-30.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE "#__extensions"
-   SET "locked" = 0
- WHERE "type" = 'plugin' AND "element" = 'recaptcha_invisible' AND "folder" = 'captcha';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-02.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-02.sql
deleted file mode 100644
index 42bdee445b720..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-02.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
-('plg_task_deleteactionlogs', 'plugin', 'deleteactionlogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0),
-('plg_task_privacyconsent', 'plugin', 'privacyconsent', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0),
-('plg_task_rotatelogs', 'plugin', 'rotatelogs', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0),
-('plg_task_sessiongc', 'plugin', 'sessiongc', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0),
-('plg_task_updatenotification', 'plugin', 'updatenotification', 'task', 0, 1, 1, 0, 1, '', '{}', '', NULL, NULL, 0, 0);
-
-INSERT INTO "#__mail_templates" ("template_id", "extension", "language", "subject", "body", "htmlbody", "attachments", "params") VALUES
-('plg_task_privacyconsent.request.reminder', 'plg_task_privacyconsent', '', 'PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT', 'PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_BODY', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
-('plg_task_updatenotification.mail', 'plg_task_updatenotification', '', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_SUBJECT', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_BODY', '', '', '{"tags":["newversion","curversion","sitename","url","link","releasenews"]}');
-
-DELETE FROM "#__mail_templates" WHERE "template_id" IN ('plg_system_privacyconsent.request.reminder', 'plg_system_updatenotification.mail');
-
-DELETE FROM "#__postinstall_messages" WHERE "condition_file" = 'site://plugins/system/updatenotification/postinstall/updatecachetime.php';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-06.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-06.sql
deleted file mode 100644
index 6561c6da33304..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-06.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-UPDATE "#__scheduler_tasks" SET "title" = 'Delete Action Logs' WHERE "type" = 'delete.actionlogs' AND "title" = 'DeleteActionLogs';
-UPDATE "#__scheduler_tasks" SET "title" = 'Privacy Consent' WHERE "type" = 'privacy.consent' AND "title" = 'PrivacyConsent';
-UPDATE "#__scheduler_tasks" SET "title" = 'Rotate Logs' WHERE "type" = 'rotation.logs' AND "title" = 'RotateLogs';
-UPDATE "#__scheduler_tasks" SET "title" = 'Session GC' WHERE "type" = 'session.gc' AND "title" = 'SessionGC';
-UPDATE "#__scheduler_tasks" SET "title" = 'Update Notification' WHERE "type" = 'update.notification' AND "title" = 'UpdateNotification';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-09.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-09.sql
deleted file mode 100644
index 4207b50a67858..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-09.sql
+++ /dev/null
@@ -1,5 +0,0 @@
--- Add com_fields to action logs extensions
-INSERT INTO "#__action_logs_extensions" ("extension") VALUES ('com_fields');
-
-INSERT INTO "#__action_log_config" ("type_title", "type_alias", "id_holder", "title_holder", "table_name", "text_prefix") VALUES
-('field', 'com_fields.field', 'id', 'title', '#__fields', 'PLG_ACTIONLOG_JOOMLA');
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-11.sql b/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-11.sql
deleted file mode 100644
index c540fd45a0d52..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-09-11.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE "#__extensions" SET "enabled" = 1 WHERE "type" = 'plugin' AND "element" = 'schedulerunner' AND "folder" = 'system';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2023-11-28.sql b/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2023-11-28.sql
deleted file mode 100644
index 32e80f5656d1d..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2023-11-28.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- --------------------------------------------------------
--- The following INSERT statement has been modified to insert
--- this core plugin with locked=1.
--- See https://github.com/joomla/joomla-cms/pull/45821 for details.
---
-INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
-(0, 'plg_schemaorg_article', 'plugin', 'article', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-02-10.sql b/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-02-10.sql
deleted file mode 100644
index 29375e78c1f50..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-02-10.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE "#__guidedtour_steps" ADD COLUMN "params" text NULL /** CAN FAIL **/;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-02-24.sql b/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-02-24.sql
deleted file mode 100644
index 36692be7b3278..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-02-24.sql
+++ /dev/null
@@ -1,37 +0,0 @@
---
--- Table structure for table "#__tuf_metadata"
---
-
-CREATE TABLE IF NOT EXISTS "#__tuf_metadata" (
-"id" serial NOT NULL,
-"update_site_id" bigint DEFAULT 0 NOT NULL,
-"root" text DEFAULT NULL,
-"targets" text DEFAULT NULL,
-"snapshot" text DEFAULT NULL,
-"timestamp" text DEFAULT NULL,
-"mirrors" text DEFAULT NULL,
-PRIMARY KEY ("id")
-);
-
-COMMENT ON TABLE "#__tuf_metadata" IS 'Secure TUF Updates';
-
--- --------------------------------------------------------
--- The following INSERT statement has been modified to avoid an SQL error
--- when there is more than 1 update site for the Joomla core.
--- See https://github.com/joomla/joomla-cms/pull/43169 for details.
---
-INSERT INTO "#__tuf_metadata" ("update_site_id", "root")
-SELECT ue."update_site_id",
-       '{"signed":{"_type":"root","spec_version":"1.0","version":2,"expires":"2025-03-02T11:22:17Z","keys":{"07eb082f367c034a95878687f6648aa76d93652b6ee73e58817053d89af6c44f":{"keytype":"ed25519","scheme":"ed25519","keyid_hash_algorithms":["sha256","sha512"],"keyval":{"public":"9b2af2d9b9727227735253d795bd27ea8f0e294a5f3603e822dc5052b44802b9"}},"1b1b1dd55b2c1c7258714cf1c1ae06f23e4607b28c762d016a9d81c48ffe5669":{"keytype":"ed25519","scheme":"ed25519","keyid_hash_algorithms":["sha256","sha512"],"keyval":{"public":"a18e5ebabc19d5d5984b601a292ece61ba3662ab2d071dc520da5bd4f8948799"}},"2dcaf3d0e552f150792f7c636d45429246dcfa34ac35b46a44f5c87cd17d457e":{"keytype":"ed25519","scheme":"ed25519","keyid_hash_algorithms":["sha256","sha512"],"keyval":{"public":"cb0a7a131961a20edea051d6dc2b091fb650bd399bd8514adb67b3c60db9f8f9"}},"31dd7c7290d664c9b88c0dead2697175293ea7df81b7f24153a37370fd3901c3":{"keytype":"ed25519","scheme":"ed25519","keyid_hash_algorithms":["sha256","sha512"],"keyval":{"public":"589d029a68b470deff1ca16dbf3eea6b5b3fcba0ae7bb52c468abc7fb058b2a2"}},"9e41a9d62d94c6a1c8a304f62c5bd72d84a9f286f27e8327cedeacb09e5156cc":{"keytype":"ed25519","scheme":"ed25519","keyid_hash_algorithms":["sha256","sha512"],"keyval":{"public":"6043c8bacc76ac5c9750f45454dd865c6ca1fc57d69e14cc192cfd420f6a66a9"}}},"roles":{"root":{"keyids":["1b1b1dd55b2c1c7258714cf1c1ae06f23e4607b28c762d016a9d81c48ffe5669","2dcaf3d0e552f150792f7c636d45429246dcfa34ac35b46a44f5c87cd17d457e"],"threshold":1},"snapshot":{"keyids":["07eb082f367c034a95878687f6648aa76d93652b6ee73e58817053d89af6c44f","2dcaf3d0e552f150792f7c636d45429246dcfa34ac35b46a44f5c87cd17d457e"],"threshold":1},"targets":{"keyids":["31dd7c7290d664c9b88c0dead2697175293ea7df81b7f24153a37370fd3901c3"],"threshold":1},"timestamp":{"keyids":["9e41a9d62d94c6a1c8a304f62c5bd72d84a9f286f27e8327cedeacb09e5156cc"],"threshold":1}},"consistent_snapshot":true},"signatures":[{"keyid":"2dcaf3d0e552f150792f7c636d45429246dcfa34ac35b46a44f5c87cd17d457e","sig":"2a225a560ec0837b721d4c5e379fedbd3c7c9079a94e6b31e47e0184c8b95421b6036b4286c5d90f29ab4c468d79a712fdb65e96511394ceb3aa8e2b3983a501"},{"keyid":"1b1b1dd55b2c1c7258714cf1c1ae06f23e4607b28c762d016a9d81c48ffe5669","sig":"8ce0b2a7bdc1e6dcba12081f440510df0a593c072dcf591631c2dd0f456844a7da63be8e8ac31ffbddf42641fde84dc733a336031d182c2163b4c1eaf2117005"}]}'
-  FROM "#__update_sites_extensions" AS ue JOIN "#__extensions" AS e ON (e."extension_id" = ue."extension_id")
- WHERE e."type"='file' AND e."element"='joomla';
-
--- --------------------------------------------------------
--- The following UPDATE statement has been modified to avoid an SQL error
--- when there is more than 1 update site for the Joomla core.
--- See https://github.com/joomla/joomla-cms/pull/42988 for details.
---
-UPDATE "#__update_sites"
-   SET "type" = 'tuf', "location" = 'https://update.joomla.org/cms/'
- WHERE "update_site_id" IN (SELECT ue."update_site_id" FROM "#__update_sites_extensions" AS ue JOIN "#__extensions" AS e ON (e."extension_id" = ue."extension_id") WHERE e."type"='file' AND e."element"='joomla');
-
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-02-25.sql b/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-02-25.sql
deleted file mode 100644
index 0ec6c6793ffd9..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-02-25.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- --------------------------------------------------------
--- The following INSERT statement has been modified to insert
--- this core plugin with locked=1.
--- See https://github.com/joomla/joomla-cms/pull/45821 for details.
---
-INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
-(0, 'plg_schemaorg_custom', 'plugin', 'custom', 'schemaorg', 0, 1, 1, 0, 1, '', '{}', '', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-03-08.sql b/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-03-08.sql
deleted file mode 100644
index dde57323da713..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-03-08.sql
+++ /dev/null
@@ -1,15 +0,0 @@
-INSERT INTO "#__guidedtour_steps" ("tour_id", "title", "published", "description", "ordering", "position", "target", "type", "interactive_type", "url", "created", "created_by", "modified", "modified_by", "language") VALUES
-(0, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_MENUS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_MENUS_DESCRIPTION', 1, 'right', '#sidebarmenu', 0, 1, '', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*'),
-(0, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_QUICKACCESS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_QUICKACCESS_DESCRIPTION', 2, 'center', '', 0, 1, '', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*'),
-(0, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_NOTIFICATIONS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_NOTIFICATIONS_DESCRIPTION', 3, 'left', '.quickicons-for-update_quickicon .card', 0, 1, '', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*'),
-(0, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_TOPBAR_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_TOPBAR_DESCRIPTION', 4, 'bottom', '#header', 0, 1, '', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*'),
-(0, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_FINALWORDS_TITLE', 1, 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_STEP_FINALWORDS_DESCRIPTION', 5, 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, '*')
-ON CONFLICT DO NOTHING;
-
-ALTER TABLE "#__guidedtours" ADD COLUMN "autostart" int NOT NULL DEFAULT 0 /** CAN FAIL **/;
-
-INSERT INTO "#__guidedtours" ("title", "uid", "description", "ordering", "extensions", "url", "created", "created_by", "modified", "modified_by", "published", "language", "access", "autostart") VALUES
-('COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_TITLE', 'joomla-welcome', 'COM_GUIDEDTOURS_TOUR_WELCOMETOJOOMLA_DESCRIPTION', 1, '["com_cpanel"]', 'administrator/index.php', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, 1, '*', 1, 0)
-ON CONFLICT DO NOTHING;
-
-UPDATE "#__guidedtour_steps" SET "tour_id" = currval(pg_get_serial_sequence('#__guidedtours','id')) WHERE "tour_id"=0;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-03-28.sql b/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-03-28.sql
deleted file mode 100644
index 82bf0d612608c..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.1.0-2024-03-28.sql
+++ /dev/null
@@ -1,12 +0,0 @@
---
--- Add post-installation message about Brotli compression in .htaccess
---
--- This statement had to be modified to prevent duplicate postinstall messages
--- when updating from 4.4.
--- See https://github.com/joomla/joomla-cms/pull/43182 for details.
---
-INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
-SELECT "extension_id", 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE', 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_DESCRIPTION', '', 'com_admin', 1, 'message', '', '', 'admin://components/com_admin/postinstall/htaccessbrotli.php', 'admin_postinstall_htaccessbrotli_condition', '5.1.0', 1
-  FROM "#__extensions"
- WHERE "name" = 'files_joomla'
-   AND (SELECT COUNT(a."postinstall_message_id") FROM "#__postinstall_messages" a WHERE a."title_key" = 'COM_ADMIN_POSTINSTALL_MSG_HTACCESS_BROTLI_TITLE') = 0;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.1.1-2024-04-18.sql b/administrator/components/com_admin/sql/updates/postgresql/5.1.1-2024-04-18.sql
deleted file mode 100644
index fc44f25a2a219..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.1.1-2024-04-18.sql
+++ /dev/null
@@ -1,10 +0,0 @@
---
--- Add a default value for the colorScheme in the Atum template on Joomla update
--- only when a value is not already set.
--- New installs will have the default value set in the installation sql.
---
-
-UPDATE "#__template_styles"
-SET "params" = jsonb_set("params"::jsonb, '{colorScheme}', '"os"', true)
-WHERE "template" = 'atum'
-AND "params"::jsonb->>'colorScheme' IS NULL;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-07-02.sql b/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-07-02.sql
deleted file mode 100644
index 26464101c0f84..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-07-02.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Add mod_articles module
-INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
-(0, 'mod_articles', 'module', 'mod_articles', '', 0, 1, 0, 0, 1, '', '', '', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-07-19.sql b/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-07-19.sql
deleted file mode 100644
index 66937855f9f0c..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-07-19.sql
+++ /dev/null
@@ -1,7 +0,0 @@
---
--- Add the Guided Tours selectable option to the User Action Logs
---
-INSERT INTO "#__action_logs_extensions" ("extension") VALUES ('com_guidedtours');
-
-INSERT INTO "#__action_log_config" ("type_title", "type_alias", "id_holder", "title_holder", "table_name", "text_prefix") VALUES
-('guidedtour', 'com_guidedtours.state', 'id', 'title', '#__guidedtours', 'PLG_ACTIONLOG_JOOMLA');
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-08-22.sql b/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-08-22.sql
deleted file mode 100644
index a92672ae0efd7..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-08-22.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-INSERT INTO "#__guidedtours" ("title", "description", "extensions", "url", "published", "language", "note", "access", "uid", "autostart", "created", "created_by", "modified", "modified_by") VALUES
-('COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_DESCRIPTION', '["com_cpanel"]', 'administrator/index.php', 1, '*', '', 1, 'joomla-whatsnew-5-2', 1, CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0);
-INSERT INTO "#__guidedtour_steps" ("title", "description", "position", "target", "type", "interactive_type", "url", "published", "language", "note", "params", "tour_id", "created", "created_by", "modified", "modified_by")
-SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_STEP_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_STEP_0_DESCRIPTION', 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', 1, '*', '', '{"required":1,"requiredvalue":""}', MAX("id"), CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0
-  FROM "#__guidedtours"
- WHERE "uid" = 'joomla-whatsnew-5-2';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-09-17.sql b/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-09-17.sql
deleted file mode 100644
index d05dd005e6615..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-09-17.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-UPDATE "#__guidedtour_steps"
-SET "ordering" = "ordering" + 1
-WHERE "title" IN ('COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_SAVECLOSE_TITLE', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_CONGRATULATIONS_TITLE');
-
-INSERT INTO "#__guidedtour_steps" ("title", "description", "position", "target", "type", "interactive_type", "url", "published", "language", "note", "tour_id", "created", "created_by", "modified", "modified_by", "ordering")
-SELECT 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_AUTOSTART_TITLE', 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_AUTOSTART_DESCRIPTION', 'bottom', '#jform_autostart0', 2, 3, '', 1, '*', '', "tour_id", CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, "ordering" + 1
-  FROM "#__guidedtour_steps"
- WHERE "title" = 'COM_GUIDEDTOURS_TOUR_GUIDEDTOURS_STEP_COMPONENT_TITLE';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.2.2-2024-09-24.sql b/administrator/components/com_admin/sql/updates/postgresql/5.2.2-2024-09-24.sql
deleted file mode 100644
index 8da7f706d58f6..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.2.2-2024-09-24.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-UPDATE "#__assets" SET "title" = 'PUBLISH' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Publish';
-UPDATE "#__assets" SET "title" = 'UNPUBLISH' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Unpublish';
-UPDATE "#__assets" SET "title" = 'TRASH' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Trash';
-UPDATE "#__assets" SET "title" = 'ARCHIVE' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Archive';
-UPDATE "#__assets" SET "title" = 'FEATURE' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Feature';
-UPDATE "#__assets" SET "title" = 'UNFEATURE' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Unfeature';
-UPDATE "#__assets" SET "title" = 'PUBLISH_AND_FEATURE' WHERE "name" LIKE 'com_content.transition.%' AND "title" = 'Publish & Feature';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.2.3-2025-01-09.sql b/administrator/components/com_admin/sql/updates/postgresql/5.2.3-2025-01-09.sql
deleted file mode 100644
index 27f126404b02e..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.2.3-2025-01-09.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-UPDATE "#__mail_templates"
-SET "params" = '{"tags":["messages","message","date","extension","username"]}'
-WHERE "template_id" = 'com_actionlogs.notification';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-10-26.sql b/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-10-26.sql
deleted file mode 100644
index 49794391fb4c4..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-10-26.sql
+++ /dev/null
@@ -1,20 +0,0 @@
---
--- Table structure for table "#__scheduler_logs"
---
-
-CREATE TABLE IF NOT EXISTS "#__scheduler_logs" (
-  "id" serial NOT NULL,
-  "taskname" varchar(255) DEFAULT '' NOT NULL,
-  "tasktype" varchar(128) NOT NULL,
-  "duration" NUMERIC(5,3) NOT NULL,
-  "jobid" integer NOT NULL,
-  "taskid" integer NOT NULL,
-  "exitcode" integer NOT NULL,
-  "lastdate" timestamp without time zone,
-  "nextdate" timestamp without time zone,
-  PRIMARY KEY (id)
-);
-CREATE INDEX "#__scheduler_logs_idx_taskname" ON "#__scheduler_logs" ("taskname");
-CREATE INDEX "#__scheduler_logs_idx_tasktype" ON "#__scheduler_logs" ("tasktype");
-CREATE INDEX "#__scheduler_logs_idx_lastdate" ON "#__scheduler_logs" ("lastdate");
-CREATE INDEX "#__scheduler_logs_idx_nextdate" ON "#__scheduler_logs" ("nextdate");
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-12-09.sql b/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-12-09.sql
deleted file mode 100644
index 2b4c0e2bed244..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-12-09.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO "#__action_log_config" ("type_title", "type_alias", "id_holder", "title_holder", "table_name", "text_prefix") VALUES
-('contact', 'com_contact.form', 'id', 'name', '#__contact_details', 'PLG_ACTIONLOG_JOOMLA');
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-12-19.sql b/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-12-19.sql
deleted file mode 100644
index 4e9852fa36751..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-12-19.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- --------------------------------------------------------
--- The following statement which was introduced with 5.3.0-alpha3
--- has been disabled as it was reverted with 5.3.0-beta1.
--- See https://github.com/joomla/joomla-cms/pull/44845 for details.
---
--- ALTER TABLE "#__action_logs_users" ADD COLUMN "exclude_self" integer DEFAULT 0 NOT NULL;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-02-09.sql b/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-02-09.sql
deleted file mode 100644
index b169f6a493fc2..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-02-09.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE "#__action_logs_users" DROP COLUMN "exclude_self" /** CAN FAIL **/;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-02-22.sql b/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-02-22.sql
deleted file mode 100644
index 4f319c1a92d2d..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-02-22.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- Add plg_extension_joomlaupdate module
-INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
-(0, 'plg_extension_joomlaupdate', 'plugin', 'joomlaupdate', 'extension', 0, 1, 1, 0, 1, '', '', '', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-03-14.sql b/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-03-14.sql
deleted file mode 100644
index cfb58259717f7..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-03-14.sql
+++ /dev/null
@@ -1,10 +0,0 @@
--- disable autostart for the previous tour
-UPDATE "#__guidedtours" SET "autostart" = 0 WHERE "uid" = 'joomla-whatsnew-5-2';
-
-INSERT INTO "#__guidedtours" ("title", "description", "extensions", "url", "published", "language", "note", "access", "uid", "autostart", "created", "created_by", "modified", "modified_by") VALUES
-('COM_GUIDEDTOURS_TOUR_WHATSNEW_5_3_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_3_DESCRIPTION', '["com_cpanel"]', 'administrator/index.php', 1, '*', '', 1, 'joomla-whatsnew-5-3', 1, CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0);
-
-INSERT INTO "#__guidedtour_steps" ("title", "description", "position", "target", "type", "interactive_type", "url", "published", "language", "note", "params", "tour_id", "created", "created_by", "modified", "modified_by")
-SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_3_STEP_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_3_STEP_0_DESCRIPTION', 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', 1, '*', '', '"{\"required\":1,\"requiredvalue\":\"\"}"', MAX("id"), CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0
-  FROM "#__guidedtours"
- WHERE "uid" = 'joomla-whatsnew-5-3';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.3.1-2025-04-27.sql b/administrator/components/com_admin/sql/updates/postgresql/5.3.1-2025-04-27.sql
deleted file mode 100644
index 9cc623fb217ff..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.3.1-2025-04-27.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-UPDATE "#__mail_templates"
-SET "params" = '{"tags":["messages","message","date","extension","username"]}'
-WHERE "template_id" = 'com_actionlogs.notification'
-AND "params" = '"tags":["messages","message","date","extension","username"]}';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.3.4-2025-09-19.sql b/administrator/components/com_admin/sql/updates/postgresql/5.3.4-2025-09-19.sql
deleted file mode 100644
index 505eff0640add..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.3.4-2025-09-19.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-UPDATE "#__content_types"
-SET "field_mappings" = jsonb_set("field_mappings"::jsonb, '{common, core_created_user_id}' , '"created_by"', true)
-WHERE "type_alias" = 'com_content.article';
-
-UPDATE "#__content_types"
-SET "field_mappings" = jsonb_set("field_mappings"::jsonb, '{common, core_created_by_alias}' , '"created_by_alias"', true)
-WHERE "type_alias" = 'com_content.article';
-
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-04-23.sql b/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-04-23.sql
deleted file mode 100644
index 95cdc7a2653bc..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-04-23.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state")
-SELECT 0, 'plg_behaviour_compat6', 'plugin', 'compat6', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","legacy_classes":"1"}', '', -1, 0
-WHERE NOT EXISTS (SELECT * FROM "#__extensions" e WHERE e."type" = 'plugin' AND e."element" = 'compat6' AND e."folder" = 'behaviour' AND e."client_id" = 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-05-10.sql b/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-05-10.sql
deleted file mode 100644
index 1c9a4100d726c..0000000000000
--- a/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-05-10.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state")
-SELECT 0, 'plg_quickicon_autoupdate', 'plugin', 'autoupdate', 'quickicon', 0, 1, 1, 0, 1, '', '', '', -1, 0
-WHERE NOT EXISTS (SELECT * FROM "#__extensions" e WHERE e."type" = 'plugin' AND e."element" = 'autoupdate' AND e."folder" = 'quickicon' AND e."client_id" = 0);
-
-INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state")
-SELECT 0, 'plg_webservices_joomlaupdate', 'plugin', 'joomlaupdate', 'webservices', 0, 1, 1, 0, 1, '', '', '', -1, 0
-WHERE NOT EXISTS (SELECT * FROM "#__extensions" e WHERE e."type" = 'plugin' AND e."element" = 'joomlaupdate' AND e."folder" = 'webservices' AND e."client_id" = 0);
-
-INSERT INTO "#__mail_templates" ("template_id", "extension", "language", "subject", "body", "htmlbody", "attachments", "params") VALUES
-('com_joomlaupdate.update.success', 'com_joomlaupdate', '', 'COM_JOOMLAUPDATE_UPDATE_SUCCESS_MAIL_SUBJECT', 'COM_JOOMLAUPDATE_UPDATE_SUCCESS_MAIL_BODY', '', '', '{"tags":["newversion","oldversion","sitename","url"]}'),
-('com_joomlaupdate.update.failed', 'com_joomlaupdate', '', 'COM_JOOMLAUPDATE_UPDATE_FAILED_MAIL_SUBJECT', 'COM_JOOMLAUPDATE_UPDATE_FAILED_MAIL_BODY', '', '', '{"tags":["newversion","oldversion","sitename","url"]}')
-ON CONFLICT DO NOTHING;
-
--- add post-installation message for automated updates
-INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
-SELECT "extension_id", 'COM_JOOMLAUPDATE_POSTINSTALL_MSG_AUTOMATED_UPDATES_TITLE', 'COM_JOOMLAUPDATE_POSTINSTALL_MSG_AUTOMATED_UPDATES_DESCRIPTION', 'COM_JOOMLAUPDATE_POSTINSTALL_MSG_AUTOMATED_UPDATES_ACTION', 'com_joomlaupdate', 1, 'action', 'admin://components/com_joomlaupdate/postinstall/autoupdate.php', 'com_joomlaupdate_postinstall_autoupdate_action', 'admin://components/com_joomlaupdate/postinstall/autoupdate.php', 'com_joomlaupdate_postinstall_autoupdate_condition', '5.4.0', 1 FROM "#__extensions" WHERE "name" = 'files_joomla';
-
--- disable autostart for the previous tour
-UPDATE "#__guidedtours" SET "autostart" = 0 WHERE "uid" = 'joomla-whatsnew-5-3';
-
-INSERT INTO "#__guidedtours" ("title", "description", "extensions", "url", "published", "language", "note", "access", "uid", "autostart", "created", "created_by", "modified", "modified_by")
-SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_4_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_4_DESCRIPTION', '["com_cpanel"]', 'administrator/index.php', 1, '*', '', 1, 'joomla-whatsnew-5-4', 1, CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0
-WHERE NOT EXISTS (SELECT * FROM "#__guidedtours" g WHERE g."uid" = 'joomla-whatsnew-5-4');
-
-INSERT INTO "#__guidedtour_steps" ("title", "description", "position", "target", "type", "interactive_type", "url", "published", "language", "note", "params", "tour_id", "created", "created_by", "modified", "modified_by")
-SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_4_STEP_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_5_4_STEP_0_DESCRIPTION', 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', 1, '*', '', '"{\"required\":1,\"requiredvalue\":\"\"}"', MAX("id"), CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0
-FROM "#__guidedtours"
-WHERE "uid" = 'joomla-whatsnew-5-4';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2024-08-11.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2024-08-11.sql
new file mode 100644
index 0000000000000..e6fba47a2cfaa
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2024-08-11.sql
@@ -0,0 +1,6 @@
+-- Update link to featured
+
+UPDATE "#__menu"
+SET "link" = 'index.php?option=com_content&view=articles&filter[featured]=1'
+WHERE "link" = 'index.php?option=com_content&view=featured'
+AND "client_id" = 1;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-03-25.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-03-25.sql
new file mode 100644
index 0000000000000..62797a72dfb48
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-03-25.sql
@@ -0,0 +1,3 @@
+INSERT INTO "#__mail_templates" ("template_id", "extension", "language", "subject", "body", "htmlbody", "attachments", "params") VALUES
+('plg_content_joomla.newarticle', 'plg_content_joomla', '', 'PLG_CONTENT_JOOMLA_NEW_ARTICLE_SUBJECT', 'PLG_CONTENT_JOOMLA_NEW_ARTICLE_BODY', '', '', '{"tags":["sitename","name","email","title","url"]}')
+ON CONFLICT DO NOTHING;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-05-20.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-05-20.sql
new file mode 100644
index 0000000000000..bed03447d009e
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-05-20.sql
@@ -0,0 +1,3 @@
+UPDATE "#__extensions"
+   SET "params" = ''
+ WHERE "type" = 'plugin' AND "element" = 'stats' AND "folder" = 'system';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-08-02.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-08-02.sql
similarity index 100%
rename from administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-08-02.sql
rename to administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-08-02.sql
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-29.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-08-16.sql
similarity index 53%
rename from administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-29.sql
rename to administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-08-16.sql
index 0d7535b274353..1ed8a5e60113f 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/5.0.0-2023-07-29.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-08-16.sql
@@ -1,3 +1,3 @@
 INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state")
-SELECT 0, 'plg_behaviour_compat', 'plugin', 'compat', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","es5_assets":"1"}', '', -1, 0
-WHERE NOT EXISTS (SELECT * FROM "#__extensions" e WHERE e."type" = 'plugin' AND e."element" = 'compat' AND e."folder" = 'behaviour' AND e."client_id" = 0);
+SELECT 0, 'plg_fields_note', 'plugin', 'note', 'fields', 0, 1, 1, 0, 1, '', '{"class":"alert alert-info","heading":"h4"}', '', -1, 0
+WHERE NOT EXISTS (SELECT * FROM "#__extensions" e WHERE e."type" = 'plugin' AND e."element" = 'note' AND e."folder" = 'fields' AND e."client_id" = 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-08-17.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-08-17.sql
new file mode 100644
index 0000000000000..16731908df72b
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-08-17.sql
@@ -0,0 +1,3 @@
+INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state")
+SELECT 0, 'plg_fields_number', 'plugin', 'number', 'fields', 0, 1, 1, 0, 1, '', '{"min":"1.0","max":"100.0","step":"0.1","currency":"0","position":"0","decimals":"2"}', '', -1, 0
+WHERE NOT EXISTS (SELECT * FROM "#__extensions" e WHERE e."type" = 'plugin' AND e."element" = 'number' AND e."folder" = 'fields' AND e."client_id" = 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-05.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-05.sql
new file mode 100644
index 0000000000000..bb3bc6726fb37
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-05.sql
@@ -0,0 +1,8 @@
+INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state")
+SELECT 0, 'cassiopeia_extended', 'template', 'cassiopeia_extended', '', 0, 1, 1, 0, 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","systemFontBody":"","systemFontHeading":"","colorName":"colors_standard","fluidContainer":"0","stickyHeader":"0","backTop":"0","colorSettings":"0","headerbg":"rgb(193, 205, 207)","headercolor":"rgb(23, 23, 23)","bodybg":"rgb(254, 254, 254)","bodycolor":"rgb(23, 23, 23)","linkcolor":"rgb(29, 121, 137)","linkcolorh":"rgb(14, 59, 67)","btnbg":"rgb(206, 60, 55)","btnbgh":"rgb(131, 35, 32)","btncolor":"rgb(254, 254, 254)","btncolorh":"rgb(254, 254, 254)","footerbg":"rgb(29, 121, 137)","footercolor":"rgb(254, 254, 254)","fontSettings":"0","bodysize":"1","h1size":"2","h2size":"1.7","h3size":"1.5"}', '', 1, 0
+WHERE NOT EXISTS (SELECT * FROM "#__extensions" e WHERE e."type" = 'template' AND e."element" = 'cassiopeia_extended' AND e."client_id" = 0);
+
+
+INSERT INTO "#__template_styles" ("template", "client_id", "home", "title", "inheritable", "parent", "params")
+SELECT 'cassiopeia_extended', 0, '0', 'Cassiopeia Extended - Default', 0, 'cassiopeia', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","systemFontBody":"","systemFontHeading":"","colorName":"colors_standard","fluidContainer":"0","stickyHeader":"0","backTop":"0","colorSettings":"0","headerbg":"rgb(193, 205, 207)","headercolor":"rgb(23, 23, 23)","bodybg":"rgb(254, 254, 254)","bodycolor":"rgb(23, 23, 23)","linkcolor":"rgb(29, 121, 137)","linkcolorh":"rgb(14, 59, 67)","btnbg":"rgb(206, 60, 55)","btnbgh":"rgb(131, 35, 32)","btncolor":"rgb(254, 254, 254)","btncolorh":"rgb(254, 254, 254)","footerbg":"rgb(29, 121, 137)","footercolor":"rgb(254, 254, 254)","fontSettings":"0","bodysize":"1","h1size":"2","h2size":"1.7","h3size":"1.5"}'
+WHERE NOT EXISTS (SELECT * FROM "#__template_styles" t WHERE t."template" = 'cassiopeia_extended' AND t."client_id" = 0 AND t."inheritable" = 0 AND t."parent" = 'cassiopeia');
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-16.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-16.sql
new file mode 100644
index 0000000000000..fea9098d5c027
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-16.sql
@@ -0,0 +1,6 @@
+-- uninstall previous What's New tours
+DELETE FROM "#__guidedtour_steps"
+ WHERE "tour_id" IN (SELECT "id" FROM "#__guidedtours" WHERE "uid" IN ('joomla-whatsnew-5-2', 'joomla-whatsnew-5-3', 'joomla-whatsnew-5-4'));
+
+DELETE FROM "#__guidedtours"
+ WHERE "uid" IN ('joomla-whatsnew-5-2', 'joomla-whatsnew-5-3', 'joomla-whatsnew-5-4');
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-17.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-17.sql
new file mode 100644
index 0000000000000..5a81db0d144de
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-17.sql
@@ -0,0 +1,13 @@
+INSERT INTO "#__guidedtours" ("title", "description", "extensions", "url", "published", "language", "note", "access", "uid", "autostart", "created", "created_by", "modified", "modified_by")
+SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_DESCRIPTION', '["com_cpanel"]', 'administrator/index.php', 1, '*', '', 1, 'joomla-whatsnew-6-0', 1, CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0
+WHERE NOT EXISTS (SELECT * FROM "#__guidedtours" g WHERE g."uid" = 'joomla-whatsnew-6-0');
+
+INSERT INTO "#__guidedtour_steps" ("title", "description", "position", "target", "type", "interactive_type", "url", "published", "language", "note", "params", "created", "created_by", "modified", "modified_by", "tour_id")
+SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_STEP_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_STEP_0_DESCRIPTION', 'center', '', 0, 1, '', 1, '*', '', '{"required":1,"requiredvalue":""}', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, MAX("id")
+  FROM "#__guidedtours"
+ WHERE "uid" = 'joomla-whatsnew-6-0';
+
+INSERT INTO "#__guidedtour_steps" ("title", "description", "position", "target", "type", "interactive_type", "url", "published", "language", "note", "params", "created", "created_by", "modified", "modified_by", "tour_id")
+SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_STEP_1_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_STEP_1_DESCRIPTION', 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', 1, '*', '', '"{\"required\":1,\"requiredvalue\":\"\"}"', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, MAX("id")
+  FROM "#__guidedtours"
+ WHERE "uid" = 'joomla-whatsnew-6-0';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-23.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-23.sql
new file mode 100644
index 0000000000000..d7f5708ce800c
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-23.sql
@@ -0,0 +1,3 @@
+UPDATE "#__update_sites"
+   SET "location" = 'https://update.joomla.org/language/translationlist_6.xml'
+ WHERE "location" = 'https://update.joomla.org/language/translationlist_5.xml';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-26.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-26.sql
new file mode 100644
index 0000000000000..5f91914aa269c
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-09-26.sql
@@ -0,0 +1,33 @@
+-- Update content types for lookup tags
+
+UPDATE "#__content_types"
+SET "content_history_options" = jsonb_set(
+	"content_history_options"::jsonb,
+	'{displayLookup}',
+	"content_history_options"::jsonb->'displayLookup' ||
+		jsonb_build_object(
+		'sourceColumn', 'tags',
+		'targetTable', '#__tags',
+		'targetColumn', 'id',
+		'displayColumn', 'title'
+		)
+	)
+WHERE "type_alias" IN (
+		 'com_content.article',
+		 'com_contact.contact',
+		 'com_newsfeeds.newsfeed',
+		 'com_content.category',
+		 'com_contact.category',
+		 'com_newsfeeds.category',
+		 'com_banners.category',
+		 'com_users.category'
+	)
+AND NOT EXISTS (
+	SELECT * FROM jsonb_array_elements("content_history_options"::jsonb->'displayLookup')
+	WHERE value = jsonb_build_object(
+		'sourceColumn', 'tags',
+		'targetTable', '#__tags',
+		'targetColumn', 'id',
+		'displayColumn', 'title'
+		)
+	);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-10-07.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-10-10.sql
similarity index 98%
rename from administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-10-07.sql
rename to administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-10-10.sql
index 23407ee5a6a5a..c416183248cde 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/5.4.0-2025-10-07.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-10-10.sql
@@ -1,2 +1,2 @@
--- Remove wrong unique constraint from "#__ucm_content" table
-ALTER TABLE "#__ucm_content" DROP CONSTRAINT "#__ucm_content_idx_type_alias_item_id" /** CAN FAIL **/;
+-- Remove wrong unique constraint from "#__ucm_content" table
+ALTER TABLE "#__ucm_content" DROP CONSTRAINT "#__ucm_content_idx_type_alias_item_id" /** CAN FAIL **/;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-10-11.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-10-11.sql
new file mode 100644
index 0000000000000..db3fae581c1e6
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.0-2025-10-11.sql
@@ -0,0 +1,5 @@
+ALTER TABLE "#__history"
+    ADD COLUMN "is_current" SMALLINT NOT NULL DEFAULT 0 /** CAN FAIL **/;
+ALTER TABLE "#__history"
+    ADD COLUMN "is_legacy" SMALLINT NOT NULL DEFAULT 0 /** CAN FAIL **/;
+UPDATE "#__history" SET "is_legacy" = 1;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.0.1-2025-10-29.sql b/administrator/components/com_admin/sql/updates/postgresql/6.0.1-2025-10-29.sql
new file mode 100644
index 0000000000000..94952c7643e62
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.0.1-2025-10-29.sql
@@ -0,0 +1,21 @@
+UPDATE "#__menu"
+SET "params" = jsonb_set(
+    "params"::jsonb,
+    '{featured_categories}',
+    COALESCE(
+        (
+            SELECT jsonb_agg(to_jsonb(CASE WHEN elem = ' ' THEN '' ELSE elem END))
+            FROM jsonb_array_elements_text("params"::jsonb->'featured_categories') AS t(elem)
+        ),
+        '[]'::jsonb
+    ),
+    false
+)
+WHERE ("params"::jsonb->'featured_categories') @> '[" "]'::jsonb
+    AND "type" = 'component'
+    AND "link" = 'index.php?option=com_content&view=featured';
+
+UPDATE "#__menu"
+SET "link" = REPLACE("link", '&catid[0]= ', '&catid[0]=')
+WHERE "type" = 'component'
+    AND "link" LIKE 'index.php?option=com_content&view=archive&catid[0]= %';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2025-10-30.sql b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2025-10-30.sql
new file mode 100644
index 0000000000000..7c05c45be4ff5
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2025-10-30.sql
@@ -0,0 +1,8 @@
+--
+-- Add a template tag for ip_address on Joomla update.
+-- New installs will have the default value set in the installation support sql.
+--
+
+UPDATE "#__mail_templates"
+SET "params" = '{"tags":["messages","message","date","extension","username","ip_address"]}'
+WHERE "template_id" = 'com_actionlogs.notification';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2025-11-29.sql b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2025-11-29.sql
new file mode 100644
index 0000000000000..2cbc909b1fa68
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2025-11-29.sql
@@ -0,0 +1,4 @@
+INSERT INTO "#__extensions" ("name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state")
+SELECT 'plg_captcha_powcaptcha', 'plugin', 'powcaptcha', 'captcha', 0, 1, 1, 0, 1, '', '{}', '', 0, 0
+WHERE NOT EXISTS (SELECT * FROM "#__extensions" e WHERE e."type" = 'plugin' AND e."element" = 'powcaptcha' AND e."folder" = 'captcha' AND e."client_id" = 0);
+
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-01-29.sql b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-01-29.sql
new file mode 100644
index 0000000000000..6f339b8dd3419
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-01-29.sql
@@ -0,0 +1,7 @@
+-- --------------------------------------------------------
+-- The following statement which was introduced with 6.1.0-beta1
+-- has been disabled as it was replaced in 6.1.0-beta3 with
+-- a new statement in file "6.1.0-2026-03-10.sql".
+-- See https://github.com/joomla/joomla-cms/pull/47361 for details.
+--
+-- INSERT INTO "#__content_types" ("type_id", "type_title", "type_alias", "table", "rules", "field_mappings", "router", "content_history_options") VALUES (14, 'Module', 'com_modules.module', '{"special":{"dbtable":"#__modules","key":"id","type":"Module","prefix":"Joomla\\\\CMS\\\\Table\\\\"}}', '', '{}', '', '{"formFile":"administrator\\/components\\/com_modules\\/forms\\/module.xml", "hideFields":["checked_out", "checked_out_time", "publish_up", "publish_down"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"checked_out", "targetTable":"#__users", "targetColumn":"id", "displayColumn":"name"}]}');
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-02-06.sql b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-02-06.sql
new file mode 100644
index 0000000000000..b456e37ba4e34
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-02-06.sql
@@ -0,0 +1,5 @@
+--
+-- Add position column to workflow stages table
+--
+
+ALTER TABLE "#__workflow_stages" ADD COLUMN "position" text NULL /** CAN FAIL **/;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-03-07.sql b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-03-07.sql
new file mode 100644
index 0000000000000..cfe92a8f8d613
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-03-07.sql
@@ -0,0 +1,15 @@
+UPDATE "#__extensions"
+   SET "params" = jsonb_set("params"::jsonb, '{html_height}' , '"550px"')
+ WHERE "type" = 'plugin'
+   AND "folder" = 'editors'
+   AND "element"  = 'tinymce'
+   AND "params" <> ''
+   AND "params"::jsonb->>'html_height' = '550';
+
+UPDATE "#__extensions"
+   SET "params" = jsonb_set("params"::jsonb, '{html_width}' , '"100%"')
+ WHERE "type" = 'plugin'
+   AND "folder" = 'editors'
+   AND "element"  = 'tinymce'
+   AND "params" <> ''
+   AND "params"::jsonb->>'html_width' = '750';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-03-10.sql b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-03-10.sql
new file mode 100644
index 0000000000000..723f9cafa746d
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-03-10.sql
@@ -0,0 +1,13 @@
+-- --------------------------------------------------------
+-- The following statement replaces the statement which has been disabled
+-- in file "6.1.0-2026-01-29.sql" with 6.1.0-beta3.
+-- See https://github.com/joomla/joomla-cms/pull/47361 for details.
+--
+INSERT INTO "#__content_types" ("type_title", "type_alias", "table", "rules", "field_mappings", "router", "content_history_options")
+SELECT 'Module', 'com_modules.module', '{"special":{"dbtable":"#__modules","key":"id","type":"Module","prefix":"Joomla\\\\CMS\\\\Table\\\\"}}', '', '{}', ''
+     , '{"formFile":"administrator\\/components\\/com_modules\\/forms\\/module.xml", "hideFields":["checked_out", "checked_out_time", "publish_up", "publish_down"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"checked_out", "targetTable":"#__users", "targetColumn":"id", "displayColumn":"name"}]}'
+WHERE NOT EXISTS (
+  SELECT * FROM "#__content_types" c
+   WHERE c."type_title" = 'Module' AND c."type_alias" = 'com_modules.module'
+     AND c."table" = '{"special":{"dbtable":"#__modules","key":"id","type":"Module","prefix":"Joomla\\\\CMS\\\\Table\\\\"}}'
+);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-03-13.sql b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-03-13.sql
new file mode 100644
index 0000000000000..9bbe0dda6b5db
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.1.0-2026-03-13.sql
@@ -0,0 +1,11 @@
+-- disable autostart for the previous tour
+UPDATE "#__guidedtours" SET "autostart" = 0 WHERE "uid" = 'joomla-whatsnew-6-0';
+
+INSERT INTO "#__guidedtours" ("title", "description", "extensions", "url", "published", "language", "note", "access", "uid", "autostart", "created", "created_by", "modified", "modified_by")
+SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_1_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_1_DESCRIPTION', '["com_cpanel"]', 'administrator/index.php', 1, '*', '', 1, 'joomla-whatsnew-6-1', 1, CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0
+ WHERE NOT EXISTS (SELECT * FROM "#__guidedtours" g WHERE g."uid" = 'joomla-whatsnew-6-1');
+
+INSERT INTO "#__guidedtour_steps" ("title", "description", "position", "target", "type", "interactive_type", "url", "published", "language", "note", "params", "created", "created_by", "modified", "modified_by", "tour_id")
+SELECT 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_1_STEP_0_TITLE', 'COM_GUIDEDTOURS_TOUR_WHATSNEW_6_1_STEP_0_DESCRIPTION', 'right', '#sidebarmenu nav > ul:first-of-type > li:last-child', 0, 1, '', 1, '*', '', '{"required":1,"requiredvalue":""}', CURRENT_TIMESTAMP, 0, CURRENT_TIMESTAMP, 0, MAX("id")
+  FROM "#__guidedtours"
+ WHERE "uid" = 'joomla-whatsnew-6-1';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.2.0-2026-07-21.sql b/administrator/components/com_admin/sql/updates/postgresql/6.2.0-2026-07-21.sql
new file mode 100644
index 0000000000000..52bef3ceb85dd
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.2.0-2026-07-21.sql
@@ -0,0 +1,5 @@
+--
+-- Add security column to updates table
+--
+
+ALTER TABLE "#__updates" ADD COLUMN "security" smallint NULL DEFAULT NULL /** CAN FAIL **/;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/6.2.0-2026-08-05.sql b/administrator/components/com_admin/sql/updates/postgresql/6.2.0-2026-08-05.sql
new file mode 100644
index 0000000000000..4ad7049a201bc
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/6.2.0-2026-08-05.sql
@@ -0,0 +1,9 @@
+--
+-- Add show_subcat_image param to com_content
+--
+
+UPDATE "#__extensions"
+SET "params" = jsonb_set("params"::jsonb, '{show_subcat_image}', '0', true)
+WHERE "element" = 'com_content'
+  AND "type" = 'component'
+  AND "params"::jsonb->>'show_subcat_image' IS NULL;
diff --git a/administrator/components/com_admin/src/Model/HelpModel.php b/administrator/components/com_admin/src/Model/HelpModel.php
index 2198e6430e801..489b9f2e53680 100644
--- a/administrator/components/com_admin/src/Model/HelpModel.php
+++ b/administrator/components/com_admin/src/Model/HelpModel.php
@@ -12,10 +12,7 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Help\Help;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\Filesystem\Folder;
-use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -28,14 +25,6 @@
  */
 class HelpModel extends BaseDatabaseModel
 {
-    /**
-     * The search string
-     *
-     * @var    string
-     * @since  1.6
-     */
-    protected $help_search = null;
-
     /**
      * The page to be viewed
      *
@@ -44,46 +33,6 @@ class HelpModel extends BaseDatabaseModel
      */
     protected $page = null;
 
-    /**
-     * The ISO language tag
-     *
-     * @var    string
-     * @since  1.6
-     */
-    protected $lang_tag = null;
-
-    /**
-     * Table of contents
-     *
-     * @var    array
-     * @since  1.6
-     */
-    protected $toc = [];
-
-    /**
-     * URL for the latest version check
-     *
-     * @var    string
-     * @since  1.6
-     */
-    protected $latest_version_check = null;
-
-    /**
-     * Method to get the help search string
-     *
-     * @return  string  Help search string
-     *
-     * @since   1.6
-     */
-    public function &getHelpSearch()
-    {
-        if (\is_null($this->help_search)) {
-            $this->help_search = Factory::getApplication()->getInput()->getString('helpsearch');
-        }
-
-        return $this->help_search;
-    }
-
     /**
      * Method to get the page
      *
@@ -99,91 +48,4 @@ public function &getPage()
 
         return $this->page;
     }
-
-    /**
-     * Method to get the lang tag
-     *
-     * @return  string  lang iso tag
-     *
-     * @since  1.6
-     */
-    public function getLangTag()
-    {
-        if (\is_null($this->lang_tag)) {
-            $this->lang_tag = Factory::getLanguage()->getTag();
-
-            if (!is_dir(JPATH_BASE . '/help/' . $this->lang_tag)) {
-                // Use English as fallback
-                $this->lang_tag = 'en-GB';
-            }
-        }
-
-        return $this->lang_tag;
-    }
-
-    /**
-     * Method to get the table of contents
-     *
-     * @return  array  Table of contents
-     */
-    public function &getToc()
-    {
-        if (\count($this->toc)) {
-            return $this->toc;
-        }
-
-        // Get vars
-        $lang_tag    = $this->getLangTag();
-        $help_search = $this->getHelpSearch();
-
-        // New style - Check for a TOC \JSON file
-        if (file_exists(JPATH_BASE . '/help/' . $lang_tag . '/toc.json')) {
-            $data = json_decode(file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/toc.json'));
-
-            // Loop through the data array
-            foreach ($data as $key => $value) {
-                $this->toc[$key] = Text::_('COM_ADMIN_HELP_' . $value);
-            }
-
-            // Sort the Table of Contents
-            asort($this->toc);
-
-            return $this->toc;
-        }
-
-        // Get Help files
-        $files = Folder::files(JPATH_BASE . '/help/' . $lang_tag, '\.xml$|\.html$');
-
-        foreach ($files as $file) {
-            $buffer = file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/' . $file);
-
-            if (!preg_match('#<title>(.*?)</title>#', $buffer, $m)) {
-                continue;
-            }
-
-            $title = trim($m[1]);
-
-            if (!$title) {
-                continue;
-            }
-
-            // Translate the page title
-            $title = Text::_($title);
-
-            // Strip the extension
-            $file = preg_replace('#\.xml$|\.html$#', '', $file);
-
-            if ($help_search && StringHelper::strpos(StringHelper::strtolower(strip_tags($buffer)), StringHelper::strtolower($help_search)) === false) {
-                continue;
-            }
-
-            // Add an item in the Table of Contents
-            $this->toc[$file] = $title;
-        }
-
-        // Sort the Table of Contents
-        asort($this->toc);
-
-        return $this->toc;
-    }
 }
diff --git a/administrator/components/com_admin/src/Model/SysinfoModel.php b/administrator/components/com_admin/src/Model/SysinfoModel.php
index d5a3eb239f48b..9ebd648c6176a 100644
--- a/administrator/components/com_admin/src/Model/SysinfoModel.php
+++ b/administrator/components/com_admin/src/Model/SysinfoModel.php
@@ -314,7 +314,7 @@ public function &getInfo(): array
 
         $this->info = [
             'version'                => (new Version())->getLongVersion(),
-            'compatpluginenabled'    => PluginHelper::isEnabled('behaviour', 'compat'),
+            'compatpluginenabled'    => PluginHelper::isEnabled('behaviour', 'compat6'),
             'compatpluginparameters' => $this->getCompatPluginParameters(),
             'phpversion'             => PHP_VERSION,
             'php'                    => php_uname(),
@@ -334,7 +334,7 @@ public function &getInfo(): array
 
     private function getCompatPluginParameters()
     {
-        $record = ExtensionHelper::getExtensionRecord('compat', 'plugin', 0, 'behaviour');
+        $record = ExtensionHelper::getExtensionRecord('compat6', 'plugin', 0, 'behaviour');
 
         if ($record) {
             $params = new Registry($record->params);
@@ -456,7 +456,7 @@ public function getExtensions(): array
     {
         $installed = [];
         $db        = $this->getDatabase();
-        $query     = $db->getQuery(true)
+        $query     = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__extensions'));
         $db->setQuery($query);
diff --git a/administrator/components/com_admin/src/Service/HTML/PhpSetting.php b/administrator/components/com_admin/src/Service/HTML/PhpSetting.php
index c1f18f44a8616..6e2cb2179f4a7 100644
--- a/administrator/components/com_admin/src/Service/HTML/PhpSetting.php
+++ b/administrator/components/com_admin/src/Service/HTML/PhpSetting.php
@@ -47,6 +47,18 @@ public function set($val)
         return Text::_($val ? 'JYES' : 'JNO');
     }
 
+    /**
+     * Method to generate a boolean message for a value
+     *
+     * @param   boolean  $val  is the value set?
+     *
+     * @return  string html code
+     */
+    public function enabled($val)
+    {
+        return Text::_($val ? 'JENABLED' : 'JDISABLED');
+    }
+
     /**
      * Method to generate a string message for a value
      *
diff --git a/administrator/components/com_admin/src/View/Help/HtmlView.php b/administrator/components/com_admin/src/View/Help/HtmlView.php
index 9d893b8cd8a70..12a04b64c1f00 100644
--- a/administrator/components/com_admin/src/View/Help/HtmlView.php
+++ b/administrator/components/com_admin/src/View/Help/HtmlView.php
@@ -43,20 +43,11 @@ class HtmlView extends BaseHtmlView
     protected $page = null;
 
     /**
-     * The iso language tag
+     * The level of each submenu
      *
-     * @var    string
-     * @since  1.6
-     */
-    protected $languageTag = null;
-
-    /**
-     * Table of contents
-     *
-     * @var    array
-     * @since  1.6
+     * @var    integer
      */
-    protected $toc = [];
+    protected $toclevel = 0;
 
     /**
      * Execute and display a template script.
@@ -73,10 +64,7 @@ public function display($tpl = null): void
     {
         /** @var HelpModel $model */
         $model                    = $this->getModel();
-        $this->helpSearch         = $model->getHelpSearch();
         $this->page               = $model->getPage();
-        $this->toc                = $model->getToc();
-        $this->languageTag        = $model->getLangTag();
 
         $this->addToolbar();
 
@@ -94,4 +82,21 @@ protected function addToolbar(): void
     {
         ToolbarHelper::title(Text::_('COM_ADMIN_HELP'), 'support help_header');
     }
+
+    /**
+     * Method to render a given level of a menu using provided layout file
+     *
+     * @param   string      $layoutFile  The layout file to be used to render
+     * @param   array       $menu        The menu to render the children of
+     *
+     * @return  void
+     *
+     * @since   6.2.0
+     */
+    public function renderSubmenu($layoutFile, $menu)
+    {
+        if (is_file($layoutFile)) {
+            require $layoutFile;
+        }
+    }
 }
diff --git a/administrator/components/com_admin/tmpl/help/default.php b/administrator/components/com_admin/tmpl/help/default.php
index 14e0a81b9833f..7bbdb2fb49034 100644
--- a/administrator/components/com_admin/tmpl/help/default.php
+++ b/administrator/components/com_admin/tmpl/help/default.php
@@ -10,44 +10,38 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Help\Help;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Router\Route;
 
 /** @var \Joomla\Component\Admin\Administrator\View\Help\HtmlView $this */
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->getDocument()->getWebAssetManager();
-$wa->useScript('com_admin.admin-help');
+$wa->useScript('com_admin.admin-help')
+    ->useStyle('com_admin.admin-help');
+
+// Get the HTML for the Table of Contents from a separate file.
+include_once 'toc-src.php';
 
 ?>
-<form action="<?php echo Route::_('index.php?option=com_admin&amp;view=help'); ?>" method="post" name="adminForm" id="adminForm" class="main-card">
-    <div class="row mt-sm-3">
-        <div id="sidebar" class="col-md-3">
-            <button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-bs-toggle="collapse" data-bs-target=".sidebar-nav" aria-controls="help-index" aria-expanded="false">
-                 <span class="icon-align-justify" aria-hidden="true"></span>
-                 <?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>
-            </button>
-            <div class="sidebar-nav" id="help-index">
-                <ul class="nav flex-column">
-                    <li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('Start_Here'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
-                    <li class="item"><?php echo HTMLHelper::_('link', 'https://help.joomla.org/proxy?keyref=Help4.x:License', Text::_('COM_ADMIN_LICENSE'), ['target' => 'helpFrame']); ?></li>
-                    <li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('Glossary'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
-                    <li class="divider"></li>
-                    <li class="nav-header"><?php echo Text::_('COM_ADMIN_ALPHABETICAL_INDEX'); ?></li>
-                    <?php foreach ($this->toc as $k => $v) : ?>
-                        <li class="item">
-                            <?php $url = Help::createUrl($k); ?>
-                            <?php echo HTMLHelper::_('link', $url, $v, ['target' => 'helpFrame']); ?>
-                        </li>
-                    <?php endforeach; ?>
-                </ul>
-            </div>
-        </div>
-        <div class="col-md-9">
-            <iframe onLoad="var x = getElementById('help-index'); x.classList.remove('show');" name="helpFrame" title="helpFrame" height="2100px" src="<?php echo $this->page; ?>" class="helpFrame table table-bordered"></iframe>
-        </div>
+<div class="d-flex flex-column flex-md-row">
+    <div id="help-sidebar" class="flex-shrink-0 mt-md-2">
+        <!-- Left menu -->
+        <button class="btn btn-sm btn-secondary my-2 options-menu d-md-none" type="button" data-bs-toggle="collapse" data-bs-target="#help-index" aria-controls="help-index" aria-expanded="false">
+            <span class="icon-align-justify" aria-hidden="true"></span>
+            <?php echo Text::_('JTOGGLE_SIDEBAR_MENU'); ?>
+        </button>
+        <nav id="help-index" class="main-nav help-nav sidebar-wrapper">
+            <h2><?php echo Text::_('COM_ADMIN_HELP_INDEX'); ?></h2>
+            <ul id="helpmenu" class="help-nav flex-column">
+                <?php
+                    // WARNING: Do not use direct 'include' or 'require' as it is important to isolate the scope for each call
+                    $this->renderSubmenu(JPATH_ADMINISTRATOR . '/components/com_admin/tmpl/help/toc-build.php', $menu);
+                ?>
+            </ul>
+        </nav>
+    </div>
+    <div class="flex-grow-1 mt-2">
+        <!-- Right content -->
+        <iframe name="helpFrame" title="<?php echo Text::_('COM_ADMIN_HELP_FRAME_TITLE'); ?>" height="2100px" src="" class="helpFrame table table-bordered"></iframe>
     </div>
-    <input class="textarea" type="hidden" name="option" value="com_admin">
-</form>
+</div>
diff --git a/administrator/components/com_admin/tmpl/help/toc-build.php b/administrator/components/com_admin/tmpl/help/toc-build.php
new file mode 100644
index 0000000000000..49da7d3bfad3b
--- /dev/null
+++ b/administrator/components/com_admin/tmpl/help/toc-build.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\Help\Help;
+use Joomla\CMS\Language\Text;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+// Increase the toclevel on entry
+$this->toclevel += 1;
+if ($this->toclevel > 1) {
+    $collapse = ' mm-collapse';
+    echo "<ul class=\"collapse-level-1{$collapse}\">\n";
+}
+foreach ($menu as $label => $value) {
+    $text = Text::_('COM_ADMIN_HELP_' . $label);
+    $lclabel = strtolower(str_replace('_', '-', $label));
+
+    if (is_array($value)) {
+        // This is a folder list item
+            $icon = "<span class=\"icon-folder\" aria-hidden=\"true\"></span>";
+        $wrap_label = "<span class=\"item-title\">{$text}</span>";
+        echo "<li class=\"item parent item-level-{$this->toclevel}\">";
+        echo "<a href=\"#\" class=\"has-arrow\">";
+        echo "{$icon}{$wrap_label}</a>\n";
+        if (!empty($value)) {
+            // Recursively build sublist.
+            $this->renderSubmenu(JPATH_ADMINISTRATOR . '/components/com_admin/tmpl/help/toc-build.php', $value);
+        }
+        echo "</li>\n";
+    } else {
+        // This is an article list item.
+        $icon = "<span class=\"icon-file-alt\" aria-hidden=\"true\"></span>";
+        // The url is help.joomla.org + $label (the help key).
+        $url = Help::createUrl($label);
+        $link = "<a data-id=\"{$lclabel}\" href=\"{$url}\" target=\"helpFrame\">{$icon}{$text}</a>\n";
+        echo "<li class=\"item item-level-{$this->toclevel}\">{$link}</li>\n";
+    }
+}
+echo "</ul>\n";
+// On return decrease the toclevel
+$this->toclevel -= 1;
diff --git a/administrator/components/com_admin/tmpl/help/toc-src.php b/administrator/components/com_admin/tmpl/help/toc-src.php
new file mode 100644
index 0000000000000..6fee063304a30
--- /dev/null
+++ b/administrator/components/com_admin/tmpl/help/toc-src.php
@@ -0,0 +1,280 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+$menu = [
+    "START_HERE" => [
+        "Start_Here" => "START_HERE",
+        "License" => "COM_ADMIN_HELP_LICENSE",
+        "Glossary" => "GLOSSARY",
+        "Home_Dashboard" => "HOME_DASHBOARD",
+        "Site_Global_Configuration" => "SITE_GLOBAL_CONFIGURATION",
+    ],
+    "CONTENT" => [
+        "ARTICLES" => [
+            "Articles" => "ARTICLES",
+            "Articles:_Edit" => "ARTICLES:_EDIT",
+            "Articles:_Categories" => "ARTICLES:_CATEGORIES",
+            "Articles:_Edit_Category" => "ARTICLES:_EDIT_CATEGORY",
+            "Articles:_Featured" => "ARTICLES:_FEATURED",
+            "Articles:_Options" => "ARTICLES:_OPTIONS",
+        ],
+        "WORKFLOWS" => [
+            "Workflows_List" => "WORKFLOWS_LIST",
+            "Stages_List:_Basic_Workflow" => "STAGES_LIST:_BASIC_WORKFLOW",
+            "Transitions_List:_Basic_Workflow" => "TRANSITIONS_LIST:_BASIC_WORKFLOW",
+        ],
+        "FIELDS" => [
+            "Field_Groups" => "FIELD_GROUPS",
+            "Field_Groups:_Edit" => "FIELD_GROUPS:_EDIT",
+            "Fields" => "FIELDS",
+            "Fields:_Edit" => "FIELDS:_EDIT",
+        ],
+        "MEDIA" => [
+            "Media" => "MEDIA",
+            "Media:_Options" => "MEDIA:_OPTIONS",
+        ],
+        "MODULES" => [
+            "Modules" => "MODULES",
+            "Modules:_Options" => "MODULES:_OPTIONS",
+        ],
+        "SITE_MODULES" => [
+            "Site_Modules:_Articles" => "SITE_MODULES:_ARTICLES",
+            "Site_Modules:_Articles_-_Archived" => "SITE_MODULES:_ARTICLES_-_ARCHIVED",
+            "Site_Modules:_Articles_-_Latest" => "SITE_MODULES:_ARTICLES_-_LATEST",
+            "Site_Modules:_Articles_-_Most_Read" => "SITE_MODULES:_ARTICLES_-_MOST_READ",
+            "Site_Modules:_Articles_-_Newsflash" => "SITE_MODULES:_ARTICLES_-_NEWSFLASH",
+            "Site_Modules:_Articles_-_Related" => "SITE_MODULES:_ARTICLES_-_RELATED",
+            "Site_Modules:_Banners" => "SITE_MODULES:_BANNERS",
+            "Site_Modules:_Breadcrumbs" => "SITE_MODULES:_BREADCRUMBS",
+            "Site_Modules:_Custom" => "SITE_MODULES:_CUSTOM",
+            "Site_Modules:_Feed_Display" => "SITE_MODULES:_FEED_DISPLAY",
+            "Site_Modules:_Footer" => "SITE_MODULES:_FOOTER",
+            "Site_Modules:_Language_Switcher" => "SITE_MODULES:_LANGUAGE_SWITCHER",
+            "Site_Modules:_Login" => "SITE_MODULES:_LOGIN",
+            "Site_Modules:_Menu" => "SITE_MODULES:_MENU",
+            "Site_Modules:_Random_Image" => "SITE_MODULES:_RANDOM_IMAGE",
+            "Site_Modules:_Smart_Search" => "SITE_MODULES:_SMART_SEARCH",
+            "Site_Modules:_Statistics" => "SITE_MODULES:_STATISTICS",
+            "Site_Modules:_Syndication_Feeds" => "SITE_MODULES:_SYNDICATION_FEEDS",
+            "Site_Modules:_Tags_-_Popular" => "SITE_MODULES:_TAGS_-_POPULAR",
+            "Site_Modules:_Tags_-_Similar" => "SITE_MODULES:_TAGS_-_SIMILAR",
+            "Site_Modules:_Wrapper" => "SITE_MODULES:_WRAPPER",
+        ],
+        "ADMIN_MODULES" => [
+            "Admin_Modules:_Action_Logs_-_Latest" => "ADMIN_MODULES:_ACTION_LOGS_-_LATEST",
+            "Admin_Modules:_Administrator_Dashboard_Menu" => "ADMIN_MODULES:_ADMINISTRATOR_DASHBOARD_MENU",
+            "Admin_Modules:_Administrator_Menu" => "ADMIN_MODULES:_ADMINISTRATOR_MENU",
+            "Admin_Modules:_Articles_-_Latest" => "ADMIN_MODULES:_ARTICLES_-_LATEST",
+            "Admin_Modules:_Custom" => "ADMIN_MODULES:_CUSTOM",
+            "Admin_Modules:_Feed_Display" => "ADMIN_MODULES:_FEED_DISPLAY",
+            "Admin_Modules:_Frontend_Link" => "ADMIN_MODULES:_FRONTEND_LINK",
+            "Admin_Modules:_Guided_Tours" => "ADMIN_MODULES:_GUIDED_TOURS",
+            "Admin_Modules:_Joomla_Version_Information" => "ADMIN_MODULES:_JOOMLA_VERSION_INFORMATION",
+            "Admin_Modules:_Login_Form" => "ADMIN_MODULES:_LOGIN_FORM",
+            "Admin_Modules:_Login_Support_Information" => "ADMIN_MODULES:_LOGIN_SUPPORT_INFORMATION",
+            "Admin_Modules:_Messages" => "ADMIN_MODULES:_MESSAGES",
+            "Admin_Modules:_Multilingual_Status" => "ADMIN_MODULES:_MULTILINGUAL_STATUS",
+            "Admin_Modules:_Popular_Articles" => "ADMIN_MODULES:_POPULAR_ARTICLES",
+            "Admin_Modules:_Post_Installation_Messages" => "ADMIN_MODULES:_POST_INSTALLATION_MESSAGES",
+            "Admin_Modules:_Privacy_Dashboard" => "ADMIN_MODULES:_PRIVACY_DASHBOARD",
+            "Admin_Modules:_Privacy_Status_Check" => "ADMIN_MODULES:_PRIVACY_STATUS_CHECK",
+            "Admin_Modules:_Quick_Icons" => "ADMIN_MODULES:_QUICK_ICONS",
+            "Admin_Modules:_Sample_Data" => "ADMIN_MODULES:_SAMPLE_DATA",
+            "Admin_Modules:_Title" => "ADMIN_MODULES:_TITLE",
+            "Admin_Modules:_Toolbar" => "ADMIN_MODULES:_TOOLBAR",
+        ],
+    ],
+    "MENUS" => [
+        "MENUS" => [
+            "Menus" => "MENUS",
+            "Menus:_Edit" => "MENUS:_EDIT",
+            "Menus:_Items" => "MENUS:_ITEMS",
+            "Menus:_Options" => "MENUS:_OPTIONS",
+        ],
+        "MENU_ITEMS" => [
+            "Menu_Item:_Alias" => "MENU_ITEM:_ALIAS",
+            "Menu_Item:_Article_Archived" => "MENU_ITEM:_ARTICLE_ARCHIVED",
+            "Menu_Item:_Compact_List_of_Tagged_Items" => "MENU_ITEM:_COMPACT_LIST_OF_TAGGED_ITEMS",
+            "Menu_Item:_Components_Menu_Container" => "MENU_ITEM:_COMPONENTS_MENU_CONTAINER",
+            "Menu_Item:_Confirm_Request" => "MENU_ITEM:_CONFIRM_REQUEST",
+            "Menu_Item:_Create_Article" => "MENU_ITEM:_CREATE_ARTICLE",
+            "Menu_Item:_Create_Contact" => "MENU_ITEM:_CREATE_CONTACT",
+            "Menu_Item:_Create_Request" => "MENU_ITEM:_CREATE_REQUEST",
+            "Menu_Item:_Display_Template_Options" => "MENU_ITEM:_DISPLAY_TEMPLATE_OPTIONS",
+            "Menu_Item:_Extend_Consent" => "MENU_ITEM:_EXTEND_CONSENT",
+            "Menu_Item:_Featured_Articles" => "MENU_ITEM:_FEATURED_ARTICLES",
+            "Menu_Item:_Featured_Contacts" => "MENU_ITEM:_FEATURED_CONTACTS",
+            "Menu_Item:_Heading" => "MENU_ITEM:_HEADING",
+            "Menu_Item:_Iframe_Wrapper" => "MENU_ITEM:_IFRAME_WRAPPER",
+            "Menu_Item:_List_All_Tags" => "MENU_ITEM:_LIST_ALL_TAGS",
+            "Menu_Item:_Login_Form" => "MENU_ITEM:_LOGIN_FORM",
+            "Menu_Item:_Logout" => "MENU_ITEM:_LOGOUT",
+            "Menu_Item:_New_Item" => "MENU_ITEM:_NEW_ITEM",
+            "Menu_Item:_Password_Reset" => "MENU_ITEM:_PASSWORD_RESET",
+            "Menu_Item:_Registration_Form" => "MENU_ITEM:_REGISTRATION_FORM",
+            "Menu_Item:_Search" => "MENU_ITEM:_SEARCH",
+            "Menu_Item:_Separator" => "MENU_ITEM:_SEPARATOR",
+            "Menu_Item:_Single_Article" => "MENU_ITEM:_SINGLE_ARTICLE",
+            "Menu_Item:_Single_Contact" => "MENU_ITEM:_SINGLE_CONTACT",
+            "Menu_Item:_Single_News_Feed" => "MENU_ITEM:_SINGLE_NEWS_FEED",
+            "Menu_Item:_Site_Configuration_Options" => "MENU_ITEM:_SITE_CONFIGURATION_OPTIONS",
+            "Menu_Item:_Tagged_Items" => "MENU_ITEM:_TAGGED_ITEMS",
+            "Menu_Item:_URL" => "MENU_ITEM:_URL",
+        ],
+    ],
+    "COMPONENTS" => [
+        "BANNERS" => [
+            "Banners" => "BANNERS",
+            "Banners:_Edit" => "BANNERS:_EDIT",
+            "Banners:_Categories" => "BANNERS:_CATEGORIES",
+            "Banners:_New_or_Edit_Category" => "BANNERS:_NEW_OR_EDIT_CATEGORY",
+            "Banners:_Clients" => "BANNERS:_CLIENTS",
+            "Banners:_New_or_Edit_Client" => "BANNERS:_NEW_OR_EDIT_CLIENT",
+            "Banners:_Tracks" => "BANNERS:_TRACKS",
+            "Banners:_Options" => "BANNERS:_OPTIONS",
+        ],
+        "CONTACTS" => [
+            "Contacts" => "CONTACTS",
+            "Contacts:_Edit" => "CONTACTS:_EDIT",
+            "Contacts:_Categories" => "CONTACTS:_CATEGORIES",
+            "Contacts:_Edit_Category" => "CONTACTS:_EDIT_CATEGORY",
+            "Contacts:_Options" => "CONTACTS:_OPTIONS",
+        ],
+        "NEWS_FEEDS" => [
+            "News_Feeds" => "NEWS_FEEDS",
+            "News_Feeds:_Edit" => "NEWS_FEEDS:_EDIT",
+            "News_Feeds:_Categories" => "NEWS_FEEDS:_CATEGORIES",
+            "News_Feeds:_Edit_Category" => "NEWS_FEEDS:_EDIT_CATEGORY",
+            "News_Feed:_Options" => "NEWS_FEED:_OPTIONS",
+        ],
+        "SMART_SEARCH" => [
+            "Smart_Search:_Indexed_Content" => "SMART_SEARCH:_INDEXED_CONTENT",
+            "Smart_Search:_Content_Maps" => "SMART_SEARCH:_CONTENT_MAPS",
+            "Smart_Search:_Search_Filters" => "SMART_SEARCH:_SEARCH_FILTERS",
+            "Smart_Search:_New_or_Edit_Filter" => "SMART_SEARCH:_NEW_OR_EDIT_FILTER",
+            "Smart_Search:_Search_Term_Analysis" => "SMART_SEARCH:_SEARCH_TERM_ANALYSIS",
+            "Smart_Search:_Options" => "SMART_SEARCH:_OPTIONS",
+        ],
+        "TAGS" => [
+            "Tags" => "TAGS",
+            "Tags:_New_or_Edit" => "TAGS:_NEW_OR_EDIT",
+            "Tags:_Options" => "TAGS:_OPTIONS",
+        ],
+    ],
+    "USERS" => [
+        "Users" => "USERS",
+        "Users:_Edit_Profile" => "USERS:_EDIT_PROFILE",
+        "Users:_Viewing_Access_Levels" => "USERS:_VIEWING_ACCESS_LEVELS",
+        "Users:_Edit_Viewing_Access_Level" => "USERS:_EDIT_VIEWING_ACCESS_LEVEL",
+        "Users:_Groups" => "USERS:_GROUPS",
+        "Users:_New_or_Edit_Group" => "USERS:_NEW_OR_EDIT_GROUP",
+        "Permissions_for_Group" => "PERMISSIONS_FOR_GROUP",
+        "Permissions_for_User" => "PERMISSIONS_FOR_USER",
+        "Users:_Options" => "USERS:_OPTIONS",
+    ],
+    "USER_ACTIONS" => [
+        "User_Actions_Log" => "USER_ACTIONS_LOG",
+        "User_Actions_Log:_Options" => "USER_ACTIONS_LOG:_OPTIONS",
+        "User_Notes" => "USER_NOTES",
+        "User_Notes:_New_or_Edit" => "USER_NOTES:_NEW_OR_EDIT",
+        "Mass_Mail_Users" => "MASS_MAIL_USERS",
+        "Private_Messages" => "PRIVATE_MESSAGES",
+        "Private_Messages:_Read" => "PRIVATE_MESSAGES:_READ",
+        "Private_Messages:_Write" => "PRIVATE_MESSAGES:_WRITE",
+        "Messages:_Options" => "MESSAGES:_OPTIONS",
+    ],
+    "PRIVACY" => [
+        "Privacy_Dashboard" => "PRIVACY_DASHBOARD",
+        "Privacy:_Consents" => "PRIVACY:_CONSENTS",
+        "Privacy:_Extension_Capabilities" => "PRIVACY:_EXTENSION_CAPABILITIES",
+        "Privacy:_Information_Requests" => "PRIVACY:_INFORMATION_REQUESTS",
+        "Privacy:_New_Information_Request" => "PRIVACY:_NEW_INFORMATION_REQUEST",
+        "Privacy:_Review_Information_Request" => "PRIVACY:_REVIEW_INFORMATION_REQUEST",
+        "Privacy:_Options" => "PRIVACY:_OPTIONS",
+    ],
+    "SYSTEM" => [
+        "EXTENSIONS" => [
+            "Extensions:_Discover" => "EXTENSIONS:_DISCOVER",
+            "Extensions:_Install" => "EXTENSIONS:_INSTALL",
+            "Extensions:_Languages" => "EXTENSIONS:_LANGUAGES",
+            "Extensions:_Manage" => "EXTENSIONS:_MANAGE",
+            "Extensions:_Update" => "EXTENSIONS:_UPDATE",
+            "Extensions:_Update_Sites" => "EXTENSIONS:_UPDATE_SITES",
+        ],
+        "TEMPLATES" => [
+            "Templates:_Templates" => "TEMPLATES:_TEMPLATES",
+            "Templates:_Customise" => "TEMPLATES:_CUSTOMISE",
+            "Templates:_Customise_Source" => "TEMPLATES:_CUSTOMISE_SOURCE",
+            "Templates:_Styles" => "TEMPLATES:_STYLES",
+            "Templates:_Edit_Style" => "TEMPLATES:_EDIT_STYLE",
+            "Template:_Options" => "TEMPLATE:_OPTIONS",
+            "Mail_Templates" => "MAIL_TEMPLATES",
+            "Mail_Template:_Edit" => "MAIL_TEMPLATE:_EDIT",
+            "Mail_Templates:_Options" => "MAIL_TEMPLATES:_OPTIONS",
+        ],
+        "MAINTENANCE" => [
+            "Information:_Database" => "INFORMATION:_DATABASE",
+            "Maintenance:_Clear_Cache" => "MAINTENANCE:_CLEAR_CACHE",
+            "Maintenance:_Global_Check-in" => "MAINTENANCE:_GLOBAL_CHECK-IN",
+            "Cache:_Options" => "CACHE:_OPTIONS",
+            "Check-in:_Options" => "CHECK-IN:_OPTIONS",
+        ],
+        "LANGUAGES" => [
+            "Languages:_Content" => "LANGUAGES:_CONTENT",
+            "Languages:_Edit_Content_Language" => "LANGUAGES:_EDIT_CONTENT_LANGUAGE",
+            "Languages:_Edit_Override" => "LANGUAGES:_EDIT_OVERRIDE",
+            "Languages:_Installed" => "LANGUAGES:_INSTALLED",
+            "Languages:_Options" => "LANGUAGES:_OPTIONS",
+            "Languages:_Overrides" => "LANGUAGES:_OVERRIDES",
+            "Multilingual_Associations" => "MULTILINGUAL_ASSOCIATIONS",
+            "Multilingual_Associations:_Edit" => "MULTILINGUAL_ASSOCIATIONS:_EDIT",
+            "Multilingual_Associations:_Options" => "MULTILINGUAL_ASSOCIATIONS:_OPTIONS",
+        ],
+        "PLUGINS" => [
+            "Plugins" => "PLUGINS",
+            "Plugins:_Name_of_Plugin" => "PLUGINS:_NAME_OF_PLUGIN",
+            "Editors" => "EDITORS",
+            "Plugin:_Options" => "PLUGIN:_OPTIONS",
+        ],
+        "REDIRECTS" => [
+            "Redirects:_Links" => "REDIRECTS:_LINKS",
+            "Redirects:_New_or_Edit" => "REDIRECTS:_NEW_OR_EDIT",
+            "Redirect:_Options" => "REDIRECT:_OPTIONS",
+        ],
+        "GUIDED_TOURS" => [
+            "Guided_Tours" => "GUIDED_TOURS",
+            "Guided_Tours:_New_or_Edit_Tour" => "GUIDED_TOURS:_NEW_OR_EDIT_TOUR",
+            "Guided_Tours:_Steps" => "GUIDED_TOURS:_STEPS",
+            "Guided_Tours:_New_or_Edit_Step" => "GUIDED_TOURS:_NEW_OR_EDIT_STEP",
+            "Guided_Tours:_Options" => "GUIDED_TOURS:_OPTIONS",
+        ],
+        "SCHEDULED_TASKS" => [
+            "Scheduled_Tasks" => "SCHEDULED_TASKS",
+            "Scheduled_Tasks:_Edit" => "SCHEDULED_TASKS:_EDIT",
+            "Scheduled_Tasks:_Options" => "SCHEDULED_TASKS:_OPTIONS",
+        ],
+        "INFORMATION" => [
+            "Information:_Warnings" => "INFORMATION:_WARNINGS",
+            "Post-installation_Messages_for_Joomla_CMS" => "POST-INSTALLATION_MESSAGES_FOR_JOOMLA_CMS",
+            "Post-installation_Messages:_Options" => "POST-INSTALLATION_MESSAGES:_OPTIONS",
+            "Site_System_Information" => "SITE_SYSTEM_INFORMATION",
+        ],
+        "JOOMLA_UPDATE" => [
+            "Joomla_Update" => "JOOMLA_UPDATE",
+            "Joomla_Update:_Options" => "JOOMLA_UPDATE:_OPTIONS",
+            "Edit_Update_Site" => "EDIT_UPDATE_SITE",
+            "Installer:_Options" => "INSTALLER:_OPTIONS",
+        ],
+    ],
+];
diff --git a/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php b/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php
index 078555d28d371..a2f520c81b14c 100644
--- a/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php
+++ b/administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php
@@ -109,7 +109,7 @@
                     <?php echo Text::_('COM_ADMIN_SESSION_AUTO_START'); ?>
                 </th>
                 <td>
-                    <?php echo (int) $this->phpSettings['session.auto_start']; ?>
+                    <?php echo HTMLHelper::_('phpsetting.enabled', $this->phpSettings['session.auto_start']); ?>
                 </td>
             </tr>
             <tr>
diff --git a/administrator/components/com_associations/src/Helper/AssociationsHelper.php b/administrator/components/com_associations/src/Helper/AssociationsHelper.php
index 6f591141a919e..3fb7a8d10446d 100644
--- a/administrator/components/com_associations/src/Helper/AssociationsHelper.php
+++ b/administrator/components/com_associations/src/Helper/AssociationsHelper.php
@@ -258,7 +258,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
                     $db = Factory::getDbo();
 
                     // Get the category name
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select($db->quoteName('title'))
                         ->from($db->quoteName('#__categories'))
                         ->where($db->quoteName('id') . ' = :id')
@@ -272,7 +272,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
                     $db = Factory::getDbo();
 
                     // Get the menutype name
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select($db->quoteName('title'))
                         ->from($db->quoteName('#__menu_types'))
                         ->where($db->quoteName('menutype') . ' = :menutype')
@@ -448,7 +448,7 @@ private static function getEnabledExtensions()
     {
         $db = Factory::getDbo();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
@@ -653,7 +653,7 @@ public static function getTypeFieldName($extensionName, $typeName, $fieldName)
     public static function getLanguagefilterPluginId()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
diff --git a/administrator/components/com_associations/src/Model/AssociationModel.php b/administrator/components/com_associations/src/Model/AssociationModel.php
index 1f366ecf36ead..6ba21237c628a 100644
--- a/administrator/components/com_associations/src/Model/AssociationModel.php
+++ b/administrator/components/com_associations/src/Model/AssociationModel.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Associations\Administrator\Model;
 
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\MVC\Model\ListModel;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -29,15 +30,13 @@ class AssociationModel extends ListModel
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since  3.7.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_associations.association', 'association', ['control' => 'jform', 'load_data' => $loadData]);
-
-        return !empty($form) ? $form : false;
+        return $this->loadForm('com_associations.association', 'association', ['control' => 'jform', 'load_data' => $loadData]);
     }
 }
diff --git a/administrator/components/com_associations/src/Model/AssociationsModel.php b/administrator/components/com_associations/src/Model/AssociationsModel.php
index c0cffcc55f771..03adf17c33da7 100644
--- a/administrator/components/com_associations/src/Model/AssociationsModel.php
+++ b/administrator/components/com_associations/src/Model/AssociationsModel.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Category;
 use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
@@ -170,7 +170,7 @@ protected function getListQuery()
         // Create a new query object.
         $user     = $this->getCurrentUser();
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
 
         $details = $type->get('details');
 
@@ -389,7 +389,7 @@ protected function getListQuery()
         $baselevel = 1;
 
         if ($categoryId = $this->getState('filter.category_id')) {
-            $categoryTable = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\');
+            $categoryTable = new Category($db);
             $categoryTable->load($categoryId);
             $baselevel = (int) $categoryTable->level;
 
@@ -462,7 +462,7 @@ public function purge($context = '', $key = '')
     {
         $app   = Factory::getApplication();
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)->delete($db->quoteName('#__associations'));
+        $query = $db->createQuery()->delete($db->quoteName('#__associations'));
 
         // Filter by associations context.
         if ($context) {
@@ -508,7 +508,7 @@ public function clean($context = '', $key = '')
     {
         $app   = Factory::getApplication();
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('key') . ', COUNT(*)')
             ->from($db->quoteName('#__associations'))
             ->group($db->quoteName('key'))
diff --git a/administrator/components/com_associations/src/View/Association/HtmlView.php b/administrator/components/com_associations/src/View/Association/HtmlView.php
index 8e155d2aa4113..b5964d93e9a19 100644
--- a/administrator/components/com_associations/src/View/Association/HtmlView.php
+++ b/administrator/components/com_associations/src/View/Association/HtmlView.php
@@ -250,6 +250,32 @@ public function display($tpl = null): void
             if (!empty($this->typeSupports['save2copy'])) {
                 $this->save2copy = true;
             }
+
+            if (\array_key_exists('urlOptions', $details)) {
+                $urlOptions     = $details['urlOptions'];
+                $specialOptions = [];
+
+                foreach ($urlOptions as $tag => $urlOption) {
+                    $helper = $extension->get('helper');
+
+                    if (\array_key_exists('functionName', $urlOption)) {
+                        $func = $urlOption['functionName'];
+                        $args = [];
+
+                        if (\array_key_exists('params', $urlOption)) {
+                            $params = $urlOption['params'];
+
+                            foreach ($params as $param) {
+                                $args[] = $input->get($param);
+                            }
+                        }
+
+                        $value = \call_user_func_array([$helper, $func], $args);
+                    }
+
+                    $specialOptions[$tag] = $value;
+                }
+            }
         }
 
         $this->extensionName = $extensionName;
@@ -289,6 +315,10 @@ public function display($tpl = null): void
             ];
         }
 
+        if (!empty($specialOptions)) {
+            $options = array_merge($options, $specialOptions);
+        }
+
         // Reference and target edit links.
         $this->editUri = 'index.php?' . http_build_query($options);
 
@@ -317,6 +347,11 @@ public function display($tpl = null): void
 
         $this->addToolbar();
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task')
+            ->addControlField('target-id', '', ['id' => 'target-id']);
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_associations/src/View/Associations/HtmlView.php b/administrator/components/com_associations/src/View/Associations/HtmlView.php
index 64a32d30d8ea7..e2ab6004af122 100644
--- a/administrator/components/com_associations/src/View/Associations/HtmlView.php
+++ b/administrator/components/com_associations/src/View/Associations/HtmlView.php
@@ -135,6 +135,10 @@ public function display($tpl = null)
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task');
+
         if (!Associations::isEnabled()) {
             $link = Route::_('index.php?option=com_plugins&task=plugin.edit&extension_id=' . AssociationsHelper::getLanguagefilterPluginId());
             Factory::getApplication()->enqueueMessage(Text::sprintf('COM_ASSOCIATIONS_ERROR_NO_ASSOC', $link), 'warning');
@@ -212,6 +216,11 @@ public function display($tpl = null)
                         if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) {
                             $this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
                         }
+
+                        // Add extra form control fields for modal
+                        $this->filterForm
+                            ->addControlField('forcedItemType', Factory::getApplication()->getInput()->get('forcedItemType', '', 'string'))
+                            ->addControlField('forcedLanguage', $forcedLanguage);
                     }
                 }
 
diff --git a/administrator/components/com_associations/tmpl/association/edit.php b/administrator/components/com_associations/tmpl/association/edit.php
index c654584ee894e..669ae9b18e4d4 100644
--- a/administrator/components/com_associations/tmpl/association/edit.php
+++ b/administrator/components/com_associations/tmpl/association/edit.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -82,7 +81,5 @@
         </div>
     </div>
 
-    <input type="hidden" name="task" value="">
-    <input type="hidden" name="target-id" id="target-id" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_associations/tmpl/associations/default.php b/administrator/components/com_associations/tmpl/associations/default.php
index 3c6bcc2f202c7..290d9c5da1239 100644
--- a/administrator/components/com_associations/tmpl/associations/default.php
+++ b/administrator/components/com_associations/tmpl/associations/default.php
@@ -164,8 +164,8 @@
                     <?php echo $this->pagination->getListFooter(); ?>
 
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_associations/tmpl/associations/modal.php b/administrator/components/com_associations/tmpl/associations/modal.php
index 5a4b2214e4519..f945152d581eb 100644
--- a/administrator/components/com_associations/tmpl/associations/modal.php
+++ b/administrator/components/com_associations/tmpl/associations/modal.php
@@ -164,9 +164,6 @@
 
         <?php endif; ?>
 
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="forcedItemType" value="<?php echo $app->getInput()->get('forcedItemType', '', 'string'); ?>">
-        <input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'cmd'); ?>">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </form>
 </div>
diff --git a/administrator/components/com_banners/helpers/banners.php b/administrator/components/com_banners/helpers/banners.php
index ab6c17e19c362..fec09b76df383 100644
--- a/administrator/components/com_banners/helpers/banners.php
+++ b/administrator/components/com_banners/helpers/banners.php
@@ -19,7 +19,7 @@
  *
  * @since       1.6
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Banners\Administrator\Helper\BannersHelper instead
  */
 class BannersHelper extends \Joomla\Component\Banners\Administrator\Helper\BannersHelper
diff --git a/administrator/components/com_banners/src/Helper/BannersHelper.php b/administrator/components/com_banners/src/Helper/BannersHelper.php
index cd867e89e53e5..a74c0f0add8dc 100644
--- a/administrator/components/com_banners/src/Helper/BannersHelper.php
+++ b/administrator/components/com_banners/src/Helper/BannersHelper.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Table\Table;
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -43,7 +42,7 @@ public static function updateReset()
         $app     = Factory::getApplication();
         $user    = $app->getIdentity();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__banners'))
             ->where(
@@ -78,7 +77,7 @@ public static function updateReset()
 
             if ($purchaseType < 0 && $row->cid) {
                 /** @var \Joomla\Component\Banners\Administrator\Table\ClientTable $client */
-                $client = Table::getInstance('ClientTable', '\\Joomla\\Component\\Banners\\Administrator\\Table\\');
+                $client = $app->bootComponent('com_banners')->getMVCFactory()->createTable('Client', 'Administrator');
                 $client->load($row->cid);
                 $purchaseType = $client->purchase_type;
             }
@@ -111,7 +110,7 @@ public static function updateReset()
             }
 
             // Update the row ordering field.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__banners'))
                 ->set(
                     [
@@ -148,7 +147,7 @@ public static function getClientOptions()
         $options = [];
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id', 'value'),
diff --git a/administrator/components/com_banners/src/Model/BannerModel.php b/administrator/components/com_banners/src/Model/BannerModel.php
index 9e7b1eb703edf..c8ab1d37b548c 100644
--- a/administrator/components/com_banners/src/Model/BannerModel.php
+++ b/administrator/components/com_banners/src/Model/BannerModel.php
@@ -16,6 +16,7 @@
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Table\TableInterface;
+use Joomla\CMS\Versioning\VersionableModelInterface;
 use Joomla\CMS\Versioning\VersionableModelTrait;
 use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
 use Joomla\Database\ParameterType;
@@ -29,7 +30,7 @@
  *
  * @since  1.6
  */
-class BannerModel extends AdminModel
+class BannerModel extends AdminModel implements VersionableModelInterface
 {
     use VersionableModelTrait;
 
@@ -82,7 +83,7 @@ protected function cleanupPostBatchCopy(TableInterface $table, $newId, $oldId)
         // Initialise clicks and impmade
         $db    = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
                 ->update($db->quoteName('#__banners'))
                 ->set($db->quoteName('clicks') . ' = 0')
                 ->set($db->quoteName('impmade') . ' = 0')
@@ -204,19 +205,16 @@ protected function canEditState($record)
      * @param   array    $data      Data for the form. [optional]
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not. [optional]
      *
-     * @return  Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
         // Get the form.
         $form = $this->loadForm('com_banners.banner', 'banner', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         // Modify the form based on access controls.
         if (!$this->canEditState((object) $data)) {
             // Disable fields for display.
@@ -264,7 +262,7 @@ protected function loadFormData()
                 $filters     = (array) $app->getUserState('com_banners.banners.filter');
                 $filterCatId = $filters['category_id'] ?? null;
 
-                $data->set('catid', $app->getInput()->getInt('catid', $filterCatId));
+                $data->catid = $app->getInput()->getInt('catid', $filterCatId);
             }
         }
 
@@ -352,7 +350,7 @@ protected function prepareTable($table)
             // Set ordering to the last item if not set
             if (empty($table->ordering)) {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('MAX(' . $db->quoteName('ordering') . ')')
                     ->from($db->quoteName('#__banners'));
 
diff --git a/administrator/components/com_banners/src/Model/BannersModel.php b/administrator/components/com_banners/src/Model/BannersModel.php
index a835d5bb23f5a..bd38b3a8f1fe3 100644
--- a/administrator/components/com_banners/src/Model/BannersModel.php
+++ b/administrator/components/com_banners/src/Model/BannersModel.php
@@ -78,7 +78,7 @@ public function &getCategoryOrders()
     {
         if (!isset($this->cache['categoryorders'])) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         'MAX(' . $db->quoteName('ordering') . ') AS ' . $db->quoteName('max'),
@@ -104,7 +104,7 @@ public function &getCategoryOrders()
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
diff --git a/administrator/components/com_banners/src/Model/ClientModel.php b/administrator/components/com_banners/src/Model/ClientModel.php
index 6378292da6ab2..4b53b4e0cd796 100644
--- a/administrator/components/com_banners/src/Model/ClientModel.php
+++ b/administrator/components/com_banners/src/Model/ClientModel.php
@@ -11,8 +11,10 @@
 namespace Joomla\Component\Banners\Administrator\Model;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Table\Table;
+use Joomla\CMS\Versioning\VersionableModelInterface;
 use Joomla\CMS\Versioning\VersionableModelTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -24,7 +26,7 @@
  *
  * @since  1.6
  */
-class ClientModel extends AdminModel
+class ClientModel extends AdminModel implements VersionableModelInterface
 {
     use VersionableModelTrait;
 
@@ -85,20 +87,14 @@ protected function canEditState($record)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_banners.client', 'client', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_banners.client', 'client', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
diff --git a/administrator/components/com_banners/src/Model/ClientsModel.php b/administrator/components/com_banners/src/Model/ClientsModel.php
index 54216dd4f553e..4d0105543bec7 100644
--- a/administrator/components/com_banners/src/Model/ClientsModel.php
+++ b/administrator/components/com_banners/src/Model/ClientsModel.php
@@ -103,7 +103,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $defaultPurchase = (int) ComponentHelper::getParams('com_banners')->get('purchase_type', 3);
 
@@ -227,7 +227,7 @@ public function getItems()
         $db        = $this->getDatabase();
         $clientIds = array_column($items, 'id');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('cid'),
diff --git a/administrator/components/com_banners/src/Model/DownloadModel.php b/administrator/components/com_banners/src/Model/DownloadModel.php
index 6dc2854c3b83a..2b276e5fc2b35 100644
--- a/administrator/components/com_banners/src/Model/DownloadModel.php
+++ b/administrator/components/com_banners/src/Model/DownloadModel.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\MVC\Model\FormModel;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -55,20 +56,14 @@ protected function populateState()
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_banners.download', 'download', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_banners.download', 'download', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
diff --git a/administrator/components/com_banners/src/Model/TracksModel.php b/administrator/components/com_banners/src/Model/TracksModel.php
index 3656463c93cf2..c2f60ce7e468c 100644
--- a/administrator/components/com_banners/src/Model/TracksModel.php
+++ b/administrator/components/com_banners/src/Model/TracksModel.php
@@ -98,7 +98,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
@@ -202,7 +202,7 @@ public function delete()
         if ($allow) {
             // Delete tracks from this banner
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__banner_tracks'));
 
             // Filter by type
@@ -223,7 +223,7 @@ public function delete()
                     ->bind(':end', $end);
             }
 
-            $subQuery = $db->getQuery(true);
+            $subQuery = $db->createQuery();
             $subQuery->select($db->quoteName('id'))
                 ->from($db->quoteName('#__banners'));
 
@@ -344,7 +344,7 @@ protected function getCategoryName()
 
         if ($categoryId) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__categories'))
                 ->where($db->quoteName('id') . ' = :categoryId')
@@ -378,7 +378,7 @@ protected function getClientName()
 
         if ($clientId) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('name'))
                 ->from($db->quoteName('#__banner_clients'))
                 ->where($db->quoteName('id') . ' = :clientId')
diff --git a/administrator/components/com_banners/src/Service/Html/Banner.php b/administrator/components/com_banners/src/Service/Html/Banner.php
index 77314f24fd6f3..bf57f4b80742c 100644
--- a/administrator/components/com_banners/src/Service/Html/Banner.php
+++ b/administrator/components/com_banners/src/Service/Html/Banner.php
@@ -63,7 +63,7 @@ public function clients()
     public function clientlist()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id', 'value'),
diff --git a/administrator/components/com_banners/src/Table/BannerTable.php b/administrator/components/com_banners/src/Table/BannerTable.php
index b26cd2b1782df..cbf5998929fea 100644
--- a/administrator/components/com_banners/src/Table/BannerTable.php
+++ b/administrator/components/com_banners/src/Table/BannerTable.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Table\Table;
-use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
 use Joomla\Event\DispatcherInterface;
@@ -31,7 +30,7 @@
  *
  * @since  1.5
  */
-class BannerTable extends Table implements VersionableTableInterface
+class BannerTable extends Table
 {
     /**
      * Indicates that columns fully support the NULL value in the database
@@ -69,7 +68,7 @@ public function clicks()
     {
         $id    = (int) $this->id;
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__banners'))
             ->set($db->quoteName('clicks') . ' = ' . $db->quoteName('clicks') . ' + 1')
             ->where($db->quoteName('id') . ' = :id')
diff --git a/administrator/components/com_banners/src/View/Banner/HtmlView.php b/administrator/components/com_banners/src/View/Banner/HtmlView.php
index a8e16b6f90649..3626467a25e41 100644
--- a/administrator/components/com_banners/src/View/Banner/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Banner/HtmlView.php
@@ -82,6 +82,10 @@ public function display($tpl = null): void
 
         $this->addToolbar();
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_banners/src/View/Banners/HtmlView.php b/administrator/components/com_banners/src/View/Banners/HtmlView.php
index 38a993977b8c7..88136e34e243c 100644
--- a/administrator/components/com_banners/src/View/Banners/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Banners/HtmlView.php
@@ -10,16 +10,10 @@
 
 namespace Joomla\Component\Banners\Administrator\View\Banners;
 
-use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Pagination\Pagination;
-use Joomla\CMS\Toolbar\Button\DropdownButton;
-use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\CMS\MVC\View\ListView;
 use Joomla\Component\Banners\Administrator\Model\BannersModel;
-use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -30,24 +24,8 @@
  *
  * @since  1.6
  */
-class HtmlView extends BaseHtmlView
+class HtmlView extends ListView
 {
-    /**
-     * The search tools form
-     *
-     * @var    Form
-     * @since  1.6
-     */
-    public $filterForm;
-
-    /**
-     * The active search filters
-     *
-     * @var    array
-     * @since  1.6
-     */
-    public $activeFilters = [];
-
     /**
      * Category data
      *
@@ -57,152 +35,53 @@ class HtmlView extends BaseHtmlView
     protected $categories = [];
 
     /**
-     * An array of items
-     *
-     * @var    array
-     * @since  1.6
-     */
-    protected $items = [];
-
-    /**
-     * The pagination object
+     * The help link for the view
      *
-     * @var    Pagination
-     * @since  1.6
+     * @var string
      */
-    protected $pagination;
+    protected $helpLink = 'Banners';
 
     /**
-     * The model state
+     * Constructor
      *
-     * @var    Registry
-     * @since  1.6
-     */
-    protected $state;
-
-    /**
-     * Is this view an Empty State
+     * @param   array  $config  An optional associative array of configuration settings.
      *
-     * @var  boolean
-     * @since 4.0.0
+     * @since 6.0.0
      */
-    private $isEmptyState = false;
-
-    /**
-     * Method to display the view.
-     *
-     * @param   string  $tpl  A template file to load. [optional]
-     *
-     * @return  void
-     *
-     * @since   1.6
-     * @throws  \Exception
-     */
-    public function display($tpl = null): void
+    public function __construct(array $config)
     {
-        /** @var BannersModel $model */
-        $model = $this->getModel();
-        $model->setUseExceptions(true);
-
-        $this->categories    = $model->getCategoryOrders();
-        $this->items         = $model->getItems();
-        $this->pagination    = $model->getPagination();
-        $this->state         = $model->getState();
-        $this->filterForm    = $model->getFilterForm();
-        $this->activeFilters = $model->getActiveFilters();
-
-        if (!\count($this->items) && $this->isEmptyState = $model->getIsEmptyState()) {
-            $this->setLayout('emptystate');
+        if (empty($config['option'])) {
+            $config['option'] = 'com_banners';
         }
 
-        $this->addToolbar();
-
-        // We do not need to filter by language when multilingual is disabled
-        if (!Multilanguage::isEnabled()) {
-            unset($this->activeFilters['language']);
-            $this->filterForm->removeField('language', 'filter');
-        }
+        $config['toolbar_icon']   = 'bookmark banners';
+        $config['supports_batch'] = true;
+        $config['category']       = 'com_banners';
 
-        parent::display($tpl);
+        parent::__construct($config);
     }
 
     /**
-     * Add the page title and toolbar.
+     * Prepare view data
      *
      * @return  void
      *
-     * @since   1.6
+     * @since 6.0.0
      */
-    protected function addToolbar(): void
+    protected function initializeView()
     {
-        $canDo   = ContentHelper::getActions('com_banners', 'category', $this->state->get('filter.category_id'));
-        $user    = $this->getCurrentUser();
-        $toolbar = $this->getDocument()->getToolbar();
-
-        ToolbarHelper::title(Text::_('COM_BANNERS_MANAGER_BANNERS'), 'bookmark banners');
-
-        if ($canDo->get('core.create') || \count($user->getAuthorisedCategories('com_banners', 'core.create')) > 0) {
-            $toolbar->addNew('banner.add');
-        }
-
-        if (!$this->isEmptyState && ($canDo->get('core.edit.state') || ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')))) {
-            /** @var  DropdownButton $dropdown */
-            $dropdown = $toolbar->dropdownButton('status-group', 'JTOOLBAR_CHANGE_STATUS')
-                ->toggleSplit(false)
-                ->icon('icon-ellipsis-h')
-                ->buttonClass('btn btn-action')
-                ->listCheck(true);
+        parent::initializeView();
 
-            $childBar = $dropdown->getChildToolbar();
-
-            if ($canDo->get('core.edit.state')) {
-                if ($this->state->get('filter.published') != 2) {
-                    $childBar->publish('banners.publish')->listCheck(true);
-
-                    $childBar->unpublish('banners.unpublish')->listCheck(true);
-                }
-
-                if ($this->state->get('filter.published') != -1) {
-                    if ($this->state->get('filter.published') != 2) {
-                        $childBar->archive('banners.archive')->listCheck(true);
-                    } elseif ($this->state->get('filter.published') == 2) {
-                        $childBar->publish('publish')->task('banners.publish')->listCheck(true);
-                    }
-                }
-
-                $childBar->checkin('banners.checkin');
-
-                if ($this->state->get('filter.published') != -2) {
-                    $childBar->trash('banners.trash')->listCheck(true);
-                }
-            }
+        /** @var BannersModel $model */
+        $model            = $this->getModel();
 
-            if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) {
-                $toolbar->delete('banners.delete', 'JTOOLBAR_DELETE_FROM_TRASH')
-                    ->message('JGLOBAL_CONFIRM_DELETE')
-                    ->listCheck(true);
-            }
+        $this->categories = $model->getCategoryOrders();
+        $this->canDo      = ContentHelper::getActions('com_banners', 'category', $this->state->get('filter.category_id'));
 
-            // Add a batch button
-            if (
-                $user->authorise('core.create', 'com_banners')
-                && $user->authorise('core.edit', 'com_banners')
-                && $user->authorise('core.edit.state', 'com_banners')
-            ) {
-                $childBar->popupButton('batch', 'JTOOLBAR_BATCH')
-                    ->popupType('inline')
-                    ->textHeader(Text::_('COM_BANNERS_BATCH_OPTIONS'))
-                    ->url('#joomla-dialog-batch')
-                    ->modalWidth('800px')
-                    ->modalHeight('fit-content')
-                    ->listCheck(true);
-            }
-        }
-
-        if ($user->authorise('core.admin', 'com_banners') || $user->authorise('core.options', 'com_banners')) {
-            $toolbar->preferences('com_banners');
+        // We do not need to filter by language when multilingual is disabled
+        if (!Multilanguage::isEnabled()) {
+            unset($this->activeFilters['language']);
+            $this->filterForm->removeField('language', 'filter');
         }
-
-        $toolbar->help('Banners');
     }
 }
diff --git a/administrator/components/com_banners/src/View/Client/HtmlView.php b/administrator/components/com_banners/src/View/Client/HtmlView.php
index b00c442ff8c8f..7d28092ced147 100644
--- a/administrator/components/com_banners/src/View/Client/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Client/HtmlView.php
@@ -91,6 +91,10 @@ public function display($tpl = null): void
 
         $this->addToolbar();
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_banners/src/View/Clients/HtmlView.php b/administrator/components/com_banners/src/View/Clients/HtmlView.php
index 314909b107932..da9a763990b2f 100644
--- a/administrator/components/com_banners/src/View/Clients/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Clients/HtmlView.php
@@ -106,6 +106,11 @@ public function display($tpl = null): void
 
         $this->addToolbar();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_banners/src/View/Tracks/HtmlView.php b/administrator/components/com_banners/src/View/Tracks/HtmlView.php
index ae53040ef7c08..03d06b869a4ea 100644
--- a/administrator/components/com_banners/src/View/Tracks/HtmlView.php
+++ b/administrator/components/com_banners/src/View/Tracks/HtmlView.php
@@ -106,6 +106,11 @@ public function display($tpl = null): void
 
         $this->addToolbar();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_banners/src/View/Tracks/RawView.php b/administrator/components/com_banners/src/View/Tracks/RawView.php
index ff7652ac2f78a..7fdac446e0b73 100644
--- a/administrator/components/com_banners/src/View/Tracks/RawView.php
+++ b/administrator/components/com_banners/src/View/Tracks/RawView.php
@@ -58,7 +58,7 @@ public function display($tpl = null): void
         $app = Factory::getApplication();
         $app->setHeader(
             'Content-disposition',
-            'attachment; filename="' . $basename . '.' . $fileType . '"; creation-date="' . Factory::getDate()->toRFC822() . '"',
+            'attachment; filename="' . str_replace('"', '', $basename) . '.' . $fileType . '"; creation-date="' . Factory::getDate()->toRFC822() . '"',
             true
         );
         echo $content;
diff --git a/administrator/components/com_banners/tmpl/banner/edit.php b/administrator/components/com_banners/tmpl/banner/edit.php
index 9ee378083f9c2..19faad9abe126 100644
--- a/administrator/components/com_banners/tmpl/banner/edit.php
+++ b/administrator/components/com_banners/tmpl/banner/edit.php
@@ -86,6 +86,5 @@
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
     </div>
 
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_banners/tmpl/banners/default.php b/administrator/components/com_banners/tmpl/banners/default.php
index 7b24a58ff792c..975ff5ea9e223 100644
--- a/administrator/components/com_banners/tmpl/banners/default.php
+++ b/administrator/components/com_banners/tmpl/banners/default.php
@@ -177,18 +177,12 @@
 
                     <?php // Load the batch processing form. ?>
                     <?php
-                    if (
-                        $user->authorise('core.create', 'com_banners')
-                        && $user->authorise('core.edit', 'com_banners')
-                        && $user->authorise('core.edit.state', 'com_banners')
-                    ) : ?>
+                    if ($this->batchAllowed) : ?>
                         <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
                     <?php endif; ?>
                 <?php endif; ?>
 
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_banners/tmpl/banners/emptystate.php b/administrator/components/com_banners/tmpl/banners/emptystate.php
index 24425a9e9ce4a..d914a76a204f5 100644
--- a/administrator/components/com_banners/tmpl/banners/emptystate.php
+++ b/administrator/components/com_banners/tmpl/banners/emptystate.php
@@ -17,8 +17,10 @@
 $displayData = [
     'textPrefix' => 'COM_BANNERS',
     'formURL'    => 'index.php?option=com_banners&view=banners',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/banners/banners-banners',
     'icon'       => 'icon-bookmark banners',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 $user = $this->getCurrentUser();
diff --git a/administrator/components/com_banners/tmpl/client/edit.php b/administrator/components/com_banners/tmpl/client/edit.php
index f7eec3482db98..bc69e03f3ff2e 100644
--- a/administrator/components/com_banners/tmpl/client/edit.php
+++ b/administrator/components/com_banners/tmpl/client/edit.php
@@ -65,6 +65,5 @@
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
     </div>
 
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_banners/tmpl/clients/default.php b/administrator/components/com_banners/tmpl/clients/default.php
index 36e8899c727ad..5502d061aed39 100644
--- a/administrator/components/com_banners/tmpl/clients/default.php
+++ b/administrator/components/com_banners/tmpl/clients/default.php
@@ -189,9 +189,7 @@
 
                 <?php endif; ?>
 
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_banners/tmpl/clients/emptystate.php b/administrator/components/com_banners/tmpl/clients/emptystate.php
index d97f2d15ffd22..247799016d21b 100644
--- a/administrator/components/com_banners/tmpl/clients/emptystate.php
+++ b/administrator/components/com_banners/tmpl/clients/emptystate.php
@@ -17,8 +17,10 @@
 $displayData = [
     'textPrefix' => 'COM_BANNERS_CLIENT',
     'formURL'    => 'index.php?option=com_banners&view=clients',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners:_Clients',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/banners/banners-banners',
     'icon'       => 'icon-bookmark banners',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 if (count($this->getCurrentUser()->getAuthorisedCategories('com_banners', 'core.create')) > 0) {
diff --git a/administrator/components/com_banners/tmpl/tracks/default.php b/administrator/components/com_banners/tmpl/tracks/default.php
index 12c8c26b79dce..83e8ad4ae2cd0 100644
--- a/administrator/components/com_banners/tmpl/tracks/default.php
+++ b/administrator/components/com_banners/tmpl/tracks/default.php
@@ -92,9 +92,8 @@
                     <?php echo $this->pagination->getListFooter(); ?>
 
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_banners/tmpl/tracks/emptystate.php b/administrator/components/com_banners/tmpl/tracks/emptystate.php
index 13913c3e7c7e8..0000fe803116d 100644
--- a/administrator/components/com_banners/tmpl/tracks/emptystate.php
+++ b/administrator/components/com_banners/tmpl/tracks/emptystate.php
@@ -14,8 +14,10 @@
 
 $displayData = [
     'textPrefix' => 'COM_BANNERS_TRACKS',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners:_Tracks',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/banners/banners-banners',
     'icon'       => 'icon-bookmark banners',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 echo LayoutHelper::render('joomla.content.emptystate', $displayData);
diff --git a/administrator/components/com_cache/src/Model/CacheModel.php b/administrator/components/com_cache/src/Model/CacheModel.php
index 2c270a5c9a369..21bb6ae371cf4 100644
--- a/administrator/components/com_cache/src/Model/CacheModel.php
+++ b/administrator/components/com_cache/src/Model/CacheModel.php
@@ -10,12 +10,10 @@
 
 namespace Joomla\Component\Cache\Administrator\Model;
 
-use Joomla\CMS\Cache\Cache;
 use Joomla\CMS\Cache\CacheController;
 use Joomla\CMS\Cache\Exception\CacheConnectingException;
 use Joomla\CMS\Cache\Exception\UnsupportedCacheException;
 use Joomla\CMS\Event\Cache\AfterPurgeEvent;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
@@ -172,16 +170,13 @@ public function getData()
      */
     public function getCache()
     {
-        $app = Factory::getApplication();
-
         $options = [
             'defaultgroup' => '',
-            'storage'      => $app->get('cache_handler', ''),
             'caching'      => true,
-            'cachebase'    => $app->get('cache_path', JPATH_CACHE),
         ];
 
-        return Cache::getInstance('', $options);
+        return $this->getCacheControllerFactory()
+            ->createCacheController('output', $options);
     }
 
     /**
@@ -263,7 +258,7 @@ public function cleanlist($array)
     public function purge()
     {
         try {
-            Factory::getCache('')->gc();
+            $this->getCache()->gc();
         } catch (CacheConnectingException) {
             return false;
         } catch (UnsupportedCacheException) {
diff --git a/administrator/components/com_cache/src/View/Cache/HtmlView.php b/administrator/components/com_cache/src/View/Cache/HtmlView.php
index b30821e8fc67b..c70f0f1087af9 100644
--- a/administrator/components/com_cache/src/View/Cache/HtmlView.php
+++ b/administrator/components/com_cache/src/View/Cache/HtmlView.php
@@ -107,6 +107,11 @@ public function display($tpl = null): void
 
         $this->addToolbar();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_cache/tmpl/cache/default.php b/administrator/components/com_cache/tmpl/cache/default.php
index 77ae9c5836892..e107886cc6042 100644
--- a/administrator/components/com_cache/tmpl/cache/default.php
+++ b/administrator/components/com_cache/tmpl/cache/default.php
@@ -92,9 +92,8 @@
                     <?php echo $this->pagination->getListFooter(); ?>
 
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_cache/tmpl/cache/emptystate.php b/administrator/components/com_cache/tmpl/cache/emptystate.php
index 386e358d53236..6f03195be7b13 100644
--- a/administrator/components/com_cache/tmpl/cache/emptystate.php
+++ b/administrator/components/com_cache/tmpl/cache/emptystate.php
@@ -14,8 +14,10 @@
 
 $displayData = [
     'textPrefix' => 'COM_CACHE',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Cache',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/system/system-cache',
     'icon'       => 'icon-bolt clear',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 echo LayoutHelper::render('joomla.content.emptystate', $displayData);
diff --git a/administrator/components/com_categories/helpers/categories.php b/administrator/components/com_categories/helpers/categories.php
index 30cde81ad9571..68bb4fa507d09 100644
--- a/administrator/components/com_categories/helpers/categories.php
+++ b/administrator/components/com_categories/helpers/categories.php
@@ -19,7 +19,7 @@
  *
  * @since       1.6
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Categories\Administrator\Helper\CategoriesHelper instead
  */
 class CategoriesHelper extends \Joomla\Component\Categories\Administrator\Helper\CategoriesHelper
diff --git a/administrator/components/com_categories/src/Controller/AjaxController.php b/administrator/components/com_categories/src/Controller/AjaxController.php
index bc6433e1d3996..a92004737c122 100644
--- a/administrator/components/com_categories/src/Controller/AjaxController.php
+++ b/administrator/components/com_categories/src/Controller/AjaxController.php
@@ -10,13 +10,14 @@
 
 namespace Joomla\Component\Categories\Administrator\Controller;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\Session\Session;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Category;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -63,8 +64,7 @@ public function fetchAssociations()
             unset($associations[$excludeLang]);
 
             // Add the title to each of the associated records
-            Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/tables');
-            $categoryTable = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\');
+            $categoryTable = new Category(Factory::getDbo());
 
             foreach ($associations as $association) {
                 $categoryTable->load($association->id);
diff --git a/administrator/components/com_categories/src/Field/CategoryeditField.php b/administrator/components/com_categories/src/Field/CategoryeditField.php
index 42adbd6bd8462..0a482aa3f9bec 100644
--- a/administrator/components/com_categories/src/Field/CategoryeditField.php
+++ b/administrator/components/com_categories/src/Field/CategoryeditField.php
@@ -146,7 +146,7 @@ public function __set($name, $value)
     protected function getOptions()
     {
         $options   = [];
-        $published = $this->element['published'] ? explode(',', (string) $this->element['published']) : [0, 1];
+        $published = $this->element['published'] ? explode(',', (string) $this->element['published']) : [0, 1, 2];
         $name      = (string) $this->element['name'];
 
         // Let's get the id for the current item, either category or content item.
@@ -175,7 +175,7 @@ protected function getOptions()
         $db   = $this->getDatabase();
         $user = $this->getCurrentUser();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id', 'value'),
@@ -251,10 +251,14 @@ protected function getOptions()
                 $option->text = Text::_('JGLOBAL_ROOT_PARENT');
             }
 
-            if ($option->published == 1) {
-                $option->text = str_repeat('- ', !$option->level ? 0 : $option->level - 1) . $option->text;
+            if ($option->published === 0) {
+                // Add ' ( Unpublished )' after every unpublished category
+                $option->text = str_repeat('- ', !$option->level ? 0 : $option->level - 1) . $option->text . ' (' . Text::_('JUNPUBLISHED') . ')';
+            } elseif ($option->published === 2) {
+                // Add ' ( Archived )' after every archived category
+                $option->text = str_repeat('- ', !$option->level ? 0 : $option->level - 1) . $option->text . ' (' . Text::_('JARCHIVED') . ')';
             } else {
-                $option->text = str_repeat('- ', !$option->level ? 0 : $option->level - 1) . '[' . $option->text . ']';
+                $option->text = str_repeat('- ', !$option->level ? 0 : $option->level - 1) . $option->text;
             }
 
             // Displays language code if not set to All
@@ -316,7 +320,7 @@ protected function getOptions()
             && !isset($options[0])
             && isset($this->element['show_root'])
         ) {
-            $rowQuery = $db->getQuery(true)
+            $rowQuery = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('a.id', 'value'),
diff --git a/administrator/components/com_categories/src/Field/ComponentsCategoryField.php b/administrator/components/com_categories/src/Field/ComponentsCategoryField.php
index c6599b83b6127..ede94cfa605df 100644
--- a/administrator/components/com_categories/src/Field/ComponentsCategoryField.php
+++ b/administrator/components/com_categories/src/Field/ComponentsCategoryField.php
@@ -47,7 +47,7 @@ protected function getOptions()
         $db      = $this->getDatabase();
         $options = [];
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select('DISTINCT ' . $db->quoteName('extension'))
             ->from($db->quoteName('#__categories'))
             ->where($db->quoteName('extension') . ' != ' . $db->quote('system'));
diff --git a/administrator/components/com_categories/src/Field/Modal/CategoryField.php b/administrator/components/com_categories/src/Field/Modal/CategoryField.php
index ba48fdcc64355..0541fa37e7dda 100644
--- a/administrator/components/com_categories/src/Field/Modal/CategoryField.php
+++ b/administrator/components/com_categories/src/Field/Modal/CategoryField.php
@@ -145,7 +145,7 @@ protected function getValueTitle()
         if ($value) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('title'))
                     ->from($db->quoteName('#__categories'))
                     ->where($db->quoteName('id') . ' = :value')
diff --git a/administrator/components/com_categories/src/Helper/CategoriesHelper.php b/administrator/components/com_categories/src/Helper/CategoriesHelper.php
index 36d247022ff4a..e8970b7770743 100644
--- a/administrator/components/com_categories/src/Helper/CategoriesHelper.php
+++ b/administrator/components/com_categories/src/Helper/CategoriesHelper.php
@@ -12,8 +12,7 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Associations;
-use Joomla\CMS\Table\Table;
-use Joomla\Database\ParameterType;
+use Joomla\Component\Categories\Administrator\Table\CategoryTable;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -29,39 +28,43 @@ class CategoriesHelper
     /**
      * Gets a list of associations for a given item.
      *
-     * @param   integer  $pk         Content item key.
-     * @param   string   $extension  Optional extension name.
+     * @param   int|int[]  $pk         Category ID or array of IDs
+     * @param   string     $extension  Optional extension name.
      *
-     * @return  array of associations.
+     * @return  array of associations, optionally grouped by ID
      */
     public static function getAssociations($pk, $extension = 'com_content')
     {
-        $langAssociations = Associations::getAssociations($extension, '#__categories', 'com_categories.item', $pk, 'id', 'alias', '');
-        $associations     = [];
-        $user             = Factory::getUser();
-        $groups           = $user->getAuthorisedViewLevels();
-
-        foreach ($langAssociations as $langAssociation) {
-            // Include only published categories with user access
-            $arrId   = explode(':', $langAssociation->id);
-            $assocId = (int) $arrId[0];
-            $db      = Factory::getDbo();
-
-            $query = $db->getQuery(true)
-                ->select($db->quoteName('published'))
-                ->from($db->quoteName('#__categories'))
-                ->whereIn($db->quoteName('access'), $groups)
-                ->where($db->quoteName('id') . ' = :associd')
-                ->bind(':associd', $assocId, ParameterType::INTEGER);
-
-            $result = (int) $db->setQuery($query)->loadResult();
-
-            if ($result === 1) {
-                $associations[$langAssociation->language] = $langAssociation->id;
+        // To avoid doing duplicate database queries.
+        static $multilanguageAssociations = [];
+
+        // Multilanguage association array key. If the key is already in the array we don't need to run the query again, just return it.
+        $queryKey = md5(serialize(array_merge([$extension, print_r($pk, true)])));
+
+        if (!isset($multilanguageAssociations[$queryKey])) {
+            $multilanguageAssociations[$queryKey] = [];
+
+            $user   = Factory::getUser();
+            $groups = implode(',', $user->getAuthorisedViewLevels());
+
+            $advClause = [];
+
+            // Filter by user groups
+            $advClause[] = 'c2.access IN (' . $groups . ')';
+
+            // Filter by published categories
+            $advClause[] = 'c2.published = 1';
+
+            $associations = Associations::getAssociations($extension, '#__categories', 'com_categories.item', (array) $pk, 'id', 'alias', '', $advClause);
+
+            foreach ($associations as $itemId => $langAssociations) {
+                foreach ($langAssociations as $langAssociation) {
+                    $multilanguageAssociations[$queryKey][$itemId][$langAssociation->language] = $langAssociation->id;
+                }
             }
         }
 
-        return $associations;
+        return \is_array($pk) ? $multilanguageAssociations[$queryKey] : ($multilanguageAssociations[$queryKey][$pk] ?? []);
     }
 
     /**
@@ -74,7 +77,7 @@ public static function getAssociations($pk, $extension = 'com_content')
      */
     public static function validateCategoryId($catid, $extension)
     {
-        $categoryTable = Table::getInstance('CategoryTable', '\\Joomla\\Component\\Categories\\Administrator\\Table\\');
+        $categoryTable = new CategoryTable(Factory::getDbo());
 
         $data              = [];
         $data['id']        = $catid;
diff --git a/administrator/components/com_categories/src/Helper/CategoryAssociationHelper.php b/administrator/components/com_categories/src/Helper/CategoryAssociationHelper.php
index f4d1950b519a4..5d27fb370e26b 100644
--- a/administrator/components/com_categories/src/Helper/CategoryAssociationHelper.php
+++ b/administrator/components/com_categories/src/Helper/CategoryAssociationHelper.php
@@ -32,42 +32,44 @@ abstract class CategoryAssociationHelper
     /**
      * Method to get the associations for a given category
      *
-     * @param   integer      $id         Id of the item
+     * @param   int|int[]    $id         ID of the item or array of IDs
      * @param   string       $extension  Name of the component
      * @param   string|null  $layout     Category layout
      *
-     * @return  array    Array of associations for the component categories
+     * @return  array    Array of associations for the component categories, optionally grouped by ID
      *
      * @since  3.0
      */
-    public static function getCategoryAssociations($id = 0, $extension = 'com_content', $layout = null)
+    public static function getCategoryAssociations($id, $extension = 'com_content', $layout = null)
     {
         $return = [];
 
         if ($id) {
             $helperClassname = ucfirst(substr($extension, 4)) . 'HelperRoute';
 
-            $associations = CategoriesHelper::getAssociations($id, $extension);
+            $associations = CategoriesHelper::getAssociations((array) $id, $extension);
 
-            foreach ($associations as $tag => $item) {
-                if (class_exists($helperClassname) && \is_callable([$helperClassname, 'getCategoryRoute'])) {
-                    $return[$tag] = $helperClassname::getCategoryRoute($item, $tag, $layout);
-                } else {
-                    $link = 'index.php?option=' . $extension . '&view=category&id=' . $item;
+            foreach ($associations as $itemId => $itemAssociations) {
+                foreach ($itemAssociations as $tag => $item) {
+                    if (class_exists($helperClassname) && \is_callable([$helperClassname, 'getCategoryRoute'])) {
+                        $return[$itemId][$tag] = $helperClassname::getCategoryRoute($item, $tag, $layout);
+                    } else {
+                        $link = 'index.php?option=' . $extension . '&view=category&id=' . $item;
 
-                    if ($tag && $tag !== '*') {
-                        $link .= '&lang=' . $tag;
-                    }
+                        if ($tag && $tag !== '*') {
+                            $link .= '&lang=' . $tag;
+                        }
 
-                    if ($layout) {
-                        $link .= '&layout=' . $layout;
-                    }
+                        if ($layout) {
+                            $link .= '&layout=' . $layout;
+                        }
 
-                    $return[$tag] = $link;
+                        $return[$itemId][$tag] = $link;
+                    }
                 }
             }
         }
 
-        return $return;
+        return \is_array($id) ? $return : ($return[$id] ?? []);
     }
 }
diff --git a/administrator/components/com_categories/src/Model/CategoriesModel.php b/administrator/components/com_categories/src/Model/CategoriesModel.php
index 1b37ffd09caa8..f5a016a9fedbc 100644
--- a/administrator/components/com_categories/src/Model/CategoriesModel.php
+++ b/administrator/components/com_categories/src/Model/CategoriesModel.php
@@ -16,7 +16,7 @@
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Category;
 use Joomla\Database\ParameterType;
 use Joomla\Database\QueryInterface;
 use Joomla\Utilities\ArrayHelper;
@@ -164,7 +164,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
 
         // Select the required fields from the table.
@@ -251,7 +251,7 @@ protected function getListQuery()
 
         if (\count($categoryId)) {
             // Case: Using both categories filter and by level filter
-            $categoryTable    = Table::getInstance('Category', 'JTable');
+            $categoryTable    = new Category($db);
             $subCatItemsWhere = [];
 
             foreach ($categoryId as $filterCatId) {
@@ -341,7 +341,7 @@ protected function getListQuery()
                 $includeNone = true;
             }
 
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                 ->from($db->quoteName('#__contentitem_tag_map'))
                 ->where(
@@ -359,7 +359,7 @@ protected function getListQuery()
             ->bind(':typeAlias', $typeAlias);
 
             if ($includeNone) {
-                $subQuery2 = $db->getQuery(true)
+                $subQuery2 = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = :typeAlias2');
@@ -378,7 +378,7 @@ protected function getListQuery()
             $tag = (int) $tag;
 
             if ($tag === 0) {
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = :typeAlias');
diff --git a/administrator/components/com_categories/src/Model/CategoryModel.php b/administrator/components/com_categories/src/Model/CategoryModel.php
index e26c9230fada7..b60f7c73dc15b 100644
--- a/administrator/components/com_categories/src/Model/CategoryModel.php
+++ b/administrator/components/com_categories/src/Model/CategoryModel.php
@@ -26,8 +26,10 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Category;
 use Joomla\CMS\UCM\UCMType;
+use Joomla\CMS\Versioning\VersionableModelInterface;
 use Joomla\CMS\Versioning\VersionableModelTrait;
 use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
+use Joomla\Component\Categories\Administrator\Table\CategoryTable;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
@@ -43,7 +45,7 @@
  *
  * @since  1.6
  */
-class CategoryModel extends AdminModel
+class CategoryModel extends AdminModel implements VersionableModelInterface
 {
     use VersionableModelTrait;
 
@@ -242,9 +244,10 @@ public function getItem($pk = null)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -264,10 +267,6 @@ public function getForm($data = [], $loadData = true)
         // Get the form.
         $form = $this->loadForm('com_categories.category' . $extension, 'category', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         // Modify the form based on Edit State access controls.
         if (empty($data['extension'])) {
             $data['extension'] = $extension;
@@ -337,18 +336,12 @@ protected function loadFormData()
                 $extension = substr($app->getUserState('com_categories.categories.filter.extension', ''), 4);
                 $filters   = (array) $app->getUserState('com_categories.categories.' . $extension . '.filter');
 
-                $data->set(
+                $data->published = $app->getInput()->getInt(
                     'published',
-                    $app->getInput()->getInt(
-                        'published',
-                        ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
-                    )
-                );
-                $data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
-                $data->set(
-                    'access',
-                    $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
+                    ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
                 );
+                $data->language = $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null));
+                $data->access   = $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')));
             }
         }
 
@@ -508,28 +501,19 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
      */
     public function save($data)
     {
-        $table      = $this->getTable();
-        $input      = Factory::getApplication()->getInput();
-        $pk         = (!empty($data['id'])) ? $data['id'] : (int) $this->getState($this->getName() . '.id');
-        $isNew      = true;
-        $context    = $this->option . '.' . $this->name;
+        $assoc = $this->getAssoc();
 
-        if (!empty($data['tags']) && $data['tags'][0] != '') {
-            $table->newTags = $data['tags'];
+        if (!$assoc) {
+            $this->associationsContext = null;
         }
 
-        // Include the plugins for the save events.
-        PluginHelper::importPlugin($this->events_map['save']);
+        $table      = $this->getTable();
+        $input      = Factory::getApplication()->getInput();
+        $pk         = (!empty($data['id'])) ? $data['id'] : (int) $this->getState($this->getName() . '.id');
 
         // Load the row if saving an existing category.
         if ($pk > 0) {
             $table->load($pk);
-            $isNew = false;
-        }
-
-        // Set the new parent id if parent id not matched OR while New/Save as Copy .
-        if ($table->parent_id != $data['parent_id'] || $data['id'] == 0) {
-            $table->setLocation($data['parent_id'], 'last-child');
         }
 
         // Alter the title for save as copy
@@ -550,179 +534,55 @@ public function save($data)
             $data['published'] = 0;
         }
 
-        // Bind the data.
-        if (!$table->bind($data)) {
-            $this->setError($table->getError());
-
-            return false;
-        }
-
-        // Bind the rules.
-        if (isset($data['rules'])) {
-            $rules = new Rules($data['rules']);
-            $table->setRules($rules);
-        }
-
-        // Check the data.
-        if (!$table->check()) {
-            $this->setError($table->getError());
+        $result = parent::save($data);
 
-            return false;
-        }
+        if ($result) {
+            /**
+             * @var CategoryTable
+             */
+            $table = $this->getTable();
 
-        // Trigger the before save event.
-        $result = Factory::getApplication()->triggerEvent($this->event_before_save, [$context, &$table, $isNew, $data]);
+            $categoryId = $this->getState($this->getName() . '.id');
 
-        if (\in_array(false, $result, true)) {
-            $this->setError($table->getError());
+            $table->load($categoryId);
 
-            return false;
-        }
-
-        // Store the data.
-        if (!$table->store()) {
-            $this->setError($table->getError());
-
-            return false;
-        }
-
-        $assoc = $this->getAssoc();
-
-        if ($assoc) {
-            // Adding self to the association
-            $associations = $data['associations'] ?? [];
-
-            // Unset any invalid associations
-            $associations = ArrayHelper::toInteger($associations);
-
-            foreach ($associations as $tag => $id) {
-                if (!$id) {
-                    unset($associations[$tag]);
-                }
-            }
-
-            // Detecting all item menus
-            $allLanguage = $table->language == '*';
-
-            if ($allLanguage && !empty($associations)) {
-                Factory::getApplication()->enqueueMessage(Text::_('COM_CATEGORIES_ERROR_ALL_LANGUAGE_ASSOCIATED'), 'notice');
-            }
-
-            // Get associationskey for edited item
-            $db    = $this->getDatabase();
-            $id    = (int) $table->id;
-            $query = $db->getQuery(true)
-                ->select($db->quoteName('key'))
-                ->from($db->quoteName('#__associations'))
-                ->where($db->quoteName('context') . ' = :associationscontext')
-                ->where($db->quoteName('id') . ' = :id')
-                ->bind(':associationscontext', $this->associationsContext)
-                ->bind(':id', $id, ParameterType::INTEGER);
-            $db->setQuery($query);
-            $oldKey = $db->loadResult();
-
-            if ($associations || $oldKey !== null) {
-                $where = [];
-
-                // Deleting old associations for the associated items
-                $query = $db->getQuery(true)
-                    ->delete($db->quoteName('#__associations'))
-                    ->where($db->quoteName('context') . ' = :associationscontext')
-                    ->bind(':associationscontext', $this->associationsContext);
-
-                if ($associations) {
-                    $where[] = $db->quoteName('id') . ' IN (' . implode(',', $query->bindArray(array_values($associations))) . ')';
-                }
-
-                if ($oldKey !== null) {
-                    $where[] = $db->quoteName('key') . ' = :oldKey';
-                    $query->bind(':oldKey', $oldKey);
-                }
-
-                $query->extendWhere('AND', $where, 'OR');
-            }
-
-            $db->setQuery($query);
-
-            try {
-                $db->execute();
-            } catch (\RuntimeException $e) {
-                $this->setError($e->getMessage());
+            // Rebuild the path for the category:
+            if (!$table->rebuildPath($table->id)) {
+                $this->setError($table->getError());
 
                 return false;
             }
 
-            // Adding self to the association
-            if (!$allLanguage) {
-                $associations[$table->language] = (int) $table->id;
-            }
-
-            if (\count($associations) > 1) {
-                // Adding new association for these items
-                $key = md5(json_encode($associations));
-                $query->clear()
-                    ->insert($db->quoteName('#__associations'))
-                    ->columns(
-                        [
-                            $db->quoteName('id'),
-                            $db->quoteName('context'),
-                            $db->quoteName('key'),
-                        ]
-                    );
-
-                foreach ($associations as $id) {
-                    $id = (int) $id;
-
-                    $query->values(
-                        implode(
-                            ',',
-                            $query->bindArray(
-                                [$id, $this->associationsContext, $key],
-                                [ParameterType::INTEGER, ParameterType::STRING, ParameterType::STRING]
-                            )
-                        )
-                    );
-                }
-
-                $db->setQuery($query);
-
-                try {
-                    $db->execute();
-                } catch (\RuntimeException $e) {
-                    $this->setError($e->getMessage());
+            // Rebuild the paths of the category's children:
+            if (!$table->rebuild($table->id, $table->lft, $table->level, $table->path)) {
+                $this->setError($table->getError());
 
-                    return false;
-                }
+                return false;
             }
         }
 
-        // Trigger the after save event.
-        Factory::getApplication()->triggerEvent($this->event_after_save, [$context, &$table, $isNew, $data]);
-
-        // Rebuild the path for the category:
-        if (!$table->rebuildPath($table->id)) {
-            $this->setError($table->getError());
-
-            return false;
-        }
-
-        // Rebuild the paths of the category's children:
-        if (!$table->rebuild($table->id, $table->lft, $table->level, $table->path)) {
-            $this->setError($table->getError());
+        return $result;
+    }
 
-            return false;
-        }
+    /**
+     * Prepare and sanitise the table data prior to saving.
+     *
+     * @param   Table  $table  A reference to a Table object.
+     *
+     * @return  void
+     *
+     * @since   6.1.0
+     */
+    protected function prepareTable($table)
+    {
+        $oldTable = clone $table;
 
-        $this->setState($this->getName() . '.id', $table->id);
+        $oldTable->load();
 
-        if (Factory::getApplication()->getInput()->get('task') == 'editAssociations') {
-            return $this->redirectToAssociations($data);
+        // Set the new parent id if parent id not matched OR while New/Save as Copy .
+        if (empty($table->id) || (int) $table->parent_id !== (int) $oldTable->parent_id) {
+            $table->setLocation($table->parent_id, 'last-child');
         }
-
-        // Clear the cache
-        $this->cleanCache();
-
-        return true;
     }
 
     /**
@@ -825,7 +685,7 @@ protected function batchFlipordering($value, $pks, $contexts)
         $successful = [];
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         /**
          * For each category get the max ordering value
@@ -934,7 +794,7 @@ protected function batchCopy($value, $pks, $contexts)
         $parents = [];
 
         // Calculate the emergency stop count as a precaution against a runaway loop bug
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(' . $db->quoteName('id') . ')')
             ->from($db->quoteName('#__categories'));
         $db->setQuery($query);
@@ -968,6 +828,13 @@ protected function batchCopy($value, $pks, $contexts)
                 continue;
             }
 
+            // Check that the user is allowed to access the item
+            if (!$this->user->authorise('core.edit', $contexts[$pk])) {
+                $this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+                return false;
+            }
+
             // Copy is a bit tricky, because we also need to copy the children
             $lft = (int) $this->table->lft;
             $rgt = (int) $this->table->rgt;
@@ -1085,7 +952,7 @@ protected function batchMove($value, $pks, $contexts)
         $this->type = $type->getTypeByAlias($this->typeAlias);
 
         $db        = $this->getDatabase();
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
         $extension = Factory::getApplication()->getInput()->get('extension', '', 'word');
 
         // Check that the parent exists.
@@ -1217,15 +1084,13 @@ protected function batchMove($value, $pks, $contexts)
     /**
      * Custom clean the cache of com_content and content modules
      *
-     * @param   string   $group     Cache group name.
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         $extension = Factory::getApplication()->getInput()->get('extension');
 
diff --git a/administrator/components/com_categories/src/Service/HTML/AdministratorService.php b/administrator/components/com_categories/src/Service/HTML/AdministratorService.php
index c2c819e1f5960..cddb935cf5517 100644
--- a/administrator/components/com_categories/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_categories/src/Service/HTML/AdministratorService.php
@@ -52,7 +52,7 @@ public function association($catid, $extension = 'com_content')
 
             // Get the associated categories
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('c.id'),
diff --git a/administrator/components/com_categories/src/View/Categories/HtmlView.php b/administrator/components/com_categories/src/View/Categories/HtmlView.php
index 961b9f3d181e9..0c6da623efd26 100644
--- a/administrator/components/com_categories/src/View/Categories/HtmlView.php
+++ b/administrator/components/com_categories/src/View/Categories/HtmlView.php
@@ -156,7 +156,7 @@ public function display($tpl = null)
         // Add form control fields
         $this->filterForm
             ->addControlField('extension', $this->state->get('filter.extension', ''))
-            ->addControlField('task', '')
+            ->addControlField('task')
             ->addControlField('boxchecked', '0');
 
         parent::display($tpl);
diff --git a/administrator/components/com_categories/src/View/Category/HtmlView.php b/administrator/components/com_categories/src/View/Category/HtmlView.php
index 7e54e36d6af94..f387b6750cf9f 100644
--- a/administrator/components/com_categories/src/View/Category/HtmlView.php
+++ b/administrator/components/com_categories/src/View/Category/HtmlView.php
@@ -141,7 +141,7 @@ public function display($tpl = null)
 
         // Add form control fields
         $this->form
-            ->addControlField('task', '')
+            ->addControlField('task')
             ->addControlField('return', $input->getBase64('return', ''))
             ->addControlField('forcedLanguage', $forcedLanguage);
 
diff --git a/administrator/components/com_categories/tmpl/categories/default.php b/administrator/components/com_categories/tmpl/categories/default.php
index a6be402cc7ed2..7f243f78f577d 100644
--- a/administrator/components/com_categories/tmpl/categories/default.php
+++ b/administrator/components/com_categories/tmpl/categories/default.php
@@ -10,13 +10,13 @@
 
 defined('_JEXEC') or die;
 
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use Joomla\String\Inflector;
 
 /** @var \Joomla\Component\Categories\Administrator\View\Categories\HtmlView $this */
 
@@ -38,10 +38,10 @@
 if (count($parts) > 1) {
     $section = $parts[1];
 
-    $inflector = Inflector::getInstance();
+    $inflector = InflectorFactory::create()->build();
 
-    if (!$inflector->isPlural($section)) {
-        $section = $inflector->toPlural($section);
+    if ($inflector->pluralize($inflector->singularize($section)) !== $section) {
+        $section = $inflector->pluralize($section);
     }
 }
 
diff --git a/administrator/components/com_categories/tmpl/categories/default_batch_body.php b/administrator/components/com_categories/tmpl/categories/default_batch_body.php
index 22b7963dc4f70..721b6703d3da8 100644
--- a/administrator/components/com_categories/tmpl/categories/default_batch_body.php
+++ b/administrator/components/com_categories/tmpl/categories/default_batch_body.php
@@ -20,6 +20,9 @@
 $published = (int) $this->state->get('filter.published');
 $extension = $this->escape($this->state->get('filter.extension'));
 
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('joomla.batch-copymove');
 ?>
 
 <div class="p-3">
diff --git a/administrator/components/com_categories/tmpl/categories/emptystate.php b/administrator/components/com_categories/tmpl/categories/emptystate.php
index 96049dd3532aa..7ddf8b16f99ec 100644
--- a/administrator/components/com_categories/tmpl/categories/emptystate.php
+++ b/administrator/components/com_categories/tmpl/categories/emptystate.php
@@ -42,6 +42,8 @@
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Category',
     'title'      => $title,
     'icon'       => 'icon-folder categories content-categories',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 if ($this->getCurrentUser()->authorise('core.create', $extension)) {
diff --git a/administrator/components/com_categories/tmpl/categories/modal.php b/administrator/components/com_categories/tmpl/categories/modal.php
index e16028f85ccd6..ada82ae3c44c4 100644
--- a/administrator/components/com_categories/tmpl/categories/modal.php
+++ b/administrator/components/com_categories/tmpl/categories/modal.php
@@ -33,7 +33,7 @@
     ->useScript('modal-content-select');
 
 $extension = $this->escape($this->state->get('filter.extension'));
-// @todo: Use of Function is deprecated and should be removed in 6.0. It stays only for backward compatibility.
+// @todo: Use of Function is deprecated and should be removed in 7.0. It stays only for backward compatibility.
 $function  = $app->getInput()->getCmd('function', 'jSelectCategory');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
diff --git a/administrator/components/com_checkin/src/Model/CheckinModel.php b/administrator/components/com_checkin/src/Model/CheckinModel.php
index dc04faf060efa..c1b5c374fea03 100644
--- a/administrator/components/com_checkin/src/Model/CheckinModel.php
+++ b/administrator/components/com_checkin/src/Model/CheckinModel.php
@@ -106,7 +106,7 @@ public function checkin($ids = [])
                 continue;
             }
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName($tn))
                 ->set($db->quoteName('checked_out') . ' = DEFAULT');
 
@@ -184,7 +184,7 @@ public function getItems()
                     continue;
                 }
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('COUNT(*)')
                     ->from($db->quoteName($tn));
 
diff --git a/administrator/components/com_checkin/src/View/Checkin/HtmlView.php b/administrator/components/com_checkin/src/View/Checkin/HtmlView.php
index f1bdb14870839..09fecd0d82e1e 100644
--- a/administrator/components/com_checkin/src/View/Checkin/HtmlView.php
+++ b/administrator/components/com_checkin/src/View/Checkin/HtmlView.php
@@ -108,6 +108,11 @@ public function display($tpl = null)
 
         $this->addToolbar();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_checkin/tmpl/checkin/default.php b/administrator/components/com_checkin/tmpl/checkin/default.php
index 4067943b59336..2951960cec7b1 100644
--- a/administrator/components/com_checkin/tmpl/checkin/default.php
+++ b/administrator/components/com_checkin/tmpl/checkin/default.php
@@ -72,9 +72,8 @@
                     <?php echo $this->pagination->getListFooter(); ?>
 
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_checkin/tmpl/checkin/emptystate.php b/administrator/components/com_checkin/tmpl/checkin/emptystate.php
index 5f8dfdada745f..6ecb1cc0a0716 100644
--- a/administrator/components/com_checkin/tmpl/checkin/emptystate.php
+++ b/administrator/components/com_checkin/tmpl/checkin/emptystate.php
@@ -18,6 +18,8 @@
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Maintenance:_Global_Check-in',
     'icon'       => 'icon-check-square',
     'title'      => Text::_('COM_CHECKIN_GLOBAL_CHECK_IN'),
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 echo LayoutHelper::render('joomla.content.emptystate', $displayData);
diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml
index 8f48019424b54..3e9bb13234a0e 100644
--- a/administrator/components/com_config/forms/application.xml
+++ b/administrator/components/com_config/forms/application.xml
@@ -357,7 +357,7 @@
 			label="Access-Control-Allow-Headers"
 			description="COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_HEADERS_DESC"
 			translate_label="false"
-			default="Content-Type,X-Joomla-Token"
+			default="Content-Type,X-Joomla-Token,Authorization"
 			showon="cors:1"
 		/>
 
diff --git a/administrator/components/com_config/src/Field/ConfigComponentsField.php b/administrator/components/com_config/src/Field/ConfigComponentsField.php
index 7ec5fb115417f..d63b17e649693 100644
--- a/administrator/components/com_config/src/Field/ConfigComponentsField.php
+++ b/administrator/components/com_config/src/Field/ConfigComponentsField.php
@@ -44,7 +44,7 @@ class ConfigComponentsField extends ListField
     protected function getOptions()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('name AS text, element AS value')
             ->from('#__extensions')
             ->where('enabled >= 1')
diff --git a/administrator/components/com_config/src/Field/FiltersField.php b/administrator/components/com_config/src/Field/FiltersField.php
index d2b5a6a9cc2e5..d851735ae21e9 100644
--- a/administrator/components/com_config/src/Field/FiltersField.php
+++ b/administrator/components/com_config/src/Field/FiltersField.php
@@ -162,7 +162,7 @@ protected function getUserGroups()
         $db = $this->getDatabase();
 
         // Get the user groups from the database.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select('a.id AS value, a.title AS text, COUNT(DISTINCT b.id) AS level, a.parent_id as parent');
         $query->from('#__usergroups AS a');
         $query->join('LEFT', '#__usergroups AS b on a.lft > b.lft AND a.rgt < b.rgt');
diff --git a/administrator/components/com_config/src/Helper/ConfigHelper.php b/administrator/components/com_config/src/Helper/ConfigHelper.php
index 115d384402162..92c472b351057 100644
--- a/administrator/components/com_config/src/Helper/ConfigHelper.php
+++ b/administrator/components/com_config/src/Helper/ConfigHelper.php
@@ -36,7 +36,7 @@ class ConfigHelper extends ContentHelper
     public static function getAllComponents()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('element')
             ->from('#__extensions')
             ->where('type = ' . $db->quote('component'))
diff --git a/administrator/components/com_config/src/Model/ApplicationModel.php b/administrator/components/com_config/src/Model/ApplicationModel.php
index 89cd7abc42bef..e954140844f90 100644
--- a/administrator/components/com_config/src/Model/ApplicationModel.php
+++ b/administrator/components/com_config/src/Model/ApplicationModel.php
@@ -18,7 +18,7 @@
 use Joomla\CMS\Event\Application\AfterSaveConfigurationEvent;
 use Joomla\CMS\Event\Application\BeforeSaveConfigurationEvent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Http\HttpFactory;
+use Joomla\CMS\Language\LanguageFactoryInterface;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
@@ -27,15 +27,16 @@
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\FormModel;
 use Joomla\CMS\Table\Asset;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Extension;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\UserHelper;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseFactory;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Folder;
 use Joomla\Filesystem\Path;
 use Joomla\Filter\OutputFilter;
+use Joomla\Http\HttpFactory;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 use PHPMailer\PHPMailer\Exception as phpMailerException;
@@ -67,20 +68,14 @@ class ApplicationModel extends FormModel implements MailerFactoryAwareInterface
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  mixed  A Form object on success, false on failure
+     * @return  mixed  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_config.application', 'application', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_config.application', 'application', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -328,7 +323,7 @@ public function save($data)
         }
 
         try {
-            $revisedDbo = DatabaseDriver::getInstance($options);
+            $revisedDbo = (new DatabaseFactory())->getDriver($options['driver'], $options);
             $revisedDbo->getVersion();
         } catch (\Exception $e) {
             $app->enqueueMessage(Text::sprintf('COM_CONFIG_ERROR_DATABASE_NOT_AVAILABLE', $e->getCode(), $e->getMessage()), 'error');
@@ -364,7 +359,7 @@ public function save($data)
                         CURLOPT_PROXYUSERPWD   => null,
                     ]
                 );
-                $response = HttpFactory::getHttp($options)->get('https://' . $host . Uri::root(true) . '/', ['Host' => $host], 10);
+                $response = (new HttpFactory())->getHttp($options)->get('https://' . $host . Uri::root(true) . '/', ['Host' => $host], 10);
 
                 // If available in HTTPS check also the status code.
                 if (!\in_array($response->getStatusCode(), [200, 503, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 401], true)) {
@@ -397,7 +392,7 @@ public function save($data)
                 return false;
             }
 
-            $asset = Table::getInstance('asset');
+            $asset = new Asset($this->getDatabase());
 
             if ($asset->loadByName('root.1')) {
                 $asset->rules = (string) $rules;
@@ -420,7 +415,7 @@ public function save($data)
         if (isset($data['filters'])) {
             $registry = new Registry(['filters' => $data['filters']]);
 
-            $extension = Table::getInstance('extension');
+            $extension = new Extension($this->getDatabase());
 
             // Get extension_id
             $extensionId = $extension->find(['name' => 'com_config']);
@@ -461,7 +456,7 @@ public function save($data)
         // Purge the database session table if we are changing to the database handler.
         if ($prev['session_handler'] != 'database' && $data['session_handler'] == 'database') {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__session'))
                 ->where($db->quoteName('time') . ' < ' . (time() - 1));
             $db->setQuery($query);
@@ -474,7 +469,7 @@ public function save($data)
                 // If we are are using the session handler, purge the extra columns, otherwise truncate the whole session table
                 if ($data['session_handler'] === 'database') {
                     $revisedDbo->setQuery(
-                        $revisedDbo->getQuery(true)
+                        $revisedDbo->createQuery()
                             ->update('#__session')
                             ->set(
                                 [
@@ -628,7 +623,9 @@ public function save($data)
         // Clean the cache if disabled but previously enabled or changing cache handlers; these operations use the `$prev` data already in memory
         if ((!$data['caching'] && $prev['caching']) || $data['cache_handler'] !== $prev['cache_handler']) {
             try {
-                Factory::getCache()->clean();
+                $this->getCacheControllerFactory()
+                    ->createCacheController('callback', ['defaultgroup' => ''])
+                    ->clean();
             } catch (CacheConnectingException) {
                 try {
                     Log::add(Text::_('COM_CONFIG_ERROR_CACHE_CONNECTION_FAILED'), Log::WARNING, 'jerror');
@@ -747,7 +744,7 @@ public function save($data)
         // Overwrite webservices cors settings
         $app->set('cors', $data['cors'] ?? 0);
         $app->set('cors_allow_origin', $data['cors_allow_origin'] ?? '*');
-        $app->set('cors_allow_headers', $data['cors_allow_headers'] ?? 'Content-Type,X-Joomla-Token');
+        $app->set('cors_allow_headers', $data['cors_allow_headers'] ?? 'Content-Type,X-Joomla-Token,Authorization');
         $app->set('cors_allow_methods', $data['cors_allow_methods'] ?? '');
 
         // Clear cache of com_config component.
@@ -941,8 +938,7 @@ public function storePermissions($permission = null)
         }
 
         try {
-            /** @var Asset $asset */
-            $asset  = Table::getInstance('asset');
+            $asset  = new Asset($this->getDatabase());
             $result = $asset->loadByName($permission['component']);
 
             if ($result === false) {
@@ -954,8 +950,7 @@ public function storePermissions($permission = null)
                 $asset->title = (string) $permission['title'];
 
                 // Get the parent asset id so we have a correct tree.
-                /** @var Asset $parentAsset */
-                $parentAsset = Table::getInstance('Asset');
+                $parentAsset = new Asset($this->getDatabase());
 
                 if (str_contains($asset->name, '.')) {
                     $assetParts = explode('.', $asset->name);
@@ -1036,7 +1031,7 @@ public function storePermissions($permission = null)
             $db = $this->getDatabase();
 
             // Get the asset id by the name of the component.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__assets'))
                 ->where($db->quoteName('name') . ' = :component')
@@ -1218,17 +1213,22 @@ public function sendTestMail()
         $mail = $this->getMailerFactory()->createMailer($config);
 
         // Prepare email and try to send it
-        $mailer = new MailTemplate('com_config.test_mail', $user->getParam('language', $app->get('language')), $mail);
+        $mailer = new MailTemplate(
+            'com_config.test_mail',
+            $user->getParam('language', $app->get('language')),
+            $mail,
+            Factory::getContainer()->get(LanguageFactoryInterface::class),
+            $this->getDatabase()
+        );
         $mailer->addTemplateData(
             [
                 // Replace the occurrences of "@" and "|" in the site name
                 'sitename' => str_replace(['@', '|'], '', $app->get('sitename')),
-                'method'   => Text::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($mail->Mailer)),
+                'method'   => Text::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($mail->Mailer ?? $input->get('mailer'))),
             ]
         );
         $mailer->addRecipient($user->email, $user->name);
 
-
         try {
             $mailSent = $mailer->send();
         } catch (MailDisabledException | phpMailerException $e) {
@@ -1238,10 +1238,10 @@ public function sendTestMail()
         }
 
         if ($mailSent === true) {
-            $methodName = Text::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($mail->Mailer));
+            $methodName = Text::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($mail->Mailer ?? $input->get('mailer')));
 
-            // If JMail send the mail using PHP Mail as fallback.
-            if ($mail->Mailer !== $app->get('mailer')) {
+            // If Mail send the mail using PHP Mail as fallback.
+            if (($mail->Mailer ?? $app->get('mailer')) !== $app->get('mailer')) {
                 $app->enqueueMessage(Text::sprintf('COM_CONFIG_SENDMAIL_SUCCESS_FALLBACK', $user->email, $methodName), 'warning');
             } else {
                 $app->enqueueMessage(Text::sprintf('COM_CONFIG_SENDMAIL_SUCCESS', $user->email, $methodName), 'message');
diff --git a/administrator/components/com_config/src/Model/ComponentModel.php b/administrator/components/com_config/src/Model/ComponentModel.php
index 0a80503e4e836..e424760b2005f 100644
--- a/administrator/components/com_config/src/Model/ComponentModel.php
+++ b/administrator/components/com_config/src/Model/ComponentModel.php
@@ -13,12 +13,15 @@
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Access\Rules;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model\AfterSaveEvent;
+use Joomla\CMS\Event\Model\BeforeSaveEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\FormModel;
 use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Asset;
+use Joomla\CMS\Table\Extension;
 use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -64,9 +67,10 @@ protected function populateState()
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  mixed  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   3.2
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -90,10 +94,6 @@ public function getForm($data = [], $loadData = true)
             '/config'
         );
 
-        if (empty($form)) {
-            return false;
-        }
-
         $lang = Factory::getLanguage();
         $lang->load($option, JPATH_BASE)
         || $lang->load($option, JPATH_BASE . "/components/$option");
@@ -156,9 +156,10 @@ public function getComponent()
      */
     public function save($data)
     {
-        $table      = Table::getInstance('extension');
+        $table      = new Extension($this->getDatabase());
         $context    = $this->option . '.' . $this->name;
-        PluginHelper::importPlugin('extension');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('extension', null, true, $dispatcher);
 
         // Check super user group.
         if (isset($data['params']) && !$this->getCurrentUser()->authorise('core.admin')) {
@@ -184,10 +185,10 @@ public function save($data)
             }
 
             $rules = new Rules($data['params']['rules']);
-            $asset = Table::getInstance('asset');
+            $asset = new Asset($this->getDatabase());
 
             if (!$asset->loadByName($data['option'])) {
-                $root = Table::getInstance('asset');
+                $root = new Asset($this->getDatabase());
                 $root->loadByName('root.1');
                 $asset->name  = $data['option'];
                 $asset->title = $data['option'];
@@ -221,14 +222,24 @@ public function save($data)
             throw new \RuntimeException($table->getError());
         }
 
-        $result = Factory::getApplication()->triggerEvent('onExtensionBeforeSave', [$context, $table, false]);
+        $result = $dispatcher->dispatch('onExtensionBeforeSave', new BeforeSaveEvent('onExtensionBeforeSave', [
+            'context' => $context,
+            'subject' => $table,
+            'isNew'   => false,
+            'data'    => $data,
+        ]))->getArgument('result', []);
 
         // Store the data.
         if (\in_array(false, $result, true) || !$table->store()) {
             throw new \RuntimeException($table->getError());
         }
 
-        Factory::getApplication()->triggerEvent('onExtensionAfterSave', [$context, $table, false]);
+        $dispatcher->dispatch('onExtensionAfterSave', new AfterSaveEvent('onExtensionAfterSave', [
+            'context' => $context,
+            'subject' => $table,
+            'isNew'   => false,
+            'data'    => $data,
+        ]));
 
         // Clean the component cache.
         $this->cleanCache('_system');
diff --git a/administrator/components/com_config/src/View/Application/HtmlView.php b/administrator/components/com_config/src/View/Application/HtmlView.php
index 6ec11ecb289a1..74a40f3ade163 100644
--- a/administrator/components/com_config/src/View/Application/HtmlView.php
+++ b/administrator/components/com_config/src/View/Application/HtmlView.php
@@ -125,6 +125,10 @@ public function display($tpl = null)
 
         $this->addToolbar();
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_config/src/View/Component/HtmlView.php b/administrator/components/com_config/src/View/Component/HtmlView.php
index 486824d9f564d..ce413d93a57cc 100644
--- a/administrator/components/com_config/src/View/Component/HtmlView.php
+++ b/administrator/components/com_config/src/View/Component/HtmlView.php
@@ -125,6 +125,13 @@ public function display($tpl = null)
 
         $this->addToolbar();
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task')
+            ->addControlField('id', $this->component->id)
+            ->addControlField('component', $this->component->option)
+            ->addControlField('return', $this->return);
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_config/tmpl/application/default.php b/administrator/components/com_config/tmpl/application/default.php
index 828f1cfaeac5a..21818e6b44b45 100644
--- a/administrator/components/com_config/tmpl/application/default.php
+++ b/administrator/components/com_config/tmpl/application/default.php
@@ -78,8 +78,7 @@
                 <?php echo HTMLHelper::_('uitab.endTab'); ?>
             <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
-            <input type="hidden" name="task" value="">
-            <?php echo HTMLHelper::_('form.token'); ?>
+            <?php echo $this->form->renderControlFields(); ?>
         </div>
     </div>
 </form>
diff --git a/administrator/components/com_config/tmpl/component/default.php b/administrator/components/com_config/tmpl/component/default.php
index 606956287439a..2cef0bd0cd4f0 100644
--- a/administrator/components/com_config/tmpl/component/default.php
+++ b/administrator/components/com_config/tmpl/component/default.php
@@ -136,10 +136,6 @@
             <?php endif; ?>
         </div>
 
-        <input type="hidden" name="id" value="<?php echo $this->component->id; ?>">
-        <input type="hidden" name="component" value="<?php echo $this->component->option; ?>">
-        <input type="hidden" name="return" value="<?php echo $this->return; ?>">
-        <input type="hidden" name="task" value="">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->form->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_contact/forms/contact.xml b/administrator/components/com_contact/forms/contact.xml
index 6e4754dd826dd..78164130415f5 100644
--- a/administrator/components/com_contact/forms/contact.xml
+++ b/administrator/components/com_contact/forms/contact.xml
@@ -205,6 +205,11 @@
 			class="advancedSelect"
 			multiple="true"
 		/>
+
+		<field
+			name="schema"
+			type="hidden"
+		/>
 	</fieldset>
 
 	<fieldset name="details" label="COM_CONTACT_CONTACT_DETAILS">
diff --git a/administrator/components/com_contact/helpers/contact.php b/administrator/components/com_contact/helpers/contact.php
index e9af534cf1693..1a2b9e5d6e137 100644
--- a/administrator/components/com_contact/helpers/contact.php
+++ b/administrator/components/com_contact/helpers/contact.php
@@ -19,7 +19,7 @@
  *
  * @since       1.6
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Contact\Administrator\Helper\ContactHelper instead
  */
 class ContactHelper extends \Joomla\Component\Contact\Administrator\Helper\ContactHelper
diff --git a/administrator/components/com_contact/src/Field/Modal/ContactField.php b/administrator/components/com_contact/src/Field/Modal/ContactField.php
index 7dc872ac6db99..6832f18b7e8e0 100644
--- a/administrator/components/com_contact/src/Field/Modal/ContactField.php
+++ b/administrator/components/com_contact/src/Field/Modal/ContactField.php
@@ -138,7 +138,7 @@ protected function getValueTitle()
         if ($value) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('name'))
                     ->from($db->quoteName('#__contact_details'))
                     ->where($db->quoteName('id') . ' = :value')
diff --git a/administrator/components/com_contact/src/Helper/AssociationsHelper.php b/administrator/components/com_contact/src/Helper/AssociationsHelper.php
index 35ee395ac5dfd..f98624830373d 100644
--- a/administrator/components/com_contact/src/Helper/AssociationsHelper.php
+++ b/administrator/components/com_contact/src/Helper/AssociationsHelper.php
@@ -11,8 +11,11 @@
 namespace Joomla\Component\Contact\Administrator\Helper;
 
 use Joomla\CMS\Association\AssociationExtensionHelper;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Table\Category;
 use Joomla\CMS\Table\Table;
+use Joomla\Component\Contact\Administrator\Table\ContactTable;
 use Joomla\Component\Contact\Site\Helper\AssociationHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -124,11 +127,11 @@ public function getItem($typeName, $id)
 
         switch ($typeName) {
             case 'contact':
-                $table = Table::getInstance('ContactTable', 'Joomla\\Component\\Contact\\Administrator\\Table\\');
+                $table = new ContactTable(Factory::getDbo());
                 break;
 
             case 'category':
-                $table = Table::getInstance('Category');
+                $table = new Category(Factory::getDbo());
                 break;
         }
 
diff --git a/administrator/components/com_contact/src/Model/ContactModel.php b/administrator/components/com_contact/src/Model/ContactModel.php
index 58d26e525c95c..9782d57b90c56 100644
--- a/administrator/components/com_contact/src/Model/ContactModel.php
+++ b/administrator/components/com_contact/src/Model/ContactModel.php
@@ -18,6 +18,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\String\PunycodeHelper;
+use Joomla\CMS\Versioning\VersionableModelInterface;
 use Joomla\CMS\Versioning\VersionableModelTrait;
 use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
 use Joomla\Database\ParameterType;
@@ -33,7 +34,7 @@
  *
  * @since  1.6
  */
-class ContactModel extends AdminModel
+class ContactModel extends AdminModel implements VersionableModelInterface
 {
     use VersionableModelTrait;
 
@@ -161,9 +162,10 @@ protected function canEditState($record)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -172,10 +174,6 @@ public function getForm($data = [], $loadData = true)
         // Get the form.
         $form = $this->loadForm('com_contact.' . $this->formName, $this->formName, ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         // Modify the form based on access controls.
         if (!$this->canEditState((object) $data)) {
             // Disable fields for display.
@@ -258,7 +256,7 @@ protected function loadFormData()
 
             // Prime some default values.
             if ($this->getState('contact.id') == 0) {
-                $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_contact.contacts.filter.category_id'), 'int'));
+                $data->catid = $app->getInput()->get('catid', $app->getUserState('com_contact.contacts.filter.category_id'), 'int');
             }
         }
 
@@ -368,7 +366,7 @@ protected function prepareTable($table)
             // Set ordering to the last item if not set
             if (empty($table->ordering)) {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('MAX(ordering)')
                     ->from($db->quoteName('#__contact_details'));
                 $db->setQuery($query);
@@ -478,7 +476,7 @@ public function featured($pks, $value = 0)
         try {
             $db = $this->getDatabase();
 
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query->update($db->quoteName('#__contact_details'));
             $query->set($db->quoteName('featured') . ' = :featured');
             $query->whereIn($db->quoteName('id'), $pks);
diff --git a/administrator/components/com_contact/src/Model/ContactsModel.php b/administrator/components/com_contact/src/Model/ContactsModel.php
index a783ac5a8bd43..a781a3ca4e6f4 100644
--- a/administrator/components/com_contact/src/Model/ContactsModel.php
+++ b/administrator/components/com_contact/src/Model/ContactsModel.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Category;
 use Joomla\Database\ParameterType;
 use Joomla\Database\QueryInterface;
 use Joomla\Utilities\ArrayHelper;
@@ -146,7 +146,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
 
         // Select the required fields from the table.
@@ -208,7 +208,7 @@ protected function getListQuery()
 
         // Join over the associations.
         if (Associations::isEnabled()) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName('asso1.id') . ') > 1')
                 ->from($db->quoteName('#__associations', 'asso1'))
                 ->join('INNER', $db->quoteName('#__associations', 'asso2'), $db->quoteName('asso1.key') . ' = ' . $db->quoteName('asso2.key'))
@@ -291,7 +291,7 @@ protected function getListQuery()
                 $includeNone = true;
             }
 
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                 ->from($db->quoteName('#__contentitem_tag_map'))
                 ->where(
@@ -308,7 +308,7 @@ protected function getListQuery()
             );
 
             if ($includeNone) {
-                $subQuery2 = $db->getQuery(true)
+                $subQuery2 = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_contact.contact'));
@@ -326,7 +326,7 @@ protected function getListQuery()
             $tag = (int) $tag;
 
             if ($tag === 0) {
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_contact.contact'));
@@ -365,7 +365,7 @@ protected function getListQuery()
         // Case: Using both categories filter and by level filter
         if (\count($categoryId)) {
             $categoryId       = ArrayHelper::toInteger($categoryId);
-            $categoryTable    = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\');
+            $categoryTable    = new Category($db);
             $subCatItemsWhere = [];
 
             // @todo: Convert to prepared statement
diff --git a/administrator/components/com_contact/src/Service/HTML/AdministratorService.php b/administrator/components/com_contact/src/Service/HTML/AdministratorService.php
index d99c69510bb38..4c6a829bec937 100644
--- a/administrator/components/com_contact/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_contact/src/Service/HTML/AdministratorService.php
@@ -52,7 +52,7 @@ public function association($contactid)
 
             // Get the associated contact items
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('c.id'),
diff --git a/administrator/components/com_contact/src/Service/HTML/Icon.php b/administrator/components/com_contact/src/Service/HTML/Icon.php
index 9073e21a66395..02b6c7f8f4684 100644
--- a/administrator/components/com_contact/src/Service/HTML/Icon.php
+++ b/administrator/components/com_contact/src/Service/HTML/Icon.php
@@ -100,7 +100,7 @@ public function create($category, $params, $attribs = [])
      */
     public function edit($contact, $params, $attribs = [], $legacy = false)
     {
-        $user = Factory::getUser();
+        $user = Factory::getApplication()->getIdentity();
         $uri  = Uri::getInstance();
 
         // Ignore if in a popup window.
diff --git a/administrator/components/com_contact/src/Table/ContactTable.php b/administrator/components/com_contact/src/Table/ContactTable.php
index f3b369cdd92d5..c5d1d9c397420 100644
--- a/administrator/components/com_contact/src/Table/ContactTable.php
+++ b/administrator/components/com_contact/src/Table/ContactTable.php
@@ -20,7 +20,6 @@
 use Joomla\CMS\Tag\TaggableTableTrait;
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
-use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Event\DispatcherInterface;
 use Joomla\String\StringHelper;
@@ -34,7 +33,7 @@
  *
  * @since  1.0
  */
-class ContactTable extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface
+class ContactTable extends Table implements TaggableTableInterface, CurrentUserInterface
 {
     use TaggableTableTrait;
     use CurrentUserTrait;
diff --git a/administrator/components/com_contact/src/View/Contact/HtmlView.php b/administrator/components/com_contact/src/View/Contact/HtmlView.php
index 5abfe5c972d58..7f35d4d27e942 100644
--- a/administrator/components/com_contact/src/View/Contact/HtmlView.php
+++ b/administrator/components/com_contact/src/View/Contact/HtmlView.php
@@ -10,16 +10,11 @@
 
 namespace Joomla\Component\Contact\Administrator\View\Contact;
 
-use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
-use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\GenericDataException;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Toolbar\Toolbar;
+use Joomla\CMS\MVC\View\FormView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\Component\Contact\Administrator\Model\ContactModel;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -30,68 +25,62 @@
  *
  * @since  1.6
  */
-class HtmlView extends BaseHtmlView
+class HtmlView extends FormView
 {
     /**
-     * The Form object
+     * Set to true, if saving to menu should be supported
      *
-     * @var  \Joomla\CMS\Form\Form
+     * @var boolean
      */
-    protected $form;
+    protected $supportSaveMenu = true;
 
     /**
-     * The active item
+     * Holds the extension for categories, if available
      *
-     * @var  object
+     * @var string
      */
-    protected $item;
+    protected $categorySection = 'com_contact';
 
     /**
-     * The model state
+     * Constructor
      *
-     * @var  \Joomla\Registry\Registry
-     */
-    protected $state;
-
-    /**
-     * Array of fieldsets not to display
-     *
-     * @var    string[]
+     * @param   array  $config  An optional associative array of configuration settings.
      *
-     * @since  5.2.0
+     * @since   6.0.0
      */
-    public $ignore_fieldsets = [];
+    public function __construct(array $config)
+    {
+        if (empty($config['option'])) {
+            $config['option'] = 'com_contact';
+        }
+
+        $config['help_link']    = 'Contacts:_Edit';
+        $config['toolbar_icon'] = 'address-book contact';
+
+        parent::__construct($config);
+    }
 
     /**
-     * Display the view.
-     *
-     * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+     * Prepare view data
      *
      * @return  void
+     *
+     * @since   6.0.0
      */
-    public function display($tpl = null)
+    protected function initializeView()
     {
-        /** @var ContactModel $model */
-        $model = $this->getModel();
+        parent::initializeView();
 
-        // Initialise variables.
-        $this->form  = $model->getForm();
-        $this->item  = $model->getItem();
-        $this->state = $model->getState();
+        $this->canDo = ContentHelper::getActions('com_contact', 'category', $this->item->catid);
 
         if ($this->getLayout() === 'modalreturn') {
-            parent::display($tpl);
-
             return;
         }
 
-        // Check for errors.
-        if (\count($errors = $model->getErrors())) {
-            throw new GenericDataException(implode("\n", $errors), 500);
-        }
-
         // If we are forcing a language in modal (used for associations).
-        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd')) {
+        $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd');
+
+        if ($this->getLayout() === 'modal' && $forcedLanguage) {
             // Set the language field to the forcedLanguage and disable changing it.
             $this->form->setValue('language', null, $forcedLanguage);
             $this->form->setFieldAttribute('language', 'readonly', 'true');
@@ -103,13 +92,10 @@ public function display($tpl = null)
             $this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage);
         }
 
-        if ($this->getLayout() !== 'modal') {
-            $this->addToolbar();
-        } else {
-            $this->addModalToolbar();
-        }
-
-        parent::display($tpl);
+        // Add form control fields
+        $this->form
+            ->addControlField('task')
+            ->addControlField('forcedLanguage', $forcedLanguage);
     }
 
     /**
@@ -121,91 +107,15 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->getInput()->set('hidemainmenu', true);
-
-        $user       = $this->getCurrentUser();
-        $userId     = $user->id;
-        $isNew      = ($this->item->id == 0);
-        $checkedOut = !(\is_null($this->item->checked_out) || $this->item->checked_out == $userId);
-        $toolbar    = $this->getDocument()->getToolbar();
-
-        // Since we don't track these assets at the item level, use the category id.
-        $canDo = ContentHelper::getActions('com_contact', 'category', $this->item->catid);
-
-        ToolbarHelper::title($isNew ? Text::_('COM_CONTACT_MANAGER_CONTACT_NEW') : Text::_('COM_CONTACT_MANAGER_CONTACT_EDIT'), 'address-book contact');
+        if ($this->getLayout() === 'modal') {
+            $this->addModalToolbar();
 
-        // Build the actions for new and existing records.
-        if ($isNew) {
-            // For new records, check the create permission.
-            if (\count($user->getAuthorisedCategories('com_contact', 'core.create')) > 0) {
-                $toolbar->apply('contact.apply');
-
-                $saveGroup = $toolbar->dropdownButton('save-group');
-
-                $saveGroup->configure(
-                    function (Toolbar $childBar) use ($user) {
-                        $childBar->save('contact.save');
-
-                        if ($user->authorise('core.create', 'com_menus.menu')) {
-                            $childBar->save('contact.save2menu', 'JTOOLBAR_SAVE_TO_MENU');
-                        }
-
-                        $childBar->save2new('contact.save2new');
-                    }
-                );
-            }
-
-            $toolbar->cancel('contact.cancel', 'JTOOLBAR_CANCEL');
-        } else {
-            // Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
-            $itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);
-
-            // Can't save the record if it's checked out and editable
-            if (!$checkedOut && $itemEditable) {
-                $toolbar->apply('contact.apply');
-            }
-
-            $saveGroup = $toolbar->dropdownButton('save-group');
-
-            $saveGroup->configure(
-                function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo, $user) {
-                    // Can't save the record if it's checked out and editable
-                    if (!$checkedOut && $itemEditable) {
-                        $childBar->save('contact.save');
-
-                        // We can save this record, but check the create permission to see if we can return to make a new one.
-                        if ($canDo->get('core.create')) {
-                            $childBar->save2new('contact.save2new');
-                        }
-                    }
-
-                    // If checked out, we can still save2menu
-                    if ($user->authorise('core.create', 'com_menus.menu')) {
-                        $childBar->save('contact.save2menu', 'JTOOLBAR_SAVE_TO_MENU');
-                    }
-
-                    // If checked out, we can still save
-                    if ($canDo->get('core.create')) {
-                        $childBar->save2copy('contact.save2copy');
-                    }
-                }
-            );
-
-            $toolbar->cancel('contact.cancel');
-
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $itemEditable) {
-                $toolbar->versions('com_contact.contact', $this->item->id);
-            }
-
-            if (Associations::isEnabled() && ComponentHelper::isEnabled('com_associations')) {
-                $toolbar->standardButton('contract', 'JTOOLBAR_ASSOCIATIONS', 'contact.editAssociations')
-                    ->icon('icon-contract')
-                    ->listCheck(false);
-            }
+            return;
         }
 
-        $toolbar->divider();
-        $toolbar->help('Contacts:_Edit');
+        parent::addToolbar();
+
+        return;
     }
 
     /**
diff --git a/administrator/components/com_contact/src/View/Contacts/HtmlView.php b/administrator/components/com_contact/src/View/Contacts/HtmlView.php
index f53d82bbba304..31759d510880a 100644
--- a/administrator/components/com_contact/src/View/Contacts/HtmlView.php
+++ b/administrator/components/com_contact/src/View/Contacts/HtmlView.php
@@ -13,12 +13,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\MVC\View\ListView;
 use Joomla\CMS\Session\Session;
-use Joomla\CMS\Toolbar\Button\DropdownButton;
-use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\Component\Contact\Administrator\Model\ContactsModel;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -29,79 +25,52 @@
  *
  * @since  1.6
  */
-class HtmlView extends BaseHtmlView
+class HtmlView extends ListView
 {
     /**
-     * An array of items
+     * The help link for the view
      *
-     * @var  array
+     * @var string
      */
-    protected $items;
+    protected $helpLink = 'Contacts';
 
     /**
-     * The pagination object
+     * Constructor
      *
-     * @var  \Joomla\CMS\Pagination\Pagination
+     * @param   array  $config  An optional associative array of configuration settings.
      */
-    protected $pagination;
-
-    /**
-     * The model state
-     *
-     * @var  \Joomla\Registry\Registry
-     */
-    protected $state;
-
-    /**
-     * Form object for search filters
-     *
-     * @var  \Joomla\CMS\Form\Form
-     */
-    public $filterForm;
+    public function __construct(array $config)
+    {
+        if (empty($config['option'])) {
+            $config['option'] = 'com_contact';
+        }
 
-    /**
-     * The active search filters
-     *
-     * @var  array
-     */
-    public $activeFilters;
+        $config['toolbar_icon']   = 'address-book contact';
+        $config['supports_batch'] = true;
 
-    /**
-     * Is this view an Empty State
-     *
-     * @var   boolean
-     *
-     * @since 4.0.0
-     */
-    private $isEmptyState = false;
+        parent::__construct($config);
+    }
 
     /**
-     * Display the view.
-     *
-     * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+     * Prepare view data
      *
      * @return  void
      */
-    public function display($tpl = null)
+    protected function initializeView()
     {
-        /** @var ContactsModel $model */
-        $model = $this->getModel();
-        $model->setUseExceptions(true);
-
-        $this->items         = $model->getItems();
-        $this->pagination    = $model->getPagination();
-        $this->state         = $model->getState();
-        $this->filterForm    = $model->getFilterForm();
-        $this->activeFilters = $model->getActiveFilters();
-
-        if (!\count($this->items) && $this->isEmptyState = $model->getIsEmptyState()) {
-            $this->setLayout('emptystate');
+        parent::initializeView();
+
+        $user  = $this->getCurrentUser();
+
+        $this->canDo = ContentHelper::getActions('com_contact', 'category', $this->state->get('filter.category_id'));
+
+        // Special case of we can create contact for specific categories show add button
+        if (\count($user->getAuthorisedCategories('com_contact', 'core.create')) > 0) {
+            $this->canDo->set('core.create', true);
         }
 
         // We don't need toolbar in the modal window.
         if ($this->getLayout() !== 'modal') {
-            $this->addToolbar();
-
             // We do not need to filter by language when multilingual is disabled
             if (!Multilanguage::isEnabled()) {
                 unset($this->activeFilters['language']);
@@ -110,7 +79,9 @@ public function display($tpl = null)
         } else {
             // In article associations modal we need to remove language filter if forcing a language.
             // We also need to change the category filter to show show categories with All or the forced language.
-            if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) {
+            $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD');
+
+            if ($forcedLanguage) {
                 // If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
                 $languageXml = new \SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
                 $this->filterForm->setField($languageXml, 'filter', true);
@@ -122,6 +93,9 @@ public function display($tpl = null)
                 $this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
             }
 
+            $this->filterForm
+                ->addControlField('forcedLanguage', $forcedLanguage);
+
             /*
             * When loaded from the frontend, the modal template requires a valid CSRF token on every request.
             * Pagination links are plain GET anchor tags that bypass form submission,
@@ -131,83 +105,5 @@ public function display($tpl = null)
                 $this->pagination->setAdditionalUrlParam(Session::getFormToken(), '1');
             }
         }
-
-        parent::display($tpl);
-    }
-
-    /**
-     * Add the page title and toolbar.
-     *
-     * @return  void
-     *
-     * @since   1.6
-     */
-    protected function addToolbar()
-    {
-        $canDo = ContentHelper::getActions('com_contact', 'category', $this->state->get('filter.category_id'));
-        $user  = $this->getCurrentUser();
-
-        // Get the toolbar object instance
-        $toolbar = $this->getDocument()->getToolbar();
-
-        ToolbarHelper::title(Text::_('COM_CONTACT_MANAGER_CONTACTS'), 'address-book contact');
-
-        if ($canDo->get('core.create') || \count($user->getAuthorisedCategories('com_contact', 'core.create')) > 0) {
-            $toolbar->addNew('contact.add');
-        }
-
-        if (!$this->isEmptyState && $canDo->get('core.edit.state')) {
-            /** @var  DropdownButton $dropdown */
-            $dropdown = $toolbar->dropdownButton('status-group', 'JTOOLBAR_CHANGE_STATUS')
-                ->toggleSplit(false)
-                ->icon('icon-ellipsis-h')
-                ->buttonClass('btn btn-action')
-                ->listCheck(true);
-
-            $childBar = $dropdown->getChildToolbar();
-
-            $childBar->publish('contacts.publish')->listCheck(true);
-            $childBar->unpublish('contacts.unpublish')->listCheck(true);
-            $childBar->standardButton('featured', 'JFEATURE', 'contacts.featured')
-                ->listCheck(true);
-            $childBar->standardButton('unfeatured', 'JUNFEATURE', 'contacts.unfeatured')
-                ->listCheck(true);
-            $childBar->archive('contacts.archive')->listCheck(true);
-
-            if ($user->authorise('core.admin')) {
-                $childBar->checkin('contacts.checkin');
-            }
-
-            if ($this->state->get('filter.published') != -2) {
-                $childBar->trash('contacts.trash')->listCheck(true);
-            }
-
-            // Add a batch button
-            if (
-                $user->authorise('core.create', 'com_contact')
-                && $user->authorise('core.edit', 'com_contact')
-                && $user->authorise('core.edit.state', 'com_contact')
-            ) {
-                $childBar->popupButton('batch', 'JTOOLBAR_BATCH')
-                    ->popupType('inline')
-                    ->textHeader(Text::_('COM_CONTACT_BATCH_OPTIONS'))
-                    ->url('#joomla-dialog-batch')
-                    ->modalWidth('800px')
-                    ->modalHeight('fit-content')
-                    ->listCheck(true);
-            }
-        }
-
-        if (!$this->isEmptyState && $this->state->get('filter.published') == -2 && $canDo->get('core.delete')) {
-            $toolbar->delete('contacts.delete', 'JTOOLBAR_DELETE_FROM_TRASH')
-                ->message('JGLOBAL_CONFIRM_DELETE')
-                ->listCheck(true);
-        }
-
-        if ($user->authorise('core.admin', 'com_contact') || $user->authorise('core.options', 'com_contact')) {
-            $toolbar->preferences('com_contact');
-        }
-
-        $toolbar->help('Contacts');
     }
 }
diff --git a/administrator/components/com_contact/tmpl/contact/edit.php b/administrator/components/com_contact/tmpl/contact/edit.php
index dddda905f7305..c45ef221aaafd 100644
--- a/administrator/components/com_contact/tmpl/contact/edit.php
+++ b/administrator/components/com_contact/tmpl/contact/edit.php
@@ -130,7 +130,6 @@
 
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
     </div>
-    <input type="hidden" name="task" value="">
-    <input type="hidden" name="forcedLanguage" value="<?php echo $input->get('forcedLanguage', '', 'cmd'); ?>">
-    <?php echo HTMLHelper::_('form.token'); ?>
+
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_contact/tmpl/contacts/default.php b/administrator/components/com_contact/tmpl/contacts/default.php
index d2cd208b88b85..32147cf2658ef 100644
--- a/administrator/components/com_contact/tmpl/contacts/default.php
+++ b/administrator/components/com_contact/tmpl/contacts/default.php
@@ -191,17 +191,12 @@
 
                     <?php // Load the batch processing form. ?>
                     <?php
-                    if (
-                        $user->authorise('core.create', 'com_contact')
-                        && $user->authorise('core.edit', 'com_contact')
-                        && $user->authorise('core.edit.state', 'com_contact')
-                    ) : ?>
+                    if ($this->batchAllowed) : ?>
                         <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
                     <?php endif; ?>
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_contact/tmpl/contacts/emptystate.php b/administrator/components/com_contact/tmpl/contacts/emptystate.php
index c42bdffdf487b..752e065b8ad01 100644
--- a/administrator/components/com_contact/tmpl/contacts/emptystate.php
+++ b/administrator/components/com_contact/tmpl/contacts/emptystate.php
@@ -17,8 +17,10 @@
 $displayData = [
     'textPrefix' => 'COM_CONTACT',
     'formURL'    => 'index.php?option=com_contact',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Contacts',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/contacts',
     'icon'       => 'icon-address-book contact',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 $user = $this->getCurrentUser();
diff --git a/administrator/components/com_contact/tmpl/contacts/modal.php b/administrator/components/com_contact/tmpl/contacts/modal.php
index ed2579532dc83..dacc4777ceddb 100644
--- a/administrator/components/com_contact/tmpl/contacts/modal.php
+++ b/administrator/components/com_contact/tmpl/contacts/modal.php
@@ -32,7 +32,7 @@
 $wa->useScript('modal-content-select')
     ->useScript('com_contact.admin-contacts-modal');
 
-// @todo: Use of Function and Editor is deprecated and should be removed in 6.0. It stays only for backward compatibility.
+// @todo: Use of Function and Editor is deprecated and should be removed in 7.0. It stays only for backward compatibility.
 $function  = $app->getInput()->getCmd('function', 'jSelectContact');
 $editor    = $app->getInput()->getCmd('editor', '');
 $listOrder = $this->escape($this->state->get('list.ordering'));
@@ -161,9 +161,7 @@
 
         <?php endif; ?>
 
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'CMD'); ?>">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->filterForm->renderControlFields(); ?>
 
     </form>
 </div>
diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index c037c6e9de367..8b21fceaf25d6 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -330,6 +330,17 @@
 			<option value="1">COM_CONTENT_FIELD_OPTION_BELOW</option>
 			<option value="-1">JHIDE</option>
 		</field>
+
+		<field
+			name="preview_token_expiration"
+			type="number"
+			label="COM_CONTENT_FIELD_PREVIEW_TOKEN_EXPIRATION_LABEL"
+			description="COM_CONTENT_FIELD_PREVIEW_TOKEN_EXPIRATION_DESC"
+			default="15"
+			min="1"
+			step="5"
+			filter="integer"
+		/>
 	</fieldset>
 	<fieldset
 		name="editinglayout"
@@ -508,7 +519,7 @@
 		<field
 			name="float_intro"
 			type="text"
-			label="COM_CONTENT_IMAGE_INTRO_CLASS_LABEL"
+			label="COM_CONTENT_FIGURE_INTRO_CLASS_LABEL"
 			validate="CssIdentifier"
 			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
 		/>
@@ -516,7 +527,7 @@
 		<field
 			name="float_fulltext"
 			type="text"
-			label="COM_CONTENT_IMAGE_FULLTEXT_CLASS_LABEL"
+			label="COM_CONTENT_FIGURE_FULLTEXT_CLASS_LABEL"
 			validate="CssIdentifier"
 			showon="show_urls_images_backend:1[OR]show_urls_images_frontend:1"
 		/>
@@ -629,6 +640,17 @@
 			<option value="1">JSHOW</option>
 		</field>
 
+		<field
+			name="show_subcat_image"
+			type="radio"
+			label="JGLOBAL_SHOW_SUBCATEGORIES_IMAGE_LABEL"
+			default="0"
+			layout="joomla.form.field.radio.switcher"
+			>
+			<option value="0">JHIDE</option>
+			<option value="1">JSHOW</option>
+		</field>
+
 		<field
 			name="show_cat_num_articles"
 			type="radio"
diff --git a/administrator/components/com_content/forms/article.xml b/administrator/components/com_content/forms/article.xml
index 2d57f6a02164b..45384ae78f0cb 100644
--- a/administrator/components/com_content/forms/article.xml
+++ b/administrator/components/com_content/forms/article.xml
@@ -262,6 +262,11 @@
 			validate="rules"
 		/>
 
+		<field
+			name="schema"
+			type="hidden"
+		/>
+
 	</fieldset>
 
 	<fields name="attribs" label="COM_CONTENT_ATTRIBS_FIELDSET_LABEL">
@@ -744,10 +749,19 @@
 			/>
 
 			<field
-				name="float_intro"
+				name="imgclass_intro"
 				type="text"
 				label="COM_CONTENT_FIELD_IMAGE_CLASS_LABEL"
-				description="COM_CONTENT_FIELD_IMAGE_CLASS_DESC"
+				description="COM_CONTENT_FIELD_IMAGEONLY_CLASS_DESC"
+				useglobal="true"
+				validate="CssIdentifier"
+			/>
+
+			<field
+				name="float_intro"
+				type="text"
+				label="COM_CONTENT_FIELD_FIGURE_CLASS_LABEL"
+				description="COM_CONTENT_FIELD_FIGURE_CLASS_DESC"
 				useglobal="true"
 				validate="CssIdentifier"
 			/>
@@ -782,12 +796,20 @@
 				label="COM_CONTENT_FIELD_IMAGE_ALT_EMPTY_LABEL"
 				description="COM_CONTENT_FIELD_IMAGE_ALT_EMPTY_DESC"
 			/>
+			<field
+				name="imgclass_fulltext"
+				type="text"
+				label="COM_CONTENT_FIELD_IMAGE_CLASS_LABEL"
+				description="COM_CONTENT_FIELD_IMAGEONLY_CLASS_DESC"
+				useglobal="true"
+				validate="CssIdentifier"
+			/>
 
 			<field
 				name="float_fulltext"
 				type="text"
-				label="COM_CONTENT_FIELD_IMAGE_CLASS_LABEL"
-				description="COM_CONTENT_FIELD_IMAGE_CLASS_DESC"
+				label="COM_CONTENT_FIELD_FIGURE_CLASS_LABEL"
+				description="COM_CONTENT_FIELD_FIGURE_CLASS_DESC"
 				useglobal="true"
 				validate="CssIdentifier"
 			/>
@@ -797,6 +819,7 @@
 				type="text"
 				label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
 			/>
+
 		</fieldset>
 	</fields>
 
diff --git a/administrator/components/com_content/forms/filter_articles.xml b/administrator/components/com_content/forms/filter_articles.xml
index 88211741e70ef..6b9be58d6a399 100644
--- a/administrator/components/com_content/forms/filter_articles.xml
+++ b/administrator/components/com_content/forms/filter_articles.xml
@@ -14,8 +14,8 @@
 			name="featured"
 			type="list"
 			label="JFEATURED"
+			filtermode="selector"
 			class="js-select-submit-on-change"
-			default=""
 			validate="options"
 			>
 			<option value="">COM_CONTENT_SELECT_FEATURED</option>
diff --git a/administrator/components/com_content/forms/filter_featured.xml b/administrator/components/com_content/forms/filter_featured.xml
deleted file mode 100644
index 5fdeefc9a2a9a..0000000000000
--- a/administrator/components/com_content/forms/filter_featured.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form>
-	<fields name="filter">
-		<field
-			name="search"
-			type="text"
-			inputmode="search"
-			label="COM_CONTENT_FILTER_SEARCH_LABEL"
-			description="COM_CONTENT_FILTER_SEARCH_DESC"
-			hint="JSEARCH_FILTER"
-		/>
-
-		<field
-			name="stage"
-			type="workflowstage"
-			label="JOPTION_SELECT_STAGE"
-			class="js-select-submit-on-change"
-			activeonly="true"
-			extension="com_content.article"
-			>
-			<option value="">JOPTION_SELECT_STAGE</option>
-		</field>
-
-		<field
-			name="published"
-			type="status"
-			label="JOPTION_SELECT_PUBLISHED"
-			class="js-select-submit-on-change"
-			extension="com_content.article"
-			>
-			<option value="">JOPTION_SELECT_PUBLISHED</option>
-		</field>
-
-		<field
-			name="category_id"
-			type="category"
-			label="JCATEGORY"
-			multiple="true"
-			extension="com_content"
-			layout="joomla.form.field.list-fancy-select"
-			hint="JOPTION_SELECT_CATEGORY"
-			class="js-select-submit-on-change"
-		/>
-
-		<field
-			name="access"
-			type="accesslevel"
-			label="JGRID_HEADING_ACCESS"
-			multiple="true"
-			layout="joomla.form.field.list-fancy-select"
-			hint="JOPTION_SELECT_ACCESS"
-			class="js-select-submit-on-change"
-		/>
-
-		<field
-			name="author_id"
-			type="author"
-			label="JOPTION_SELECT_AUTHOR"
-			multiple="true"
-			layout="joomla.form.field.list-fancy-select"
-			hint="JOPTION_SELECT_AUTHOR"
-			class="js-select-submit-on-change"
-			>
-			<option value="0">JNONE_FILTER</option>
-			<option value="by_me">COM_CONTENT_FILTER_AUTHORS_BY_ME</option>
-		</field>
-
-		<field
-			name="language"
-			type="contentlanguage"
-			label="JGRID_HEADING_LANGUAGE"
-			class="js-select-submit-on-change"
-			>
-			<option value="">JOPTION_SELECT_LANGUAGE</option>
-			<option value="*">JALL</option>
-		</field>
-
-		<field
-			name="tag"
-			type="tag"
-			label="JTAG"
-			multiple="true"
-			mode="nested"
-			custom="false"
-			hint="JOPTION_SELECT_TAG"
-			class="js-select-submit-on-change"
-			default=""
-			>
-			<option value="0">JNONE_FILTER</option>
-		</field>
-
-		<field
-			name="level"
-			type="integer"
-			label="JGLOBAL_MAXLEVEL_LABEL"
-			first="1"
-			last="10"
-			step="1"
-			languages="*"
-			class="js-select-submit-on-change"
-			>
-			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
-		</field>
-	</fields>
-
-	<fields name="list">
-		<field
-			name="fullordering"
-			type="list"
-			label="JGLOBAL_SORT_BY"
-			class="js-select-submit-on-change"
-			default="a.title ASC"
-			validate="options"
-			>
-			<option value="">JGLOBAL_SORT_BY</option>
-			<option value="fp.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
-			<option value="fp.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
-			<option value="ws.title ASC" requires="workflow">JSTAGE_ASC</option>
-			<option value="ws.title DESC" requires="workflow">JSTAGE_DESC</option>
-			<option value="a.state ASC">JSTATUS_ASC</option>
-			<option value="a.state DESC">JSTATUS_DESC</option>
-			<option value="a.title ASC">JGLOBAL_TITLE_ASC</option>
-			<option value="a.title DESC">JGLOBAL_TITLE_DESC</option>
-			<option value="category_title ASC">JCATEGORY_ASC</option>
-			<option value="category_title DESC">JCATEGORY_DESC</option>
-			<option value="a.access ASC">JGRID_HEADING_ACCESS_ASC</option>
-			<option value="a.access DESC">JGRID_HEADING_ACCESS_DESC</option>
-			<option value="a.created_by ASC">JAUTHOR_ASC</option>
-			<option value="a.created_by DESC">JAUTHOR_DESC</option>
-			<option value="a.publish_up ASC">COM_CONTENT_PUBLISH_UP_ASC</option>
-			<option value="a.publish_up DESC">COM_CONTENT_PUBLISH_UP_DESC</option>
-			<option value="a.publish_down ASC">COM_CONTENT_PUBLISH_DOWN_ASC</option>
-			<option value="a.publish_down DESC">COM_CONTENT_PUBLISH_DOWN_DESC</option>
-			<option value="language ASC" requires="multilanguage">JGRID_HEADING_LANGUAGE_ASC</option>
-			<option value="language DESC" requires="multilanguage">JGRID_HEADING_LANGUAGE_DESC</option>
-			<option value="a.created ASC">JDATE_ASC</option>
-			<option value="a.created DESC">JDATE_DESC</option>
-			<option value="a.hits ASC" requires="hits">JGLOBAL_HITS_ASC</option>
-			<option value="a.hits DESC" requires="hits">JGLOBAL_HITS_DESC</option>
-			<option value="rating_count ASC" requires="vote">JGLOBAL_VOTES_ASC</option>
-			<option value="rating_count DESC" requires="vote">JGLOBAL_VOTES_DESC</option>
-			<option value="rating ASC" requires="vote">JGLOBAL_RATINGS_ASC</option>
-			<option value="rating DESC" requires="vote">JGLOBAL_RATINGS_DESC</option>
-			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
-			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
-		</field>
-
-		<field
-			name="limit"
-			type="limitbox"
-			label="JGLOBAL_LIST_LIMIT"
-			default="25"
-			class="js-select-submit-on-change"
-		/>
-	</fields>
-</form>
diff --git a/administrator/components/com_content/helpers/content.php b/administrator/components/com_content/helpers/content.php
index 1ae6756d2b044..9fb7ffcdf3682 100644
--- a/administrator/components/com_content/helpers/content.php
+++ b/administrator/components/com_content/helpers/content.php
@@ -19,7 +19,7 @@
  *
  * @since       1.6
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Content\Administrator\Helper\ContentHelper instead
  */
 class ContentHelper extends \Joomla\Component\Content\Administrator\Helper\ContentHelper
diff --git a/administrator/components/com_content/presets/content.xml b/administrator/components/com_content/presets/content.xml
index 214cf4c8ce64c..c6e1452e2606b 100644
--- a/administrator/components/com_content/presets/content.xml
+++ b/administrator/components/com_content/presets/content.xml
@@ -27,14 +27,6 @@
 			quicktask="index.php?option=com_categories&amp;extension=com_content&amp;task=category.add"
 			quicktask-title="COM_CONTENT_MENUS_NEW_CATEGORY"
 		/>
-
-		<menuitem
-			title="COM_CONTENT_MENUS_FEATURED"
-			type="component"
-			element="com_content"
-			link="index.php?option=com_content&amp;view=featured"
-			class="class:featured"
-		/>
 	</menuitem>
 
 	<menuitem
diff --git a/administrator/components/com_content/src/Controller/AjaxController.php b/administrator/components/com_content/src/Controller/AjaxController.php
index 9b8047b685320..144e0ff504551 100644
--- a/administrator/components/com_content/src/Controller/AjaxController.php
+++ b/administrator/components/com_content/src/Controller/AjaxController.php
@@ -10,13 +10,14 @@
 
 namespace Joomla\Component\Content\Administrator\Controller;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\Session\Session;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Content;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -61,7 +62,7 @@ public function fetchAssociations()
             unset($associations[$excludeLang]);
 
             // Add the title to each of the associated records
-            $contentTable = Table::getInstance('Content', '\\Joomla\\CMS\\Table\\');
+            $contentTable = new Content(Factory::getDbo());
 
             foreach ($associations as $association) {
                 $contentTable->load($association->id);
diff --git a/administrator/components/com_content/src/Controller/ArticlesController.php b/administrator/components/com_content/src/Controller/ArticlesController.php
index dc86b71f090e5..4794e167e1c0f 100644
--- a/administrator/components/com_content/src/Controller/ArticlesController.php
+++ b/administrator/components/com_content/src/Controller/ArticlesController.php
@@ -16,6 +16,7 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\Router\Route;
+use Joomla\Component\Content\Administrator\Model\ArticlesModel;
 use Joomla\Input\Input;
 use Joomla\Utilities\ArrayHelper;
 
@@ -145,9 +146,7 @@ public function getQuickiconContent()
     {
         $model = $this->getModel('articles');
 
-        $model->setState('filter.published', 1);
-
-        $amount = (int) $model->getTotal();
+        $amount = (int) $model->getTotal($featured = '');
 
         $result = [];
 
@@ -157,4 +156,31 @@ public function getQuickiconContent()
 
         echo new JsonResponse($result);
     }
+
+    /**
+     * Method to get the number of published featured articles for quickicons
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    public function getQuickiconFeatured()
+    {
+        /**
+         * @var ArticlesModel $model
+         */
+        $model = $this->getModel('articles');
+
+        $model->setState('filter.featured', '1');
+
+        $amount = (int) $model->getTotal();
+
+        $result = [];
+
+        $result['amount'] = $amount;
+        $result['sronly'] = Text::plural('COM_CONTENT_FEATURED_N_QUICKICON_SRONLY', $amount);
+        $result['name']   = Text::plural('COM_CONTENT_FEATURED_N_QUICKICON', $amount);
+
+        echo new JsonResponse($result);
+    }
 }
diff --git a/administrator/components/com_content/src/Controller/DisplayController.php b/administrator/components/com_content/src/Controller/DisplayController.php
index 158c8f3a17ce3..1afb8032bd43d 100644
--- a/administrator/components/com_content/src/Controller/DisplayController.php
+++ b/administrator/components/com_content/src/Controller/DisplayController.php
@@ -62,6 +62,11 @@ public function display($cachable = false, $urlparams = [])
             return false;
         }
 
+        if ($view === 'featured' || $this->input->getInt('featured')) {
+            $this->setRedirect(Route::_('index.php?option=com_content&view=articles&filter[featured]=1', false));
+            return false;
+        }
+
         return parent::display();
     }
 }
diff --git a/administrator/components/com_content/src/Controller/FeaturedController.php b/administrator/components/com_content/src/Controller/FeaturedController.php
index 92756c9fc89c6..7206922c5fad2 100644
--- a/administrator/components/com_content/src/Controller/FeaturedController.php
+++ b/administrator/components/com_content/src/Controller/FeaturedController.php
@@ -10,9 +10,6 @@
 
 namespace Joomla\Component\Content\Administrator\Controller;
 
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Response\JsonResponse;
-
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -24,66 +21,6 @@
  */
 class FeaturedController extends ArticlesController
 {
-    /**
-     * Removes an item.
-     *
-     * @return  void
-     *
-     * @since   1.6
-     */
-    public function delete()
-    {
-        // Check for request forgeries
-        $this->checkToken();
-
-        $user = $this->app->getIdentity();
-        $ids  = (array) $this->input->get('cid', [], 'int');
-
-        // Access checks.
-        foreach ($ids as $i => $id) {
-            // Remove zero value resulting from input filter
-            if ($id === 0) {
-                unset($ids[$i]);
-
-                continue;
-            }
-
-            if (!$user->authorise('core.delete', 'com_content.article.' . (int) $id)) {
-                // Prune items that you can't delete.
-                unset($ids[$i]);
-                $this->app->enqueueMessage(Text::_('JERROR_CORE_DELETE_NOT_PERMITTED'), 'notice');
-            }
-        }
-
-        if (empty($ids)) {
-            $this->app->enqueueMessage(Text::_('JERROR_NO_ITEMS_SELECTED'), 'error');
-        } else {
-            /** @var \Joomla\Component\Content\Administrator\Model\FeatureModel $model */
-            $model = $this->getModel();
-
-            // Remove the items.
-            if (!$model->featured($ids, 0)) {
-                $this->app->enqueueMessage($model->getError(), 'error');
-            }
-        }
-
-        $this->setRedirect('index.php?option=com_content&view=featured');
-    }
-
-    /**
-     * Method to publish a list of articles.
-     *
-     * @return  void
-     *
-     * @since   1.0
-     */
-    public function publish()
-    {
-        parent::publish();
-
-        $this->setRedirect('index.php?option=com_content&view=featured');
-    }
-
     /**
      * Method to get a model object, loading it if required.
      *
@@ -99,29 +36,4 @@ public function getModel($name = 'Feature', $prefix = 'Administrator', $config =
     {
         return parent::getModel($name, $prefix, $config);
     }
-
-    /**
-     * Method to get the number of published featured articles for quickicons
-     *
-     * @return  void
-     *
-     * @since   4.3.0
-     */
-    public function getQuickiconContent()
-    {
-        $model = $this->getModel('articles');
-
-        $model->setState('filter.published', 1);
-        $model->setState('filter.featured', 1);
-
-        $amount = (int) $model->getTotal();
-
-        $result = [];
-
-        $result['amount'] = $amount;
-        $result['sronly'] = Text::plural('COM_CONTENT_FEATURED_N_QUICKICON_SRONLY', $amount);
-        $result['name']   = Text::plural('COM_CONTENT_FEATURED_N_QUICKICON', $amount);
-
-        echo new JsonResponse($result);
-    }
 }
diff --git a/administrator/components/com_content/src/Extension/ContentComponent.php b/administrator/components/com_content/src/Extension/ContentComponent.php
index bd2861e1fa467..a27ddb5a396b9 100644
--- a/administrator/components/com_content/src/Extension/ContentComponent.php
+++ b/administrator/components/com_content/src/Extension/ContentComponent.php
@@ -29,11 +29,13 @@
 use Joomla\CMS\Schemaorg\SchemaorgServiceTrait;
 use Joomla\CMS\Tag\TagServiceInterface;
 use Joomla\CMS\Tag\TagServiceTrait;
+use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\CMS\Workflow\WorkflowServiceInterface;
 use Joomla\CMS\Workflow\WorkflowServiceTrait;
 use Joomla\Component\Content\Administrator\Helper\ContentHelper;
 use Joomla\Component\Content\Administrator\Service\HTML\AdministratorService;
 use Joomla\Component\Content\Administrator\Service\HTML\Icon;
+use Joomla\Database\DatabaseInterface;
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -127,8 +129,13 @@ class ContentComponent extends MVCComponent implements
      */
     public function boot(ContainerInterface $container)
     {
-        $this->getRegistry()->register('contentadministrator', new AdministratorService());
-        $this->getRegistry()->register('contenticon', new Icon());
+        $contentAdministrator = new AdministratorService();
+        $contentAdministrator->setDatabase($container->get(DatabaseInterface::class));
+        $this->getRegistry()->register('contentadministrator', $contentAdministrator);
+
+        $icon = new Icon();
+        $icon->setUserFactory($container->get(UserFactoryInterface::class));
+        $this->getRegistry()->register('contenticon', $icon);
 
         // The layout joomla.content.icons does need a general icon service
         $this->getRegistry()->register('icon', $this->getRegistry()->getService('contenticon'));
diff --git a/administrator/components/com_content/src/Field/Modal/ArticleField.php b/administrator/components/com_content/src/Field/Modal/ArticleField.php
index c173321bbf6c0..478227bb2dbb0 100644
--- a/administrator/components/com_content/src/Field/Modal/ArticleField.php
+++ b/administrator/components/com_content/src/Field/Modal/ArticleField.php
@@ -138,7 +138,7 @@ protected function getValueTitle()
         if ($value) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('title'))
                     ->from($db->quoteName('#__content'))
                     ->where($db->quoteName('id') . ' = :value')
diff --git a/administrator/components/com_content/src/Helper/AssociationsHelper.php b/administrator/components/com_content/src/Helper/AssociationsHelper.php
index 7a0c73cc48c0e..3580bf942559f 100644
--- a/administrator/components/com_content/src/Helper/AssociationsHelper.php
+++ b/administrator/components/com_content/src/Helper/AssociationsHelper.php
@@ -11,7 +11,10 @@
 namespace Joomla\Component\Content\Administrator\Helper;
 
 use Joomla\CMS\Association\AssociationExtensionHelper;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Table\Category;
+use Joomla\CMS\Table\Content;
 use Joomla\CMS\Table\Table;
 use Joomla\Component\Content\Site\Helper\AssociationHelper;
 
@@ -124,11 +127,11 @@ public function getItem($typeName, $id)
 
         switch ($typeName) {
             case 'article':
-                $table = Table::getInstance('Content');
+                $table = new Content(Factory::getDbo());
                 break;
 
             case 'category':
-                $table = Table::getInstance('Category');
+                $table = new Category(Factory::getDbo());
                 break;
         }
 
diff --git a/administrator/components/com_content/src/Helper/ContentHelper.php b/administrator/components/com_content/src/Helper/ContentHelper.php
index 2729c5ab00d9b..7374b21dcca72 100644
--- a/administrator/components/com_content/src/Helper/ContentHelper.php
+++ b/administrator/components/com_content/src/Helper/ContentHelper.php
@@ -41,7 +41,7 @@ class ContentHelper extends \Joomla\CMS\Helper\ContentHelper
     public static function canDeleteState(int $id): bool
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select('id')
             ->from($db->quoteName('#__content'))
@@ -110,7 +110,7 @@ public static function onPrepareForm(Form $form, $data)
             return;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('title'))
             ->from($db->quoteName('#__workflows'))
@@ -139,7 +139,7 @@ public static function onPrepareForm(Form $form, $data)
             if (!empty($categories)) {
                 $categories = array_reverse($categories);
 
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->select($db->quoteName('title'))
                     ->from($db->quoteName('#__workflows'))
diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php
index 26202762b8031..8b18f53989ad8 100644
--- a/administrator/components/com_content/src/Model/ArticleModel.php
+++ b/administrator/components/com_content/src/Model/ArticleModel.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Event\AbstractEvent;
+use Joomla\CMS\Event\Model\AfterSaveEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Form\Form;
@@ -29,6 +30,7 @@
 use Joomla\CMS\Table\TableInterface;
 use Joomla\CMS\Tag\TaggableTableInterface;
 use Joomla\CMS\UCM\UCMType;
+use Joomla\CMS\Versioning\VersionableModelInterface;
 use Joomla\CMS\Versioning\VersionableModelTrait;
 use Joomla\CMS\Workflow\Workflow;
 use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
@@ -49,7 +51,7 @@
  * @since  1.6
  */
 
-class ArticleModel extends AdminModel implements WorkflowModelInterface
+class ArticleModel extends AdminModel implements WorkflowModelInterface, VersionableModelInterface
 {
     use WorkflowBehaviorTrait;
     use VersionableModelTrait;
@@ -140,7 +142,7 @@ protected function cleanupPostBatchCopy(TableInterface $table, $newId, $oldId)
         // Check if the article was featured and update the #__content_frontpage table
         if ($table->featured == 1) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('featured_up'),
@@ -154,7 +156,7 @@ protected function cleanupPostBatchCopy(TableInterface $table, $newId, $oldId)
             $featured = $db->setQuery($query)->loadObject();
 
             if ($featured) {
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->insert($db->quoteName('#__content_frontpage'))
                     ->values(':newId, 0, :featuredUp, :featuredDown')
                     ->bind(':newId', $newId, ParameterType::INTEGER)
@@ -182,7 +184,15 @@ protected function cleanupPostBatchCopy(TableInterface $table, $newId, $oldId)
             }
         }
 
-        Factory::getApplication()->triggerEvent('onContentAfterSave', ['com_content.article', &$this->table, false, $fieldsData]);
+        $this->getDispatcher()->dispatch(
+            'onContentAfterSave',
+            new AfterSaveEvent('onContentAfterSave', [
+                'context' => 'com_content.article',
+                'subject' => $this->table,
+                'isNew'   => false,
+                'data'    => $fieldsData,
+            ])
+        );
     }
 
     /**
@@ -213,7 +223,8 @@ protected function batchMove($value, $pks, $contexts)
             return false;
         }
 
-        PluginHelper::importPlugin('system');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('system', null, true, $dispatcher);
 
         // Parent exists so we proceed
         foreach ($pks as $pk) {
@@ -272,7 +283,12 @@ protected function batchMove($value, $pks, $contexts)
             }
 
             // Run event for moved article
-            Factory::getApplication()->triggerEvent('onContentAfterSave', ['com_content.article', &$this->table, false, $fieldsData]);
+            $dispatcher->dispatch('onContentAfterSave', new AfterSaveEvent('onContentAfterSave', [
+                'context' => 'com_content.article',
+                'subject' => $this->table,
+                'isNew'   => false,
+                'data'    => $fieldsData,
+            ]));
         }
 
         // Clean the cache
@@ -410,7 +426,7 @@ public function getItem($pk = null)
                 if ($item->featured) {
                     // Get featured dates.
                     $db    = $this->getDatabase();
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select(
                             [
                                 $db->quoteName('featured_up'),
@@ -455,9 +471,10 @@ public function getItem($pk = null)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -466,10 +483,6 @@ public function getForm($data = [], $loadData = true)
         // Get the form.
         $form = $this->loadForm('com_content.article', 'article', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         // Object uses for checking edit state permission of article
         $record = new \stdClass();
 
@@ -579,13 +592,10 @@ protected function loadFormData()
 
             // Pre-select some filters (Status, Category, Language, Access) in edit form if those have been selected in Article Manager: Articles
             if ($this->getState('article.id') == 0) {
-                $filters = (array) $app->getUserState('com_content.articles.filter');
-                $data->set(
+                $filters     = (array) $app->getUserState('com_content.articles.filter');
+                $data->state = $app->getInput()->getInt(
                     'state',
-                    $app->getInput()->getInt(
-                        'state',
-                        ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
-                    )
+                    ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
                 );
 
                 // If multiple categories are filtered, pick the first one to avoid loading all fields
@@ -598,16 +608,13 @@ protected function loadFormData()
                     $selectedCatId = (int) $filteredCategories;
                 }
 
-                $data->set('catid', $app->getInput()->getInt('catid', $selectedCatId));
+                $data->catid = $app->getInput()->getInt('catid', $selectedCatId);
 
                 if ($app->isClient('administrator')) {
-                    $data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
+                    $data->language = $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null));
                 }
 
-                $data->set(
-                    'access',
-                    $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
-                );
+                $data->access = $app->getInput()->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')));
             }
         }
 
@@ -771,26 +778,26 @@ public function save($data)
         }
 
         // Automatic handling of alias for empty fields
-        if (\in_array($input->get('task'), ['apply', 'save', 'save2new']) && (!isset($data['id']) || (int) $data['id'] == 0)) {
+        if (\in_array($input->get('task'), ['add', 'apply', 'save', 'save2new']) && (!isset($data['id']) || (int) $data['id'] == 0)) {
             if ($data['alias'] == null) {
                 if ($app->get('unicodeslugs') == 1) {
                     $data['alias'] = OutputFilter::stringUrlUnicodeSlug($data['title']);
                 } else {
                     $data['alias'] = OutputFilter::stringURLSafe($data['title']);
                 }
+            }
 
-                $table = $this->getTable();
+            $table = $this->getTable();
 
-                if ($table->load(['alias' => $data['alias'], 'catid' => $data['catid']])) {
-                    $msg = Text::_('COM_CONTENT_SAVE_WARNING');
-                }
+            if ($table->load(['alias' => $data['alias'], 'catid' => $data['catid']])) {
+                $msg = Text::_('COM_CONTENT_SAVE_WARNING');
+            }
 
-                [$title, $alias] = $this->generateNewTitle($data['catid'], $data['alias'], $data['title']);
-                $data['alias']   = $alias;
+            [$title, $alias] = $this->generateNewTitle($data['catid'], $data['alias'], $data['title']);
+            $data['alias']   = $alias;
 
-                if (isset($msg)) {
-                    $app->enqueueMessage($msg, 'warning');
-                }
+            if (isset($msg)) {
+                $app->enqueueMessage($msg, 'warning');
             }
         }
 
@@ -880,7 +887,7 @@ public function featured($pks, $value = 0, $featuredUp = null, $featuredDown = n
 
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__content'))
                 ->set($db->quoteName('featured') . ' = :featured')
                 ->whereIn($db->quoteName('id'), $pks)
@@ -891,14 +898,14 @@ public function featured($pks, $value = 0, $featuredUp = null, $featuredDown = n
             if ($value === 0) {
                 // Adjust the mapping table.
                 // Clear the existing features settings.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__content_frontpage'))
                     ->whereIn($db->quoteName('content_id'), $pks);
                 $db->setQuery($query);
                 $db->execute();
             } else {
                 // First, we find out which of our new featured articles are already featured.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('content_id'))
                     ->from($db->quoteName('#__content_frontpage'))
                     ->whereIn($db->quoteName('content_id'), $pks);
@@ -908,7 +915,7 @@ public function featured($pks, $value = 0, $featuredUp = null, $featuredDown = n
 
                 // Update old featured articles
                 if (\count($oldFeatured)) {
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->update($db->quoteName('#__content_frontpage'))
                         ->set(
                             [
@@ -928,7 +935,7 @@ public function featured($pks, $value = 0, $featuredUp = null, $featuredDown = n
 
                 // Featuring.
                 if ($newFeatured) {
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->insert($db->quoteName('#__content_frontpage'))
                         ->columns(
                             [
@@ -1055,15 +1062,13 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
     /**
      * Custom clean the cache of com_content and content modules
      *
-     * @param   string   $group     The cache group
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_content');
         parent::cleanCache('mod_articles');
@@ -1114,7 +1119,7 @@ public function delete(&$pks)
         if ($return) {
             // Now check to see if this articles was featured if so delete it from the #__content_frontpage table
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__content_frontpage'))
                 ->whereIn($db->quoteName('content_id'), $pks);
             $db->setQuery($query);
diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php
index 8add698bad7bf..97b379cc68f48 100644
--- a/administrator/components/com_content/src/Model/ArticlesModel.php
+++ b/administrator/components/com_content/src/Model/ArticlesModel.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Category;
 use Joomla\Component\Content\Administrator\Extension\ContentComponent;
 use Joomla\Database\ParameterType;
 use Joomla\Database\QueryInterface;
@@ -76,6 +76,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
                 'rating_count', 'rating',
                 'stage', 'wa.stage_id',
                 'ws.title',
+                'fp.ordering',
             ];
 
             if (Associations::isEnabled()) {
@@ -141,6 +142,7 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
         // Required content filters for the administrator menu
         $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id');
         $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level');
+        $this->getUserStateFromRequest($this->context . '.filter.featured', 'filter_featured');
         $this->getUserStateFromRequest($this->context . '.filter.author_id', 'filter_author_id');
         $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '');
         $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access');
@@ -176,11 +178,17 @@ protected function getStoreId($id = '')
         $id .= ':' . $this->getState('filter.search');
         $id .= ':' . serialize($this->getState('filter.access'));
         $id .= ':' . $this->getState('filter.published');
+        $id .= ':' . $this->getState('filter.featured');
         $id .= ':' . serialize($this->getState('filter.category_id'));
         $id .= ':' . serialize($this->getState('filter.author_id'));
         $id .= ':' . $this->getState('filter.language');
         $id .= ':' . serialize($this->getState('filter.tag'));
         $id .= ':' . $this->getState('filter.checked_out');
+        $id .= ':' . $this->getState('filter.date_filtering');
+        $id .= ':' . $this->getState('filter.date_field');
+        $id .= ':' . $this->getState('filter.start_date_range');
+        $id .= ':' . $this->getState('filter.end_date_range');
+        $id .= ':' . $this->getState('filter.relative_date');
 
         return parent::getStoreId($id);
     }
@@ -196,7 +204,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
 
         $params = ComponentHelper::getParams('com_content');
@@ -285,7 +293,7 @@ protected function getListQuery()
 
         // Join over the associations.
         if (Associations::isEnabled()) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName('asso1.id') . ') > 1')
                 ->from($db->quoteName('#__associations', 'asso1'))
                 ->join('INNER', $db->quoteName('#__associations', 'asso2'), $db->quoteName('asso1.key') . ' = ' . $db->quoteName('asso2.key'))
@@ -312,12 +320,19 @@ protected function getListQuery()
         }
 
         // Filter by featured.
-        $featured = (string) $this->getState('filter.featured');
+        $featured = $this->getState('filter.featured');
 
-        if (\in_array($featured, ['0','1'])) {
+        $defaultOrdering = 'a.id';
+
+        if (is_numeric($featured) && \in_array($featured, [0, 1])) {
             $featured = (int) $featured;
             $query->where($db->quoteName('a.featured') . ' = :featured')
                 ->bind(':featured', $featured, ParameterType::INTEGER);
+
+            if ($featured) {
+                $query->select($db->quoteName('fp.ordering'));
+                $defaultOrdering = 'fp.ordering';
+            }
         }
 
         // Filter by access level on categories.
@@ -365,7 +380,7 @@ protected function getListQuery()
         // Case: Using both categories filter and by level filter
         if (\count($categoryId)) {
             $categoryId       = ArrayHelper::toInteger($categoryId);
-            $categoryTable    = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\');
+            $categoryTable    = new Category($db);
             $subCatItemsWhere = [];
 
             foreach ($categoryId as $key => $filter_catid) {
@@ -405,7 +420,7 @@ protected function getListQuery()
 
             if ($authorId === 0) {
                 // Only show deleted authors' articles
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select($db->quoteName('id'))
                     ->from($db->quoteName('#__users'));
 
@@ -431,7 +446,7 @@ protected function getListQuery()
                 $authorId = array_filter($authorId);
 
                 // Subquery for deleted users
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select($db->quoteName('id'))
                     ->from($db->quoteName('#__users'));
 
@@ -519,7 +534,7 @@ protected function getListQuery()
                 $includeNone = true;
             }
 
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                 ->from($db->quoteName('#__contentitem_tag_map'))
                 ->where(
@@ -536,7 +551,7 @@ protected function getListQuery()
             );
 
             if ($includeNone) {
-                $subQuery2 = $db->getQuery(true)
+                $subQuery2 = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_content.article'));
@@ -554,7 +569,7 @@ protected function getListQuery()
             $tag = (int) $tag;
 
             if ($tag === 0) {
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_content.article'));
@@ -582,8 +597,74 @@ protected function getListQuery()
             }
         }
 
+        // Filter by date after modified date.
+        $modifiedStartDateTime = $this->getState('filter.modified_start');
+
+        if (!empty($modifiedStartDateTime)) {
+            $query->where($db->quoteName('a.modified') . ' >= :startDate')
+                ->bind(':startDate', $modifiedStartDateTime);
+        }
+
+        // Filter by date before modified date.
+        $modifiedEndDateTime = $this->getState('filter.modified_end');
+
+        if (!empty($modifiedEndDateTime)) {
+            $query->where($db->quoteName('a.modified') . ' <= :endDate')
+                ->bind(':endDate', $modifiedEndDateTime);
+        }
+
+        // Filter by Date Range or Relative Date
+        $dateFiltering = $this->getState('filter.date_filtering', 'off');
+        $dateField     = $this->getState('filter.date_field', 'a.created');
+
+        // Validate the date field to prevent SQL injection
+        $validDateFields = ['a.created', 'a.modified', 'a.publish_up'];
+
+        if (!\in_array($dateField, $validDateFields)) {
+            $dateField = 'a.created';
+        }
+
+        switch ($dateFiltering) {
+            case 'range':
+                $startDateRange = $this->getState('filter.start_date_range', '');
+                $endDateRange   = $this->getState('filter.end_date_range', '');
+
+                if ($startDateRange || $endDateRange) {
+                    $query->where($db->quoteName($dateField) . ' IS NOT NULL');
+
+                    if ($startDateRange) {
+                        $query->where($db->quoteName($dateField) . ' >= :startDateRange')
+                            ->bind(':startDateRange', $startDateRange);
+                    }
+
+                    if ($endDateRange) {
+                        $query->where($db->quoteName($dateField) . ' <= :endDateRange')
+                            ->bind(':endDateRange', $endDateRange);
+                    }
+                }
+
+                break;
+
+            case 'relative':
+                $relativeDate = (int) $this->getState('filter.relative_date', 0);
+
+                if ($relativeDate > 0) {
+                    $nowDate = Factory::getDate()->toSql();
+                    $query->where(
+                        $db->quoteName($dateField) . ' IS NOT NULL AND '
+                        . $db->quoteName($dateField) . ' >= ' . $query->dateAdd($db->quote($nowDate), -1 * $relativeDate, 'DAY')
+                    );
+                }
+
+                break;
+
+            case 'off':
+            default:
+                break;
+        }
+
         // Add the list ordering clause.
-        $orderCol  = $this->state->get('list.ordering', 'a.id');
+        $orderCol  = $this->state->get('list.ordering', $defaultOrdering);
         $orderDirn = $this->state->get('list.direction', 'DESC');
 
         if ($orderCol === 'a.ordering' || $orderCol === 'category_title') {
@@ -640,7 +721,7 @@ public function getTransitions()
             if (\count($stage_ids) || \count($workflow_ids)) {
                 Factory::getLanguage()->load('com_workflow', JPATH_ADMINISTRATOR);
 
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query  ->select(
                     [
diff --git a/administrator/components/com_content/src/Model/FeaturedModel.php b/administrator/components/com_content/src/Model/FeaturedModel.php
index 4491380af7a88..a9ecfb6378781 100644
--- a/administrator/components/com_content/src/Model/FeaturedModel.php
+++ b/administrator/components/com_content/src/Model/FeaturedModel.php
@@ -10,9 +10,6 @@
 
 namespace Joomla\Component\Content\Administrator\Model;
 
-use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
-use Joomla\Database\QueryInterface;
-
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -21,87 +18,11 @@
  * Methods supporting a list of featured article records.
  *
  * @since  1.6
+ *
+ * @deprecated  6.0 will be removed in 8.0
+ *              Use \Joomla\Component\Content\Administrator\Model\ArticlesModel instead
+ *              set the filter.featured state to 1 to get only featured articles
  */
 class FeaturedModel extends ArticlesModel
 {
-    /**
-     * Constructor.
-     *
-     * @param   array                 $config   An optional associative array of configuration settings.
-     * @param   ?MVCFactoryInterface  $factory  The factory.
-     *
-     * @see     \Joomla\CMS\MVC\Controller\BaseController
-     * @since   1.6
-     */
-    public function __construct($config = [], ?MVCFactoryInterface $factory = null)
-    {
-        if (empty($config['filter_fields'])) {
-            $config['filter_fields'] = [
-                'id', 'a.id',
-                'title', 'a.title',
-                'alias', 'a.alias',
-                'checked_out', 'a.checked_out',
-                'checked_out_time', 'a.checked_out_time',
-                'catid', 'a.catid', 'category_title',
-                'state', 'a.state',
-                'access', 'a.access', 'access_level',
-                'created', 'a.created',
-                'created_by', 'a.created_by',
-                'created_by_alias', 'a.created_by_alias',
-                'ordering', 'a.ordering',
-                'featured_up', 'fp.featured_up',
-                'featured_down', 'fp.featured_down',
-                'language', 'a.language',
-                'hits', 'a.hits',
-                'publish_up', 'a.publish_up',
-                'publish_down', 'a.publish_down',
-                'fp.ordering',
-                'published', 'a.published',
-                'author_id',
-                'category_id',
-                'level',
-                'tag',
-                'rating_count', 'rating',
-                'ws.title',
-            ];
-        }
-
-        parent::__construct($config, $factory);
-    }
-
-    /**
-     * Method to auto-populate the model state.
-     *
-     * Note. Calling getState in this method will result in recursion.
-     *
-     * @param   string  $ordering   An optional ordering field.
-     * @param   string  $direction  An optional direction (asc|desc).
-     *
-     * @return  void
-     *
-     * @since   3.5
-     */
-    protected function populateState($ordering = 'a.title', $direction = 'asc')
-    {
-        parent::populateState($ordering, $direction);
-
-        // Filter by featured articles.
-        $this->setState('filter.featured', 1);
-    }
-
-    /**
-     * Build an SQL query to load the list data.
-     *
-     * @return  QueryInterface
-     *
-     * @since   4.0.0
-     */
-    protected function getListQuery()
-    {
-        $query = parent::getListQuery();
-
-        $query->select($this->getDatabase()->quoteName('fp.ordering'));
-
-        return $query;
-    }
 }
diff --git a/administrator/components/com_content/src/Service/HTML/AdministratorService.php b/administrator/components/com_content/src/Service/HTML/AdministratorService.php
index bc6836e6897a4..bfa4f52fedb4f 100644
--- a/administrator/components/com_content/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_content/src/Service/HTML/AdministratorService.php
@@ -16,6 +16,9 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\DatabaseInterface;
+use Joomla\Database\Exception\DatabaseNotFoundException;
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -29,6 +32,8 @@
  */
 class AdministratorService
 {
+    use DatabaseAwareTrait;
+
     /**
      * Render the list of associated items
      *
@@ -50,8 +55,14 @@ public function association($articleid)
             }
 
             // Get the associated menu items
-            $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            try {
+                $db = $this->getDatabase();
+            } catch (DatabaseNotFoundException) {
+                @trigger_error('Database must be set, this will not be caught anymore in 8.0', E_USER_DEPRECATED);
+                $db = Factory::getContainer()->get(DatabaseInterface::class);
+            }
+
+            $query = $db->createQuery()
                 ->select(
                     [
                         'c.*',
diff --git a/administrator/components/com_content/src/Service/HTML/Icon.php b/administrator/components/com_content/src/Service/HTML/Icon.php
index fe1782260de47..1d9e69cfd07a7 100644
--- a/administrator/components/com_content/src/Service/HTML/Icon.php
+++ b/administrator/components/com_content/src/Service/HTML/Icon.php
@@ -16,6 +16,8 @@
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\User\UserFactoryAwareTrait;
+use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\CMS\Workflow\Workflow;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 use Joomla\Registry\Registry;
@@ -31,6 +33,8 @@
  */
 class Icon
 {
+    use UserFactoryAwareTrait;
+
     /**
      * Method to generate a link to the create item page for the given category
      *
@@ -86,7 +90,7 @@ public function create($category, $params, $attribs = [], $legacy = false)
      */
     public function edit($article, $params, $attribs = [], $legacy = false)
     {
-        $user = Factory::getUser();
+        $user = Factory::getApplication()->getIdentity();
         $uri  = Uri::getInstance();
 
         // Ignore if in a popup window.
@@ -106,7 +110,15 @@ public function edit($article, $params, $attribs = [], $legacy = false)
             && !\is_null($article->checked_out)
             && $article->checked_out != $user->id
         ) {
-            $checkoutUser = Factory::getUser($article->checked_out);
+            try {
+                $checkoutUser = $this->getUserFactory()->loadUserById($article->checked_out);
+            } catch (\UnexpectedValueException) {
+                @trigger_error('UserFactory must be set, this will not be caught anymore in 8.0', E_USER_DEPRECATED);
+                $checkoutUser = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById(
+                    $article->checked_out
+                );
+            }
+
             $date         = HTMLHelper::_('date', $article->checked_out_time);
             $tooltip      = Text::sprintf('COM_CONTENT_CHECKED_OUT_BY', $checkoutUser->name)
                 . ' <br> ' . $date;
diff --git a/administrator/components/com_content/src/Service/PreviewTokenService.php b/administrator/components/com_content/src/Service/PreviewTokenService.php
new file mode 100644
index 0000000000000..a5d900d5eaa43
--- /dev/null
+++ b/administrator/components/com_content/src/Service/PreviewTokenService.php
@@ -0,0 +1,156 @@
+<?php
+
+/**
+ * @package         Joomla.Administrator
+ * @subpackage      com_content
+ *
+ * @copyright       (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Content\Administrator\Service;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Service class for generating and validating article preview tokens.
+ *
+ * Tokens are URL-safe, HMAC-SHA256 signed, and time-limited.
+ * They allow unauthenticated public access to article previews without
+ * requiring a frontend login or published state.
+ *
+ * Usage:
+ *   $helper = new PreviewTokenService($app->get('secret'));
+ *   $token  = $helper->createToken($articleId, 24);
+ *   $valid  = $helper->validateToken($token, $articleId);
+ *
+ * @since  6.2.0
+ */
+class PreviewTokenService
+{
+    /**
+     * The secret key used to sign and verify preview tokens.
+     *
+     * @var string
+     */
+    private string $secret;
+
+    /**
+     * @param   string  $secret  The secret key
+     *
+     * @since   6.2.0
+     */
+    public function __construct(string $secret)
+    {
+        $this->secret = $secret;
+    }
+
+    /**
+     * Generate a signed preview token for a given article.
+     *
+     * @param   int  $id                The article ID.
+     * @param   int  $expiresInMinutes  Number of minutes before the token expires.
+     *
+     * @return  string
+     *
+     * @since   6.2.0
+     */
+    public function createToken(int $id, int $expiresInMinutes): string
+    {
+        $payload = $this->encode(json_encode([
+            'id'  => $id,
+            'exp' => time() + ($expiresInMinutes * 60),
+        ]));
+
+        $signature = $this->encode(hash_hmac('sha256', $payload, $this->secret, true));
+
+        return $payload . '.' . $signature;
+    }
+
+    /**
+     * Validate a preview token against a given article ID.
+     *
+     * Checks that the token:
+     * - Has a valid structure
+     * - Has not been tampered with (HMAC signature check)
+     * - Has not expired
+     * - Belongs to the expected article
+     *
+     * @param   string  $token  The preview token from the URL.
+     * @param   int     $id     The expected article ID.
+     *
+     * @return  bool
+     *
+     * @since   6.2.0
+     */
+    public function validateToken(string $token, int $id): bool
+    {
+        $parts = explode('.', $token);
+
+        if (\count($parts) !== 2) {
+            return false;
+        }
+
+        [$payload, $signature] = $parts;
+
+        if (!hash_equals($this->encode(hash_hmac('sha256', $payload, $this->secret, true)), $signature)) {
+            return false;
+        }
+
+        $decoded = $this->decode($payload);
+
+        if ($decoded === false) {
+            return false;
+        }
+
+        $data = json_decode($decoded, true);
+
+        if (!\is_array($data) || !isset($data['id'], $data['exp'])) {
+            return false;
+        }
+
+        if (!\is_int($data['id']) || !\is_int($data['exp'])) {
+            return false;
+        }
+
+        if ($data['id'] !== $id) {
+            return false;
+        }
+
+        return time() < $data['exp'];
+    }
+
+    /**
+     * Encode binary data to URL-safe Base64 string.
+     *
+     * @param   string  $data
+     *
+     * @return  string
+     *
+     * @since   6.2.0
+     */
+    private function encode(string $data): string
+    {
+        return str_replace('=', '', strtr(base64_encode($data), '+/', '-_'));
+    }
+
+    /**
+     * Decode a URL-safe Base64 string to binary data.
+     *
+     * @param   string  $data
+     *
+     * @return  string|false
+     *
+     * @since   6.2.0
+     */
+    private function decode(string $data): string|false
+    {
+        if ($remainder = \strlen($data) % 4) {
+            $data .= str_repeat('=', 4 - $remainder);
+        }
+
+        return base64_decode(strtr($data, '-_', '+/'));
+    }
+}
diff --git a/administrator/components/com_content/src/View/Article/HtmlView.php b/administrator/components/com_content/src/View/Article/HtmlView.php
index 1cebea5ae0abe..6ded1f8cbe799 100644
--- a/administrator/components/com_content/src/View/Article/HtmlView.php
+++ b/administrator/components/com_content/src/View/Article/HtmlView.php
@@ -13,14 +13,10 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
-use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Toolbar\Toolbar;
+use Joomla\CMS\MVC\View\FormView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\Component\Content\Administrator\Model\ArticleModel;
+use Joomla\Component\Content\Administrator\Service\PreviewTokenService;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -32,83 +28,83 @@
  *
  * @since  1.6
  */
-class HtmlView extends BaseHtmlView
+class HtmlView extends FormView
 {
     /**
-     * The \JForm object
+     * Pagebreak TOC alias
      *
-     * @var  \Joomla\CMS\Form\Form
+     * @var  string
      */
-    protected $form;
+    protected $eName;
 
     /**
-     * The active item
+     * Set to true, if saving to menu should be supported
      *
-     * @var  object
+     * @var boolean
      */
-    protected $item;
+    protected $supportSaveMenu = true;
 
     /**
-     * The model state
+     * Holds the extension for categories, if available
      *
-     * @var  object
+     * @var string
      */
-    protected $state;
+    protected $categorySection = 'com_content';
 
     /**
-     * The actions the user is authorised to perform
+     * Constructor
      *
-     * @var  \Joomla\Registry\Registry
-     */
-    protected $canDo;
-
-    /**
-     * Pagebreak TOC alias
+     * @param   array  $config  An optional associative array of configuration settings.
      *
-     * @var  string
+     * @since   6.0.0
      */
-    protected $eName;
+    public function __construct(array $config)
+    {
+        if (empty($config['option'])) {
+            $config['option'] = 'com_content';
+        }
 
-    /**
-     * Array of fieldsets not to display
-     *
-     * @var    string[]
-     *
-     * @since  5.2.0
-     */
-    public $ignore_fieldsets = [];
+        $config['help_link']      = 'Articles:_Edit';
+        $config['toolbar_icon']   = 'pencil-alt article-add';
+
+        parent::__construct($config);
+    }
 
     /**
-     * Execute and display a template script.
-     *
-     * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+     * Prepare view data
      *
      * @return  void
      *
-     * @since   1.6
-     *
-     * @throws  \Exception
+     * @since   6.0.0
      */
-    public function display($tpl = null)
+    protected function initializeView()
     {
         if ($this->getLayout() == 'pagebreak') {
-            parent::display($tpl);
-
             return;
         }
 
-        /** @var ArticleModel $model */
-        $model = $this->getModel();
-        $model->setUseExceptions(true);
+        parent::initializeView();
 
-        $this->form  = $model->getForm();
-        $this->item  = $model->getItem();
-        $this->state = $model->getState();
         $this->canDo = ContentHelper::getActions('com_content', 'article', $this->item->id);
 
-        if ($this->getLayout() === 'modalreturn') {
-            parent::display($tpl);
+        $url = RouteHelper::getArticleRoute($this->item->id . ':' . $this->item->alias, $this->item->catid, $this->item->language);
+
+        // Generate preview token if editing an existing article
+        if ($this->item->id > 0) {
+            $params     = ComponentHelper::getParams('com_content');
+            $expiration = (int) $params->get('preview_token_expiration', 15);
+
+            $tokenHelper = new PreviewTokenService(Factory::getApplication()->get('secret'));
+            $token       = $tokenHelper->createToken((int) $this->item->id, $expiration);
+
+            // Append token using proper URL query parameter handling
+            $url .= (!str_contains($url, '?') ? '?' : '&') . 'preview_token=' . $token;
+        }
+
+        $this->previewLink = $url;
+        $this->jooa11yLink = $url . '&jooa11y=1';
 
+        if ($this->getLayout() === 'modalreturn') {
             return;
         }
 
@@ -130,17 +126,9 @@ public function display($tpl = null)
 
         // Add form control fields
         $this->form
-            ->addControlField('task', '')
+            ->addControlField('task')
             ->addControlField('return', $input->getBase64('return', ''))
             ->addControlField('forcedLanguage', $forcedLanguage);
-
-        if ($this->getLayout() !== 'modal') {
-            $this->addToolbar();
-        } else {
-            $this->addModalToolbar();
-        }
-
-        parent::display($tpl);
     }
 
     /**
@@ -154,104 +142,23 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        Factory::getApplication()->getInput()->set('hidemainmenu', true);
+        if ($this->getLayout() === 'pagebreak') {
+            return;
+        }
+        if ($this->getLayout() === 'modal') {
+            $this->addModalToolbar();
+
+            return;
+        }
+
         $user       = $this->getCurrentUser();
         $userId     = $user->id;
         $isNew      = ($this->item->id == 0);
         $checkedOut = !(\is_null($this->item->checked_out) || $this->item->checked_out == $userId);
-        $toolbar    = $this->getDocument()->getToolbar();
-
-        // Built the actions for new and existing records.
-        $canDo = $this->canDo;
 
-        ToolbarHelper::title(
-            Text::_('COM_CONTENT_PAGE_' . ($checkedOut ? 'VIEW_ARTICLE' : ($isNew ? 'ADD_ARTICLE' : 'EDIT_ARTICLE'))),
-            'pencil-alt article-add'
-        );
-
-        // For new records, check the create permission.
-        if ($isNew && (\count($user->getAuthorisedCategories('com_content', 'core.create')) > 0)) {
-            $toolbar->apply('article.apply');
-
-            $saveGroup = $toolbar->dropdownButton('save-group');
-
-            $saveGroup->configure(
-                function (Toolbar $childBar) use ($user) {
-                    $childBar->save('article.save');
-
-                    if ($user->authorise('core.create', 'com_menus.menu')) {
-                        $childBar->save('article.save2menu', 'JTOOLBAR_SAVE_TO_MENU');
-                    }
-
-                    $childBar->save2new('article.save2new');
-                }
-            );
-
-            $toolbar->cancel('article.cancel', 'JTOOLBAR_CANCEL');
-        } else {
-            // Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
-            $itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);
-
-            if (!$checkedOut && $itemEditable) {
-                $toolbar->apply('article.apply');
-            }
-
-            $saveGroup = $toolbar->dropdownButton('save-group');
-
-            $saveGroup->configure(
-                function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo, $user) {
-                    // Can't save the record if it's checked out and editable
-                    if (!$checkedOut && $itemEditable) {
-                        $childBar->save('article.save');
-
-                        // We can save this record, but check the create permission to see if we can return to make a new one.
-                        if ($canDo->get('core.create')) {
-                            $childBar->save2new('article.save2new');
-                        }
-                    }
-
-                    // If checked out, we can still save2menu
-                    if ($user->authorise('core.create', 'com_menus.menu')) {
-                        $childBar->save('article.save2menu', 'JTOOLBAR_SAVE_TO_MENU');
-                    }
-
-                    // If checked out, we can still save
-                    if ($canDo->get('core.create')) {
-                        $childBar->save2copy('article.save2copy');
-                    }
-                }
-            );
-
-            $toolbar->cancel('article.cancel', 'JTOOLBAR_CLOSE');
-
-            if (!$isNew) {
-                if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $itemEditable) {
-                    $toolbar->versions('com_content.article', $this->item->id);
-                }
-
-                $url = RouteHelper::getArticleRoute($this->item->id . ':' . $this->item->alias, $this->item->catid, $this->item->language);
-
-                $toolbar->preview(Route::link('site', $url, true), 'JGLOBAL_PREVIEW')
-                    ->bodyHeight(80)
-                    ->modalWidth(90);
-
-                if (PluginHelper::isEnabled('system', 'jooa11y')) {
-                    $toolbar->jooa11y(Route::link('site', $url . '&jooa11y=1', true), 'JGLOBAL_JOOA11Y')
-                        ->bodyHeight(80)
-                        ->modalWidth(90);
-                }
-
-                if (Associations::isEnabled() && ComponentHelper::isEnabled('com_associations')) {
-                    $toolbar->standardButton('associations', 'JTOOLBAR_ASSOCIATIONS', 'article.editAssociations')
-                        ->icon('icon-contract')
-                        ->listCheck(false);
-                }
-            }
-        }
+        $this->toolbarTitle = Text::_('COM_CONTENT_PAGE_' . ($checkedOut ? 'VIEW_ARTICLE' : ($isNew ? 'ADD_ARTICLE' : 'EDIT_ARTICLE')));
 
-        $toolbar->divider();
-        $toolbar->inlinehelp();
-        $toolbar->help('Articles:_Edit');
+        parent::addToolbar();
     }
 
     /**
diff --git a/administrator/components/com_content/src/View/Articles/HtmlView.php b/administrator/components/com_content/src/View/Articles/HtmlView.php
index cbc8eba68fc75..272d89a947dff 100644
--- a/administrator/components/com_content/src/View/Articles/HtmlView.php
+++ b/administrator/components/com_content/src/View/Articles/HtmlView.php
@@ -171,7 +171,7 @@ public function display($tpl = null)
 
         // Add form control fields
         $this->filterForm
-            ->addControlField('task', '')
+            ->addControlField('task')
             ->addControlField('boxchecked', '0');
 
         parent::display($tpl);
@@ -186,9 +186,9 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        $canDo   = ContentHelper::getActions('com_content', 'category', $this->state->get('filter.category_id'));
-        $user    = $this->getCurrentUser();
-        $toolbar = $this->getDocument()->getToolbar();
+        $canDo    = ContentHelper::getActions('com_content', 'category', $this->state->get('filter.category_id'));
+        $user     = $this->getCurrentUser();
+        $toolbar  = $this->getDocument()->getToolbar();
 
         ToolbarHelper::title(Text::_('COM_CONTENT_ARTICLES_TITLE'), 'copy article');
 
@@ -234,11 +234,9 @@ protected function addToolbar()
 
                 $childBar->unpublish('articles.unpublish')->listCheck(true);
 
-                $childBar->standardButton('featured', 'JFEATURE', 'articles.featured')
-                    ->listCheck(true);
+                $childBar->standardButton('featured', 'JFEATURE', 'articles.featured')->listCheck(true);
 
-                $childBar->standardButton('unfeatured', 'JUNFEATURE', 'articles.unfeatured')
-                    ->listCheck(true);
+                $childBar->standardButton('unfeatured', 'JUNFEATURE', 'articles.unfeatured')->listCheck(true);
 
                 $childBar->archive('articles.archive')->listCheck(true);
 
diff --git a/administrator/components/com_content/src/View/Featured/HtmlView.php b/administrator/components/com_content/src/View/Featured/HtmlView.php
index a38910a969d89..7a7730b551e35 100644
--- a/administrator/components/com_content/src/View/Featured/HtmlView.php
+++ b/administrator/components/com_content/src/View/Featured/HtmlView.php
@@ -10,16 +10,7 @@
 
 namespace Joomla\Component\Content\Administrator\View\Featured;
 
-use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\Toolbar\Button\DropdownButton;
-use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\Component\Content\Administrator\Extension\ContentComponent;
-use Joomla\Component\Content\Administrator\Helper\ContentHelper;
-use Joomla\Component\Content\Administrator\Model\FeaturedModel;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -29,177 +20,9 @@
  * View class for a list of featured articles.
  *
  * @since  1.6
+ *
+ * @deprecated  6.0 will be removed in 8.0 is integrated in Articles view
  */
 class HtmlView extends BaseHtmlView
 {
-    /**
-     * An array of items
-     *
-     * @var  array
-     */
-    protected $items;
-
-    /**
-     * The pagination object
-     *
-     * @var  \Joomla\CMS\Pagination\Pagination
-     */
-    protected $pagination;
-
-    /**
-     * The model state
-     *
-     * @var  \Joomla\Registry\Registry
-     */
-    protected $state;
-
-    /**
-     * Form object for search filters
-     *
-     * @var  \Joomla\CMS\Form\Form
-     */
-    public $filterForm;
-
-    /**
-     * The active search filters
-     *
-     * @var  array
-     */
-    public $activeFilters;
-
-    /**
-     * All transition, which can be executed of one if the items
-     *
-     * @var  array
-     */
-    protected $transitions = [];
-
-    /**
-     * Is this view an Empty State
-     *
-     * @var  boolean
-     * @since 4.0.0
-     */
-    private $isEmptyState = false;
-
-    /**
-     * Display the view
-     *
-     * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
-     *
-     * @return  void
-     */
-    public function display($tpl = null)
-    {
-        /** @var FeaturedModel $model */
-        $model = $this->getModel();
-        $model->setUseExceptions(true);
-
-        $this->items         = $model->getItems();
-        $this->pagination    = $model->getPagination();
-        $this->state         = $model->getState();
-        $this->filterForm    = $model->getFilterForm();
-        $this->activeFilters = $model->getActiveFilters();
-        $this->vote          = PluginHelper::isEnabled('content', 'vote');
-        $this->hits          = ComponentHelper::getParams('com_content')->get('record_hits', 1);
-
-        if (!\count($this->items) && $this->isEmptyState = $model->getIsEmptyState()) {
-            $this->setLayout('emptystate');
-        }
-
-        if (ComponentHelper::getParams('com_content')->get('workflow_enabled')) {
-            PluginHelper::importPlugin('workflow');
-
-            $this->transitions = $model->getTransitions();
-        }
-
-        $this->addToolbar();
-
-        // We do not need to filter by language when multilingual is disabled
-        if (!Multilanguage::isEnabled()) {
-            unset($this->activeFilters['language']);
-            $this->filterForm->removeField('language', 'filter');
-        }
-
-        parent::display($tpl);
-    }
-
-    /**
-     * Add the page title and toolbar.
-     *
-     * @return  void
-     *
-     * @since   1.6
-     */
-    protected function addToolbar()
-    {
-        $canDo   = ContentHelper::getActions('com_content', 'category', $this->state->get('filter.category_id'));
-        $user    = $this->getCurrentUser();
-        $toolbar = $this->getDocument()->getToolbar();
-
-        ToolbarHelper::title(Text::_('COM_CONTENT_FEATURED_TITLE'), 'star featured');
-
-        if ($canDo->get('core.create') || \count($user->getAuthorisedCategories('com_content', 'core.create')) > 0) {
-            $toolbar->addNew('article.add');
-        }
-
-        if (!$this->isEmptyState && ($canDo->get('core.edit.state') || \count($this->transitions))) {
-            /** @var DropdownButton $dropdown */
-            $dropdown = $toolbar->dropdownButton('status-group', 'JTOOLBAR_CHANGE_STATUS')
-                ->toggleSplit(false)
-                ->icon('icon-ellipsis-h')
-                ->buttonClass('btn btn-action')
-                ->listCheck(true);
-
-            $childBar = $dropdown->getChildToolbar();
-
-            if (\count($this->transitions)) {
-                $childBar->separatorButton('transition-headline', 'COM_CONTENT_RUN_TRANSITIONS')
-                    ->buttonClass('text-center py-2 h3');
-
-                $cmd      = "Joomla.submitbutton('articles.runTransition');";
-                $messages = "{error: [Joomla.Text._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')]}";
-                $alert    = 'Joomla.renderMessages(' . $messages . ')';
-                $cmd      = 'if (document.adminForm.boxchecked.value == 0) { ' . $alert . ' } else { ' . $cmd . ' }';
-
-                foreach ($this->transitions as $transition) {
-                    $childBar->standardButton('transition', $transition['text'])
-                        ->buttonClass('transition-' . (int) $transition['value'])
-                        ->icon('icon-project-diagram')
-                        ->onclick('document.adminForm.transition_id.value=' . (int) $transition['value'] . ';' . $cmd);
-                }
-
-                $childBar->separatorButton('transition-separator');
-            }
-
-            if ($canDo->get('core.edit.state')) {
-                $childBar->publish('articles.publish')->listCheck(true);
-
-                $childBar->unpublish('articles.unpublish')->listCheck(true);
-
-                $childBar->standardButton('unfeatured', 'JUNFEATURE')
-                    ->task('articles.unfeatured')
-                    ->listCheck(true);
-
-                $childBar->archive('articles.archive')->listCheck(true);
-                $childBar->checkin('articles.checkin');
-
-                if (!$this->state->get('filter.published') == ContentComponent::CONDITION_TRASHED) {
-                    $childBar->trash('articles.trash')->listCheck(true);
-                }
-            }
-        }
-
-        if (!$this->isEmptyState && $this->state->get('filter.published') == ContentComponent::CONDITION_TRASHED && $canDo->get('core.delete')) {
-            $toolbar->delete('articles.delete', 'JTOOLBAR_DELETE_FROM_TRASH')
-                ->message('JGLOBAL_CONFIRM_DELETE')
-                ->listCheck(true);
-        }
-
-        if ($user->authorise('core.admin', 'com_content') || $user->authorise('core.options', 'com_content')) {
-            $toolbar->preferences('com_content');
-        }
-
-        $toolbar->help('Articles:_Featured');
-    }
 }
diff --git a/administrator/components/com_content/tmpl/articles/default.php b/administrator/components/com_content/tmpl/articles/default.php
index 2ad21717fd3bd..0c56baffad293 100644
--- a/administrator/components/com_content/tmpl/articles/default.php
+++ b/administrator/components/com_content/tmpl/articles/default.php
@@ -37,7 +37,9 @@
 $userId    = $user->id;
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
-$saveOrder = $listOrder == 'a.ordering';
+$featured  = $this->state->get('filter.featured');
+$orderName = $featured === '1' ? 'fp.ordering' : 'a.ordering';
+$saveOrder = $listOrder == $orderName;
 
 if (strpos($listOrder, 'publish_up') !== false) {
     $orderingColumn = 'publish_up';
@@ -50,7 +52,8 @@
 }
 
 if ($saveOrder && !empty($this->items)) {
-    $saveOrderingUrl = 'index.php?option=com_content&task=articles.saveOrderAjax&tmpl=component&' . Session::getFormToken() . '=1';
+    $controller = $featured === '1' ? 'featured' : 'articles';
+    $saveOrderingUrl = 'index.php?option=com_content&task=' . $controller . '.saveOrderAjax&tmpl=component&' . Session::getFormToken() . '=1';
     HTMLHelper::_('draggablelist.draggable');
 }
 
@@ -78,7 +81,7 @@
             <div id="j-main-container" class="j-main-container">
                 <?php
                 // Search tools bar
-                echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]);
+                echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this, 'options' => ['selectorFieldName' => 'featured']]);
                 ?>
                 <?php if (empty($this->items)) : ?>
                     <div class="alert alert-info">
@@ -88,7 +91,7 @@
                 <?php else : ?>
                     <table class="table itemList" id="articleList">
                         <caption class="visually-hidden">
-                            <?php echo Text::_('COM_CONTENT_ARTICLES_TABLE_CAPTION'); ?>,
+                            <?php echo $featured === '1' ? Text::_('COM_CONTENT_FEATURED_TABLE_CAPTION') : Text::_('COM_CONTENT_ARTICLES_TABLE_CAPTION'); ?>,
                             <span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
                             <span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
                         </caption>
@@ -98,15 +101,15 @@
                                     <?php echo HTMLHelper::_('grid.checkall'); ?>
                                 </td>
                                 <th scope="col" class="w-1 text-center d-none d-md-table-cell">
-                                    <?php echo HTMLHelper::_('searchtools.sort', '', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-sort'); ?>
+                                    <?php echo HTMLHelper::_('searchtools.sort', '', $orderName, $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-sort'); ?>
                                 </th>
                                 <?php if ($workflow_enabled) : ?>
-                                <th scope="col" class="w-1 text-center">
-                                    <?php echo HTMLHelper::_('searchtools.sort', 'JSTAGE', 'ws.title', $listDirn, $listOrder); ?>
-                                </th>
+                                    <th scope="col" class="w-1 text-center">
+                                        <?php echo HTMLHelper::_('searchtools.sort', 'JSTAGE', 'ws.title', $listDirn, $listOrder); ?>
+                                    </th>
                                 <?php endif; ?>
                                 <th scope="col" class="w-1 text-center d-none d-md-table-cell">
-                                    <?php echo HTMLHelper::_('searchtools.sort', 'JFEATURED', 'a.featured', $listDirn, $listOrder); ?>
+                                    <?php echo $featured === '1' ? Text::_('JFEATURED') : HTMLHelper::_('searchtools.sort', 'JFEATURED', 'a.featured', $listDirn, $listOrder); ?>
                                 </th>
                                 <th scope="col" class="w-1 text-center">
                                     <?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
@@ -152,10 +155,13 @@
                             </tr>
                         </thead>
                         <tbody<?php if ($saveOrder) :
-                            ?> class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="<?php echo strtolower($listDirn); ?>" data-nested="true"<?php
+                            ?> class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="<?php echo strtolower($listDirn); ?>"<?php echo $featured === '1' ? '' : ' data-nested="true"'; ?><?php
                               endif; ?>>
                         <?php foreach ($this->items as $i => $item) :
                             $item->max_ordering = 0;
+                            $ordering             = ($listOrder == 'fp.ordering');
+                            $assetId              = 'com_content.article.' . $item->id;
+                            $canCreate            = $user->authorise('core.create', 'com_content.category.' . $item->catid);
                             $canEdit              = $user->authorise('core.edit', 'com_content.article.' . $item->id);
                             $canCheckin           = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || is_null($item->checked_out);
                             $canEditOwn           = $user->authorise('core.edit.own', 'com_content.article.' . $item->id) && $item->created_by == $userId;
@@ -190,7 +196,7 @@
                             }
 
                             ?>
-                            <tr class="row<?php echo $i % 2; ?>" data-draggable-group="<?php echo $item->catid; ?>"
+                            <tr class="row<?php echo $i % 2; ?>"<?php echo $featured === '1' ? '' : ' data-draggable-group="' . $item->catid . '"'; ?>
                                 <?php echo $dataTransitionsAttribute ?? '' ?>
                             >
                                 <td class="text-center">
diff --git a/administrator/components/com_content/tmpl/articles/default.xml b/administrator/components/com_content/tmpl/articles/default.xml
index 424d988d71cde..b042f2497994f 100644
--- a/administrator/components/com_content/tmpl/articles/default.xml
+++ b/administrator/components/com_content/tmpl/articles/default.xml
@@ -37,6 +37,19 @@
 				<option value="">JOPTION_SELECT_MAX_LEVELS</option>
 			</field>
 
+			<field
+				name="filter_featured"
+				type="list"
+				label="JFEATURED"
+				filtermode="selector"
+				class="js-select-submit-on-change"
+				validate="options"
+				>
+				<option value="">COM_CONTENT_SELECT_FEATURED</option>
+				<option value="0">COM_CONTENT_FILTER_FEATURED_NO</option>
+				<option value="1">COM_CONTENT_FILTER_FEATURED_YES</option>
+			</field>
+
 			<field
 				name="filter_author_id"
 				type="author"
diff --git a/administrator/components/com_content/tmpl/articles/emptystate.php b/administrator/components/com_content/tmpl/articles/emptystate.php
index 90cf4415edadb..04605e063c380 100644
--- a/administrator/components/com_content/tmpl/articles/emptystate.php
+++ b/administrator/components/com_content/tmpl/articles/emptystate.php
@@ -17,8 +17,10 @@
 $displayData = [
     'textPrefix' => 'COM_CONTENT',
     'formURL'    => 'index.php?option=com_content&view=articles',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Adding_a_new_article',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/articles',
     'icon'       => 'icon-copy article',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 $user = $this->getCurrentUser();
diff --git a/administrator/components/com_content/tmpl/articles/modal.php b/administrator/components/com_content/tmpl/articles/modal.php
index 1d498b8a16b2a..b773f02f463e3 100644
--- a/administrator/components/com_content/tmpl/articles/modal.php
+++ b/administrator/components/com_content/tmpl/articles/modal.php
@@ -34,7 +34,7 @@
     ->useScript('modal-content-select')
     ->useScript('com_content.admin-articles-modal');
 
-// @todo: Use of Function and Editor is deprecated and should be removed in 6.0. It stays only for backward compatibility.
+// @todo: Use of Function and Editor is deprecated and should be removed in 7.0. It stays only for backward compatibility.
 $function  = $app->getInput()->getCmd('function', 'jSelectArticle');
 $editor    = $app->getInput()->getCmd('editor', '');
 $listOrder = $this->escape($this->state->get('list.ordering'));
diff --git a/administrator/components/com_content/tmpl/featured/default.php b/administrator/components/com_content/tmpl/featured/default.php
deleted file mode 100644
index a6541223ffeb8..0000000000000
--- a/administrator/components/com_content/tmpl/featured/default.php
+++ /dev/null
@@ -1,400 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_content
- *
- * @copyright   (C) 2009 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Button\FeaturedButton;
-use Joomla\CMS\Button\PublishedButton;
-use Joomla\CMS\Button\TransitionButton;
-use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Associations;
-use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-use Joomla\Component\Content\Administrator\Helper\ContentHelper;
-use Joomla\Utilities\ArrayHelper;
-
-/** @var \Joomla\Component\Content\Administrator\View\Featured\HtmlView $this */
-
-/** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa = $this->getDocument()->getWebAssetManager();
-$wa->useScript('table.columns')
-    ->useScript('multiselect');
-
-$app       = Factory::getApplication();
-$user      = $this->getCurrentUser();
-$userId    = $user->id;
-$listOrder = $this->escape($this->state->get('list.ordering'));
-$listDirn  = $this->escape($this->state->get('list.direction'));
-$saveOrder = $listOrder == 'fp.ordering';
-
-if (strpos($listOrder, 'publish_up') !== false) {
-    $orderingColumn = 'publish_up';
-} elseif (strpos($listOrder, 'publish_down') !== false) {
-    $orderingColumn = 'publish_down';
-} elseif (strpos($listOrder, 'modified') !== false) {
-    $orderingColumn = 'modified';
-} else {
-    $orderingColumn = 'created';
-}
-
-
-if ($saveOrder && !empty($this->items)) {
-    $saveOrderingUrl = 'index.php?option=com_content&task=featured.saveOrderAjax&tmpl=component&' . Session::getFormToken() . '=1';
-    HTMLHelper::_('draggablelist.draggable');
-}
-
-$workflow_enabled  = ComponentHelper::getParams('com_content')->get('workflow_enabled');
-$workflow_state    = false;
-$workflow_featured = false;
-
-if ($workflow_enabled) :
-    $wa->getRegistry()->addExtensionRegistryFile('com_workflow');
-    $wa->useScript('com_workflow.admin-items-workflow-buttons')
-    ->useScript('com_content.articles-status');
-
-    $workflow_state    = Factory::getApplication()->bootComponent('com_content')->isFunctionalityUsed('core.state', 'com_content.article');
-    $workflow_featured = Factory::getApplication()->bootComponent('com_content')->isFunctionalityUsed('core.featured', 'com_content.article');
-endif;
-
-$assoc = Associations::isEnabled();
-
-?>
-
-<form action="<?php echo Route::_('index.php?option=com_content&view=featured'); ?>" method="post" name="adminForm" id="adminForm">
-    <div class="row">
-        <div class="col-md-12">
-            <div id="j-main-container" class="j-main-container">
-                <?php
-                // Search tools bar
-                echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]);
-                ?>
-                <?php if (empty($this->items)) : ?>
-                    <div class="alert alert-info">
-                        <span class="icon-info-circle" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('INFO'); ?></span>
-                        <?php echo Text::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-                    </div>
-                <?php else : ?>
-                    <table class="table itemList" id="articleList">
-                        <caption class="visually-hidden">
-                            <?php echo Text::_('COM_CONTENT_FEATURED_TABLE_CAPTION'); ?>,
-                            <span id="orderedBy"><?php echo Text::_('JGLOBAL_SORTED_BY'); ?> </span>,
-                            <span id="filteredBy"><?php echo Text::_('JGLOBAL_FILTERED_BY'); ?></span>
-                        </caption>
-                        <thead>
-                            <tr>
-                                <td class="w-1 text-center">
-                                    <?php echo HTMLHelper::_('grid.checkall'); ?>
-                                </td>
-                                <th scope="col" class="w-1 text-center d-none d-md-table-cell">
-                                    <?php echo HTMLHelper::_('searchtools.sort', '', 'fp.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-sort'); ?>
-                                </th>
-                                <?php if ($workflow_enabled) : ?>
-                                    <th scope="col" class="w-1 text-center">
-                                        <?php echo HTMLHelper::_('searchtools.sort', 'JSTAGE', 'ws.title', $listDirn, $listOrder); ?>
-                                    </th>
-                                <?php endif; ?>
-                                <th scope="col" class="w-1 text-center d-none d-md-table-cell">
-                                    <?php echo Text::_('JFEATURED'); ?>
-                                </th>
-                                <th scope="col" class="w-1 text-center">
-                                    <?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
-                                </th>
-                                <th scope="col" style="min-width:100px">
-                                    <?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
-                                </th>
-                                <th scope="col" class="w-10 d-none d-md-table-cell">
-                                    <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
-                                </th>
-                                <th scope="col" class="w-10 d-none d-md-table-cell">
-                                    <?php echo HTMLHelper::_('searchtools.sort', 'JAUTHOR', 'a.created_by', $listDirn, $listOrder); ?>
-                                </th>
-                                <?php if ($assoc) : ?>
-                                    <th scope="col" class="w-5 d-none d-md-table-cell">
-                                        <?php echo HTMLHelper::_('searchtools.sort', 'COM_CONTENT_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
-                                    </th>
-                                <?php endif; ?>
-                                <?php if (Multilanguage::isEnabled()) : ?>
-                                    <th scope="col" class="w-10 d-none d-md-table-cell">
-                                        <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
-                                    </th>
-                                <?php endif; ?>
-                                <th scope="col" class="w-10 d-none d-md-table-cell text-center">
-                                    <?php echo HTMLHelper::_('searchtools.sort', 'COM_CONTENT_HEADING_DATE_' . strtoupper($orderingColumn), 'a.' . $orderingColumn, $listDirn, $listOrder); ?>
-                                </th>
-                                <?php if ($this->hits) : ?>
-                                    <th scope="col" class="w-3 d-none d-lg-table-cell text-center">
-                                        <?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
-                                    </th>
-                                <?php endif; ?>
-                                <?php if ($this->vote) : ?>
-                                    <th scope="col" class="w-3 d-none d-md-table-cell text-center">
-                                        <?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_VOTES', 'rating_count', $listDirn, $listOrder); ?>
-                                    </th>
-                                    <th scope="col" class="w-3 d-none d-md-table-cell text-center">
-                                        <?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_RATINGS', 'rating', $listDirn, $listOrder); ?>
-                                    </th>
-                                <?php endif; ?>
-                                <th scope="col" class="w-3 d-none d-lg-table-cell">
-                                    <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
-                                </th>
-                            </tr>
-                        </thead>
-                        <tbody<?php if ($saveOrder) :
-                            ?> class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="<?php echo strtolower($listDirn); ?>"<?php
-                              endif; ?>>
-                        <?php $count = count($this->items); ?>
-                        <?php foreach ($this->items as $i => $item) :
-                            $item->max_ordering = 0;
-                            $ordering         = ($listOrder == 'fp.ordering');
-                            $assetId          = 'com_content.article.' . $item->id;
-                            $canCreate        = $user->authorise('core.create', 'com_content.category.' . $item->catid);
-                            $canEdit          = $user->authorise('core.edit', 'com_content.article.' . $item->id);
-                            $canCheckin       = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $userId || is_null($item->checked_out);
-                            $canChange        = $user->authorise('core.edit.state', 'com_content.article.' . $item->id) && $canCheckin;
-                            $canEditCat       = $user->authorise('core.edit', 'com_content.category.' . $item->catid);
-                            $canEditOwnCat    = $user->authorise('core.edit.own', 'com_content.category.' . $item->catid) && $item->category_uid == $userId;
-                            $canEditParCat    = $user->authorise('core.edit', 'com_content.category.' . $item->parent_category_id);
-                            $canEditOwnParCat = $user->authorise('core.edit.own', 'com_content.category.' . $item->parent_category_id) && $item->parent_category_uid == $userId;
-
-                            $transitions = ContentHelper::filterTransitions($this->transitions, (int) $item->stage_id, (int) $item->workflow_id);
-
-                            $transition_ids = ArrayHelper::getColumn($transitions, 'value');
-                            $transition_ids = ArrayHelper::toInteger($transition_ids);
-
-                            ?>
-                            <tr class="row<?php echo $i % 2; ?>" data-transitions="<?php echo implode(',', $transition_ids); ?>">
-                                <td class="text-center">
-                                    <?php echo HTMLHelper::_('grid.id', $i, $item->id, false, 'cid', 'cb', $item->title); ?>
-                                </td>
-                                <td class="text-center d-none d-md-table-cell">
-                                    <?php
-                                    $iconClass = '';
-
-                                    if (!$canChange) {
-                                        $iconClass = ' inactive';
-                                    } elseif (!$saveOrder) {
-                                        $iconClass = ' inactive" title="' . Text::_('JORDERINGDISABLED');
-                                    }
-                                    ?>
-                                    <span class="sortable-handler<?php echo $iconClass ?>">
-                                        <span class="icon-ellipsis-v" aria-hidden="true"></span>
-                                    </span>
-                                    <?php if ($canChange && $saveOrder) : ?>
-                                        <input type="text" name="order[]" size="5" value="<?php echo $item->ordering; ?>" class="width-20 text-area-order hidden">
-                                    <?php endif; ?>
-                                </td>
-                                <?php if ($workflow_enabled) : ?>
-                                <td class="article-stage text-center">
-                                    <?php
-                                    $options = [
-                                    'transitions' => $transitions,
-                                    'title' => Text::_($item->stage_title),
-                                    'tip_content' => Text::sprintf('JWORKFLOW', Text::_($item->workflow_title)),
-                                    'id' => 'workflow-' . $item->id,
-                                    'task' => 'articles.runTransition'
-                                    ];
-
-                                    echo (new TransitionButton($options))
-                                    ->render(0, $i);
-                                    ?>
-                                    <div class="small">
-                                        <?php echo Text::_($item->stage_title); ?>
-                                    </div>
-                                </td>
-                                <?php endif; ?>
-                                <td class="text-center d-none d-md-table-cell">
-                                <?php
-                                    $options = [
-                                        'task_prefix' => 'articles.',
-                                        'disabled' => $workflow_featured || !$canChange,
-                                        'id' => 'featured-' . $item->id
-                                    ];
-
-                                    echo (new FeaturedButton())
-                                        ->render((int) $item->featured, $i, $options, $item->featured_up, $item->featured_down);
-                                    ?>
-                                </td>
-                                <td class="article-status text-center">
-                                <?php
-                                    $options = [
-                                        'task_prefix' => 'articles.',
-                                        'disabled' => $workflow_state || !$canChange,
-                                        'id' => 'state-' . $item->id,
-                                        'category_published' => $item->category_published
-                                    ];
-
-                                    echo (new PublishedButton())->render((int) $item->state, $i, $options, $item->publish_up, $item->publish_down);
-                                    ?>
-                                </td>
-                                <th scope="row" class="has-context">
-                                    <div class="break-word">
-                                        <?php if ($item->checked_out) : ?>
-                                            <?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'articles.', $canCheckin); ?>
-                                        <?php endif; ?>
-                                        <?php if ($canEdit) : ?>
-                                            <a href="<?php echo Route::_('index.php?option=com_content&task=article.edit&return=featured&id=' . $item->id); ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo $this->escape($item->title); ?>">
-                                                <?php echo $this->escape($item->title); ?></a>
-                                        <?php else : ?>
-                                            <span title="<?php echo Text::sprintf('JFIELD_ALIAS_LABEL', $this->escape($item->alias)); ?>"><?php echo $this->escape($item->title); ?></span>
-                                        <?php endif; ?>
-                                        <div class="small break-word">
-                                            <?php if (empty($item->note)) : ?>
-                                                <?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
-                                            <?php else : ?>
-                                                <?php echo Text::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
-                                            <?php endif; ?>
-                                        </div>
-                                        <div class="small">
-                                            <?php
-                                            $ParentCatUrl = Route::_('index.php?option=com_categories&task=category.edit&id=' . $item->parent_category_id . '&extension=com_content');
-                                            $CurrentCatUrl = Route::_('index.php?option=com_categories&task=category.edit&id=' . $item->catid . '&extension=com_content');
-                                            $EditCatTxt = Text::_('COM_CONTENT_EDIT_CATEGORY');
-                                            echo Text::_('JCATEGORY') . ': ';
-                                            if ($item->category_level != '1') :
-                                                if ($item->parent_category_level != '1') :
-                                                    echo ' &#187; ';
-                                                endif;
-                                            endif;
-                                            if ($this->getLanguage()->isRtl()) {
-                                                if ($canEditCat || $canEditOwnCat) :
-                                                    echo '<a href="' . $CurrentCatUrl . '" title="' . $EditCatTxt . '">';
-                                                endif;
-                                                echo $this->escape($item->category_title);
-                                                if ($canEditCat || $canEditOwnCat) :
-                                                    echo '</a>';
-                                                endif;
-                                                if ($item->category_level != '1') :
-                                                    echo ' &#171; ';
-                                                    if ($canEditParCat || $canEditOwnParCat) :
-                                                        echo '<a href="' . $ParentCatUrl . '" title="' . $EditCatTxt . '">';
-                                                    endif;
-                                                    echo $this->escape($item->parent_category_title);
-                                                    if ($canEditParCat || $canEditOwnParCat) :
-                                                        echo '</a>';
-                                                    endif;
-                                                endif;
-                                            } else {
-                                                if ($item->category_level != '1') :
-                                                    if ($canEditParCat || $canEditOwnParCat) :
-                                                        echo '<a href="' . $ParentCatUrl . '" title="' . $EditCatTxt . '">';
-                                                    endif;
-                                                    echo $this->escape($item->parent_category_title);
-                                                    if ($canEditParCat || $canEditOwnParCat) :
-                                                        echo '</a>';
-                                                    endif;
-                                                    echo ' &#187; ';
-                                                endif;
-                                                if ($canEditCat || $canEditOwnCat) :
-                                                    echo '<a href="' . $CurrentCatUrl . '" title="' . $EditCatTxt . '">';
-                                                endif;
-                                                echo $this->escape($item->category_title);
-                                                if ($canEditCat || $canEditOwnCat) :
-                                                    echo '</a>';
-                                                endif;
-                                            }
-                                            if ($item->category_published < '1') :
-                                                echo $item->category_published == '0' ? ' (' . Text::_('JUNPUBLISHED') . ')' : ' (' . Text::_('JTRASHED') . ')';
-                                            endif;
-                                            ?>
-                                        </div>
-                                    </div>
-                                </th>
-                                <td class="small d-none d-md-table-cell">
-                                    <?php echo $this->escape($item->access_level); ?>
-                                </td>
-                                <td class="small d-none d-md-table-cell">
-                                    <?php if (!empty($item->author_name)) : ?>
-                                        <a href="<?php echo Route::_('index.php?option=com_users&task=user.edit&id=' . (int) $item->created_by); ?>">
-                                            <?php echo $this->escape($item->author_name); ?>
-                                        </a>
-                                    <?php else : ?>
-                                        [ <?php echo Text::_('JNONE'); ?> ]
-                                    <?php endif; ?>
-                                    <?php if ($item->created_by_alias) : ?>
-                                        <div class="smallsub"><?php echo Text::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->created_by_alias)); ?></div>
-                                    <?php endif; ?>
-                                </td>
-                                <?php if ($assoc) : ?>
-                                    <td class="d-none d-md-table-cell">
-                                        <?php if ($item->association) : ?>
-                                            <?php echo HTMLHelper::_('contentadministrator.association', $item->id); ?>
-                                        <?php endif; ?>
-                                    </td>
-                                <?php endif; ?>
-                                <?php if (Multilanguage::isEnabled()) : ?>
-                                    <td class="small d-none d-md-table-cell">
-                                        <?php echo LayoutHelper::render('joomla.content.language', $item); ?>
-                                    </td>
-                                <?php endif; ?>
-                                <td class="small d-none d-md-table-cell text-center">
-                                    <?php
-                                    $date = $item->{$orderingColumn};
-                                    echo $date > 0 ? HTMLHelper::_('date', $date, Text::_('DATE_FORMAT_LC4')) : '-';
-                                    ?>
-                                </td>
-                                <?php if ($this->hits) : ?>
-                                    <td class="d-none d-lg-table-cell text-center">
-                                        <span class="badge bg-info">
-                                            <?php echo (int) $item->hits; ?>
-                                        </span>
-                                    </td>
-                                <?php endif; ?>
-                                <?php if ($this->vote) : ?>
-                                    <td class="d-none d-md-table-cell text-center">
-                                        <span class="badge bg-success">
-                                            <?php echo (int) $item->rating_count; ?>
-                                        </span>
-                                    </td>
-                                    <td class="d-none d-md-table-cell text-center">
-                                        <span class="badge bg-warning">
-                                            <?php echo (int) $item->rating; ?>
-                                        </span>
-                                    </td>
-                                <?php endif; ?>
-                                <td class="d-none d-lg-table-cell">
-                                    <?php echo (int) $item->id; ?>
-                                </td>
-                            </tr>
-                        <?php endforeach; ?>
-                        </tbody>
-                    </table>
-
-                    <?php // load the pagination. ?>
-                    <?php echo $this->pagination->getListFooter(); ?>
-
-                    <?php echo HTMLHelper::_(
-                        'bootstrap.renderModal',
-                        'stageModal',
-                        [
-                            'title'  => Text::_('JTOOLBAR_CHANGE_STATUS'),
-                            'footer' => $this->loadTemplate('stage_footer'),
-                        ],
-                        $this->loadTemplate('stage_body')
-                    ); ?>
-
-                <?php endif; ?>
-
-                <?php if ($workflow_enabled) : ?>
-                <input type="hidden" name="transition_id" value="">
-                <?php endif; ?>
-
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="featured" value="1">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
-            </div>
-        </div>
-    </div>
-</form>
diff --git a/administrator/components/com_content/tmpl/featured/default.xml b/administrator/components/com_content/tmpl/featured/default.xml
deleted file mode 100644
index 34a2929f6e8e1..0000000000000
--- a/administrator/components/com_content/tmpl/featured/default.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-	<layout title="COM_CONTENT_FEATURED_VIEW_DEFAULT_TITLE">
-		<message>
-			<![CDATA[COM_CONTENT_FEATURED_VIEW_DEFAULT_DESC]]>
-		</message>
-	</layout>
-</metadata>
diff --git a/administrator/components/com_content/tmpl/featured/default_stage_body.php b/administrator/components/com_content/tmpl/featured/default_stage_body.php
deleted file mode 100644
index d5f510e40a892..0000000000000
--- a/administrator/components/com_content/tmpl/featured/default_stage_body.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_content
- *
- * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Language\Text;
-
-?>
-
-<div class="container">
-    <div class="row">
-        <div class="col-12">
-            <p><?php echo Text::_('COM_CONTENT_CHANGE_STAGE_AMBIGUOUS_TRANSITIONS'); ?></p>
-        </div>
-        <div class="col-12" id="stageModal-content">
-        </div>
-    </div>
-</div>
diff --git a/administrator/components/com_content/tmpl/featured/default_stage_footer.php b/administrator/components/com_content/tmpl/featured/default_stage_footer.php
deleted file mode 100644
index 8c6d2bfccdad4..0000000000000
--- a/administrator/components/com_content/tmpl/featured/default_stage_footer.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_content
- *
- * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Language\Text;
-
-/** @var \Joomla\Component\Content\Administrator\View\Featured\HtmlView $this */
-
-/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa = $this->getDocument()->getWebAssetManager();
-$wa->useScript('com_content.admin-articles-stage');
-
-?>
-<button class="btn btn-secondary" type="button" data-bs-dismiss="modal">
-    <?php echo Text::_('JCANCEL'); ?>
-</button>
-<button id="stage-submit-button-id" class="btn btn-success" type="button" data-submit-task="">
-    <?php echo Text::_('JGLOBAL_STAGE_PROCESS'); ?>
-</button>
diff --git a/administrator/components/com_content/tmpl/featured/emptystate.php b/administrator/components/com_content/tmpl/featured/emptystate.php
deleted file mode 100644
index 3f20dbd6f98e9..0000000000000
--- a/administrator/components/com_content/tmpl/featured/emptystate.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_content
- *
- * @copyright   (C) 2008 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Layout\LayoutHelper;
-
-/** @var \Joomla\Component\Content\Administrator\View\Featured\HtmlView $this */
-
-$displayData = [
-    'textPrefix' => 'COM_CONTENT',
-    'formURL'    => 'index.php?option=com_content&view=featured',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Adding_a_new_article',
-];
-
-$user = $this->getCurrentUser();
-
-if ($user->authorise('core.create', 'com_content') || count($user->getAuthorisedCategories('com_content', 'core.create')) > 0) {
-    $displayData['createURL'] = 'index.php?option=com_content&task=article.add';
-}
-
-echo LayoutHelper::render('joomla.content.emptystate', $displayData);
diff --git a/administrator/components/com_contenthistory/helpers/contenthistory.php b/administrator/components/com_contenthistory/helpers/contenthistory.php
index 2c6e09c5244a4..4bc9ab99a1c78 100644
--- a/administrator/components/com_contenthistory/helpers/contenthistory.php
+++ b/administrator/components/com_contenthistory/helpers/contenthistory.php
@@ -19,7 +19,7 @@
  *
  * @since       3.2
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Contenthistory\Administrator\Helper\ContenthistoryHelper instead
  */
 class ContenthistoryHelper extends \Joomla\Component\Contenthistory\Administrator\Helper\ContenthistoryHelper
diff --git a/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php b/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
index aa501e65ce981..ade226ba68bc4 100644
--- a/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
+++ b/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
@@ -14,11 +14,11 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Table\ContentHistory;
 use Joomla\CMS\Table\ContentType;
-use Joomla\CMS\Table\Table;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Folder;
 use Joomla\Filesystem\Path;
+use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -76,8 +76,18 @@ public static function decodeFields($jsonString)
 
         if (\is_object($object)) {
             foreach ($object as $name => $value) {
-                if (!\is_null($value) && $subObject = json_decode($value)) {
-                    $object->$name = $subObject;
+                if (!\is_null($value)) {
+                    if (\is_object($value)) {
+                        $object->$name = ArrayHelper::fromObject($value);
+                        continue;
+                    }
+
+                    if (str_starts_with($value, '{')) {
+                        $object->$name = json_decode($value);
+                        continue;
+                    }
+
+                    $object->$name = $value;
                 }
             }
         }
@@ -192,7 +202,7 @@ public static function getLookupValue($lookup, $value)
         if (isset($lookup->sourceColumn, $lookup->targetTable, $lookup->targetColumn, $lookup->displayColumn)) {
             $db    = Factory::getDbo();
             $value = (int) $value;
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query->select($db->quoteName($lookup->displayColumn))
                 ->from($db->quoteName($lookup->targetTable))
                 ->where($db->quoteName($lookup->targetColumn) . ' = :value')
@@ -320,7 +330,7 @@ public static function mergeLabels($object, $formValues)
     public static function prepareData(ContentHistory $table)
     {
         $object     = static::decodeFields($table->version_data);
-        $typesTable = Table::getInstance('ContentType', 'Joomla\\CMS\\Table\\');
+        $typesTable = new ContentType(Factory::getDbo());
         $typeAlias  = explode('.', $table->item_id);
         array_pop($typeAlias);
         $typesTable->load(['type_alias' => implode('.', $typeAlias)]);
@@ -351,8 +361,24 @@ public static function processLookupFields($object, ContentType $typesTable)
                     $sourceColumn = $lookup->sourceColumn ?? false;
                     $sourceValue  = $object->$sourceColumn->value ?? false;
 
-                    if ($sourceColumn && $sourceValue && ($lookupValue = static::getLookupValue($lookup, $sourceValue))) {
-                        $object->$sourceColumn->value = $lookupValue;
+                    if (!\is_array($sourceValue)) {
+                        if ($sourceColumn && $sourceValue && ($lookupValue = static::getLookupValue($lookup, $sourceValue))) {
+                            $object->$sourceColumn->value = $lookupValue;
+                        }
+
+                        continue;
+                    }
+
+                    if (\is_array($sourceValue)) {
+                        $result = [];
+
+                        foreach ($sourceValue as $key => $subValue) {
+                            if ($sourceColumn && $subValue && ($lookupValue = static::getLookupValue($lookup, $subValue))) {
+                                $result[$key] = $lookupValue;
+                            }
+
+                            $object->$sourceColumn->value = $result;
+                        }
                     }
                 }
             }
diff --git a/administrator/components/com_contenthistory/src/Model/HistoryModel.php b/administrator/components/com_contenthistory/src/Model/HistoryModel.php
index fa06f07b33773..60ef3d2c3a905 100644
--- a/administrator/components/com_contenthistory/src/Model/HistoryModel.php
+++ b/administrator/components/com_contenthistory/src/Model/HistoryModel.php
@@ -305,7 +305,6 @@ protected function populateState($ordering = 'h.save_date', $direction = 'DESC')
         $itemId = $input->get('item_id', '', 'string');
 
         $this->setState('item_id', $itemId);
-        $this->setState('sha1_hash', $this->getSha1Hash());
 
         // Load the parameters.
         $params = ComponentHelper::getParams('com_contenthistory');
@@ -326,7 +325,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $itemId = $this->getState('item_id');
 
         // Select the required fields from the table.
@@ -343,6 +342,7 @@ protected function getListQuery()
                     $db->quoteName('h.sha1_hash'),
                     $db->quoteName('h.version_data'),
                     $db->quoteName('h.keep_forever'),
+                    $db->quoteName('h.is_current'),
                 ]
             )
         )
@@ -373,17 +373,33 @@ protected function getListQuery()
      *
      * @since   3.2
      */
-    protected function getSha1Hash()
+    public function getSha1Hash()
     {
+        /**
+         * From Joomla 6, we use is_current field to determine the current version, so no need to calculate sha1 hash
+         * if there is already a current version
+         */
+
+        $items = $this->getItems();
+
+        foreach ($items as $item) {
+            if ($item->is_current == 1) {
+                return $item->sha1_hash;
+            }
+        }
+
+        // Legacy code for history concept before 6.0.0, deprecated 6.0.0 will be removed with 8.0.0
         $result    = false;
-        $item_id   = Factory::getApplication()->getInput()->getCmd('item_id', '');
-        $typeAlias = explode('.', $item_id);
-        Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/' . $typeAlias[0] . '/tables');
+        $item_id   = $this->state->get('item_id', '');
+
+        [$extension, $type, $id] = explode('.', $item_id);
+
+        Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/' . $extension . '/tables');
         $typeTable = $this->getTable('ContentType');
-        $typeTable->load(['type_alias' => $typeAlias[0] . '.' . $typeAlias[1]]);
+        $typeTable->load(['type_alias' => $extension . '.' . $type]);
         $contentTable = $typeTable->getContentTable();
 
-        if ($contentTable && $contentTable->load($typeAlias[2])) {
+        if ($contentTable && $contentTable->load($id)) {
             $helper = new CMSHelper();
 
             $dataObject = $helper->getDataObject($contentTable);
diff --git a/administrator/components/com_contenthistory/src/View/History/HtmlView.php b/administrator/components/com_contenthistory/src/View/History/HtmlView.php
index 9167863588c04..2c29e9ee77b9d 100644
--- a/administrator/components/com_contenthistory/src/View/History/HtmlView.php
+++ b/administrator/components/com_contenthistory/src/View/History/HtmlView.php
@@ -59,6 +59,13 @@ class HtmlView extends BaseHtmlView
      */
     protected $toolbar;
 
+    /**
+     * The SHA1 hash of the current version of the item being viewed
+     *
+     * @var  string
+     */
+    protected $currentVersionHash;
+
     /**
      * Method to display the view.
      *
@@ -74,9 +81,10 @@ public function display($tpl = null)
         $model = $this->getModel();
         $model->setUseExceptions(true);
 
-        $this->state      = $model->getState();
-        $this->items      = $model->getItems();
-        $this->pagination = $model->getPagination();
+        $this->state              = $model->getState();
+        $this->items              = $model->getItems();
+        $this->pagination         = $model->getPagination();
+        $this->currentVersionHash = $model->getSha1Hash();
 
         $this->toolbar = $this->addToolbar();
 
diff --git a/administrator/components/com_contenthistory/tmpl/compare/compare.php b/administrator/components/com_contenthistory/tmpl/compare/compare.php
index 8f855b92c1ad8..fd9812febac91 100644
--- a/administrator/components/com_contenthistory/tmpl/compare/compare.php
+++ b/administrator/components/com_contenthistory/tmpl/compare/compare.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Session\Session;
+use Joomla\Utilities\ArrayHelper;
 
 /** @var \Joomla\Component\Contenthistory\Administrator\View\Compare\HtmlView $this */
 
@@ -19,8 +20,8 @@
 
 $version2 = $this->items[0];
 $version1 = $this->items[1];
-$object1  = $version1->data;
-$object2  = $version2->data;
+$object1  = ArrayHelper::fromObject($version1->data);
+$object2  = ArrayHelper::fromObject($version2->data);
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->getDocument()->getWebAssetManager();
@@ -43,40 +44,69 @@
             </tr>
         </thead>
         <tbody>
-        <?php foreach ($object1 as $name => $value) : ?>
-            <?php if (isset($value->value) && isset($object2->$name->value) && $value->value != $object2->$name->value) : ?>
-                <?php if (is_object($value->value)) : ?>
-                    <tr>
-                        <td colspan="4">
-                            <strong><?php echo $value->label; ?></strong>
-                        </td>
-                    </tr>
-                    <?php foreach ($value->value as $subName => $subValue) : ?>
-                        <?php $newSubValue = $object2->$name->value->$subName->value ?? ''; ?>
-                        <?php if ($subValue->value || $newSubValue) : ?>
-                            <?php if ($subValue->value != $newSubValue) : ?>
-                                <tr>
-                                    <th scope="row"><em>&nbsp;&nbsp;<?php echo $subValue->label; ?></em></th>
-                                    <td class="original"><?php echo htmlspecialchars($subValue->value, ENT_COMPAT, 'UTF-8'); ?></td>
-                                    <td class="changed" ><?php echo htmlspecialchars($newSubValue, ENT_COMPAT, 'UTF-8'); ?></td>
-                                    <td class="diff">&nbsp;</td>
-                                </tr>
+            <?php foreach ($object1 as $name => $value1) : ?>
+                <?php if (isset($value1['value']) && isset($object2[$name]['value']) && ($value1['value'] !== $object2[$name]['value'])) : ?>
+                    <?php $value2 = $object2[$name]; ?>
+                    <?php
+                    if (is_array($value1)) : ?>
+                        <?php if (is_array($value1['value'])) : ?>
+                            <tr>
+                                <td colspan="4">
+                                    <strong><?php echo $value1['label']; ?></strong>
+                                </td>
+                            </tr>
+                            <?php $keys = array_keys($value1['value']); ?>
+                            <?php if (isset($value2['value']) && is_array($value2['value'])) :?>
+                                <?php $keys = array_unique(array_merge(array_keys($value1['value']), array_keys($value2['value']))); ?>
                             <?php endif; ?>
+                                <?php foreach ($keys as $key) : ?>
+                                    <?php if (isset($value1['value'][$key]) && isset($value2['value'][$key]) && $value1['value'][$key] === $value2['value'][$key]) :?>
+                                        <?php continue; ?>
+                                    <?php endif;?>
+                                    <tr>
+                                        <td></td>
+                                        <td class="original">
+                                            <?php if (isset($value1['value'][$key])) : ?>
+                                                <?php $currentvalue1 = $value1['value'][$key]; ?>
+                                                <?php if (is_array($currentvalue1)) : ?>
+                                                    <?php $currentvalue1 = ArrayHelper::isAssociative($currentvalue1) ? json_encode($currentvalue1) : implode(' | ', $currentvalue1); ?>
+                                                    <?php echo htmlspecialchars($key . ': ' . $currentvalue1, ENT_COMPAT, 'UTF-8'); ?>
+                                                <?php else : ?>
+                                                    <?php echo htmlspecialchars($key . ': ' . $currentvalue1, ENT_COMPAT, 'UTF-8'); ?>
+                                                <?php endif;?>
+                                            <?php endif; ?>
+                                        </td>
+                                        <td class="changed">
+                                            <?php if (isset($value2['value'][$key])) : ?>
+                                                <?php $currentvalue2 = $value2['value'][$key]; ?>
+                                                <?php if (is_array($currentvalue2)) : ?>
+                                                    <?php $currentvalue2 = ArrayHelper::isAssociative($currentvalue2) ? json_encode($currentvalue2) : implode(' | ', $currentvalue2); ?>
+                                                    <?php echo htmlspecialchars($key . ': ' . $currentvalue2, ENT_COMPAT, 'UTF-8'); ?>
+                                                <?php else : ?>
+                                                    <?php echo htmlspecialchars($key . ': ' . $currentvalue2, ENT_COMPAT, 'UTF-8'); ?>
+                                                <?php endif;?>
+                                            <?php endif; ?>
+                                        <td class="diff">&nbsp;</td>
+                                    </tr>
+                                <?php endforeach; ?>
+                        <?php else : ?>
+                            <tr>
+                                <th scope="row">
+                                    <?php
+                                    echo $value1['label']; ?>
+                                </th>
+                                <?php $currentvalue1 = is_array($value1['value']) ? json_encode($value1['value']) : $value1['value']; ?>
+                                <td class="original"><?php
+                                    echo htmlspecialchars($currentvalue1); ?></td>
+                                <?php $currentvalue2 = is_array($value2['value']) ? json_encode($value2['value']) : $value2['value']; ?>
+                                <td class="changed"><?php
+                                    echo htmlspecialchars($currentvalue2, ENT_COMPAT, 'UTF-8'); ?></td>
+                                <td class="diff">&nbsp;</td>
+                            </tr>
                         <?php endif; ?>
-                    <?php endforeach; ?>
-                <?php else : ?>
-                    <tr>
-                        <th scope="row">
-                            <?php echo $value->label; ?>
-                        </th>
-                        <td class="original"><?php echo htmlspecialchars($value->value); ?></td>
-                        <?php $object2->$name->value = is_object($object2->$name->value) ? json_encode($object2->$name->value) : $object2->$name->value; ?>
-                        <td class="changed"><?php echo htmlspecialchars($object2->$name->value, ENT_COMPAT, 'UTF-8'); ?></td>
-                        <td class="diff">&nbsp;</td>
-                    </tr>
+                    <?php endif; ?>
                 <?php endif; ?>
-            <?php endif; ?>
-        <?php endforeach; ?>
+            <?php endforeach; ?>
         </tbody>
     </table>
 </div>
diff --git a/administrator/components/com_contenthistory/tmpl/history/modal.php b/administrator/components/com_contenthistory/tmpl/history/modal.php
index 759607d4cbfd9..64d90c2502168 100644
--- a/administrator/components/com_contenthistory/tmpl/history/modal.php
+++ b/administrator/components/com_contenthistory/tmpl/history/modal.php
@@ -19,7 +19,7 @@
 
 Session::checkToken('get') or die(Text::_('JINVALID_TOKEN'));
 
-$hash           = $this->state->get('sha1_hash');
+$hash           = $this->currentVersionHash;
 $formUrl        = 'index.php?option=com_contenthistory&view=history&layout=modal&tmpl=component&item_id=' . $this->state->get('item_id') . '&' . Session::getFormToken() . '=1';
 
 Text::script('COM_CONTENTHISTORY_BUTTON_SELECT_ONE_VERSION', true);
diff --git a/administrator/components/com_contenthistory/tmpl/preview/preview.php b/administrator/components/com_contenthistory/tmpl/preview/preview.php
index 390aa50e6e7a6..587abb3452efc 100644
--- a/administrator/components/com_contenthistory/tmpl/preview/preview.php
+++ b/administrator/components/com_contenthistory/tmpl/preview/preview.php
@@ -51,14 +51,27 @@
                         <?php $subValue->value = (\is_object($subValue->value) || \is_array($subValue->value)) ? \json_encode($subValue->value, \JSON_UNESCAPED_UNICODE) : $subValue->value; ?>
                         <tr>
                             <th scope="row"><em>&nbsp;&nbsp;<?php echo $subValue->label; ?></em></th>
-                            <td><?php echo $this->escape($subValue->value); ?></td>
+                            <td>
+                                <?php if (\is_array($subValue->value)) : ?>
+                                    <?php echo $this->escape(json_decode($subValue->value)); ?>
+                                <?php else : ?>
+                                    <?php echo $this->escape($subValue->value); ?>
+                                <?php endif; ?>
+                            </td>
                         </tr>
                     <?php endif; ?>
+
                 <?php endforeach; ?>
             <?php else : ?>
                 <tr>
                     <th scope="row"><?php echo $value->label; ?></th>
-                    <td><?php echo $this->escape($value->value); ?></td>
+                    <td>
+                        <?php if (\is_array($value->value)) : ?>
+                            <?php echo $this->escape(json_encode($value->value)); ?>
+                        <?php else : ?>
+                            <?php echo $this->escape($value->value); ?>
+                        <?php endif; ?>
+                    </td>
                 </tr>
             <?php endif; ?>
         <?php endforeach; ?>
diff --git a/administrator/components/com_fields/helpers/fields.php b/administrator/components/com_fields/helpers/fields.php
index 2553d401495d8..ac7be20986c8f 100644
--- a/administrator/components/com_fields/helpers/fields.php
+++ b/administrator/components/com_fields/helpers/fields.php
@@ -19,7 +19,7 @@
  *
  * @since       3.7.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Fields\Administrator\Helper\FieldsHelper instead
  */
 class FieldsHelper extends \Joomla\Component\Fields\Administrator\Helper\FieldsHelper
diff --git a/administrator/components/com_fields/src/Controller/FieldController.php b/administrator/components/com_fields/src/Controller/FieldController.php
index 8401f415a7f29..e58ecd2fba469 100644
--- a/administrator/components/com_fields/src/Controller/FieldController.php
+++ b/administrator/components/com_fields/src/Controller/FieldController.php
@@ -103,6 +103,20 @@ protected function allowEdit($data = [], $key = 'id')
             return parent::allowEdit($data, $key);
         }
 
+        // Get existing record
+        $record = $this->getModel()->getItem($recordId);
+
+        if (empty($record)) {
+            return false;
+        }
+
+        [$recordOption] = explode('.', $record->context);
+
+        // Validate request context and field context match
+        if ($recordOption !== $this->component) {
+            return false;
+        }
+
         // Check edit on the record asset (explicit or inherited)
         if ($user->authorise('core.edit', $this->component . '.field.' . $recordId)) {
             return true;
@@ -110,13 +124,6 @@ protected function allowEdit($data = [], $key = 'id')
 
         // Check edit own on the record asset (explicit or inherited)
         if ($user->authorise('core.edit.own', $this->component . '.field.' . $recordId)) {
-            // Existing record already has an owner, get it
-            $record = $this->getModel()->getItem($recordId);
-
-            if (empty($record)) {
-                return false;
-            }
-
             // Grant if current user is owner of the record
             return $user->id == $record->created_user_id;
         }
diff --git a/administrator/components/com_fields/src/Controller/GroupController.php b/administrator/components/com_fields/src/Controller/GroupController.php
index debed0279faeb..b5a6c82f043df 100644
--- a/administrator/components/com_fields/src/Controller/GroupController.php
+++ b/administrator/components/com_fields/src/Controller/GroupController.php
@@ -125,6 +125,20 @@ protected function allowEdit($data = [], $key = 'parent_id')
             return parent::allowEdit($data, $key);
         }
 
+        // Get existing record
+        $record = $this->getModel()->getItem($recordId);
+
+        if (empty($record)) {
+            return false;
+        }
+
+        [$recordOption] = explode('.', $record->context);
+
+        // Validate request context and field context match
+        if ($recordOption !== $this->component) {
+            return false;
+        }
+
         // Check edit on the record asset (explicit or inherited)
         if ($user->authorise('core.edit', $this->component . '.fieldgroup.' . $recordId)) {
             return true;
@@ -132,13 +146,6 @@ protected function allowEdit($data = [], $key = 'parent_id')
 
         // Check edit own on the record asset (explicit or inherited)
         if ($user->authorise('core.edit.own', $this->component . '.fieldgroup.' . $recordId) || $user->authorise('core.edit.own', $this->component)) {
-            // Existing record already has an owner, get it
-            $record = $this->getModel()->getItem($recordId);
-
-            if (empty($record)) {
-                return false;
-            }
-
             // Grant if current user is owner of the record
             return $user->id == $record->created_by;
         }
diff --git a/administrator/components/com_fields/src/Field/ComponentsFieldgroupField.php b/administrator/components/com_fields/src/Field/ComponentsFieldgroupField.php
index a0a846231577e..988e1a552947d 100644
--- a/administrator/components/com_fields/src/Field/ComponentsFieldgroupField.php
+++ b/administrator/components/com_fields/src/Field/ComponentsFieldgroupField.php
@@ -48,7 +48,7 @@ protected function getOptions()
         // Initialise variable.
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT a.name AS text, a.element AS value')
             ->from('#__extensions as a')
             ->where('a.enabled >= 1')
diff --git a/administrator/components/com_fields/src/Field/ComponentsFieldsField.php b/administrator/components/com_fields/src/Field/ComponentsFieldsField.php
index 5e63972a75754..6991a493afa1d 100644
--- a/administrator/components/com_fields/src/Field/ComponentsFieldsField.php
+++ b/administrator/components/com_fields/src/Field/ComponentsFieldsField.php
@@ -48,7 +48,7 @@ protected function getOptions()
         // Initialise variable.
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT a.name AS text, a.element AS value')
             ->from('#__extensions as a')
             ->where('a.enabled >= 1')
diff --git a/administrator/components/com_fields/src/Field/FieldLayoutField.php b/administrator/components/com_fields/src/Field/FieldLayoutField.php
index 95216b097eadb..b5d4c26b39166 100644
--- a/administrator/components/com_fields/src/Field/FieldLayoutField.php
+++ b/administrator/components/com_fields/src/Field/FieldLayoutField.php
@@ -51,7 +51,7 @@ protected function getInput()
         if ($extension) {
             // Get the database object and a new query object.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Build the query.
             $query->select('element, name')
diff --git a/administrator/components/com_fields/src/Field/FieldgroupsField.php b/administrator/components/com_fields/src/Field/FieldgroupsField.php
index 65e0110c776d0..bdaf402a17f84 100644
--- a/administrator/components/com_fields/src/Field/FieldgroupsField.php
+++ b/administrator/components/com_fields/src/Field/FieldgroupsField.php
@@ -46,7 +46,7 @@ protected function getOptions()
         $viewlevels = ArrayHelper::toInteger($user->getAuthorisedViewLevels());
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('title', 'text'),
diff --git a/administrator/components/com_fields/src/Helper/FieldsHelper.php b/administrator/components/com_fields/src/Helper/FieldsHelper.php
index d1b98e21efe1a..a80d834387ace 100644
--- a/administrator/components/com_fields/src/Helper/FieldsHelper.php
+++ b/administrator/components/com_fields/src/Helper/FieldsHelper.php
@@ -601,7 +601,7 @@ public static function getAssignedCategoriesIds($fieldId)
         }
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('a.category_id'))
             ->from($db->quoteName('#__fields_categories', 'a'))
@@ -630,7 +630,7 @@ public static function getAssignedCategoriesTitles($fieldId)
         }
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('c.title'))
             ->from($db->quoteName('#__fields_categories', 'a'))
@@ -653,7 +653,7 @@ public static function getAssignedCategoriesTitles($fieldId)
     public static function getFieldsPluginId()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/administrator/components/com_fields/src/Model/FieldModel.php
index 6c18c3c76c52f..a09edbd323d57 100644
--- a/administrator/components/com_fields/src/Model/FieldModel.php
+++ b/administrator/components/com_fields/src/Model/FieldModel.php
@@ -224,7 +224,7 @@ public function save($data)
         }
 
         // First delete all assigned categories
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->delete('#__fields_categories')
             ->where($db->quoteName('field_id') . ' = :fieldid')
             ->bind(':fieldid', $id, ParameterType::INTEGER);
@@ -261,7 +261,7 @@ public function save($data)
                 $names = array_column((array) $newParams, 'value');
 
                 $fieldId = (int) $field->id;
-                $query   = $db->getQuery(true);
+                $query   = $db->createQuery();
                 $query->delete($db->quoteName('#__fields_values'))
                     ->where($db->quoteName('field_id') . ' = :fieldid')
                     ->bind(':fieldid', $fieldId, ParameterType::INTEGER);
@@ -352,7 +352,7 @@ private function checkDefaultValue($data)
             try {
                 $rule->setDatabase($this->getDatabase());
             } catch (DatabaseNotFoundException) {
-                @trigger_error('Database must be set, this will not be caught anymore in 5.0.', E_USER_DEPRECATED);
+                @trigger_error('Database must be set, this will not be caught anymore in 7.0.', E_USER_DEPRECATED);
                 $rule->setDatabase(Factory::getContainer()->get(DatabaseInterface::class));
             }
         }
@@ -429,7 +429,7 @@ public function getItem($pk = null)
             }
 
             $db      = $this->getDatabase();
-            $query   = $db->getQuery(true);
+            $query   = $db->createQuery();
             $fieldId = (int) $result->id;
             $query->select($db->quoteName('category_id'))
                 ->from($db->quoteName('#__fields_categories'))
@@ -513,7 +513,7 @@ public function delete(&$pks)
 
             if (!empty($pks)) {
                 // Delete Values
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->delete($db->quoteName('#__fields_values'))
                     ->whereIn($db->quoteName('field_id'), $pks);
@@ -521,7 +521,7 @@ public function delete(&$pks)
                 $db->setQuery($query)->execute();
 
                 // Delete Assigned Categories
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->delete($db->quoteName('#__fields_categories'))
                     ->whereIn($db->quoteName('field_id'), $pks);
@@ -539,9 +539,10 @@ public function delete(&$pks)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|bool  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   3.7.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -579,10 +580,6 @@ public function getForm($data = [], $loadData = true)
             ]
         );
 
-        if (empty($form)) {
-            return false;
-        }
-
         // Modify the form based on Edit State access controls.
         if (empty($data['context'])) {
             $data['context'] = $context;
@@ -665,7 +662,7 @@ public function setFieldValue($fieldId, $itemId, $value)
 
             // Deleting the existing record as it is a reset
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->delete($db->quoteName('#__fields_values'))
                 ->where($db->quoteName('field_id') . ' = :fieldid')
@@ -749,7 +746,7 @@ public function getFieldValues(array $fieldIds, $itemId)
         if (!\array_key_exists($key, $this->valueCache)) {
             // Create the query
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->select($db->quoteName(['field_id', 'value']))
                 ->from($db->quoteName('#__fields_values'))
@@ -804,12 +801,12 @@ public function cleanupValues($context, $itemId)
     {
         // Delete with inner join is not possible so we need to do a subquery
         $db          = $this->getDatabase();
-        $fieldsQuery = $db->getQuery(true);
+        $fieldsQuery = $db->createQuery();
         $fieldsQuery->select($db->quoteName('id'))
             ->from($db->quoteName('#__fields'))
             ->where($db->quoteName('context') . ' = :context');
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->delete($db->quoteName('#__fields_values'))
             ->where($db->quoteName('field_id') . ' IN (' . $fieldsQuery . ')')
@@ -960,24 +957,18 @@ protected function loadFormData()
                 // get selected fields
                 $filters = (array) $app->getUserState('com_fields.fields.filter');
 
-                $data->set('state', $input->getInt('state', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
-                $data->set('language', $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
-                $data->set('group_id', $input->getString('group_id', (!empty($filters['group_id']) ? $filters['group_id'] : null)));
-                $data->set(
+                $data->state            = $input->getInt('state', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null));
+                $data->language         = $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null));
+                $data->group_id         = $input->getString('group_id', (!empty($filters['group_id']) ? $filters['group_id'] : null));
+                $data->assigned_cat_ids = $input->get(
                     'assigned_cat_ids',
-                    $input->get(
-                        'assigned_cat_ids',
-                        (!empty($filters['assigned_cat_ids']) ? (array)$filters['assigned_cat_ids'] : [0]),
-                        'array'
-                    )
-                );
-                $data->set(
-                    'access',
-                    $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
+                    (!empty($filters['assigned_cat_ids']) ? (array)$filters['assigned_cat_ids'] : [0]),
+                    'array'
                 );
+                $data->access = $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')));
 
                 // Set the type if available from the request
-                $data->set('type', $input->getWord('type', $this->state->get('field.type', $data->get('type'))));
+                $data->type = $input->getWord('type', $this->state->get('field.type', $data->type));
             }
 
             if ($data->label && !isset($data->params['label'])) {
@@ -1140,15 +1131,13 @@ function () use ($component, $section) {
     /**
      * Clean the cache
      *
-     * @param   string   $group     The cache group
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   3.7.0
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         $context = Factory::getApplication()->getInput()->get('context');
 
@@ -1186,14 +1175,20 @@ protected function batchCopy($value, $pks, $contexts)
         $user      = $this->getCurrentUser();
         $table     = $this->getTable();
         $newIds    = [];
-        $component = $this->state->get('filter.component');
         $value     = (int) $value;
 
         foreach ($pks as $pk) {
-            if ($user->authorise('core.create', $component . '.fieldgroup.' . $value)) {
+            $table->reset();
+            $table->load($pk);
+            [$recordComponent] = explode('.', (string) $table->context);
+
+            if (
+                $user->authorise('core.create', $recordComponent . '.fieldgroup.' . $value)
+                && $user->authorise('core.edit', $recordComponent . '.field.' . $pk)
+            ) {
                 // Find all assigned categories to this field
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->select($db->quoteName('category_id'))
                     ->from($db->quoteName('#__fields_categories'))
@@ -1201,9 +1196,6 @@ protected function batchCopy($value, $pks, $contexts)
 
                 $assignedCatIds = $db->setQuery($query)->loadColumn();
 
-                $table->reset();
-                $table->load($pk);
-
                 $table->group_id = $value;
 
                 // Reset the ID because we are making a copy
diff --git a/administrator/components/com_fields/src/Model/FieldsModel.php b/administrator/components/com_fields/src/Model/FieldsModel.php
index 4993a1cfd1ca0..665c8ac44503c 100644
--- a/administrator/components/com_fields/src/Model/FieldsModel.php
+++ b/administrator/components/com_fields/src/Model/FieldsModel.php
@@ -140,7 +140,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
         $app   = Factory::getApplication();
 
@@ -444,7 +444,7 @@ public function getGroups()
         $context    = $this->state->get('filter.context');
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('title', 'text'),
diff --git a/administrator/components/com_fields/src/Model/GroupModel.php b/administrator/components/com_fields/src/Model/GroupModel.php
index 196b956b0d73d..ad49c788d043d 100644
--- a/administrator/components/com_fields/src/Model/GroupModel.php
+++ b/administrator/components/com_fields/src/Model/GroupModel.php
@@ -92,9 +92,10 @@ public function getTable($name = 'Group', $prefix = 'Administrator', $options =
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  mixed  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   3.7.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -116,10 +117,6 @@ public function getForm($data = [], $loadData = true)
             ]
         );
 
-        if (empty($form)) {
-            return false;
-        }
-
         $record          = new \stdClass();
         $record->context = $context;
         $record->id      = $jinput->get('id');
@@ -318,18 +315,9 @@ protected function loadFormData()
                 $context = substr($app->getUserState('com_fields.groups.filter.context', ''), 4);
                 $filters = (array) $app->getUserState('com_fields.groups.' . $context . '.filter');
 
-                $data->set(
-                    'state',
-                    $input->getInt('state', (!empty($filters['state']) ? $filters['state'] : null))
-                );
-                $data->set(
-                    'language',
-                    $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null))
-                );
-                $data->set(
-                    'access',
-                    $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')))
-                );
+                $data->state    = $input->getInt('state', (!empty($filters['state']) ? $filters['state'] : null));
+                $data->language = $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null));
+                $data->access   = $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')));
             }
         }
 
@@ -366,15 +354,13 @@ public function getItem($pk = null)
     /**
      * Clean the cache
      *
-     * @param   string   $group     The cache group
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   3.7.0
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         $context = Factory::getApplication()->getInput()->get('context');
 
diff --git a/administrator/components/com_fields/src/Model/GroupsModel.php b/administrator/components/com_fields/src/Model/GroupsModel.php
index 5ad10277f1c23..e5b270899e020 100644
--- a/administrator/components/com_fields/src/Model/GroupsModel.php
+++ b/administrator/components/com_fields/src/Model/GroupsModel.php
@@ -128,7 +128,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
 
         // Select the required fields from the table.
diff --git a/administrator/components/com_fields/src/Table/FieldTable.php b/administrator/components/com_fields/src/Table/FieldTable.php
index de2620c2fc057..fdbd40c59c38e 100644
--- a/administrator/components/com_fields/src/Table/FieldTable.php
+++ b/administrator/components/com_fields/src/Table/FieldTable.php
@@ -127,7 +127,6 @@ public function bind($src, $ignore = '')
      *
      * @return  boolean  True if the instance is sane and able to be stored in the database.
      *
-     * @link    https://docs.joomla.org/Special:MyLanguage/JTable/check
      * @since   3.7.0
      */
     public function check()
@@ -243,7 +242,6 @@ protected function _getAssetName()
      *
      * @return  string  The string to use as the title in the asset table.
      *
-     * @link    https://docs.joomla.org/Special:MyLanguage/JTable/getAssetTitle
      * @since   3.7.0
      */
     protected function _getAssetTitle()
@@ -299,7 +297,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
     private function getAssetId($name)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__assets'))
             ->where($db->quoteName('name') . ' = :name')
diff --git a/administrator/components/com_fields/src/Table/GroupTable.php b/administrator/components/com_fields/src/Table/GroupTable.php
index 2e9eb93ffc324..95cb3bad47454 100644
--- a/administrator/components/com_fields/src/Table/GroupTable.php
+++ b/administrator/components/com_fields/src/Table/GroupTable.php
@@ -94,7 +94,6 @@ public function bind($src, $ignore = '')
      *
      * @return  boolean  True if the instance is sane and able to be stored in the database.
      *
-     * @link    https://docs.joomla.org/Special:MyLanguage/JTable/check
      * @since   3.7.0
      */
     public function check()
@@ -178,7 +177,6 @@ protected function _getAssetName()
      *
      * @return  string  The string to use as the title in the asset table.
      *
-     * @link    https://docs.joomla.org/Special:MyLanguage/JTable/getAssetTitle
      * @since   3.7.0
      */
     protected function _getAssetTitle()
@@ -204,7 +202,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
     {
         $component = explode('.', $this->context);
         $db        = $this->getDatabase();
-        $query     = $db->getQuery(true)
+        $query     = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__assets'))
             ->where($db->quoteName('name') . ' = :name')
diff --git a/administrator/components/com_fields/src/View/Field/HtmlView.php b/administrator/components/com_fields/src/View/Field/HtmlView.php
index 647743895cb23..35e7cb6f2009a 100644
--- a/administrator/components/com_fields/src/View/Field/HtmlView.php
+++ b/administrator/components/com_fields/src/View/Field/HtmlView.php
@@ -78,6 +78,10 @@ public function display($tpl = null)
 
         $this->addToolbar();
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_fields/src/View/Fields/HtmlView.php b/administrator/components/com_fields/src/View/Fields/HtmlView.php
index 8f395bc2db3c7..da72c4a2e45e2 100644
--- a/administrator/components/com_fields/src/View/Fields/HtmlView.php
+++ b/administrator/components/com_fields/src/View/Fields/HtmlView.php
@@ -109,6 +109,11 @@ public function display($tpl = null)
             }
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_fields/src/View/Group/HtmlView.php b/administrator/components/com_fields/src/View/Group/HtmlView.php
index b6ebc8d9bd778..b870e4deed52a 100644
--- a/administrator/components/com_fields/src/View/Group/HtmlView.php
+++ b/administrator/components/com_fields/src/View/Group/HtmlView.php
@@ -96,6 +96,10 @@ public function display($tpl = null)
 
         $this->addToolbar();
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_fields/src/View/Groups/HtmlView.php b/administrator/components/com_fields/src/View/Groups/HtmlView.php
index b2c15e384f39e..92e6de5b6b02e 100644
--- a/administrator/components/com_fields/src/View/Groups/HtmlView.php
+++ b/administrator/components/com_fields/src/View/Groups/HtmlView.php
@@ -106,6 +106,11 @@ public function display($tpl = null)
             $this->filterForm->removeField('language', 'filter');
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_fields/tmpl/field/edit.php b/administrator/components/com_fields/tmpl/field/edit.php
index ff044f1040eca..a6e0eaa7585c6 100644
--- a/administrator/components/com_fields/tmpl/field/edit.php
+++ b/administrator/components/com_fields/tmpl/field/edit.php
@@ -95,7 +95,7 @@
         <?php endif; ?>
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
         <?php echo $this->form->getInput('context'); ?>
-        <input type="hidden" name="task" value="">
-        <?php echo HTMLHelper::_('form.token'); ?>
+
+        <?php echo $this->form->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_fields/tmpl/fields/default.php b/administrator/components/com_fields/tmpl/fields/default.php
index 0c237e1ddde3b..21955fd2e5079 100644
--- a/administrator/components/com_fields/tmpl/fields/default.php
+++ b/administrator/components/com_fields/tmpl/fields/default.php
@@ -210,9 +210,8 @@
                         <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
                     <?php endif; ?>
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_fields/tmpl/fields/modal.php b/administrator/components/com_fields/tmpl/fields/modal.php
index 717d6f07b9fd3..7a4e9794febcb 100644
--- a/administrator/components/com_fields/tmpl/fields/modal.php
+++ b/administrator/components/com_fields/tmpl/fields/modal.php
@@ -135,9 +135,6 @@
 
         <?php endif; ?>
 
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="boxchecked" value="0">
-        <?php echo HTMLHelper::_('form.token'); ?>
-
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </form>
 </div>
diff --git a/administrator/components/com_fields/tmpl/group/edit.php b/administrator/components/com_fields/tmpl/group/edit.php
index a527ca814d36a..9190bf7d937a0 100644
--- a/administrator/components/com_fields/tmpl/group/edit.php
+++ b/administrator/components/com_fields/tmpl/group/edit.php
@@ -78,7 +78,7 @@
         <?php endif; ?>
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
         <?php echo $this->form->getInput('context'); ?>
-        <input type="hidden" name="task" value="">
-        <?php echo HTMLHelper::_('form.token'); ?>
+
+        <?php echo $this->form->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_fields/tmpl/groups/default.php b/administrator/components/com_fields/tmpl/groups/default.php
index d72ad1d5cb4c9..6ead0edaf2600 100644
--- a/administrator/components/com_fields/tmpl/groups/default.php
+++ b/administrator/components/com_fields/tmpl/groups/default.php
@@ -178,9 +178,8 @@
                         <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
                     <?php endif; ?>
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_finder/helpers/indexer/adapter.php b/administrator/components/com_finder/helpers/indexer/adapter.php
deleted file mode 100644
index 0c4f653b6aae0..0000000000000
--- a/administrator/components/com_finder/helpers/indexer/adapter.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- *
- * @copyright   (C) 2011 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-\defined('_JEXEC') or die;
-
-/**
- * Finder Indexer Adapter class.
- *
- * @since       2.5
- *
- * @deprecated  4.3 will be removed in 6.0
- *              Use \Joomla\Component\Finder\Administrator\Indexer\Adapter instead
- */
diff --git a/administrator/components/com_finder/helpers/indexer/helper.php b/administrator/components/com_finder/helpers/indexer/helper.php
deleted file mode 100644
index 155fb6e74b641..0000000000000
--- a/administrator/components/com_finder/helpers/indexer/helper.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- *
- * @copyright   (C) 2011 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-\defined('_JEXEC') or die;
-
-/**
- * Finder Indexer Helper class.
- *
- * @since       2.5
- *
- * @deprecated  4.3 will be removed in 6.0
- *              Use \Joomla\Component\Finder\Administrator\Indexer\Helper instead
- */
diff --git a/administrator/components/com_finder/helpers/indexer/parser.php b/administrator/components/com_finder/helpers/indexer/parser.php
deleted file mode 100644
index 79465a956d971..0000000000000
--- a/administrator/components/com_finder/helpers/indexer/parser.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- *
- * @copyright   (C) 2011 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-\defined('_JEXEC') or die;
-
-/**
- * Finder Indexer Parser class.
- *
- * @since       2.5
- *
- * @deprecated  4.3 will be removed in 6.0
- *              5.0 Use \Joomla\Component\Finder\Administrator\Indexer\Parser instead
- */
diff --git a/administrator/components/com_finder/helpers/indexer/query.php b/administrator/components/com_finder/helpers/indexer/query.php
deleted file mode 100644
index a1bec5b312162..0000000000000
--- a/administrator/components/com_finder/helpers/indexer/query.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- *
- * @copyright   (C) 2011 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-\defined('_JEXEC') or die;
-
-/**
- * Finder Indexer Query class.
- *
- * @since       2.5
- *
- * @deprecated  4.3 will be removed in 6.0
- *              Use \Joomla\Component\Finder\Administrator\Indexer\Query instead
- */
diff --git a/administrator/components/com_finder/helpers/indexer/result.php b/administrator/components/com_finder/helpers/indexer/result.php
deleted file mode 100644
index 70c3ded2ab226..0000000000000
--- a/administrator/components/com_finder/helpers/indexer/result.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- *
- * @copyright   (C) 2011 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-\defined('_JEXEC') or die;
-
-/**
- * Finder Indexer Result class.
- *
- * @since       2.5
- *
- * @deprecated  4.3 will be removed in 6.0
- *              Use \Joomla\Component\Finder\Administrator\Indexer\Result instead
- */
diff --git a/administrator/components/com_finder/helpers/indexer/taxonomy.php b/administrator/components/com_finder/helpers/indexer/taxonomy.php
deleted file mode 100644
index e539e7f7d4391..0000000000000
--- a/administrator/components/com_finder/helpers/indexer/taxonomy.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- *
- * @copyright   (C) 2011 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-\defined('_JEXEC') or die;
-
-/**
- * Finder Indexer Taxonomy class.
- *
- * @since       2.5
- * @deprecated  4.3 will be removed in 6.0
- *              Use \Joomla\Component\Finder\Administrator\Indexer\Taxonomy instead
- */
diff --git a/administrator/components/com_finder/helpers/indexer/token.php b/administrator/components/com_finder/helpers/indexer/token.php
deleted file mode 100644
index 1d24a63a58562..0000000000000
--- a/administrator/components/com_finder/helpers/indexer/token.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_finder
- *
- * @copyright   (C) 2011 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-\defined('_JEXEC') or die;
-
-/**
- * Finder Indexer Token class.
- *
- * @since       2.5
- *
- * @deprecated  4.3 will be removed in 6.0
- *              Use \Joomla\Component\Finder\Administrator\Indexer\Token instead
- */
diff --git a/administrator/components/com_finder/helpers/language.php b/administrator/components/com_finder/helpers/language.php
index e66f1caa9f7ac..07f8342eb2334 100644
--- a/administrator/components/com_finder/helpers/language.php
+++ b/administrator/components/com_finder/helpers/language.php
@@ -21,7 +21,7 @@
  *
  * @since       2.5
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Finder\Administrator\Helper\LanguageHelper instead
  */
 class FinderHelperLanguage extends LanguageHelper
diff --git a/administrator/components/com_finder/src/Controller/IndexerController.php b/administrator/components/com_finder/src/Controller/IndexerController.php
index f1012745ce234..4291c4924ef4e 100644
--- a/administrator/components/com_finder/src/Controller/IndexerController.php
+++ b/administrator/components/com_finder/src/Controller/IndexerController.php
@@ -57,7 +57,6 @@ public function start()
         $dispatcher = $this->getDispatcher();
 
         if ($params->get('enable_logging', '0')) {
-            $options['format']    = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
             $options['text_file'] = 'indexer.php';
             Log::addLogger($options);
         }
@@ -129,7 +128,6 @@ public function batch()
         $dispatcher = $this->getDispatcher();
 
         if ($params->get('enable_logging', '0')) {
-            $options['format']    = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
             $options['text_file'] = 'indexer.php';
             Log::addLogger($options);
         }
@@ -284,7 +282,6 @@ public static function sendResponse($data = null)
         $params = ComponentHelper::getParams('com_finder');
 
         if ($params->get('enable_logging', '0')) {
-            $options['format']    = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
             $options['text_file'] = 'indexer.php';
             Log::addLogger($options);
         }
diff --git a/administrator/components/com_finder/src/Field/ContentmapField.php b/administrator/components/com_finder/src/Field/ContentmapField.php
index ea005dc8e581d..d38fc8cb48cf2 100644
--- a/administrator/components/com_finder/src/Field/ContentmapField.php
+++ b/administrator/components/com_finder/src/Field/ContentmapField.php
@@ -50,7 +50,7 @@ protected function getGroups()
         $db = $this->getDatabase();
 
         // Main query.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('a.title', 'text'))
             ->select($db->quoteName('a.id', 'value'))
             ->select($db->quoteName('a.parent_id'))
diff --git a/administrator/components/com_finder/src/Field/ContenttypesField.php b/administrator/components/com_finder/src/Field/ContenttypesField.php
index 45d78df38e5be..5e0eedc3afce7 100644
--- a/administrator/components/com_finder/src/Field/ContenttypesField.php
+++ b/administrator/components/com_finder/src/Field/ContenttypesField.php
@@ -49,7 +49,7 @@ public function getOptions()
         $options = [];
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id', 'value'))
             ->select($db->quoteName('title', 'text'))
             ->from($db->quoteName('#__finder_types'));
diff --git a/administrator/components/com_finder/src/Field/SearchfilterField.php b/administrator/components/com_finder/src/Field/SearchfilterField.php
index 7925b42e01ab9..e22ec7ddf9b47 100644
--- a/administrator/components/com_finder/src/Field/SearchfilterField.php
+++ b/administrator/components/com_finder/src/Field/SearchfilterField.php
@@ -44,7 +44,7 @@ public function getOptions()
     {
         // Build the query.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('f.title AS text, f.filter_id AS value')
             ->from($db->quoteName('#__finder_filters') . ' AS f')
             ->where('f.state = 1')
diff --git a/administrator/components/com_finder/src/Indexer/Adapter.php b/administrator/components/com_finder/src/Indexer/Adapter.php
index 0f25a148d22d7..48de309632dc5 100644
--- a/administrator/components/com_finder/src/Indexer/Adapter.php
+++ b/administrator/components/com_finder/src/Indexer/Adapter.php
@@ -292,8 +292,8 @@ public function onFinderGarbageCollection()
         $db      = $this->db;
         $type_id = $this->getTypeId();
 
-        $query    = $db->getQuery(true);
-        $subquery = $db->getQuery(true);
+        $query    = $db->createQuery();
+        $subquery = $db->createQuery();
         $subquery->select('CONCAT(' . $db->quote($this->getUrl('', $this->extension, $this->layout)) . ', id)')
             ->from($db->quoteName($this->table));
         $query->select($db->quoteName('l.link_id'))
@@ -336,7 +336,7 @@ protected function change($id, $property, $value)
         $item = $this->db->quote($this->getUrl($id, $this->extension, $this->layout));
 
         // Update the content items.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->update($this->db->quoteName('#__finder_links'))
             ->set($this->db->quoteName($property) . ' = ' . (int) $value)
             ->where($this->db->quoteName('url') . ' = ' . $item);
@@ -399,7 +399,7 @@ protected function remove($id, $removeTaxonomies = true)
         $url = $this->db->quote($this->getUrl($id, $this->extension, $this->layout));
 
         // Get the link ids for the content items.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('link_id'))
             ->from($this->db->quoteName('#__finder_links'))
             ->where($this->db->quoteName('url') . ' = ' . $url);
@@ -506,7 +506,7 @@ protected function categoryStateChange($pks, $value)
      */
     protected function checkCategoryAccess($row)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('access'))
             ->from($this->db->quoteName('#__categories'))
             ->where($this->db->quoteName('id') . ' = ' . (int) $row->id);
@@ -527,7 +527,7 @@ protected function checkCategoryAccess($row)
      */
     protected function checkItemAccess($row)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('access'))
             ->from($this->db->quoteName($this->table))
             ->where($this->db->quoteName('id') . ' = ' . (int) $row->id);
@@ -649,7 +649,7 @@ protected function getItems($offset, $limit, $query = null)
     protected function getListQuery($query = null)
     {
         // Check if we can use the supplied SQL query.
-        return $query instanceof QueryInterface ? $query : $this->db->getQuery(true);
+        return $query instanceof QueryInterface ? $query : $this->db->createQuery();
     }
 
     /**
@@ -664,7 +664,7 @@ protected function getListQuery($query = null)
     protected function getPluginType($id)
     {
         // Prepare the query
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('element'))
             ->from($this->db->quoteName('#__extensions'))
             ->where($this->db->quoteName('folder') . ' = ' . $this->db->quote('finder'))
@@ -684,7 +684,7 @@ protected function getPluginType($id)
      */
     protected function getStateQuery()
     {
-        $query = $this->db->getQuery(true);
+        $query = $this->db->createQuery();
 
         // Item ID
         $query->select('a.id');
@@ -712,7 +712,7 @@ protected function getStateQuery()
     protected function getUpdateQueryByTime($time)
     {
         // Build an SQL query based on the modified time.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->where('a.modified >= ' . $this->db->quote($time));
 
         return $query;
@@ -730,7 +730,7 @@ protected function getUpdateQueryByTime($time)
     protected function getUpdateQueryByIds($ids)
     {
         // Build an SQL query based on the item ids.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->where('a.id IN(' . implode(',', $ids) . ')');
 
         return $query;
@@ -747,7 +747,7 @@ protected function getUpdateQueryByIds($ids)
     protected function getTypeId()
     {
         // Get the type id from the database.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('id'))
             ->from($this->db->quoteName('#__finder_types'))
             ->where($this->db->quoteName('title') . ' = ' . $this->db->quote($this->type_title));
@@ -793,7 +793,7 @@ protected function getItemMenuTitle($url)
         $groups = implode(',', $user->getAuthorisedViewLevels());
 
         // Build a query to get the menu params.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('params'))
             ->from($this->db->quoteName('#__menu'))
             ->where($this->db->quoteName('link') . ' = ' . $this->db->quote($url))
diff --git a/administrator/components/com_finder/src/Indexer/DebugAdapter.php b/administrator/components/com_finder/src/Indexer/DebugAdapter.php
index 419a7607f7447..4bdb474ae2d57 100644
--- a/administrator/components/com_finder/src/Indexer/DebugAdapter.php
+++ b/administrator/components/com_finder/src/Indexer/DebugAdapter.php
@@ -291,8 +291,8 @@ public function onFinderGarbageCollection()
         $db      = $this->db;
         $type_id = $this->getTypeId();
 
-        $query    = $db->getQuery(true);
-        $subquery = $db->getQuery(true);
+        $query    = $db->createQuery();
+        $subquery = $db->createQuery();
         $subquery->select('CONCAT(' . $db->quote($this->getUrl('', $this->extension, $this->layout)) . ', id)')
             ->from($db->quoteName($this->table));
         $query->select($db->quoteName('l.link_id'))
@@ -335,7 +335,7 @@ protected function change($id, $property, $value)
         $item = $this->db->quote($this->getUrl($id, $this->extension, $this->layout));
 
         // Update the content items.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->update($this->db->quoteName('#__finder_links'))
             ->set($this->db->quoteName($property) . ' = ' . (int) $value)
             ->where($this->db->quoteName('url') . ' = ' . $item);
@@ -401,7 +401,7 @@ protected function remove($id, $removeTaxonomies = true)
         $url = $this->db->quote($this->getUrl($id, $this->extension, $this->layout));
 
         // Get the link ids for the content items.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('link_id'))
             ->from($this->db->quoteName('#__finder_links'))
             ->where($this->db->quoteName('url') . ' = ' . $url);
@@ -508,7 +508,7 @@ protected function categoryStateChange($pks, $value)
      */
     protected function checkCategoryAccess($row)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('access'))
             ->from($this->db->quoteName('#__categories'))
             ->where($this->db->quoteName('id') . ' = ' . (int) $row->id);
@@ -529,7 +529,7 @@ protected function checkCategoryAccess($row)
      */
     protected function checkItemAccess($row)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('access'))
             ->from($this->db->quoteName($this->table))
             ->where($this->db->quoteName('id') . ' = ' . (int) $row->id);
@@ -655,7 +655,7 @@ protected function getItems($offset, $limit, $query = null)
     protected function getListQuery($query = null)
     {
         // Check if we can use the supplied SQL query.
-        return $query instanceof QueryInterface ? $query : $this->db->getQuery(true);
+        return $query instanceof QueryInterface ? $query : $this->db->createQuery();
     }
 
     /**
@@ -670,7 +670,7 @@ protected function getListQuery($query = null)
     protected function getPluginType($id)
     {
         // Prepare the query
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('element'))
             ->from($this->db->quoteName('#__extensions'))
             ->where($this->db->quoteName('extension_id') . ' = ' . (int) $id);
@@ -689,7 +689,7 @@ protected function getPluginType($id)
      */
     protected function getStateQuery()
     {
-        $query = $this->db->getQuery(true);
+        $query = $this->db->createQuery();
 
         // Item ID
         $query->select('a.id');
@@ -717,7 +717,7 @@ protected function getStateQuery()
     protected function getUpdateQueryByTime($time)
     {
         // Build an SQL query based on the modified time.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->where('a.modified >= ' . $this->db->quote($time));
 
         return $query;
@@ -735,7 +735,7 @@ protected function getUpdateQueryByTime($time)
     protected function getUpdateQueryByIds($ids)
     {
         // Build an SQL query based on the item ids.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->where('a.id IN(' . implode(',', $ids) . ')');
 
         return $query;
@@ -752,7 +752,7 @@ protected function getUpdateQueryByIds($ids)
     protected function getTypeId()
     {
         // Get the type id from the database.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('id'))
             ->from($this->db->quoteName('#__finder_types'))
             ->where($this->db->quoteName('title') . ' = ' . $this->db->quote($this->type_title));
@@ -798,7 +798,7 @@ protected function getItemMenuTitle($url)
         $groups = implode(',', $user->getAuthorisedViewLevels());
 
         // Build a query to get the menu params.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('params'))
             ->from($this->db->quoteName('#__menu'))
             ->where($this->db->quoteName('link') . ' = ' . $this->db->quote($url))
diff --git a/administrator/components/com_finder/src/Indexer/Helper.php b/administrator/components/com_finder/src/Indexer/Helper.php
index b57cdbdb83de8..7e36e43bc6146 100644
--- a/administrator/components/com_finder/src/Indexer/Helper.php
+++ b/administrator/components/com_finder/src/Indexer/Helper.php
@@ -11,12 +11,14 @@
 namespace Joomla\Component\Finder\Administrator\Indexer;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\Event\Finder\PrepareContentEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Content;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 
@@ -228,7 +230,7 @@ public static function addContentType($title, $mime = null)
         static $types;
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Check if the types are loaded.
         if (empty($types)) {
@@ -321,7 +323,7 @@ public static function getCommonWords($lang)
         $db = Factory::getDbo();
 
         // Create the query to load all the common terms for the language.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('term'))
             ->from($db->quoteName('#__finder_terms_common'))
             ->where($db->quoteName('language') . ' = ' . $db->quote($lang));
@@ -472,7 +474,7 @@ public static function prepareContent($text, $params = null, ?Result $item = nul
         }
 
         // Create a mock content object.
-        $content       = Table::getInstance('Content');
+        $content       = new Content(Factory::getDbo());
         $content->text = $text;
 
         if ($item) {
@@ -485,7 +487,17 @@ public static function prepareContent($text, $params = null, ?Result $item = nul
         }
 
         // Fire the onContentPrepare event.
-        Factory::getApplication()->triggerEvent('onContentPrepare', ['com_finder.indexer', &$content, &$params, 0]);
+        Factory::getContainer()
+            ->get(DispatcherInterface::class)
+            ->dispatch(
+                'onContentPrepare',
+                new ContentPrepareEvent('onContentPrepare', [
+                    'context' => 'com_finder.indexer',
+                    'subject' => $content,
+                    'params'  => $params,
+                    'page'    => 0,
+                ])
+            );
 
         return $content->text;
     }
diff --git a/administrator/components/com_finder/src/Indexer/Indexer.php b/administrator/components/com_finder/src/Indexer/Indexer.php
index b8a5ddc407ef4..5a8784255ea0d 100644
--- a/administrator/components/com_finder/src/Indexer/Indexer.php
+++ b/administrator/components/com_finder/src/Indexer/Indexer.php
@@ -12,7 +12,6 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Profiler\Profiler;
 use Joomla\Database\DatabaseInterface;
@@ -83,7 +82,7 @@ class Indexer
     /**
      * The indexer state object.
      *
-     * @var    CMSObject
+     * @var    \stdClass
      * @since  2.5
      */
     public static $state;
@@ -122,14 +121,14 @@ class Indexer
     public function __construct(?DatabaseInterface $db = null)
     {
         if ($db === null) {
-            @trigger_error('Database will be mandatory in 5.0.', E_USER_DEPRECATED);
+            @trigger_error('Database will be mandatory in 7.0.', E_USER_DEPRECATED);
             $db = Factory::getContainer()->get(DatabaseInterface::class);
         }
 
         $this->db = $db;
 
         // Set up query template for addTokensToDb
-        $this->addTokensToDbQueryTemplate = $db->getQuery(true)->insert($db->quoteName('#__finder_tokens'))
+        $this->addTokensToDbQueryTemplate = $db->createQuery()->insert($db->quoteName('#__finder_tokens'))
             ->columns(
                 [
                     $db->quoteName('term'),
@@ -146,7 +145,7 @@ public function __construct(?DatabaseInterface $db = null)
     /**
      * Method to get the indexer state.
      *
-     * @return  CMSObject  The indexer state object.
+     * @return  \stdClass  The indexer state object.
      *
      * @since   2.5
      */
@@ -158,12 +157,12 @@ public static function getState()
         }
 
         // If we couldn't load from the internal state, try the session.
-        $session = Factory::getSession();
+        $session = Factory::getApplication()->getSession();
         $data    = $session->get('_finder.state', null);
 
         // If the state is empty, load the values for the first time.
         if (empty($data)) {
-            $data        = new CMSObject();
+            $data        = new \stdClass();
             $data->force = false;
 
             // Load the default configuration options.
@@ -228,7 +227,7 @@ public static function getState()
     /**
      * Method to set the indexer state.
      *
-     * @param   CMSObject  $data  A new indexer state object.
+     * @param   \stdClass  $data  A new indexer state object.
      *
      * @return  boolean  True on success, false on failure.
      *
@@ -237,7 +236,7 @@ public static function getState()
     public static function setState($data)
     {
         // Check the state object.
-        if (empty($data) || !$data instanceof CMSObject) {
+        if (empty($data) || !$data instanceof \stdClass) {
             return false;
         }
 
@@ -245,7 +244,7 @@ public static function setState($data)
         static::$state = $data;
 
         // Set the new session state.
-        Factory::getSession()->set('_finder.state', $data);
+        Factory::getApplication()->getSession()->set('_finder.state', $data);
 
         return true;
     }
@@ -263,7 +262,7 @@ public static function resetState()
         self::$state = null;
 
         // Reset the session state to null.
-        Factory::getSession()->set('_finder.state', null);
+        Factory::getApplication()->getSession()->set('_finder.state', null);
     }
 
     /**
@@ -285,7 +284,7 @@ public function index($item, $format = 'html')
         $serverType = strtolower($db->getServerType());
 
         // Check if the item is in the database.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('link_id') . ', ' . $db->quoteName('md5sum'))
             ->from($db->quoteName('#__finder_links'))
             ->where($db->quoteName('url') . ' = ' . $db->quote($item->url));
@@ -541,7 +540,7 @@ public function index($item, $format = 'html')
          * so we need to go back and update the aggregate table with all the
          * new term ids.
          */
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__finder_tokens_aggregate', 'ta'))
             ->innerJoin($db->quoteName('#__finder_terms', 't'), 't.term = ta.term AND t.language = ta.language')
             ->where('ta.term_id = 0');
@@ -651,7 +650,7 @@ public function index($item, $format = 'html')
     public function remove($linkId, $removeTaxonomies = true)
     {
         $db     = $this->db;
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $linkId = (int) $linkId;
 
         // Update the link counts for the terms.
@@ -713,25 +712,25 @@ public function optimize()
         $serverType = strtolower($db->getServerType());
 
         // Delete all broken links. (Links missing the object)
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete('#__finder_links')
             ->where($db->quoteName('object') . ' = ' . $db->quote(''));
         $db->setQuery($query);
         $db->execute();
 
         // Delete all orphaned mappings of terms to links
-        $query2 = $db->getQuery(true)
+        $query2 = $db->createQuery()
             ->select($db->quoteName('link_id'))
             ->from($db->quoteName('#__finder_links'));
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__finder_links_terms'))
             ->where($db->quoteName('link_id') . ' NOT IN (' . $query2 . ')');
         $db->setQuery($query);
         $db->execute();
 
         // Update count of links in terms table
-        $query  = $db->getQuery(true);
-        $query2 = $db->getQuery(true);
+        $query  = $db->createQuery();
+        $query2 = $db->createQuery();
         $query2->select('COUNT(lt.link_id)')
             ->from($db->quoteName('#__finder_links_terms', 'lt'))
             ->where($db->quoteName('lt.term_id') . ' = ' . $db->quoteName('t.term_id'));
@@ -741,7 +740,7 @@ public function optimize()
         $db->execute();
 
         // Delete all orphaned terms.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->delete($db->quoteName('#__finder_terms'))
             ->where($db->quoteName('links') . ' <= 0');
         $db->setQuery($query);
@@ -749,10 +748,10 @@ public function optimize()
 
 
         // Delete all orphaned terms
-        $query2 = $db->getQuery(true)
+        $query2 = $db->createQuery()
             ->select($db->quoteName('term_id'))
             ->from($db->quoteName('#__finder_links_terms'));
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__finder_terms'))
             ->where($db->quoteName('term_id') . ' NOT IN (' . $query2 . ')');
         $db->setQuery($query);
diff --git a/administrator/components/com_finder/src/Indexer/Query.php b/administrator/components/com_finder/src/Indexer/Query.php
index abcc2154a2f9b..405adc3fbca59 100644
--- a/administrator/components/com_finder/src/Indexer/Query.php
+++ b/administrator/components/com_finder/src/Indexer/Query.php
@@ -208,7 +208,7 @@ class Query
     public function __construct($options, ?DatabaseInterface $db = null)
     {
         if ($db === null) {
-            @trigger_error('Database will be mandatory in 5.0.', E_USER_DEPRECATED);
+            @trigger_error('Database will be mandatory in 7.0.', E_USER_DEPRECATED);
             $db = Factory::getContainer()->get(DatabaseInterface::class);
         }
 
@@ -505,7 +505,7 @@ protected function processStaticTaxonomy($filterId)
         $groups = implode(',', Factory::getUser()->getAuthorisedViewLevels());
 
         // Load the predefined filter.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('f.data, f.params')
             ->from($db->quoteName('#__finder_filters') . ' AS f')
             ->where('f.filter_id = ' . (int) $filterId);
@@ -609,7 +609,7 @@ protected function processDynamicTaxonomy($filters)
         // Get the database object.
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         /*
          * Create the query to get filters from the database. We do this for
@@ -1260,7 +1260,7 @@ protected function getTokenData($token)
         $db = $this->getDatabase();
 
         // Create a database query to build match the token.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('t.term, t.term_id')
             ->from('#__finder_terms AS t');
 
diff --git a/administrator/components/com_finder/src/Indexer/Taxonomy.php b/administrator/components/com_finder/src/Indexer/Taxonomy.php
index 28414eeef34bc..5091a21b92d4a 100644
--- a/administrator/components/com_finder/src/Indexer/Taxonomy.php
+++ b/administrator/components/com_finder/src/Indexer/Taxonomy.php
@@ -174,7 +174,7 @@ protected static function storeNode($node, $parentId)
 
         // Check to see if the node is in the table.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__finder_taxonomy'))
             ->where($db->quoteName('parent_id') . ' = ' . $db->quote($parentId))
@@ -277,7 +277,7 @@ public static function addMap($linkId, $nodeId)
         // Insert the map.
         $db = Factory::getDbo();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('link_id'))
             ->from($db->quoteName('#__finder_taxonomy_map'))
             ->where($db->quoteName('link_id') . ' = ' . (int) $linkId)
@@ -315,7 +315,7 @@ public static function getBranchTitles()
             $groups = implode(',', Factory::getUser()->getAuthorisedViewLevels());
 
             // Create a query to get the taxonomy branch titles.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__finder_taxonomy'))
                 ->where($db->quoteName('parent_id') . ' = 1')
@@ -350,7 +350,7 @@ public static function getNodeByTitle($branch, $title)
         $groups = implode(',', Factory::getUser()->getAuthorisedViewLevels());
 
         // Create a query to get the node.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('t1.*')
             ->from($db->quoteName('#__finder_taxonomy') . ' AS t1')
             ->join('INNER', $db->quoteName('#__finder_taxonomy') . ' AS t2 ON t2.id = t1.parent_id')
@@ -382,7 +382,7 @@ public static function removeMaps($linkId)
     {
         // Delete the maps.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__finder_taxonomy_map'))
             ->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
         $db->setQuery($query);
@@ -403,10 +403,10 @@ public static function removeOrphanMaps()
     {
         // Delete all orphaned maps
         $db     = Factory::getDbo();
-        $query2 = $db->getQuery(true)
+        $query2 = $db->createQuery()
             ->select($db->quoteName('link_id'))
             ->from($db->quoteName('#__finder_links'));
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__finder_taxonomy_map'))
             ->where($db->quoteName('link_id') . ' NOT IN (' . $query2 . ')');
         $db->setQuery($query);
@@ -430,8 +430,8 @@ public static function removeOrphanNodes()
         $affectedRows = 0;
         $db           = Factory::getDbo();
         $nodeTable    = new MapTable($db);
-        $query        = $db->getQuery(true);
-        $query2       = $db->getQuery(true);
+        $query        = $db->createQuery();
+        $query2       = $db->createQuery();
 
         $query->select($db->quoteName('t.id'))
             ->from($db->quoteName('#__finder_taxonomy', 't'))
@@ -473,7 +473,7 @@ public static function getTaxonomy($id = 0)
     {
         if (!\count(self::$taxonomies)) {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->select(['id','parent_id','lft','rgt','level','path','title','alias','state','access','language'])
                 ->from($db->quoteName('#__finder_taxonomy'))
diff --git a/administrator/components/com_finder/src/Model/FilterModel.php b/administrator/components/com_finder/src/Model/FilterModel.php
index f785e07312386..1e0b84e0d7f21 100644
--- a/administrator/components/com_finder/src/Model/FilterModel.php
+++ b/administrator/components/com_finder/src/Model/FilterModel.php
@@ -45,15 +45,13 @@ class FilterModel extends AdminModel
     /**
      * Custom clean cache method.
      *
-     * @param   string   $group     The component name. [optional]
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param   string  $group  The component name. [optional]
      *
      * @return  void
      *
      * @since   2.5
      */
-    protected function cleanCache($group = 'com_finder', $clientId = 0)
+    protected function cleanCache($group = 'com_finder')
     {
         parent::cleanCache($group);
     }
@@ -98,20 +96,14 @@ public function getFilter()
      * @param   array    $data      Data for the form. [optional]
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not. [optional]
      *
-     * @return  Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   2.5
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_finder.filter', 'filter', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_finder.filter', 'filter', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -145,7 +137,7 @@ protected function loadFormData()
     public function getTotal()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('MAX(link_id)')
             ->from('#__finder_links');
 
diff --git a/administrator/components/com_finder/src/Model/FiltersModel.php b/administrator/components/com_finder/src/Model/FiltersModel.php
index ec05f535ba67e..23d98fbf8a932 100644
--- a/administrator/components/com_finder/src/Model/FiltersModel.php
+++ b/administrator/components/com_finder/src/Model/FiltersModel.php
@@ -61,7 +61,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select all fields from the table.
         $query->select('a.*')
diff --git a/administrator/components/com_finder/src/Model/IndexModel.php b/administrator/components/com_finder/src/Model/IndexModel.php
index b8cb0f99e005c..e2a903b861b7d 100644
--- a/administrator/components/com_finder/src/Model/IndexModel.php
+++ b/administrator/components/com_finder/src/Model/IndexModel.php
@@ -11,6 +11,9 @@
 namespace Joomla\Component\Finder\Administrator\Model;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model\AfterChangeStateEvent;
+use Joomla\CMS\Event\Model\AfterDeleteEvent;
+use Joomla\CMS\Event\Model\BeforeDeleteEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
@@ -123,7 +126,8 @@ public function delete(&$pks)
         $table = $this->getTable();
 
         // Include the content plugins for the on delete events.
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         // Iterate the items to delete each one.
         foreach ($pks as $i => $pk) {
@@ -132,7 +136,13 @@ public function delete(&$pks)
                     $context = $this->option . '.' . $this->name;
 
                     // Trigger the onContentBeforeDelete event.
-                    $result = Factory::getApplication()->triggerEvent($this->event_before_delete, [$context, $table]);
+                    $result = $dispatcher->dispatch(
+                        $this->event_before_delete,
+                        new BeforeDeleteEvent($this->event_before_delete, [
+                            'context' => $context,
+                            'subject' => $table,
+                        ])
+                    )->getArgument('result', []);
 
                     if (\in_array(false, $result, true)) {
                         $this->setError($table->getError());
@@ -147,7 +157,13 @@ public function delete(&$pks)
                     }
 
                     // Trigger the onContentAfterDelete event.
-                    Factory::getApplication()->triggerEvent($this->event_after_delete, [$context, $table]);
+                    $dispatcher->dispatch(
+                        $this->event_after_delete,
+                        new AfterDeleteEvent($this->event_after_delete, [
+                            'context' => $context,
+                            'subject' => $table,
+                        ])
+                    );
                 } else {
                     // Prune items that you can't change.
                     unset($pks[$i]);
@@ -182,7 +198,7 @@ public function delete(&$pks)
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('l.*')
             ->select($db->quoteName('t.title', 't_title'))
             ->from($db->quoteName('#__finder_links', 'l'))
@@ -259,7 +275,7 @@ protected function getListQuery()
     public function getPluginState()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('name, enabled')
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -304,7 +320,7 @@ protected function getStoreId($id = '')
     public function getTotalIndexed()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(link_id)')
             ->from($db->quoteName('#__finder_links'));
         $db->setQuery($query);
@@ -419,7 +435,8 @@ public function publish(&$pks, $value = 1)
         $pks   = (array) $pks;
 
         // Include the content plugins for the change of state event.
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         // Access checks.
         foreach ($pks as $i => $pk) {
@@ -444,7 +461,14 @@ public function publish(&$pks, $value = 1)
         $context = $this->option . '.' . $this->name;
 
         // Trigger the onContentChangeState event.
-        $result = Factory::getApplication()->triggerEvent('onContentChangeState', [$context, $pks, $value]);
+        $result = $dispatcher->dispatch(
+            'onContentChangeState',
+            new AfterChangeStateEvent('onContentChangeState', [
+                'context' => $context,
+                'subject' => $pks,
+                'value'   => $value,
+            ])
+        )->getArgument('result', []);
 
         if (\in_array(false, $result, true)) {
             $this->setError($table->getError());
diff --git a/administrator/components/com_finder/src/Model/IndexerModel.php b/administrator/components/com_finder/src/Model/IndexerModel.php
index cdef667e77c08..4319a660ab417 100644
--- a/administrator/components/com_finder/src/Model/IndexerModel.php
+++ b/administrator/components/com_finder/src/Model/IndexerModel.php
@@ -38,13 +38,6 @@ class IndexerModel extends FormModel
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_finder.indexer', 'indexer', ['control' => '', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_finder.indexer', 'indexer', ['control' => '', 'load_data' => $loadData]);
     }
 }
diff --git a/administrator/components/com_finder/src/Model/ItemModel.php b/administrator/components/com_finder/src/Model/ItemModel.php
index fdb9b268bc054..cdeaf3b1a44be 100644
--- a/administrator/components/com_finder/src/Model/ItemModel.php
+++ b/administrator/components/com_finder/src/Model/ItemModel.php
@@ -46,7 +46,7 @@ public function getItem()
     {
         $link_id = (int) $this->getState('item.link_id');
         $db      = $this->getDatabase();
-        $query   = $db->getQuery(true)
+        $query   = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__finder_links', 'l'))
             ->where($db->quoteName('l.link_id') . ' = :link_id')
@@ -68,7 +68,7 @@ public function getTerms()
     {
         $link_id = (int) $this->getState('item.link_id');
         $db      = $this->getDatabase();
-        $query   = $db->getQuery(true)
+        $query   = $db->createQuery()
             ->select('t.*, l.*')
             ->from($db->quoteName('#__finder_links_terms', 'l'))
             ->leftJoin($db->quoteName('#__finder_terms', 't') . ' ON ' . $db->quoteName('t.term_id') . ' = ' . $db->quoteName('l.term_id'))
@@ -92,7 +92,7 @@ public function getTaxonomies()
     {
         $link_id = (int) $this->getState('item.link_id');
         $db      = $this->getDatabase();
-        $query   = $db->getQuery(true)
+        $query   = $db->createQuery()
             ->select('t.*, m.*')
             ->from($db->quoteName('#__finder_taxonomy_map', 'm'))
             ->leftJoin($db->quoteName('#__finder_taxonomy', 't') . ' ON ' . $db->quoteName('t.id') . ' = ' . $db->quoteName('m.node_id'))
diff --git a/administrator/components/com_finder/src/Model/MapsModel.php b/administrator/components/com_finder/src/Model/MapsModel.php
index 98231c4d188bf..ce9842149a554 100644
--- a/administrator/components/com_finder/src/Model/MapsModel.php
+++ b/administrator/components/com_finder/src/Model/MapsModel.php
@@ -11,7 +11,9 @@
 namespace Joomla\Component\Finder\Administrator\Model;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
+use Joomla\CMS\Event\Model\AfterChangeStateEvent;
+use Joomla\CMS\Event\Model\AfterDeleteEvent;
+use Joomla\CMS\Event\Model\BeforeDeleteEvent;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
@@ -98,7 +100,8 @@ public function delete(&$pks)
         $table = $this->getTable();
 
         // Include the content plugins for the on delete events.
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         // Iterate the items to check if all of them exist.
         foreach ($pks as $i => $pk) {
@@ -117,7 +120,13 @@ public function delete(&$pks)
                     $context = $this->option . '.' . $this->name;
 
                     // Trigger the onContentBeforeDelete event.
-                    $result = Factory::getApplication()->triggerEvent('onContentBeforeDelete', [$context, $table]);
+                    $result = $dispatcher->dispatch(
+                        'onContentBeforeDelete',
+                        new BeforeDeleteEvent('onContentBeforeDelete', [
+                            'context' => $context,
+                            'subject' => $table,
+                        ])
+                    )->getArgument('result', []);
 
                     if (\in_array(false, $result, true)) {
                         $this->setError($table->getError());
@@ -132,7 +141,10 @@ public function delete(&$pks)
                     }
 
                     // Trigger the onContentAfterDelete event.
-                    Factory::getApplication()->triggerEvent('onContentAfterDelete', [$context, $table]);
+                    $dispatcher->dispatch('onContentAfterDelete', new AfterDeleteEvent('onContentAfterDelete', [
+                        'context' => $context,
+                        'subject' => $table,
+                    ]));
                 } else {
                     // Prune items that you can't change.
                     unset($pks[$i]);
@@ -165,7 +177,7 @@ protected function getListQuery()
         $db = $this->getDatabase();
 
         // Select all fields from the table.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('a.id, a.parent_id, a.lft, a.rgt, a.level, a.path, a.title, a.alias, a.state, a.access, a.language')
             ->from($db->quoteName('#__finder_taxonomy', 'a'))
             ->where('a.parent_id != 0');
@@ -175,7 +187,7 @@ protected function getListQuery()
             ->leftJoin($db->quoteName('#__finder_taxonomy', 'b') . ' ON b.level = 1 AND b.lft <= a.lft AND a.rgt <= b.rgt');
 
         // Join to get the map links.
-        $stateQuery = $db->getQuery(true)
+        $stateQuery = $db->createQuery()
             ->select('m.node_id')
             ->select('COUNT(NULLIF(l.published, 0)) AS count_published')
             ->select('COUNT(NULLIF(l.published, 1)) AS count_unpublished')
@@ -314,7 +326,8 @@ public function publish(&$pks, $value = 1)
         $pks   = (array) $pks;
 
         // Include the content plugins for the change of state event.
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         // Access checks.
         foreach ($pks as $i => $pk) {
@@ -339,7 +352,14 @@ public function publish(&$pks, $value = 1)
         $context = $this->option . '.' . $this->name;
 
         // Trigger the onContentChangeState event.
-        $result = Factory::getApplication()->triggerEvent('onContentChangeState', [$context, $pks, $value]);
+        $result = $dispatcher->dispatch(
+            'onContentChangeState',
+            new AfterChangeStateEvent('onContentChangeState', [
+                'context' => $context,
+                'subject' => $pks,
+                'value'   => $value,
+            ])
+        )->getArgument('result', []);
 
         if (\in_array(false, $result, true)) {
             $this->setError($table->getError());
@@ -363,7 +383,7 @@ public function publish(&$pks, $value = 1)
     public function purge()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__finder_taxonomy'))
             ->where($db->quoteName('parent_id') . ' > 1');
         $db->setQuery($query);
diff --git a/administrator/components/com_finder/src/Model/SearchesModel.php b/administrator/components/com_finder/src/Model/SearchesModel.php
index 5cdff1385b1c2..6ae77a2022e39 100644
--- a/administrator/components/com_finder/src/Model/SearchesModel.php
+++ b/administrator/components/com_finder/src/Model/SearchesModel.php
@@ -105,7 +105,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
diff --git a/administrator/components/com_finder/src/Model/StatisticsModel.php b/administrator/components/com_finder/src/Model/StatisticsModel.php
index 8845712b15b58..2d066e0cca76c 100644
--- a/administrator/components/com_finder/src/Model/StatisticsModel.php
+++ b/administrator/components/com_finder/src/Model/StatisticsModel.php
@@ -12,7 +12,6 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -29,7 +28,7 @@ class StatisticsModel extends BaseDatabaseModel
     /**
      * Method to get the component statistics
      *
-     * @return  CMSObject The component statistics
+     * @return  \stdClass The component statistics
      *
      * @since   2.5
      */
@@ -37,8 +36,8 @@ public function getData()
     {
         // Initialise
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
-        $data  = new CMSObject();
+        $query = $db->createQuery();
+        $data  = new \stdClass();
 
         $query->select('COUNT(term_id)')
             ->from($db->quoteName('#__finder_terms'));
diff --git a/administrator/components/com_finder/src/Response/Response.php b/administrator/components/com_finder/src/Response/Response.php
index 39691a8520f84..5737670b40874 100644
--- a/administrator/components/com_finder/src/Response/Response.php
+++ b/administrator/components/com_finder/src/Response/Response.php
@@ -142,7 +142,6 @@ public function __construct($state)
         $params = ComponentHelper::getParams('com_finder');
 
         if ($params->get('enable_logging', '0')) {
-            $options['format']    = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
             $options['text_file'] = 'indexer.php';
             Log::addLogger($options);
         }
diff --git a/administrator/components/com_finder/src/Service/HTML/Filter.php b/administrator/components/com_finder/src/Service/HTML/Filter.php
index 7a0c7c8531cdb..3080879d91d13 100644
--- a/administrator/components/com_finder/src/Service/HTML/Filter.php
+++ b/administrator/components/com_finder/src/Service/HTML/Filter.php
@@ -47,7 +47,7 @@ class Filter
     public function slider($options = [])
     {
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $user   = Factory::getUser();
         $groups = implode(',', $user->getAuthorisedViewLevels());
         $html   = '';
@@ -225,7 +225,7 @@ public function select($idxQuery, $options)
             $branches = $cache->get($cacheId);
         } else {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Load the predefined filter if specified.
             if (!empty($idxQuery->filter)) {
diff --git a/administrator/components/com_finder/src/Service/HTML/Finder.php b/administrator/components/com_finder/src/Service/HTML/Finder.php
index fa62a601879e0..fad16340e01f7 100644
--- a/administrator/components/com_finder/src/Service/HTML/Finder.php
+++ b/administrator/components/com_finder/src/Service/HTML/Finder.php
@@ -41,7 +41,7 @@ public function typeslist()
     {
         // Load the finder types.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT t.title AS text, t.id AS value')
             ->from($db->quoteName('#__finder_types') . ' AS t')
             ->join('LEFT', $db->quoteName('#__finder_links') . ' AS l ON l.type_id = t.id')
@@ -78,7 +78,7 @@ public function mapslist()
     {
         // Load the finder types.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title', 'text'))
             ->select($db->quoteName('id', 'value'))
             ->from($db->quoteName('#__finder_taxonomy'))
diff --git a/administrator/components/com_finder/src/View/Filter/HtmlView.php b/administrator/components/com_finder/src/View/Filter/HtmlView.php
index dc0cbebf16502..08d9458b489cb 100644
--- a/administrator/components/com_finder/src/View/Filter/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Filter/HtmlView.php
@@ -110,6 +110,11 @@ public function display($tpl = null)
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task')
+            ->addControlField('return', Factory::getApplication()->getInput()->get('return', '', 'BASE64'));
+
         // Configure the toolbar.
         $this->addToolbar();
 
diff --git a/administrator/components/com_finder/src/View/Filters/HtmlView.php b/administrator/components/com_finder/src/View/Filters/HtmlView.php
index 555aec748934c..c1d040b1e334f 100644
--- a/administrator/components/com_finder/src/View/Filters/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Filters/HtmlView.php
@@ -112,9 +112,10 @@ public function display($tpl = null)
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
 
-        if (\count($this->items) === 0 && $this->isEmptyState = $model->getIsEmptyState()) {
-            $this->setLayout('emptystate');
-        }
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
 
         // Configure the toolbar.
         $this->addToolbar();
diff --git a/administrator/components/com_finder/src/View/Index/HtmlView.php b/administrator/components/com_finder/src/View/Index/HtmlView.php
index 5434f680f1152..431da29241a32 100644
--- a/administrator/components/com_finder/src/View/Index/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Index/HtmlView.php
@@ -166,6 +166,11 @@ public function display($tpl = null)
             $this->finderPlugins = false;
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         // Configure the toolbar.
         $this->addToolbar();
 
diff --git a/administrator/components/com_finder/src/View/Maps/HtmlView.php b/administrator/components/com_finder/src/View/Maps/HtmlView.php
index f9bc5d7be75bc..8b8af14c9fd9d 100644
--- a/administrator/components/com_finder/src/View/Maps/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Maps/HtmlView.php
@@ -120,6 +120,11 @@ public function display($tpl = null)
             $this->setLayout('emptystate');
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task', 'display')
+            ->addControlField('boxchecked', '0');
+
         // Prepare the view.
         $this->addToolbar();
 
diff --git a/administrator/components/com_finder/src/View/Searches/HtmlView.php b/administrator/components/com_finder/src/View/Searches/HtmlView.php
index f2af9b33c6d46..27d6c21313f4f 100644
--- a/administrator/components/com_finder/src/View/Searches/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Searches/HtmlView.php
@@ -132,6 +132,11 @@ public function display($tpl = null)
             }
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         // Prepare the view.
         $this->addToolbar();
 
diff --git a/administrator/components/com_finder/src/View/Statistics/HtmlView.php b/administrator/components/com_finder/src/View/Statistics/HtmlView.php
index c4fbcb5aad878..635f690058f19 100644
--- a/administrator/components/com_finder/src/View/Statistics/HtmlView.php
+++ b/administrator/components/com_finder/src/View/Statistics/HtmlView.php
@@ -27,7 +27,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The index statistics
      *
-     * @var    \Joomla\CMS\Object\CMSObject
+     * @var    \stdClass
      *
      * @since  3.6.1
      */
diff --git a/administrator/components/com_finder/tmpl/filter/edit.php b/administrator/components/com_finder/tmpl/filter/edit.php
index 8d0f660cffe46..10c4e69139e60 100644
--- a/administrator/components/com_finder/tmpl/filter/edit.php
+++ b/administrator/components/com_finder/tmpl/filter/edit.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -87,8 +86,6 @@
 
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="return" value="<?php echo Factory::getApplication()->getInput()->get('return', '', 'BASE64'); ?>">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->form->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php
index a75c842ed8ec5..88e5acbbc7bdb 100644
--- a/administrator/components/com_finder/tmpl/filters/default.php
+++ b/administrator/components/com_finder/tmpl/filters/default.php
@@ -124,9 +124,8 @@
                     <?php echo $this->pagination->getListFooter(); ?>
 
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_finder/tmpl/filters/emptystate.php b/administrator/components/com_finder/tmpl/filters/emptystate.php
index 416a26b972689..a4597ea2e1fe3 100644
--- a/administrator/components/com_finder/tmpl/filters/emptystate.php
+++ b/administrator/components/com_finder/tmpl/filters/emptystate.php
@@ -18,11 +18,13 @@
 $displayData = [
     'textPrefix' => 'COM_FINDER',
     'formURL'    => 'index.php?option=com_finder&view=filters',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Smart_Search_quickstart_guide',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/smart-search/smart-search-smart-search-quickstart-guide',
     'icon'       => 'icon-search-plus finder',
     'btnadd'     => Text::_('COM_FINDER_FILTERS_EMPTYSTATE_BUTTON_ADD'),
     'content'    => Text::_('COM_FINDER_FILTERS_EMPTYSTATE_CONTENT'),
     'title'      => Text::_('COM_FINDER_FILTERS_TOOLBAR_TITLE'),
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 if ($this->getCurrentUser()->authorise('core.create', 'com_finder')) {
diff --git a/administrator/components/com_finder/tmpl/index/default.php b/administrator/components/com_finder/tmpl/index/default.php
index da5fe365c863c..10065d9d8ed3c 100644
--- a/administrator/components/com_finder/tmpl/index/default.php
+++ b/administrator/components/com_finder/tmpl/index/default.php
@@ -169,9 +169,7 @@
                     <?php echo $this->pagination->getListFooter(); ?>
                 <?php endif; ?>
 
-                <input type="hidden" name="task" value="display">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_finder/tmpl/index/emptystate.php b/administrator/components/com_finder/tmpl/index/emptystate.php
index 10a2395144ea6..694932c5cc6b7 100644
--- a/administrator/components/com_finder/tmpl/index/emptystate.php
+++ b/administrator/components/com_finder/tmpl/index/emptystate.php
@@ -21,11 +21,13 @@
 $displayData = [
     'textPrefix' => 'COM_FINDER',
     'formURL'    => 'index.php?option=com_finder&view=index',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Smart_Search_quickstart_guide',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/smart-search/smart-search-smart-search-quickstart-guides',
     'icon'       => 'icon-search-plus finder',
     'content'    => Text::_('COM_FINDER_INDEX_NO_DATA') . '<br>' . Text::_('COM_FINDER_INDEX_TIP'),
     'title'      => Text::_('COM_FINDER_HEADING_INDEXER'),
     'createURL'  => "javascript:document.getElementsByClassName('button-index')[0].click();",
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 echo LayoutHelper::render('joomla.content.emptystate', $displayData);
diff --git a/administrator/components/com_finder/tmpl/indexer/debug.php b/administrator/components/com_finder/tmpl/indexer/debug.php
index 2cfad37dd97ba..d948819afca00 100644
--- a/administrator/components/com_finder/tmpl/indexer/debug.php
+++ b/administrator/components/com_finder/tmpl/indexer/debug.php
@@ -10,7 +10,7 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -37,7 +37,7 @@
                     <?php echo $this->form->renderField('plugin'); ?>
                     <?php echo $this->form->renderField('id'); ?>
 
-                    <input id="finder-indexer-token" type="hidden" name="<?php echo Factory::getSession()->getFormToken(); ?>" value="1">
+                    <?php echo HTMLHelper::_('form.token', ['id' => 'finder-indexer-token']); ?>
                 </fieldset>
             </div>
         </div>
diff --git a/administrator/components/com_finder/tmpl/indexer/default.php b/administrator/components/com_finder/tmpl/indexer/default.php
index db3ca5a37d173..6e16d033ca958 100644
--- a/administrator/components/com_finder/tmpl/indexer/default.php
+++ b/administrator/components/com_finder/tmpl/indexer/default.php
@@ -10,7 +10,7 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
 /** @var \Joomla\Component\Finder\Administrator\View\Indexer\HtmlView $this */
@@ -39,5 +39,5 @@
     <dl id="finder-debug-data" class="row">
     </dl>
     <?php endif; ?>
-    <input id="finder-indexer-token" type="hidden" name="<?php echo Factory::getSession()->getFormToken(); ?>" value="1">
+    <?php echo HTMLHelper::_('form.token', ['id' => 'finder-indexer-token']); ?>
 </div>
diff --git a/administrator/components/com_finder/tmpl/maps/default.php b/administrator/components/com_finder/tmpl/maps/default.php
index 2b9ca870ffecc..1e14cc6b72653 100644
--- a/administrator/components/com_finder/tmpl/maps/default.php
+++ b/administrator/components/com_finder/tmpl/maps/default.php
@@ -168,9 +168,7 @@
                 <?php endif; ?>
             </div>
 
-            <input type="hidden" name="task" value="display">
-            <input type="hidden" name="boxchecked" value="0">
-            <?php echo HTMLHelper::_('form.token'); ?>
+            <?php echo $this->filterForm->renderControlFields(); ?>
         </div>
     </div>
 </form>
diff --git a/administrator/components/com_finder/tmpl/maps/emptystate.php b/administrator/components/com_finder/tmpl/maps/emptystate.php
index 00bb16722d867..a7337a0766db4 100644
--- a/administrator/components/com_finder/tmpl/maps/emptystate.php
+++ b/administrator/components/com_finder/tmpl/maps/emptystate.php
@@ -18,7 +18,9 @@
     'formURL'    => 'index.php?option=com_finder&view=maps',
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Smart_Search:_Content_Maps',
     'icon'       => 'icon-search-plus finder',
-    'title'      => Text::_('COM_FINDER_MAPS_TOOLBAR_TITLE')
+    'title'      => Text::_('COM_FINDER_MAPS_TOOLBAR_TITLE'),
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 echo LayoutHelper::render('joomla.content.emptystate', $displayData);
diff --git a/administrator/components/com_finder/tmpl/searches/default.php b/administrator/components/com_finder/tmpl/searches/default.php
index e6cf3b29731e4..d892b3163ecb9 100644
--- a/administrator/components/com_finder/tmpl/searches/default.php
+++ b/administrator/components/com_finder/tmpl/searches/default.php
@@ -76,9 +76,8 @@
                     <?php echo $this->pagination->getListFooter(); ?>
 
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_finder/tmpl/searches/emptystate.php b/administrator/components/com_finder/tmpl/searches/emptystate.php
index 31d49307f0a37..3534093a67c53 100644
--- a/administrator/components/com_finder/tmpl/searches/emptystate.php
+++ b/administrator/components/com_finder/tmpl/searches/emptystate.php
@@ -20,6 +20,8 @@
     'icon'       => 'icon-search',
     'title'      => Text::_('COM_FINDER_MANAGER_SEARCHES'),
     'content'    => Text::_('COM_FINDER_EMPTYSTATE_SEARCHES_CONTENT'),
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 echo LayoutHelper::render('joomla.content.emptystate', $displayData);
diff --git a/administrator/components/com_guidedtours/src/Model/StepModel.php b/administrator/components/com_guidedtours/src/Model/StepModel.php
index e78e4a221ef0b..4bbba92039c66 100644
--- a/administrator/components/com_guidedtours/src/Model/StepModel.php
+++ b/administrator/components/com_guidedtours/src/Model/StepModel.php
@@ -11,6 +11,7 @@
 namespace Joomla\Component\Guidedtours\Administrator\Model;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Table\Table;
@@ -129,7 +130,7 @@ protected function prepareTable($table)
             // Set ordering to the last item if not set
             if (empty($table->ordering)) {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('MAX(ordering)')
                     ->from($db->quoteName('#__guidedtour_steps'));
                 $db->setQuery($query);
@@ -167,9 +168,10 @@ public function getTable($type = 'Step', $prefix = 'Administrator', $config = []
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \JForm|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   4.3.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -183,10 +185,6 @@ public function getForm($data = [], $loadData = true)
             ]
         );
 
-        if (empty($form)) {
-            return false;
-        }
-
         $id = $data['id'] ?? $form->getValue('id');
 
         $item = $this->getItem($id);
diff --git a/administrator/components/com_guidedtours/src/Model/StepsModel.php b/administrator/components/com_guidedtours/src/Model/StepsModel.php
index d3daaa4685b81..1a6886b56c6f5 100644
--- a/administrator/components/com_guidedtours/src/Model/StepsModel.php
+++ b/administrator/components/com_guidedtours/src/Model/StepsModel.php
@@ -148,7 +148,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
diff --git a/administrator/components/com_guidedtours/src/Model/TourModel.php b/administrator/components/com_guidedtours/src/Model/TourModel.php
index d39e479885b25..11363b2a8e504 100644
--- a/administrator/components/com_guidedtours/src/Model/TourModel.php
+++ b/administrator/components/com_guidedtours/src/Model/TourModel.php
@@ -11,11 +11,13 @@
 namespace Joomla\Component\Guidedtours\Administrator\Model;
 
 use Joomla\CMS\Date\Date;
+use Joomla\CMS\Event\Model\AfterDeleteEvent;
+use Joomla\CMS\Event\Model\BeforeDeleteEvent;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Component\Guidedtours\Administrator\Helper\GuidedtoursHelper;
 use Joomla\Database\ParameterType;
@@ -105,7 +107,7 @@ protected function prepareTable($table)
             // Set ordering to the last item if not set
             if (empty($table->ordering)) {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('MAX(ordering)')
                     ->from($db->quoteName('#__guidedtours'));
                 $db->setQuery($query);
@@ -126,9 +128,10 @@ protected function prepareTable($table)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return \JForm|boolean  A Form object on success, false on failure
+     * @return Form  A Form object
      *
      * @since  4.3.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -142,10 +145,6 @@ public function getForm($data = [], $loadData = true)
             ]
         );
 
-        if (empty($form)) {
-            return false;
-        }
-
         $id = $data['id'] ?? $form->getValue('id');
 
         $item = $this->getItem($id);
@@ -221,9 +220,9 @@ public function getItem($pk = null)
             return false;
         }
 
-        // Convert to the CMSObject before adding other data.
+        // Convert to an object before adding other data.
         $properties = $table->getProperties(1);
-        $item       = ArrayHelper::toObject($properties, CMSObject::class);
+        $item       = ArrayHelper::toObject($properties);
 
         if (property_exists($item, 'params')) {
             $registry     = new Registry($item->params);
@@ -257,7 +256,8 @@ public function delete(&$pks)
         $table = $this->getTable();
 
         // Include the plugins for the delete events.
-        PluginHelper::importPlugin($this->events_map['delete']);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['delete'], null, true, $dispatcher);
 
         // Iterate the items to delete each one.
         foreach ($pks as $i => $pk) {
@@ -266,7 +266,13 @@ public function delete(&$pks)
                     $context = $this->option . '.' . $this->name;
 
                     // Trigger the before delete event.
-                    $result = Factory::getApplication()->triggerEvent($this->event_before_delete, [$context, $table]);
+                    $result = $dispatcher->dispatch(
+                        $this->event_before_delete,
+                        new BeforeDeleteEvent($this->event_before_delete, [
+                            'context' => $context,
+                            'subject' => $table,
+                        ])
+                    )->getArgument('result', []);
 
                     if (\in_array(false, $result, true)) {
                         $this->setError($table->getError());
@@ -284,14 +290,20 @@ public function delete(&$pks)
 
                     // Delete of the tour has been successful, now delete the steps
                     $db    = $this->getDatabase();
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->delete($db->quoteName('#__guidedtour_steps'))
                         ->where($db->quoteName('tour_id') . '=' . $tourId);
                     $db->setQuery($query);
                     $db->execute();
 
                     // Trigger the after event.
-                    Factory::getApplication()->triggerEvent($this->event_after_delete, [$context, $table]);
+                    $dispatcher->dispatch(
+                        $this->event_after_delete,
+                        new AfterDeleteEvent($this->event_after_delete, [
+                            'context' => $context,
+                            'subject' => $table,
+                        ])
+                    );
                 } else {
                     // Prune items that you can't change.
                     unset($pks[$i]);
@@ -356,7 +368,7 @@ public function duplicate(&$pks)
 
                 $pk = (int) $pk;
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select(
                         $db->quoteName(
                             [
@@ -386,7 +398,7 @@ public function duplicate(&$pks)
                 $rows = $db->loadObjectList();
 
                 if ($rows) {
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->insert($db->quoteName('#__guidedtour_steps'))
                         ->columns(
                             [
@@ -495,7 +507,7 @@ protected function setStepsLanguage(int $id, string $language = '*'): bool
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__guidedtour_steps'))
             ->set($db->quoteName('language') . ' = :language')
             ->where($db->quoteName('tour_id') . ' = :tourId')
@@ -518,7 +530,7 @@ public function setAutostart($id, $autostart)
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__guidedtours'))
             ->set($db->quoteName('autostart') . ' = :autostart')
             ->where($db->quoteName('id') . ' = :tourId')
@@ -542,7 +554,7 @@ public function isAutostart($pk): bool
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('autostart'))
             ->from($db->quoteName('#__guidedtours'))
             ->where($db->quoteName('published') . ' = 1');
@@ -587,7 +599,7 @@ public function saveTourUserState($id, $state = ''): bool
         $profileKey = 'guidedtour.id.' . $id;
 
         // Check if the profile key already exists.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('profile_value'))
             ->from($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = :user_id')
diff --git a/administrator/components/com_guidedtours/src/Model/ToursModel.php b/administrator/components/com_guidedtours/src/Model/ToursModel.php
index 3179b7d79f91c..6f0358dcb0735 100644
--- a/administrator/components/com_guidedtours/src/Model/ToursModel.php
+++ b/administrator/components/com_guidedtours/src/Model/ToursModel.php
@@ -113,7 +113,7 @@ public function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
@@ -123,7 +123,7 @@ public function getListQuery()
             )
         );
 
-        $subQuery = $db->getQuery(true)
+        $subQuery = $db->createQuery()
             ->select('COUNT(' . $db->quoteName('s.id') . ')')
             ->from($db->quoteName('#__guidedtour_steps', 's'))
             ->where(
diff --git a/administrator/components/com_guidedtours/src/View/Step/HtmlView.php b/administrator/components/com_guidedtours/src/View/Step/HtmlView.php
index 47f974e1092cb..01a1fdff9fc60 100644
--- a/administrator/components/com_guidedtours/src/View/Step/HtmlView.php
+++ b/administrator/components/com_guidedtours/src/View/Step/HtmlView.php
@@ -16,6 +16,7 @@
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Guidedtours\Administrator\Model\StepModel;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -52,7 +53,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The actions the user is authorised to perform
      *
-     * @var \Joomla\CMS\Object\CMSObject
+     * @var Registry
      */
     protected $canDo;
 
@@ -76,6 +77,10 @@ public function display($tpl = null)
         $this->item  = $model->getItem();
         $this->state = $model->getState();
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php
index 66e8e659d9a48..e5ded57d049ed 100644
--- a/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php
+++ b/administrator/components/com_guidedtours/src/View/Steps/HtmlView.php
@@ -108,6 +108,11 @@ public function display($tpl = null)
         // Unset the tour_id field from activeFilters as we don't filter by tour here.
         unset($this->activeFilters['tour_id']);
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php b/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php
index a65a5bc1f4e33..7a03caeba4d76 100644
--- a/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php
+++ b/administrator/components/com_guidedtours/src/View/Tour/HtmlView.php
@@ -76,6 +76,10 @@ public function display($tpl = null)
         $this->item  = $model->getItem();
         $this->state = $model->getState();
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php b/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php
index ef8929999dd8e..30dea05f42a20 100644
--- a/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php
+++ b/administrator/components/com_guidedtours/src/View/Tours/HtmlView.php
@@ -103,6 +103,11 @@ public function display($tpl = null)
             $this->filterForm->removeField('language', 'filter');
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_guidedtours/tmpl/step/edit.php b/administrator/components/com_guidedtours/tmpl/step/edit.php
index 6f0fac755e907..a529e494035ff 100644
--- a/administrator/components/com_guidedtours/tmpl/step/edit.php
+++ b/administrator/components/com_guidedtours/tmpl/step/edit.php
@@ -104,7 +104,7 @@
 
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
     </div>
-    <input type="hidden" name="task" value="">
     <?php echo $this->form->getInput('tour_id'); ?>
-    <?php echo HTMLHelper::_('form.token'); ?>
+
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_guidedtours/tmpl/steps/default.php b/administrator/components/com_guidedtours/tmpl/steps/default.php
index 97a0217a49c86..fccae6e1fb487 100644
--- a/administrator/components/com_guidedtours/tmpl/steps/default.php
+++ b/administrator/components/com_guidedtours/tmpl/steps/default.php
@@ -17,9 +17,8 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\Component\Guidedtours\Administrator\Extension\GuidedtoursComponent;
-use Joomla\Component\Guidedtours\Administrator\View\Steps\HtmlView;
 
-/** @var  HtmlView  $this */
+/** @var  \Joomla\Component\Guidedtours\Administrator\View\Steps\HtmlView  $this */
 
 /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->getDocument()->getWebAssetManager();
@@ -227,8 +226,6 @@ class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="
             ?>
         <?php endif; ?>
 
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="boxchecked" value="0">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_guidedtours/tmpl/steps/emptystate.php b/administrator/components/com_guidedtours/tmpl/steps/emptystate.php
index 68ae26353b72f..4364dbdc54013 100644
--- a/administrator/components/com_guidedtours/tmpl/steps/emptystate.php
+++ b/administrator/components/com_guidedtours/tmpl/steps/emptystate.php
@@ -19,6 +19,8 @@
     'formURL'    => 'index.php?option=com_guidedtours&view=steps',
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Guided_Tours:_Steps',
     'icon'       => 'icon-map-signs',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 $user = $this->getCurrentUser();
diff --git a/administrator/components/com_guidedtours/tmpl/tour/edit.php b/administrator/components/com_guidedtours/tmpl/tour/edit.php
index 5bef1f3549f89..7ed71c51be486 100644
--- a/administrator/components/com_guidedtours/tmpl/tour/edit.php
+++ b/administrator/components/com_guidedtours/tmpl/tour/edit.php
@@ -100,6 +100,5 @@
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
     </div>
 
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_guidedtours/tmpl/tours/default.php b/administrator/components/com_guidedtours/tmpl/tours/default.php
index 33ef8b8f550f5..492777d1fa398 100644
--- a/administrator/components/com_guidedtours/tmpl/tours/default.php
+++ b/administrator/components/com_guidedtours/tmpl/tours/default.php
@@ -18,9 +18,8 @@
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use Joomla\Component\Guidedtours\Administrator\View\Tours\HtmlView;
 
-/** @var  HtmlView  $this */
+/** @var  \Joomla\Component\Guidedtours\Administrator\View\Tours\HtmlView  $this */
 
 /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->getDocument()->getWebAssetManager();
@@ -252,8 +251,6 @@ class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="
             ?>
         <?php endif; ?>
 
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="boxchecked" value="0">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_guidedtours/tmpl/tours/emptystate.php b/administrator/components/com_guidedtours/tmpl/tours/emptystate.php
index 6500a86264413..a899420c3ef53 100644
--- a/administrator/components/com_guidedtours/tmpl/tours/emptystate.php
+++ b/administrator/components/com_guidedtours/tmpl/tours/emptystate.php
@@ -19,6 +19,8 @@
     'formURL'    => 'index.php?option=com_guidedtours&view=tours',
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Guided_Tours',
     'icon'       => 'icon-map-signs',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 $user = $this->getCurrentUser();
diff --git a/administrator/components/com_installer/helpers/installer.php b/administrator/components/com_installer/helpers/installer.php
index 6a3f34aa789bc..27a4f56414085 100644
--- a/administrator/components/com_installer/helpers/installer.php
+++ b/administrator/components/com_installer/helpers/installer.php
@@ -19,7 +19,7 @@
  *
  * @since  1.6
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Installer\Administrator\Helper\InstallerHelper instead
  */
 class InstallerHelper extends \Joomla\Component\Installer\Administrator\Helper\InstallerHelper
diff --git a/administrator/components/com_installer/src/Helper/InstallerHelper.php b/administrator/components/com_installer/src/Helper/InstallerHelper.php
index 5be9411ad6e22..51d178bec9455 100644
--- a/administrator/components/com_installer/src/Helper/InstallerHelper.php
+++ b/administrator/components/com_installer/src/Helper/InstallerHelper.php
@@ -13,7 +13,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
 
@@ -38,7 +37,7 @@ class InstallerHelper
     public static function getExtensionTypes()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('type'))
             ->from($db->quoteName('#__extensions'));
         $db->setQuery($query);
@@ -64,7 +63,7 @@ public static function getExtensionGroups()
     {
         $nofolder = '';
         $db       = Factory::getDbo();
-        $query    = $db->getQuery(true)
+        $query    = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('folder'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('folder') . ' != :folder')
@@ -131,7 +130,7 @@ public static function getPackageOptions(): array
 
         /** @var DatabaseInterface $db The application's database driver object */
         $db         = Factory::getContainer()->get(DatabaseInterface::class);
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
@@ -233,19 +232,19 @@ public static function getInstallationXML(
     /**
      * Get the download key of an extension going through their installation xml
      *
-     * @param   CMSObject  $extension  element of an extension
+     * @param   \stdClass  $extension  element of an extension
      *
      * @return  array  An array with the prefix, suffix and value of the download key
      *
      * @since   4.0.0
      */
-    public static function getDownloadKey(CMSObject $extension): array
+    public static function getDownloadKey(\stdClass $extension): array
     {
         $installXmlFile = self::getInstallationXML(
-            $extension->get('element'),
-            $extension->get('type'),
-            $extension->get('client_id'),
-            $extension->get('folder')
+            $extension->element,
+            $extension->type,
+            $extension->client_id,
+            $extension->folder
         );
 
         if (!$installXmlFile) {
@@ -264,7 +263,7 @@ public static function getDownloadKey(CMSObject $extension): array
 
         $prefix = (string) $installXmlFile->dlid['prefix'];
         $suffix = (string) $installXmlFile->dlid['suffix'];
-        $value  = substr($extension->get('extra_query'), \strlen($prefix));
+        $value  = substr($extension->extra_query ?? '', \strlen($prefix));
 
         if ($suffix) {
             $value = substr($value, 0, -\strlen($suffix));
@@ -309,8 +308,8 @@ public static function getExtensionDownloadKey(
             ];
         }
 
-        // Try to retrieve the extension information as a CMSObject
-        $query = $db->getQuery(true)
+        // Try to retrieve the extension information
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('type') . ' = :type')
@@ -323,8 +322,8 @@ public static function getExtensionDownloadKey(
         $query->bind(':folder', $folder, ParameterType::STRING);
 
         try {
-            $extension = new CMSObject($db->setQuery($query)->loadAssoc());
-        } catch (\Exception) {
+            $extension = $db->setQuery($query)->loadObject();
+        } catch (\Exception $e) {
             return [
                 'supported' => false,
                 'valid'     => false,
@@ -355,15 +354,15 @@ public static function getDownloadKeySupportedSites($onlyEnabled = false): array
 
         $extensions = self::getUpdateSitesInformation($onlyEnabled);
 
-        $filterClosure = function (CMSObject $extension) {
+        $filterClosure = function ($extension) {
             $dlidInfo = self::getDownloadKey($extension);
 
             return $dlidInfo['supported'];
         };
         $extensions = array_filter($extensions, $filterClosure);
 
-        $mapClosure = function (CMSObject $extension) {
-            return $extension->get('update_site_id');
+        $mapClosure = function ($extension) {
+            return $extension->update_site_id ?? null;
         };
 
         return array_map($mapClosure, $extensions);
@@ -391,7 +390,7 @@ public static function getDownloadKeyExistsSites(bool $exists = true, $onlyEnabl
         $extensions = self::getUpdateSitesInformation($onlyEnabled);
 
         // Filter the extensions by what supports Download Keys
-        $filterClosure = function (CMSObject $extension) use ($exists) {
+        $filterClosure = function ($extension) use ($exists) {
             $dlidInfo = self::getDownloadKey($extension);
 
             if (!$dlidInfo['supported']) {
@@ -403,8 +402,8 @@ public static function getDownloadKeyExistsSites(bool $exists = true, $onlyEnabl
         $extensions = array_filter($extensions, $filterClosure);
 
         // Return only the update site IDs
-        $mapClosure = function (CMSObject $extension) {
-            return $extension->get('update_site_id');
+        $mapClosure = function ($extension) {
+            return $extension->update_site_id ?? null;
         };
 
         return array_map($mapClosure, $extensions);
@@ -416,7 +415,7 @@ public static function getDownloadKeyExistsSites(bool $exists = true, $onlyEnabl
      *
      * @param   bool  $onlyEnabled  Only return enabled update sites
      *
-     * @return  CMSObject[]  List of update site and linked extension information
+     * @return  \stdClass[]  List of update site and linked extension information
      * @since   4.0.0
      */
     protected static function getUpdateSitesInformation(bool $onlyEnabled): array
@@ -427,7 +426,7 @@ protected static function getUpdateSitesInformation(bool $onlyEnabled): array
             return [];
         }
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
@@ -473,15 +472,10 @@ protected static function getUpdateSitesInformation(bool $onlyEnabled): array
 
         // Try to get all of the update sites, including related extension information
         try {
-            $items = [];
             $db->setQuery($query);
 
-            foreach ($db->getIterator() as $item) {
-                $items[] = new CMSObject($item);
-            }
-
-            return $items;
-        } catch (\Exception) {
+            return $db->loadObjectList();
+        } catch (\Exception $e) {
             return [];
         }
     }
diff --git a/administrator/components/com_installer/src/Model/DatabaseModel.php b/administrator/components/com_installer/src/Model/DatabaseModel.php
index f9019190175f4..607507a85a81b 100644
--- a/administrator/components/com_installer/src/Model/DatabaseModel.php
+++ b/administrator/components/com_installer/src/Model/DatabaseModel.php
@@ -322,7 +322,7 @@ public function getItems()
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
@@ -427,7 +427,7 @@ public function getSchemaVersion($extensionId)
     {
         $db          = $this->getDatabase();
         $extensionId = (int) $extensionId;
-        $query       = $db->getQuery(true)
+        $query       = $db->createQuery()
             ->select($db->quoteName('version_id'))
             ->from($db->quoteName('#__schemas'))
             ->where($db->quoteName('extension_id') . ' = :extensionid')
@@ -462,7 +462,7 @@ public function fixSchemaVersion($changeSet, $extensionId)
         // Delete old row.
         $extensionId = (int) $extensionId;
         $db          = $this->getDatabase();
-        $query       = $db->getQuery(true)
+        $query       = $db->createQuery()
             ->delete($db->quoteName('#__schemas'))
             ->where($db->quoteName('extension_id') . ' = :extensionid')
             ->bind(':extensionid', $extensionId, ParameterType::INTEGER);
diff --git a/administrator/components/com_installer/src/Model/DiscoverModel.php b/administrator/components/com_installer/src/Model/DiscoverModel.php
index 52e24afc3d801..1536c7f4d2f23 100644
--- a/administrator/components/com_installer/src/Model/DiscoverModel.php
+++ b/administrator/components/com_installer/src/Model/DiscoverModel.php
@@ -90,7 +90,7 @@ protected function populateState($ordering = 'name', $direction = 'asc')
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('state') . ' = -1');
@@ -150,7 +150,7 @@ public function discover()
 
         // Get all templates, including discovered ones
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['extension_id', 'element', 'folder', 'client_id', 'type']))
             ->from($db->quoteName('#__extensions'));
         $db->setQuery($query);
@@ -253,7 +253,7 @@ public function discover_install()
     public function purge()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__extensions'))
             ->where($db->quoteName('state') . ' = -1');
         $db->setQuery($query);
@@ -297,7 +297,7 @@ protected function getEmptyStateQuery()
     public function checkExtensions()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('state') . ' = -1');
diff --git a/administrator/components/com_installer/src/Model/InstallModel.php b/administrator/components/com_installer/src/Model/InstallModel.php
index 8ebda75e853be..12c6cc02088a5 100644
--- a/administrator/components/com_installer/src/Model/InstallModel.php
+++ b/administrator/components/com_installer/src/Model/InstallModel.php
@@ -328,7 +328,7 @@ protected function _getPackageFromUpload()
         $tmp_src  = $userfile['tmp_name'];
 
         // Move uploaded file. Allow "unsafe" files: an extension package legitimately contains PHP,
-        // which the File::upload() safety scan (default since joomla/filesystem 3.3.0) would reject.
+        // which the File::upload() safety scan (default since joomla/filesystem 4.2.0) would reject.
         try {
             File::upload($tmp_src, $tmp_dest, false, true);
         } catch (FilesystemException) {
diff --git a/administrator/components/com_installer/src/Model/LanguagesModel.php b/administrator/components/com_installer/src/Model/LanguagesModel.php
index 0c54ca93fb390..101f6cfd6955f 100644
--- a/administrator/components/com_installer/src/Model/LanguagesModel.php
+++ b/administrator/components/com_installer/src/Model/LanguagesModel.php
@@ -10,10 +10,12 @@
 namespace Joomla\Component\Installer\Administrator\Model;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\Version;
+use Joomla\Http\HttpFactory;
+use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -66,7 +68,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
     private function getUpdateSite()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('us.location'))
             ->from($db->quoteName('#__extensions', 'e'))
             ->where($db->quoteName('e.type') . ' = ' . $db->quote('package'))
@@ -131,11 +133,14 @@ protected function getLanguages()
         if (empty($updateSite)) {
             Factory::getApplication()->enqueueMessage(Text::_('COM_INSTALLER_MSG_WARNING_NO_LANGUAGES_UPDATESERVER'), 'warning');
 
-            return;
+            return [];
         }
 
+        $options = new Registry();
+        $options->set('userAgent', (new Version())->getUserAgent('Joomla', true, false));
+
         try {
-            $response = HttpFactory::getHttp()->get($updateSite);
+            $response = (new HttpFactory())->getHttp($options)->get($updateSite);
         } catch (\RuntimeException) {
             $response = null;
         }
@@ -143,7 +148,7 @@ protected function getLanguages()
         if ($response === null || $response->getStatusCode() !== 200) {
             Factory::getApplication()->enqueueMessage(Text::sprintf('COM_INSTALLER_MSG_ERROR_CANT_CONNECT_TO_UPDATESERVER', $updateSite), 'error');
 
-            return;
+            return [];
         }
 
         $updateSiteXML = simplexml_load_string((string) $response->getBody());
@@ -151,7 +156,7 @@ protected function getLanguages()
         if (!$updateSiteXML) {
             Factory::getApplication()->enqueueMessage(Text::sprintf('COM_INSTALLER_MSG_ERROR_CANT_RETRIEVE_XML', $updateSite), 'error');
 
-            return;
+            return [];
         }
 
         $languages     = [];
diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php
index 2756887df1b77..8ac385f59e02e 100644
--- a/administrator/components/com_installer/src/Model/ManageModel.php
+++ b/administrator/components/com_installer/src/Model/ManageModel.php
@@ -263,20 +263,20 @@ public function remove($eid = [])
                 // Build an array of extensions that failed to uninstall
                 if ($result === false) {
                     // There was an error in uninstalling the package
-                    $msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype);
+                    $msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype, $row->name);
 
                     continue;
                 }
 
                 // Package uninstalled successfully
-                $msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_SUCCESS', $rowtype);
+                $msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_SUCCESS', $rowtype, $row->name);
                 $result = true;
 
                 continue;
             }
 
             // There was an error in uninstalling the package
-            $msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype);
+            $msgs[] = Text::sprintf('COM_INSTALLER_UNINSTALL_ERROR', $rowtype, $row->name);
         }
 
         $msg = implode('<br>', $msgs);
@@ -306,7 +306,7 @@ public function remove($eid = [])
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->select('2*protected+(1-protected)*enabled AS status')
             ->from('#__extensions')
@@ -395,7 +395,7 @@ public function loadChangelog($eid, $source)
         // Get the changelog URL
         $eid   = (int) $eid;
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
diff --git a/administrator/components/com_installer/src/Model/UpdateModel.php b/administrator/components/com_installer/src/Model/UpdateModel.php
index 5bfbf76b6d1b9..f07244302038b 100644
--- a/administrator/components/com_installer/src/Model/UpdateModel.php
+++ b/administrator/components/com_installer/src/Model/UpdateModel.php
@@ -12,7 +12,6 @@
 
 use Joomla\CMS\Extension\ExtensionHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Form\Form;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Installer\InstallerHelper;
 use Joomla\CMS\Language\Text;
@@ -97,7 +96,7 @@ protected function getListQuery()
         $db = $this->getDatabase();
 
         // Grab updates ignoring new installs
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('u.*')
             ->select($db->quoteName('e.manifest_cache'))
             ->from($db->quoteName('#__updates', 'u'))
@@ -245,7 +244,7 @@ public function getDisabledUpdateSites()
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__update_sites'))
             ->where($db->quoteName('enabled') . ' = 0');
@@ -293,7 +292,7 @@ public function purge()
         }
 
         // Reset the last update check timestamp
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__update_sites'))
             ->set($db->quoteName('last_check_timestamp') . ' = ' . $db->quote(0));
         $db->setQuery($query);
@@ -334,7 +333,7 @@ public function update($uids, $minimumStability = Updater::STABILITY_STABLE)
 
             $app   = Factory::getApplication();
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('type')
                 ->from('#__update_sites')
                 ->where($db->quoteName('update_site_id') . ' = :id')
@@ -519,49 +518,6 @@ private function install($update)
         return $result;
     }
 
-    /**
-     * Method to get the row form.
-     *
-     * @param   array    $data      Data for the form.
-     * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
-     *
-     * @return  Form|bool  A Form object on success, false on failure
-     *
-     * @since   2.5.2
-     */
-    public function getForm($data = [], $loadData = true)
-    {
-        // Get the form.
-        Form::addFormPath(JPATH_COMPONENT . '/models/forms');
-        Form::addFieldPath(JPATH_COMPONENT . '/models/fields');
-        $form = Form::getInstance('com_installer.update', 'update', ['load_data' => $loadData]);
-
-        // Check the session for previously entered form data.
-        $data = $this->loadFormData();
-
-        // Bind the form data if present.
-        if (!empty($data)) {
-            $form->bind($data);
-        }
-
-        return $form;
-    }
-
-    /**
-     * Method to get the data that should be injected in the form.
-     *
-     * @return  mixed  The data for the form.
-     *
-     * @since   2.5.2
-     */
-    protected function loadFormData()
-    {
-        // Check the session for previously entered form data.
-        $data = Factory::getApplication()->getUserState($this->context, []);
-
-        return $data;
-    }
-
     /**
      * Method to add parameters to the update
      *
diff --git a/administrator/components/com_installer/src/Model/UpdatesiteModel.php b/administrator/components/com_installer/src/Model/UpdatesiteModel.php
index 5b2efd737254c..3906da9393d4c 100644
--- a/administrator/components/com_installer/src/Model/UpdatesiteModel.php
+++ b/administrator/components/com_installer/src/Model/UpdatesiteModel.php
@@ -12,7 +12,6 @@
 
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Component\Installer\Administrator\Helper\InstallerHelper;
 use Joomla\Database\ParameterType;
 
@@ -41,7 +40,7 @@ class UpdatesiteModel extends AdminModel
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @throws  \Exception
      *
@@ -49,14 +48,7 @@ class UpdatesiteModel extends AdminModel
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_installer.updatesite', 'updatesite', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_installer.updatesite', 'updatesite', ['control' => 'jform', 'load_data' => $loadData]);
     }
     /**
      * Method to get the data that should be injected in the form.
@@ -87,8 +79,8 @@ public function getItem($pk = null)
         $item = parent::getItem($pk);
 
         $db           = $this->getDatabase();
-        $updateSiteId = (int) $item->get('update_site_id');
-        $query        = $db->getQuery(true)
+        $updateSiteId = (int) $item->update_site_id ?? 0;
+        $query        = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
@@ -116,13 +108,13 @@ public function getItem($pk = null)
             ->bind(':updatesiteid', $updateSiteId, ParameterType::INTEGER);
 
         $db->setQuery($query);
-        $extension = new CMSObject($db->loadAssoc());
+        $extension = $db->loadObject();
 
         $downloadKey = InstallerHelper::getDownloadKey($extension);
 
-        $item->set('extra_query', $downloadKey['value'] ?? '');
-        $item->set('downloadIdPrefix', $downloadKey['prefix'] ?? '');
-        $item->set('downloadIdSuffix', $downloadKey['suffix'] ?? '');
+        $item->extra_query      = $downloadKey['value'] ?? '';
+        $item->downloadIdPrefix = $downloadKey['prefix'] ?? '';
+        $item->downloadIdSuffix = $downloadKey['suffix'] ?? '';
 
         return $item;
     }
@@ -154,7 +146,7 @@ public function save($data): bool
 
         // Delete update records forcing Joomla to fetch them again, applying the new extra_query.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__updates'))
             ->where($db->quoteName('update_site_id') . ' = :updateSiteId');
         $query->bind(':updateSiteId', $data['update_site_id'], ParameterType::INTEGER);
diff --git a/administrator/components/com_installer/src/Model/UpdatesitesModel.php b/administrator/components/com_installer/src/Model/UpdatesitesModel.php
index b8b48d027f701..a4ef97e71ade6 100644
--- a/administrator/components/com_installer/src/Model/UpdatesitesModel.php
+++ b/administrator/components/com_installer/src/Model/UpdatesitesModel.php
@@ -10,11 +10,11 @@
 
 namespace Joomla\Component\Installer\Administrator\Model;
 
+use Joomla\CMS\Event\Extension\AfterUpdateEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Table\UpdateSite as UpdateSiteTable;
@@ -136,7 +136,7 @@ public function delete($ids = [])
         $count = 0;
 
         // Gets the update site names.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['update_site_id', 'name']))
             ->from($db->quoteName('#__update_sites'))
             ->whereIn($db->quoteName('update_site_id'), $ids);
@@ -157,21 +157,21 @@ public function delete($ids = [])
             // Delete the update site from all tables.
             try {
                 $id    = (int) $id;
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__update_sites'))
                     ->where($db->quoteName('update_site_id') . ' = :id')
                     ->bind(':id', $id, ParameterType::INTEGER);
                 $db->setQuery($query);
                 $db->execute();
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__update_sites_extensions'))
                     ->where($db->quoteName('update_site_id') . ' = :id')
                     ->bind(':id', $id, ParameterType::INTEGER);
                 $db->setQuery($query);
                 $db->execute();
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__updates'))
                     ->where($db->quoteName('update_site_id') . ' = :id')
                     ->bind(':id', $id, ParameterType::INTEGER);
@@ -210,7 +210,7 @@ protected function getJoomlaUpdateSitesIds($column = 0)
         $db = $this->getDatabase();
 
         // Fetch the Joomla core update sites ids and their extension ids. We search for all except the core joomla extension with update sites.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['use.update_site_id', 'e.extension_id']))
             ->from($db->quoteName('#__update_sites_extensions', 'use'))
             ->join(
@@ -256,7 +256,7 @@ public function rebuild(): void
 
         // Check if Joomla Extension plugin is enabled.
         if (!PluginHelper::isEnabled('extension', 'joomla')) {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('extension_id'))
                 ->from($db->quoteName('#__extensions'))
                 ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -305,26 +305,26 @@ public function rebuild(): void
         $joomlaUpdateSitesIds = $this->getJoomlaUpdateSitesIds(0);
 
         // First backup any custom extra_query for the sites
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('TRIM(' . $db->quoteName('location') . ') AS ' . $db->quoteName('location') . ', ' . $db->quoteName('extra_query'))
             ->from($db->quoteName('#__update_sites'));
         $db->setQuery($query);
         $backupExtraQuerys = $db->loadAssocList('location');
 
         // Delete from all tables (except joomla core update sites).
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__update_sites'))
             ->whereNotIn($db->quoteName('update_site_id'), $joomlaUpdateSitesIds);
         $db->setQuery($query);
         $db->execute();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__update_sites_extensions'))
             ->whereNotIn($db->quoteName('update_site_id'), $joomlaUpdateSitesIds);
         $db->setQuery($query);
         $db->execute();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__updates'))
             ->whereNotIn($db->quoteName('update_site_id'), $joomlaUpdateSitesIds);
         $db->setQuery($query);
@@ -366,7 +366,7 @@ public function rebuild(): void
                         $pkgName = (string) $manifest->packagename;
                         $type    = (string) $manifest['type'];
 
-                        $query = $db->getQuery(true)
+                        $query = $db->createQuery()
                             ->select($db->quoteName('extension_id'))
                             ->from($db->quoteName('#__extensions'))
                             ->where(
@@ -408,10 +408,17 @@ public function rebuild(): void
                             }
 
                             // Load the extension plugin (if not loaded yet).
-                            PluginHelper::importPlugin('extension', 'joomla');
+                            $dispatcher = $this->getDispatcher();
+                            PluginHelper::importPlugin('extension', 'joomla', true, $dispatcher);
 
                             // Fire the onExtensionAfterUpdate
-                            $app->triggerEvent('onExtensionAfterUpdate', ['installer' => $tmpInstaller, 'eid' => $eid]);
+                            $dispatcher->dispatch(
+                                'onExtensionAfterUpdate',
+                                new AfterUpdateEvent('onExtensionAfterUpdate', [
+                                    'installer' => $tmpInstaller,
+                                    'eid'       => $eid,
+                                ])
+                            );
 
                             $count++;
                         }
@@ -444,8 +451,7 @@ public function getItems()
         array_walk(
             $items,
             static function ($item) {
-                $data              = new CMSObject($item);
-                $item->downloadKey = InstallerHelper::getDownloadKey($data);
+                $item->downloadKey = InstallerHelper::getDownloadKey($item);
             }
         );
 
@@ -491,7 +497,7 @@ protected function getStoreId($id = '')
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
diff --git a/administrator/components/com_installer/src/View/Database/HtmlView.php b/administrator/components/com_installer/src/View/Database/HtmlView.php
index 931bf0062da6c..ed0bf15239475 100644
--- a/administrator/components/com_installer/src/View/Database/HtmlView.php
+++ b/administrator/components/com_installer/src/View/Database/HtmlView.php
@@ -105,6 +105,11 @@ public function display($tpl = null)
             : $app->enqueueMessage(Text::_('COM_INSTALLER_MSG_DATABASE_CORE_ERRORS'), 'warning');
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_installer/src/View/Discover/HtmlView.php b/administrator/components/com_installer/src/View/Discover/HtmlView.php
index aed4d36a2c5e3..8d17f7d5af9ae 100644
--- a/administrator/components/com_installer/src/View/Discover/HtmlView.php
+++ b/administrator/components/com_installer/src/View/Discover/HtmlView.php
@@ -94,6 +94,11 @@ public function display($tpl = null)
             $this->setLayout('emptystate');
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_installer/src/View/Languages/HtmlView.php b/administrator/components/com_installer/src/View/Languages/HtmlView.php
index a8bf800a4c896..3b8e912752d6b 100644
--- a/administrator/components/com_installer/src/View/Languages/HtmlView.php
+++ b/administrator/components/com_installer/src/View/Languages/HtmlView.php
@@ -76,6 +76,15 @@ public function display($tpl = null)
         $this->activeFilters = $model->getActiveFilters();
         $this->installedLang = LanguageHelper::getInstalledLanguages();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0')
+            ->addControlField('return', base64_encode('index.php?option=com_installer&view=languages'))
+            ->addControlField('install_url', '', ['id' => 'install_url'])
+            ->addControlField('installtype', 'url')
+            ->addControlField('package', 'language');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_installer/src/View/Manage/HtmlView.php b/administrator/components/com_installer/src/View/Manage/HtmlView.php
index be38d698ab860..5abc4a85c018e 100644
--- a/administrator/components/com_installer/src/View/Manage/HtmlView.php
+++ b/administrator/components/com_installer/src/View/Manage/HtmlView.php
@@ -83,6 +83,11 @@ public function display($tpl = null)
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         // Display the view.
         parent::display($tpl);
     }
@@ -117,6 +122,7 @@ protected function addToolbar()
 
         if ($canDo->get('core.delete')) {
             $childBar->delete('manage.remove', 'JTOOLBAR_UNINSTALL')
+                ->icon('icon-exclamation-triangle')
                 ->message('COM_INSTALLER_CONFIRM_UNINSTALL')
                 ->listCheck(true);
         }
diff --git a/administrator/components/com_installer/src/View/Update/HtmlView.php b/administrator/components/com_installer/src/View/Update/HtmlView.php
index e1b5b77156cb7..fc9017bd85aef 100644
--- a/administrator/components/com_installer/src/View/Update/HtmlView.php
+++ b/administrator/components/com_installer/src/View/Update/HtmlView.php
@@ -13,8 +13,7 @@
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
-use Joomla\Component\Installer\Administrator\Helper\InstallerHelper as CmsInstallerHelper;
+use Joomla\Component\Installer\Administrator\Helper\InstallerHelper;
 use Joomla\Component\Installer\Administrator\Model\UpdateModel;
 use Joomla\Component\Installer\Administrator\View\Installer\HtmlView as InstallerViewDefault;
 
@@ -32,7 +31,7 @@ class HtmlView extends InstallerViewDefault
     /**
      * List of update items.
      *
-     * @var array
+     * @var \stdClass[]
      */
     protected $items;
 
@@ -100,12 +99,12 @@ public function display($tpl = null)
         }
 
         // Find if there are any updates which require but are missing a Download Key
-        if (!class_exists('Joomla\Component\Installer\Administrator\Helper\InstallerHelper')) {
+        if (!class_exists(InstallerHelper::class)) {
             require_once JPATH_ADMINISTRATOR . '/components/com_installer/src/Helper/InstallerHelper.php';
         }
 
         $mappingCallback = function ($item) {
-            $dlkeyInfo                  = CmsInstallerHelper::getDownloadKey(new CMSObject($item));
+            $dlkeyInfo                  = InstallerHelper::getDownloadKey($item);
             $item->isMissingDownloadKey = $dlkeyInfo['supported'] && !$dlkeyInfo['valid'];
 
             if ($item->isMissingDownloadKey) {
@@ -122,6 +121,11 @@ public function display($tpl = null)
             Factory::getApplication()->enqueueMessage($msg, CMSApplication::MSG_WARNING);
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         parent::display($tpl);
     }
 
diff --git a/administrator/components/com_installer/src/View/Updatesite/HtmlView.php b/administrator/components/com_installer/src/View/Updatesite/HtmlView.php
index b643c21b4222e..386b9282b1a55 100644
--- a/administrator/components/com_installer/src/View/Updatesite/HtmlView.php
+++ b/administrator/components/com_installer/src/View/Updatesite/HtmlView.php
@@ -71,12 +71,16 @@ public function display($tpl = null): void
 
         // Remove the extra_query field if it's a free download extension
         $dlidSupportingSites = InstallerHelper::getDownloadKeySupportedSites(false);
-        $update_site_id      = $this->item->get('update_site_id');
+        $update_site_id      = $this->item->update_site_id;
 
         if (!\in_array($update_site_id, $dlidSupportingSites)) {
             $this->form->removeField('extra_query');
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         parent::display($tpl);
     }
 
@@ -109,14 +113,8 @@ protected function addToolbar(): void
 
         // Can't save the record if it's checked out and editable
         if (!$checkedOut && $itemEditable && $this->form->getField('extra_query')) {
-            $saveGroup = $toolbar->dropdownButton('save-group');
-
-            $saveGroup->configure(
-                function (Toolbar $childBar) {
-                    $childBar->apply('updatesite.apply');
-                    $childBar->save('updatesite.save');
-                }
-            );
+            $toolbar->apply('updatesite.apply');
+            $toolbar->save('updatesite.save');
         }
 
         $toolbar->cancel('updatesite.cancel');
diff --git a/administrator/components/com_installer/src/View/Updatesites/HtmlView.php b/administrator/components/com_installer/src/View/Updatesites/HtmlView.php
index 6d61cd5a16dfc..443247a3dd2b3 100644
--- a/administrator/components/com_installer/src/View/Updatesites/HtmlView.php
+++ b/administrator/components/com_installer/src/View/Updatesites/HtmlView.php
@@ -82,6 +82,11 @@ public function display($tpl = null): void
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         // Display the view
         parent::display($tpl);
     }
@@ -114,7 +119,9 @@ protected function addToolbar(): void
             $childBar->unpublish('updatesites.unpublish', 'JTOOLBAR_DISABLE')->listCheck(true);
 
             if ($canDo->get('core.delete')) {
-                $childBar->delete('updatesites.delete')->listCheck(true);
+                $childBar->delete('updatesites.delete')
+                    ->icon('icon-exclamation-triangle')
+                    ->listCheck(true);
             }
 
             $childBar->checkin('updatesites.checkin')->listCheck(true);
diff --git a/administrator/components/com_installer/tmpl/database/default.php b/administrator/components/com_installer/tmpl/database/default.php
index dcbd008ce8c64..1755222e8b116 100644
--- a/administrator/components/com_installer/tmpl/database/default.php
+++ b/administrator/components/com_installer/tmpl/database/default.php
@@ -64,7 +64,7 @@
                                     <th scope="col" class="w-10 d-none d-lg-table-cell text-end">
                                         <?php echo Text::_('COM_INSTALLER_HEADING_DATABASE_SCHEMA'); ?>
                                     </th>
-                                    <th scope="col" class="w-10 d-none d-lg-table-cell">
+                                    <th scope="col" class="w-10 d-none d-lg-table-cell text-end">
                                         <?php echo Text::_('COM_INSTALLER_HEADING_UPDATE_VERSION'); ?>
                                     </th>
                                     <th scope="col" class="w-10 d-none d-lg-table-cell">
@@ -108,7 +108,7 @@
                                         <td class="d-none d-lg-table-cell text-end">
                                             <?php echo $extension->version_id; ?>
                                         </td>
-                                        <td class="d-none d-lg-table-cell">
+                                        <td class="d-none d-lg-table-cell text-end">
                                             <?php echo '&#x200E;' . $extension->version; ?>
                                         </td>
                                         <td class="d-none d-lg-table-cell">
@@ -126,9 +126,8 @@
                         <?php echo $this->pagination->getListFooter(); ?>
 
                     <?php endif; ?>
-                    <input type="hidden" name="task" value="">
-                    <input type="hidden" name="boxchecked" value="0">
-                    <?php echo HTMLHelper::_('form.token'); ?>
+
+                    <?php echo $this->filterForm->renderControlFields(); ?>
                 </div>
             </div>
         </div>
diff --git a/administrator/components/com_installer/tmpl/discover/default.php b/administrator/components/com_installer/tmpl/discover/default.php
index a42996408b1b9..7ab3c87446753 100644
--- a/administrator/components/com_installer/tmpl/discover/default.php
+++ b/administrator/components/com_installer/tmpl/discover/default.php
@@ -121,9 +121,8 @@
                         <?php echo $this->pagination->getListFooter(); ?>
 
                     <?php endif; ?>
-                    <input type="hidden" name="task" value="">
-                    <input type="hidden" name="boxchecked" value="0">
-                    <?php echo HTMLHelper::_('form.token'); ?>
+
+                    <?php echo $this->filterForm->renderControlFields(); ?>
                 </div>
             </div>
         </div>
diff --git a/administrator/components/com_installer/tmpl/discover/emptystate.php b/administrator/components/com_installer/tmpl/discover/emptystate.php
index b895352e42a9d..f926998d141cb 100644
--- a/administrator/components/com_installer/tmpl/discover/emptystate.php
+++ b/administrator/components/com_installer/tmpl/discover/emptystate.php
@@ -25,6 +25,8 @@
     'content'    => Text::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'),
     'title'      => Text::_('COM_INSTALLER_EMPTYSTATE_DISCOVER_TITLE'),
     'btnadd'     => Text::_('COM_INSTALLER_EMPTYSTATE_DISCOVER_BUTTON_ADD'),
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 /** @var \Joomla\Component\Installer\Administrator\View\Discover\HtmlView $this */
diff --git a/administrator/components/com_installer/tmpl/languages/default.php b/administrator/components/com_installer/tmpl/languages/default.php
index dc022abcbec45..de255c066f9dc 100644
--- a/administrator/components/com_installer/tmpl/languages/default.php
+++ b/administrator/components/com_installer/tmpl/languages/default.php
@@ -117,13 +117,8 @@ class="<?php echo $buttonClass; ?>"
                         <?php echo $this->pagination->getListFooter(); ?>
 
                     <?php endif; ?>
-                    <input type="hidden" name="task" value="">
-                    <input type="hidden" name="return" value="<?php echo base64_encode('index.php?option=com_installer&view=languages') ?>">
-                    <input type="hidden" id="install_url" name="install_url">
-                    <input type="hidden" name="installtype" value="url">
-                    <input type="hidden" name="package" value="language">
-                    <input type="hidden" name="boxchecked" value="0">
-                    <?php echo HTMLHelper::_('form.token'); ?>
+
+                    <?php echo $this->filterForm->renderControlFields(); ?>
                 </div>
             </div>
         </div>
diff --git a/administrator/components/com_installer/tmpl/manage/default.php b/administrator/components/com_installer/tmpl/manage/default.php
index 0c09f458e1d68..0a0f76bc438ba 100644
--- a/administrator/components/com_installer/tmpl/manage/default.php
+++ b/administrator/components/com_installer/tmpl/manage/default.php
@@ -174,9 +174,8 @@
                         <?php echo $this->pagination->getListFooter(); ?>
 
                     <?php endif; ?>
-                    <input type="hidden" name="task" value="">
-                    <input type="hidden" name="boxchecked" value="0">
-                    <?php echo HTMLHelper::_('form.token'); ?>
+
+                    <?php echo $this->filterForm->renderControlFields(); ?>
                 </div>
             </div>
         </div>
diff --git a/administrator/components/com_installer/tmpl/update/default.php b/administrator/components/com_installer/tmpl/update/default.php
index 43cb139e01d6d..e493e91f3b0da 100644
--- a/administrator/components/com_installer/tmpl/update/default.php
+++ b/administrator/components/com_installer/tmpl/update/default.php
@@ -105,6 +105,11 @@
                                             <?php $url = 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $item->update_site_id; ?>
                                             <a class="btn btn-danger btn-sm text-decoration-none" href="<?php echo Route::_($url); ?>"><?php echo Text::_('COM_INSTALLER_DOWNLOADKEY_MISSING_LABEL'); ?></a>
                                         <?php endif; ?>
+										<?php if (!empty($item->security)) : ?>
+                                        <div class="btn btn-<?php echo $item->security > 2 ? 'danger' : 'warning'; ?> btn-sm text-decoration-none">
+                                            <?php echo Text::_('COM_INSTALLER_SECURITY_SEVERITY_' . (int) $item->security); ?>
+										</div>
+										<?php endif; ?>
                                     </th>
                                     <td class="d-none d-md-table-cell">
                                         <?php echo $item->client_translated; ?>
@@ -153,9 +158,8 @@
                         <?php echo $this->pagination->getListFooter(); ?>
 
                     <?php endif; ?>
-                    <input type="hidden" name="task" value="">
-                    <input type="hidden" name="boxchecked" value="0">
-                    <?php echo HTMLHelper::_('form.token'); ?>
+
+                    <?php echo $this->filterForm->renderControlFields(); ?>
                 </div>
             </div>
         </div>
diff --git a/administrator/components/com_installer/tmpl/update/emptystate.php b/administrator/components/com_installer/tmpl/update/emptystate.php
index 6ba4a0d275fe5..59b12f33b73e8 100644
--- a/administrator/components/com_installer/tmpl/update/emptystate.php
+++ b/administrator/components/com_installer/tmpl/update/emptystate.php
@@ -20,6 +20,8 @@
     'formURL'    => 'index.php?option=com_installer&view=update',
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Extensions:_Update',
     'icon'       => 'icon-puzzle-piece install',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 $user = $this->getCurrentUser();
diff --git a/administrator/components/com_installer/tmpl/updatesite/edit.php b/administrator/components/com_installer/tmpl/updatesite/edit.php
index dc95fcddcd8a8..a0f33c2094808 100644
--- a/administrator/components/com_installer/tmpl/updatesite/edit.php
+++ b/administrator/components/com_installer/tmpl/updatesite/edit.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -24,6 +23,6 @@
 <h2><?php echo $this->item->name; ?></h2>
 <form action="<?php echo Route::_('index.php?option=com_installer&view=updatesite&layout=edit&update_site_id=' . (int) $this->item->update_site_id); ?>" method="post" name="adminForm" id="adminForm" aria-label="<?php echo Text::_('COM_INSTALLER_UPDATE_FORM_EDIT'); ?>" class="main-card p-4 form-validate">
     <?php echo $this->form->renderFieldset('updateSite'); ?>
-    <input type="hidden" name="task" value=""/>
-    <?php echo HTMLHelper::_('form.token'); ?>
+
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_installer/tmpl/updatesites/default.php b/administrator/components/com_installer/tmpl/updatesites/default.php
index be5c1e9f25249..8c8bcd0d2e096 100644
--- a/administrator/components/com_installer/tmpl/updatesites/default.php
+++ b/administrator/components/com_installer/tmpl/updatesites/default.php
@@ -158,9 +158,8 @@
                         <?php echo $this->pagination->getListFooter(); ?>
 
                     <?php endif; ?>
-                    <input type="hidden" name="task" value="">
-                    <input type="hidden" name="boxchecked" value="0">
-                    <?php echo HTMLHelper::_('form.token'); ?>
+
+                    <?php echo $this->filterForm->renderControlFields(); ?>
                 </div>
             </div>
         </div>
diff --git a/administrator/components/com_joomlaupdate/postinstall/autoupdate.php b/administrator/components/com_joomlaupdate/postinstall/autoupdate.php
index 16f468f15fb6f..944cdd67bd544 100644
--- a/administrator/components/com_joomlaupdate/postinstall/autoupdate.php
+++ b/administrator/components/com_joomlaupdate/postinstall/autoupdate.php
@@ -26,7 +26,7 @@
  * Returns true it is disabled.
  *
  * @return  bool
- * @since   5.4.0
+ * @since   6.0.0
  */
 function com_joomlaupdate_postinstall_autoupdate_condition(): bool
 {
@@ -39,7 +39,7 @@ function com_joomlaupdate_postinstall_autoupdate_condition(): bool
  * Enables the Automated Update.
  *
  * @return  void
- * @since   5.4.0
+ * @since   6.0.0
  */
 function com_joomlaupdate_postinstall_autoupdate_action(): void
 {
diff --git a/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php b/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
index 1353fabeb306d..ee2668bf790c3 100644
--- a/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
+++ b/administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
@@ -11,7 +11,6 @@
 namespace Joomla\Component\Joomlaupdate\Administrator\Controller;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
@@ -468,118 +467,14 @@ public function finaliseconfirm()
         $this->setRedirect('index.php?option=com_joomlaupdate&task=update.finalise&' . Session::getFormToken() . '=1');
     }
 
-    /**
-     * Fetch Extension update XML proxy. Used to prevent Access-Control-Allow-Origin errors.
-     * Prints a JSON string.
-     * Called from JS.
-     *
-     * @since       3.10.0
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Use batchextensioncompatibility instead.
-     *              Example: $updateController->batchextensioncompatibility();
-     *
-     * @return void
-     */
-    public function fetchExtensionCompatibility()
-    {
-        $extensionID          = $this->input->get('extension-id', '', 'DEFAULT');
-        $joomlaTargetVersion  = $this->input->get('joomla-target-version', '', 'DEFAULT');
-        $joomlaCurrentVersion = $this->input->get('joomla-current-version', '', JVERSION);
-        $extensionVersion     = $this->input->get('extension-version', '', 'DEFAULT');
-
-        /** @var \Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel $model */
-        $model                      = $this->getModel('Update');
-        $upgradeCompatibilityStatus = $model->fetchCompatibility($extensionID, $joomlaTargetVersion);
-        $currentCompatibilityStatus = $model->fetchCompatibility($extensionID, $joomlaCurrentVersion);
-        $upgradeUpdateVersion       = false;
-        $currentUpdateVersion       = false;
-
-        $upgradeWarning = 0;
-
-        if ($upgradeCompatibilityStatus->state == 1 && !empty($upgradeCompatibilityStatus->compatibleVersions)) {
-            $upgradeUpdateVersion = end($upgradeCompatibilityStatus->compatibleVersions);
-        }
-
-        if ($currentCompatibilityStatus->state == 1 && !empty($currentCompatibilityStatus->compatibleVersions)) {
-            $currentUpdateVersion = end($currentCompatibilityStatus->compatibleVersions);
-        }
-
-        if ($upgradeCompatibilityStatus->state === 3 || $currentCompatibilityStatus->state === 3) {
-            // One of the update servers could not be checked.
-            $resultGroup = 4;
-        } elseif ($upgradeUpdateVersion !== false) {
-            $upgradeOldestVersion = $upgradeCompatibilityStatus->compatibleVersions[0];
-
-            if ($currentUpdateVersion !== false) {
-                // If there are updates compatible with both CMS versions use these
-                $bothCompatibleVersions = array_values(
-                    array_intersect($upgradeCompatibilityStatus->compatibleVersions, $currentCompatibilityStatus->compatibleVersions)
-                );
-
-                if (!empty($bothCompatibleVersions)) {
-                    $upgradeOldestVersion = $bothCompatibleVersions[0];
-                    $upgradeUpdateVersion = end($bothCompatibleVersions);
-                }
-            }
-
-            if (version_compare($upgradeOldestVersion, $extensionVersion, '>')) {
-                // Installed version is empty or older than the oldest compatible update: Update required
-                $resultGroup = 2;
-            } else {
-                // Current version is compatible
-                $resultGroup = 3;
-            }
-
-            if ($currentUpdateVersion !== false && version_compare($upgradeUpdateVersion, $currentUpdateVersion, '<')) {
-                // Special case warning when version compatible with target is lower than current
-                $upgradeWarning = 2;
-            }
-        } elseif ($currentUpdateVersion !== false) {
-            // No compatible version for target version but there is a compatible version for current version
-            $resultGroup = 1;
-        } else {
-            // No update server available
-            $resultGroup = 1;
-        }
-
-        // Do we need to capture
-        $combinedCompatibilityStatus = [
-            'upgradeCompatibilityStatus' => (object) [
-                'state'             => $upgradeCompatibilityStatus->state,
-                'compatibleVersion' => $upgradeUpdateVersion,
-            ],
-            'currentCompatibilityStatus' => (object) [
-                'state'             => $currentCompatibilityStatus->state,
-                'compatibleVersion' => $currentUpdateVersion,
-            ],
-            'resultGroup'    => $resultGroup,
-            'upgradeWarning' => $upgradeWarning,
-        ];
-
-        $this->app           = Factory::getApplication();
-        $this->app->mimeType = 'application/json';
-        $this->app->charSet  = 'utf-8';
-        $this->app->setHeader('Content-Type', $this->app->mimeType . '; charset=' . $this->app->charSet);
-        $this->app->sendHeaders();
-
-        try {
-            echo new JsonResponse($combinedCompatibilityStatus);
-        } catch (\Exception $e) {
-            echo $e;
-        }
-
-        $this->app->close();
-    }
-
     /**
      * Determines the compatibility information for a number of extensions.
      *
      * Called by the Joomla Update JavaScript (PreUpdateChecker.checkNextChunk).
      *
      * @return  void
-     * @since   4.2.0
      *
+     * @since   4.2.0
      */
     public function batchextensioncompatibility()
     {
diff --git a/administrator/components/com_joomlaupdate/src/Model/NotificationModel.php b/administrator/components/com_joomlaupdate/src/Model/NotificationModel.php
index bf97abafd57d3..5519b5c7331ce 100644
--- a/administrator/components/com_joomlaupdate/src/Model/NotificationModel.php
+++ b/administrator/components/com_joomlaupdate/src/Model/NotificationModel.php
@@ -14,7 +14,11 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\UserGroupsHelper;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\LanguageFactoryInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailHelper;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
@@ -33,8 +37,11 @@
  * @internal
  * @since  5.4.0
  */
-final class NotificationModel extends BaseDatabaseModel
+final class NotificationModel extends BaseDatabaseModel implements MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
+
     /**
      * Sends the update notification to the specifically configured emails and superusers
      *
@@ -116,7 +123,12 @@ public function sendNotification($type, $oldVersion, $newVersion): void
                 $receiverLanguage->load('com_joomlaupdate', JPATH_ADMINISTRATOR, $receiverLocale);
             }
 
-            $mailer = new MailTemplate('com_joomlaupdate.update.' . $type, $receiverLocale);
+            $mailer = new MailTemplate(
+                'com_joomlaupdate.update.' . $type,
+                $receiverLocale,
+                $this->getMailerFactory()->createMailer(),
+                $this->getLanguageFactory()
+            );
             $mailer->addRecipient($receiver->email, $receiver->name);
             $mailer->addTemplateData($substitutions);
             $mailer->send();
diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
index 32faa4618b2ff..742ebfcbb0f4a 100644
--- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
@@ -18,8 +18,6 @@
 use Joomla\CMS\Extension\ExtensionHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
-use Joomla\CMS\Http\Http;
-use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
@@ -39,6 +37,7 @@
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\Exception\FilesystemException;
 use Joomla\Filesystem\File;
+use Joomla\Http\HttpFactory;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 use Tobscure\JsonApi\Exception\InvalidParameterException;
@@ -79,7 +78,6 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
 
         // Register a logger for update process
         $options = [
-            'format'    => '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}',
             'text_file' => 'joomla_update.php',
         ];
 
@@ -130,7 +128,7 @@ public function applyUpdateSite(?string $updateSource = null, ?string $updateURL
 
         $id    = ExtensionHelper::getExtensionRecord('joomla', 'file')->extension_id;
         $db    = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('us') . '.*')
             ->from($db->quoteName('#__update_sites_extensions', 'map'))
             ->join(
@@ -204,7 +202,7 @@ public function getCheckForSelfUpdate()
     {
         $db = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('element') . ' = ' . $db->quote('com_joomlaupdate'));
@@ -228,7 +226,7 @@ public function getCheckForSelfUpdate()
             $updater->findUpdates($joomlaUpdateComponentId, $cache_timeout, Updater::STABILITY_STABLE);
 
             // Fetch the update information from the database.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__updates'))
                 ->where($db->quoteName('extension_id') . ' = :id')
@@ -274,7 +272,7 @@ public function getUpdateInformation()
         // Fetch the update information from the database.
         $id    = ExtensionHelper::getExtensionRecord('joomla', 'file')->extension_id;
         $db    = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__updates'))
             ->where($db->quoteName('extension_id') . ' = :id')
@@ -354,7 +352,7 @@ public function purge()
         $update_site->update_site_id       = 1;
         $db->updateObject('#__update_sites', $update_site, 'update_site_id');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__updates'))
             ->where($db->quoteName('update_site_id') . ' = 1');
         $db->setQuery($query);
@@ -386,11 +384,12 @@ public function download()
         // We have to manually follow the redirects here so we set the option to false.
         $httpOptions = new Registry();
         $httpOptions->set('follow_location', false);
+        $httpOptions->set('userAgent', (new Version())->getUserAgent('Joomla', true, false));
 
         $response = ['basename' => false, 'check' => null, 'version' => $updateInfo['latest']];
 
         try {
-            $head = HttpFactory::getHttp($httpOptions)->head($packageURL);
+            $head = (new HttpFactory())->getHttp($httpOptions)->head($packageURL);
         } catch (\RuntimeException) {
             // Passing false here -> download failed message
             return $response;
@@ -401,7 +400,7 @@ public function download()
             $packageURL = (string) $head->getHeaders()['location'][0];
 
             try {
-                $head = HttpFactory::getHttp($httpOptions)->head($packageURL);
+                $head = (new HttpFactory())->getHttp($httpOptions)->head($packageURL);
             } catch (\RuntimeException) {
                 // Passing false here -> download failed message
                 return $response;
@@ -586,7 +585,10 @@ public function changeAutoUpdateRegistration(AutoupdateRegisterState $targetStat
         $this->cleanCache('_system');
 
         // Prepare connection
-        $http = HttpFactory::getHttp();
+        $options = new Registry();
+        $options->set('userAgent', (new Version())->getUserAgent('Joomla', true, false));
+
+        $http = (new HttpFactory())->getHttp($options);
 
         $url = self::AUTOUPDATE_URL;
         $url .= ($targetState === AutoupdateRegisterState::Subscribe) ? '/register' : '/delete';
@@ -661,7 +663,7 @@ public function changeAutoUpdateRegistration(AutoupdateRegisterState $targetStat
     /**
      * Update the autoupdate activation and registration states
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     protected function updateAutoUpdateParams(AutoupdateRegisterState $registrationState, bool $enableUpdate): void
     {
@@ -779,8 +781,11 @@ protected function downloadPackage($url, $target)
         }
 
         // Download the package
+        $options = new Registry();
+        $options->set('userAgent', (new Version())->getUserAgent('Joomla', true, false));
+
         try {
-            $result = HttpFactory::getHttp([], ['curl', 'stream'])->get($url);
+            $result = (new HttpFactory())->getHttp($options, ['curl', 'stream'])->get($url);
         } catch (\RuntimeException) {
             return false;
         }
@@ -810,7 +815,7 @@ protected function downloadPackage($url, $target)
      * @return  boolean
      * @since   2.5.1
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use "createUpdateFile" instead
      *              Example: $updateModel->createUpdateFile($basename);
      */
@@ -943,8 +948,6 @@ public function finaliseUpgrade()
         $installer->extension = new \Joomla\CMS\Table\Extension($db);
         $installer->extension->load(ExtensionHelper::getExtensionRecord('joomla', 'file')->extension_id);
 
-        $installer->setAdapter($installer->extension->type);
-
         $installer->setPath('manifest', JPATH_MANIFESTS . '/files/joomla.xml');
         $installer->setPath('source', JPATH_MANIFESTS . '/files');
         $installer->setPath('extension_root', JPATH_ROOT);
@@ -989,7 +992,7 @@ public function finaliseUpgrade()
          * we can assume that it was (badly) uninstalled.
          * If it isn't, add an entry to extensions.
          */
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('type') . ' = ' . $db->quote('file'))
@@ -1256,7 +1259,7 @@ public function upload()
         $tmp_src  = $userfile['tmp_name'];
 
         // Move uploaded file. Allow "unsafe" files: the Joomla update package legitimately contains
-        // PHP, which the File::upload() safety scan (default since joomla/filesystem 3.3.0) would reject.
+        // PHP, which the File::upload() safety scan (default since joomla/filesystem 4.2.0) would reject.
         try {
             File::upload($tmp_src, $tmp_dest, false, true);
         } catch (FilesystemException $exception) {
@@ -1294,11 +1297,7 @@ public function captiveLogin($credentials)
         $authenticate = Authentication::getInstance();
         $response     = $authenticate->authenticate($credentials);
 
-        if ($response->status !== Authentication::STATUS_SUCCESS) {
-            return false;
-        }
-
-        return true;
+        return $response->status === Authentication::STATUS_SUCCESS;
     }
 
     /**
@@ -1312,11 +1311,7 @@ public function captiveFileExists()
     {
         $file = Factory::getApplication()->getUserState('com_joomlaupdate.temp_file', null);
 
-        if (empty($file) || !is_file($file)) {
-            return false;
-        }
-
-        return true;
+        return !empty($file) && is_file($file);
     }
 
     /**
@@ -1427,33 +1422,37 @@ public function getPhpOptions()
             $option->notice = $option->state ? null : Text::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_DATABASE_NOT_SUPPORTED_NOTICE');
             $options[]      = $option;
 
-            // Check if the Joomla 5 backwards compatibility plugin is disabled
-            $plugin = ExtensionHelper::getExtensionRecord('compat', 'plugin', 0, 'behaviour');
-
-            $this->translateExtensionName($plugin);
-
-            $option         = new \stdClass();
-            $option->state  = !PluginHelper::isEnabled('behaviour', 'compat');
-            $option->label  = $option->state
-                ? $plugin->name
-                : Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_BC_DISABLED_TITLE', $plugin->name);
-            $option->notice = $option->state
-                ? null
-                : Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_BC_DISABLED_NOTICE', $plugin->name, $plugin->folder, $plugin->element);
-            $options[]      = $option;
+            // Check if the backwards compatibility plugin of current Joomla major version is disabled
+            $plugin = ExtensionHelper::getExtensionRecord('compat' . Version::MAJOR_VERSION, 'plugin', 0, 'behaviour');
+
+            if ($plugin) {
+                $this->translateExtensionName($plugin);
+
+                $option         = new \stdClass();
+                $option->state  = !PluginHelper::isEnabled($plugin->folder, $plugin->element);
+                $option->label  = $option->state
+                    ? $plugin->name
+                    : Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_BC_DISABLED_TITLE', $plugin->name);
+                $option->notice = $option->state
+                    ? null
+                    : Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_BC_DISABLED_NOTICE', $plugin->name, $plugin->folder, $plugin->element);
+                $options[]      = $option;
+            }
 
-            // Check if the Joomla 6 backwards compatibility plugin is enabled
-            $plugin = ExtensionHelper::getExtensionRecord('compat6', 'plugin', 0, 'behaviour');
+            // Check if the backwards compatibility plugin of next Joomla major version is enabled
+            $plugin = ExtensionHelper::getExtensionRecord('compat' . (Version::MAJOR_VERSION + 1), 'plugin', 0, 'behaviour');
 
-            $this->translateExtensionName($plugin);
+            if ($plugin) {
+                $this->translateExtensionName($plugin);
 
-            $option         = new \stdClass();
-            $option->state  = PluginHelper::isEnabled('behaviour', 'compat6');
-            $option->label  = $option->state
-                ? $plugin->name
-                : Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_BC_ENABLED_TITLE', $plugin->name);
-            $option->notice = $option->state ? null : Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_ENABLED_NOTICE', $plugin->folder, $plugin->element);
-            $options[]      = $option;
+                $option         = new \stdClass();
+                $option->state  = PluginHelper::isEnabled($plugin->folder, $plugin->element);
+                $option->label  = $option->state
+                    ? $plugin->name
+                    : Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_BC_ENABLED_TITLE', $plugin->name);
+                $option->notice = $option->state ? null : Text::sprintf('COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_ENABLED_NOTICE', $plugin->folder, $plugin->element);
+                $options[]      = $option;
+            }
         }
 
         // Check if database structure is up to date
@@ -1680,13 +1679,8 @@ private function getDatabaseSchemaCheck(): bool
             return false;
         }
 
-        // Check if database schema version does not match CMS version
-        if ($model->getSchemaVersion($coreExtensionInfo->extension_id) != $changeInformation['schema']) {
-            return false;
-        }
-
-        // No database problems found
-        return true;
+        // Check if database schema version match CMS version
+        return $model->getSchemaVersion($coreExtensionInfo->extension_id) === $changeInformation['schema'];
     }
 
     /**
@@ -1699,7 +1693,7 @@ private function getDatabaseSchemaCheck(): bool
     public function getNonCoreExtensions()
     {
         $db    = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             [
@@ -1747,7 +1741,7 @@ public function getNonCoreExtensions()
     public function getNonCorePlugins($folderFilter = ['system', 'user', 'authentication', 'actionlog', 'multifactorauth'])
     {
         $db    = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             $db->quoteName('ex.name') . ', ' .
@@ -1794,7 +1788,7 @@ public function getNonCorePlugins($folderFilter = ['system', 'user', 'authentica
     }
 
     /**
-     * Called by controller's fetchExtensionCompatibility, which is called via AJAX.
+     * Called by controller's batchextensioncompatibility, which is called via AJAX.
      *
      * @param   string  $extensionID          The ID of the checked extension
      * @param   string  $joomlaTargetVersion  Target version of Joomla
@@ -1859,7 +1853,7 @@ private function getUpdateSitesInfo($extensionID)
     {
         $id    = (int) $extensionID;
         $db    = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             [
@@ -1911,7 +1905,10 @@ private function getCollectionDetailsUrls($updateSiteInfo, $joomlaTargetVersion)
     {
         $return = [];
 
-        $http = new Http();
+        $options = new Registry();
+        $options->set('userAgent', (new Version())->getUserAgent('Joomla', true, false));
+
+        $http = (new HttpFactory())->getHttp($options);
 
         try {
             $response = $http->get($updateSiteInfo['location']);
@@ -2005,7 +2002,7 @@ private function checkCompatibility($updateFileUrl, $joomlaTargetVersion)
      *
      * @return  void
      *
-     * @since   5.4.8
+     * @since   6.1.3
      */
     private function reportCompatibilityUpdateSiteFailure(array $updateSiteInfo, \Throwable $exception): void
     {
@@ -2100,7 +2097,7 @@ protected function translateExtensionName(&$item)
     public function isTemplateActive($template)
     {
         $db    = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             $db->quoteName(
@@ -2129,7 +2126,7 @@ function ($value) {
         $menu = false;
 
         if (\count($ids)) {
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->select(
                 'COUNT(*)'
@@ -2437,7 +2434,7 @@ public function resetUpdateSource()
 
         $params = $params->toString();
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->update($db->quoteName('#__extensions'))
             ->set($db->quoteName('params') . ' = :params')
             ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php
index 5f7bcef919994..b19882347dd41 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php
@@ -47,7 +47,7 @@
     'textPrefix' => 'COM_JOOMLAUPDATE' . $this->messagePrefix,
     'content'    => $reasonNoDownload . Text::sprintf($this->langKey, $this->updateSourceKey),
     'formURL'    => 'index.php?option=com_joomlaupdate&view=joomlaupdate',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Updating_from_an_existing_version',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/migration',
     'icon'       => 'icon-loop joomlaupdate',
     'createURL'  => 'index.php?option=com_joomlaupdate&task=update.purge&' . Session::getFormToken() . '=1'
 ];
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
index 8101f06c2d1e3..9797d65c4d922 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
@@ -16,9 +16,8 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\Version;
-use Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView;
 
-/** @var HtmlView $this */
+/** @var \Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView $this */
 
 /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->getDocument()->getWebAssetManager();
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php
index 8e402929e3680..b770ca600a3f9 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/reinstall.php
@@ -28,7 +28,7 @@
     'textPrefix' => 'COM_JOOMLAUPDATE_REINSTALL',
     'content'    => Text::sprintf($this->langKey, $this->updateSourceKey),
     'formURL'    => 'index.php?option=com_joomlaupdate&view=joomlaupdate',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Updating_from_an_existing_version',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/migration',
     'icon'       => 'icon-loop joomlaupdate',
     'createURL'  => '#'
 ];
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/selfupdate.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/selfupdate.php
index 52044361cb0b2..4b05ae8e9bb50 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/selfupdate.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/selfupdate.php
@@ -15,7 +15,7 @@
 $displayData = [
     'textPrefix' => 'COM_JOOMLAUPDATE_SELF',
     'formURL'    => 'index.php?option=com_joomlaupdate&view=joomlaupdate',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Updating_from_an_existing_version',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/migration',
     'icon'       => 'icon-loop joomlaupdate',
     'createURL'  => 'index.php?option=com_installer&view=update'
 ];
diff --git a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php
index d316daba2266f..8719f09dc4e6b 100644
--- a/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php
+++ b/administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php
@@ -29,7 +29,7 @@
     'title'      => Text::sprintf('COM_JOOMLAUPDATE_UPDATE_EMPTYSTATE_TITLE', $this->escape($this->updateInfo['latest'])),
     'content'    => Text::sprintf($this->langKey, $this->updateSourceKey),
     'formURL'    => 'index.php?option=com_joomlaupdate&view=joomlaupdate',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Updating_from_an_existing_version',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/migration',
     'icon'       => 'icon-loop joomlaupdate',
     'createURL'  => '#'
 ];
diff --git a/administrator/components/com_joomlaupdate/tmpl/update/default.php b/administrator/components/com_joomlaupdate/tmpl/update/default.php
index 898a647e62433..dac13c3f840c3 100644
--- a/administrator/components/com_joomlaupdate/tmpl/update/default.php
+++ b/administrator/components/com_joomlaupdate/tmpl/update/default.php
@@ -45,7 +45,7 @@
 $password = Factory::getApplication()->getUserState('com_joomlaupdate.password', null);
 $filesize = Factory::getApplication()->getUserState('com_joomlaupdate.filesize', null);
 $ajaxUrl = Uri::base() . 'components/com_joomlaupdate/extract.php';
-$returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise&' . Factory::getSession()->getFormToken() . '=1';
+$returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise&' . Factory::getApplication()->getSession()->getFormToken() . '=1';
 
 $this->getDocument()->addScriptOptions(
     'joomlaupdate',
diff --git a/administrator/components/com_joomlaupdate/tmpl/upload/default.php b/administrator/components/com_joomlaupdate/tmpl/upload/default.php
index 1626462d8d430..8f54385b0e0bf 100644
--- a/administrator/components/com_joomlaupdate/tmpl/upload/default.php
+++ b/administrator/components/com_joomlaupdate/tmpl/upload/default.php
@@ -14,9 +14,8 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Updater\Update;
 use Joomla\CMS\Utility\Utility;
-use Joomla\Component\Joomlaupdate\Administrator\View\Joomlaupdate\HtmlView;
 
-/** @var HtmlView $this */
+/** @var \Joomla\Component\Joomlaupdate\Administrator\View\Upload\HtmlView $this */
 
 /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->getDocument()->getWebAssetManager();
diff --git a/administrator/components/com_languages/config.xml b/administrator/components/com_languages/config.xml
index 89b9af7140712..c2f4fabe59fc2 100644
--- a/administrator/components/com_languages/config.xml
+++ b/administrator/components/com_languages/config.xml
@@ -1,6 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <config>
 	<help key="Languages:_Options"/>
+	<fieldset
+		name="fallback"
+		label="COM_LANGUAGES_CONFIG_FALLBACK_FIELDSET_LABEL"
+		description="COM_LANGUAGES_CONFIG_FALLBACK_FIELDSET_DESC"
+		>
+
+		<field
+			name="fallback_overrides"
+			type="subform"
+			label="COM_LANGUAGES_CONFIG_FALLBACK_OVERRIDES_LABEL"
+			description="COM_LANGUAGES_CONFIG_FALLBACK_OVERRIDES_DESC"
+			multiple="true"
+			layout="joomla.form.field.subform.repeatable-table"
+			>
+			<form>
+				<field
+					name="tag"
+					type="text"
+					label="COM_LANGUAGES_CONFIG_FALLBACK_TAG_LABEL"
+					description="COM_LANGUAGES_CONFIG_FALLBACK_TAG_DESC"
+					filter="cmd"
+					hint="de-CH"
+                    required="true"
+
+				/>
+
+				<field
+					name="fallback"
+					type="text"
+					label="COM_LANGUAGES_CONFIG_FALLBACK_TARGET_LABEL"
+					description="COM_LANGUAGES_CONFIG_FALLBACK_TARGET_DESC"
+					filter="cmd"
+					hint="de-DE"
+           			required="true"
+			/>
+			</form>
+		</field>
+	</fieldset>
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"
diff --git a/administrator/components/com_languages/src/Controller/OverrideController.php b/administrator/components/com_languages/src/Controller/OverrideController.php
index 737fc9a668d33..5b92c20885c8b 100644
--- a/administrator/components/com_languages/src/Controller/OverrideController.php
+++ b/administrator/components/com_languages/src/Controller/OverrideController.php
@@ -195,4 +195,51 @@ public function cancel($key = null)
         $this->app->setUserState($context . '.data', null);
         $this->setRedirect(Route::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false));
     }
+
+    /**
+     * Gets the URL arguments to append to an item redirect.
+     *
+     * @param   integer  $recordId  The primary key id for the item.
+     * @param   string   $urlVar    The name of the URL variable for the id.
+     *
+     * @return  string  The arguments to append to the redirect URL.
+     *
+     * @since   6.1.0
+     */
+    protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
+    {
+        $append = parent::getRedirectToItemAppend($recordId, $urlVar);
+
+        $filterLanguage = $this->input->get('filter_language', '', 'cmd');
+
+        if ($filterLanguage !== '') {
+            $append .= '&filter_language=' . $filterLanguage;
+        }
+
+        $filterClient = $this->input->get('filter_client', null, 'int');
+
+        if ($filterClient !== null) {
+            $append .= '&filter_client=' . $filterClient;
+        }
+
+        $sourceKey = $this->input->get('source_key', '', 'cmd');
+
+        if ($sourceKey !== '') {
+            $append .= '&source_key=' . rawurlencode($sourceKey);
+        }
+
+        $sourceLanguage = $this->input->get('source_language', '', 'cmd');
+
+        if ($sourceLanguage !== '') {
+            $append .= '&source_language=' . $sourceLanguage;
+        }
+
+        $sourceText = $this->input->getString('source_text', '');
+
+        if ($sourceText !== '') {
+            $append .= '&source_text=' . rawurlencode($sourceText);
+        }
+
+        return $append;
+    }
 }
diff --git a/administrator/components/com_languages/src/Helper/MultilangstatusHelper.php b/administrator/components/com_languages/src/Helper/MultilangstatusHelper.php
index 1923d723313de..b06b599f480d7 100644
--- a/administrator/components/com_languages/src/Helper/MultilangstatusHelper.php
+++ b/administrator/components/com_languages/src/Helper/MultilangstatusHelper.php
@@ -36,7 +36,7 @@ public static function getHomes()
     {
         // Check for multiple Home pages.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__menu'))
             ->where(
@@ -61,7 +61,7 @@ public static function getLangswitchers()
     {
         // Check if switcher is published.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__modules'))
             ->where(
@@ -86,7 +86,7 @@ public static function getContentlangs()
     {
         // Check for published Content Languages.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('lang_code'),
@@ -110,7 +110,7 @@ public static function getStatus()
     {
         // Check for combined status.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select all fields from the languages table.
         $query->select(
@@ -156,7 +156,7 @@ public static function getContacts()
         $languages = \count(LanguageHelper::getLanguages());
 
         // Get the number of contact with all as language
-        $alang = $db->getQuery(true)
+        $alang = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__contact_details', 'cd'))
             ->where(
@@ -168,7 +168,7 @@ public static function getContacts()
             );
 
         // Get the number of languages for the contact
-        $slang = $db->getQuery(true)
+        $slang = $db->createQuery()
             ->select('COUNT(DISTINCT ' . $db->quoteName('l.lang_code') . ')')
             ->from($db->quoteName('#__languages', 'l'))
             ->join('LEFT', $db->quoteName('#__contact_details', 'cd'), $db->quoteName('cd.language') . ' = ' . $db->quoteName('l.lang_code'))
@@ -181,7 +181,7 @@ public static function getContacts()
             );
 
         // Get the number of multiple contact/language
-        $mlang = $db->getQuery(true)
+        $mlang = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__languages', 'l'))
             ->join('LEFT', $db->quoteName('#__contact_details', 'cd'), $db->quoteName('cd.language') . ' = ' . $db->quoteName('l.lang_code'))
@@ -196,12 +196,12 @@ public static function getContacts()
             ->having('COUNT(*) > 1');
 
         // Get the contacts
-        $subQuery = $db->getQuery(true)
+        $subQuery = $db->createQuery()
             ->select('1')
             ->from($db->quoteName('#__content', 'c'))
             ->where($db->quoteName('c.created_by') . ' = ' . $db->quoteName('u.id'));
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('u.name'),
@@ -251,7 +251,7 @@ public static function getDefaultHomeModule()
     {
         // Find Default Home menutype.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('menutype'))
             ->from($db->quoteName('#__menu'))
             ->where(
@@ -311,7 +311,7 @@ public static function getModule($moduleName, $instanceTitle = null)
     {
         $db = Factory::getDbo();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id'),
diff --git a/administrator/components/com_languages/src/Model/InstalledModel.php b/administrator/components/com_languages/src/Model/InstalledModel.php
index 950d735508294..9f33139c5205d 100644
--- a/administrator/components/com_languages/src/Model/InstalledModel.php
+++ b/administrator/components/com_languages/src/Model/InstalledModel.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Extension;
 use Joomla\Filesystem\Folder;
 use Joomla\Utilities\ArrayHelper;
 
@@ -288,7 +288,7 @@ public function publish($cid)
             $params = ComponentHelper::getParams('com_languages');
             $params->set($client->name, $cid);
 
-            $table = Table::getInstance('extension', 'Joomla\\CMS\\Table\\');
+            $table = new Extension($this->getDatabase());
             $id    = $table->find(['element' => 'com_languages']);
 
             // Load.
diff --git a/administrator/components/com_languages/src/Model/LanguageModel.php b/administrator/components/com_languages/src/Model/LanguageModel.php
index 5c191be729218..5ae98e8ac1828 100644
--- a/administrator/components/com_languages/src/Model/LanguageModel.php
+++ b/administrator/components/com_languages/src/Model/LanguageModel.php
@@ -12,12 +12,15 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model\AfterSaveEvent;
+use Joomla\CMS\Event\Model\BeforeSaveEvent;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Table\Language;
 use Joomla\CMS\Table\Table;
 use Joomla\Utilities\ArrayHelper;
 
@@ -70,7 +73,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
      */
     public function getTable($name = '', $prefix = '', $options = [])
     {
-        return Table::getInstance('Language', 'Joomla\\CMS\\Table\\');
+        return new Language($this->getDatabase());
     }
 
     /**
@@ -127,7 +130,7 @@ public function getItem($langId = null)
         }
 
         $properties = $table->getProperties(1);
-        $value      = ArrayHelper::toObject($properties, CMSObject::class);
+        $value      = ArrayHelper::toObject($properties);
 
         return $value;
     }
@@ -138,20 +141,14 @@ public function getItem($langId = null)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form|bool  A Form object on success, false on failure.
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_languages.language', 'language', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_languages.language', 'language', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -189,7 +186,8 @@ public function save($data)
         $langId = (!empty($data['lang_id'])) ? $data['lang_id'] : (int) $this->getState('language.id');
         $isNew  = true;
 
-        PluginHelper::importPlugin($this->events_map['save']);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['save'], null, true, $dispatcher);
 
         $table   = $this->getTable();
         $context = $this->option . '.' . $this->name;
@@ -237,7 +235,15 @@ public function save($data)
         }
 
         // Trigger the before save event.
-        $result = Factory::getApplication()->triggerEvent($this->event_before_save, [$context, &$table, $isNew]);
+        $result = $dispatcher->dispatch(
+            $this->event_before_save,
+            new BeforeSaveEvent($this->event_before_save, [
+                'context' => $context,
+                'subject' => $table,
+                'isNew'   => $isNew,
+                'data'    => $data,
+            ])
+        )->getArgument('result', []);
 
         // Check the event responses.
         if (\in_array(false, $result, true)) {
@@ -254,7 +260,15 @@ public function save($data)
         }
 
         // Trigger the after save event.
-        Factory::getApplication()->triggerEvent($this->event_after_save, [$context, &$table, $isNew]);
+        $dispatcher->dispatch(
+            $this->event_after_save,
+            new AfterSaveEvent($this->event_after_save, [
+                'context' => $context,
+                'subject' => $table,
+                'isNew'   => $isNew,
+                'data'    => $data,
+            ])
+        );
 
         $this->setState('language.id', $table->lang_id);
 
@@ -267,15 +281,13 @@ public function save($data)
     /**
      * Custom clean cache method.
      *
-     * @param   string   $group     Optional cache group name.
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('_system');
         parent::cleanCache('com_languages');
diff --git a/administrator/components/com_languages/src/Model/LanguagesModel.php b/administrator/components/com_languages/src/Model/LanguagesModel.php
index bd2a894d108af..8793360280deb 100644
--- a/administrator/components/com_languages/src/Model/LanguagesModel.php
+++ b/administrator/components/com_languages/src/Model/LanguagesModel.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Language;
 use Joomla\Database\ParameterType;
 use Joomla\Database\QueryInterface;
 
@@ -113,7 +113,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select all fields from the languages table.
         $query->select(
@@ -182,7 +182,9 @@ protected function getListQuery()
      */
     public function setPublished($cid, $value = 0)
     {
-        return Table::getInstance('Language', 'Joomla\\CMS\\Table\\')->publish($cid, $value);
+        $table = new Language($this->getDatabase());
+
+        return $table->publish($cid, $value);
     }
 
     /**
@@ -200,7 +202,7 @@ public function delete($pks)
         $pks = (array) $pks;
 
         // Get a row instance.
-        $table = Table::getInstance('Language', 'Joomla\\CMS\\Table\\');
+        $table = new Language($this->getDatabase());
 
         // Iterate the items to delete each one.
         foreach ($pks as $itemId) {
@@ -220,15 +222,13 @@ public function delete($pks)
     /**
      * Custom clean cache method, 2 places for 2 clients.
      *
-     * @param   string   $group     Optional cache group name.
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('_system');
         parent::cleanCache('com_languages');
diff --git a/administrator/components/com_languages/src/Model/OverrideModel.php b/administrator/components/com_languages/src/Model/OverrideModel.php
index ed8d5f5131384..222c553dd010c 100644
--- a/administrator/components/com_languages/src/Model/OverrideModel.php
+++ b/administrator/components/com_languages/src/Model/OverrideModel.php
@@ -11,6 +11,7 @@
 namespace Joomla\Component\Languages\Administrator\Model;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Language;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
@@ -34,19 +35,16 @@ class OverrideModel extends AdminModel
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form|bool  A Form object on success, false on failure.
+     * @return  Form  A Form object
      *
      * @since   2.5
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
         // Get the form.
         $form = $this->loadForm('com_languages.override', 'override', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         $client   = $this->getState('filter.client', 'site');
         $language = $this->getState('filter.language', 'en-GB');
         $langName = Language::getInstance($language)->getName();
@@ -74,12 +72,40 @@ public function getForm($data = [], $loadData = true)
     protected function loadFormData()
     {
         // Check the session for previously entered form data.
-        $data = Factory::getApplication()->getUserState('com_languages.edit.override.data', []);
+        $data  = Factory::getApplication()->getUserState('com_languages.edit.override.data', []);
+        $input = Factory::getApplication()->getInput();
 
         if (empty($data)) {
             $data = $this->getItem();
         }
 
+        $currentKey      = \is_object($data) ? ($data->key ?? '') : ($data['key'] ?? '');
+        $currentOverride = \is_object($data) ? ($data->override ?? '') : ($data['override'] ?? '');
+
+        if ($currentKey === '') {
+            $sourceKey = $input->get('source_key', '', 'cmd');
+
+            if ($sourceKey !== '') {
+                if (\is_object($data)) {
+                    $data->key = $sourceKey;
+                } else {
+                    $data['key'] = $sourceKey;
+                }
+            }
+        }
+
+        if ($currentOverride === '') {
+            $sourceText = $input->getString('source_text', '');
+
+            if ($sourceText !== '') {
+                if (\is_object($data)) {
+                    $data->override = $sourceText;
+                } else {
+                    $data['override'] = $sourceText;
+                }
+            }
+        }
+
         $this->preprocessData('com_languages.override', $data);
 
         return $data;
diff --git a/administrator/components/com_languages/src/Model/OverridesModel.php b/administrator/components/com_languages/src/Model/OverridesModel.php
index 63092bcc64358..a01051911589b 100644
--- a/administrator/components/com_languages/src/Model/OverridesModel.php
+++ b/administrator/components/com_languages/src/Model/OverridesModel.php
@@ -115,6 +115,59 @@ public function getOverrides($all = false)
         return $this->cache[$store];
     }
 
+    /**
+     * Retrieves overrides for all installed languages for the current client.
+     *
+     * @return  array
+     *
+     * @since   6.1.0
+     */
+    public function getLanguageOverrides()
+    {
+        $store = $this->getStoreId('languageOverrides');
+
+        if (!empty($this->cache[$store])) {
+            return $this->cache[$store];
+        }
+
+        $client    = strtoupper($this->getState('filter.client'));
+        $languages = $this->getLanguages();
+        $overrides = [];
+        $basePath  = \constant('JPATH_' . $client) . '/language/overrides/';
+
+        foreach ($languages as $tag => $language) {
+            $fileName        = $basePath . $tag . '.override.ini';
+            $overrides[$tag] = LanguageHelper::parseIniFile($fileName);
+        }
+
+        $this->cache[$store] = $overrides;
+
+        return $this->cache[$store];
+    }
+
+    /**
+     * Retrieves installed languages for the current client.
+     *
+     * @return  array
+     *
+     * @since   6.1.0
+     */
+    public function getLanguages()
+    {
+        $store = $this->getStoreId('languages');
+
+        if (!empty($this->cache[$store])) {
+            return $this->cache[$store];
+        }
+
+        $client = strtoupper($this->getState('filter.client'));
+        $path   = \constant('JPATH_' . $client);
+
+        $this->cache[$store] = LanguageHelper::getKnownLanguages($path);
+
+        return $this->cache[$store];
+    }
+
     /**
      * Method to get the total number of overrides.
      *
diff --git a/administrator/components/com_languages/src/Model/StringsModel.php b/administrator/components/com_languages/src/Model/StringsModel.php
index 0ffbd2de50420..06fb9df16ba91 100644
--- a/administrator/components/com_languages/src/Model/StringsModel.php
+++ b/administrator/components/com_languages/src/Model/StringsModel.php
@@ -51,7 +51,7 @@ public function refresh()
         }
 
         // Create the insert query.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->insert($db->quoteName('#__overrider'))
             ->columns(
                 [
@@ -142,7 +142,7 @@ public function search()
             $searchstring = '%' . $filter->clean($searchTerm, 'TRIM') . '%';
 
             // Create the search query.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('constant'),
diff --git a/administrator/components/com_languages/src/Rule/DisallowQuotesRule.php b/administrator/components/com_languages/src/Rule/DisallowQuotesRule.php
index 1b9f00a12adc0..c0988372a0de0 100644
--- a/administrator/components/com_languages/src/Rule/DisallowQuotesRule.php
+++ b/administrator/components/com_languages/src/Rule/DisallowQuotesRule.php
@@ -24,7 +24,7 @@
  * The DisallowQuotesRule Class.
  * Validates that non-superadmins can not use quotes or doublequotes in i18n overrides
  *
- * @since  joomla 5.4.7
+ * @since  joomla 6.1.2
  */
 class DisallowQuotesRule extends FormRule
 {
diff --git a/administrator/components/com_languages/src/View/Installed/HtmlView.php b/administrator/components/com_languages/src/View/Installed/HtmlView.php
index 865fbe5f6fce0..3413acbd2f80e 100644
--- a/administrator/components/com_languages/src/View/Installed/HtmlView.php
+++ b/administrator/components/com_languages/src/View/Installed/HtmlView.php
@@ -95,6 +95,11 @@ public function display($tpl = null)
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_languages/src/View/Language/HtmlView.php b/administrator/components/com_languages/src/View/Language/HtmlView.php
index 1ec3be4a03421..09d9fe9c18538 100644
--- a/administrator/components/com_languages/src/View/Language/HtmlView.php
+++ b/administrator/components/com_languages/src/View/Language/HtmlView.php
@@ -77,6 +77,10 @@ public function display($tpl = null)
         $this->state = $model->getState();
         $this->canDo = ContentHelper::getActions('com_languages');
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         $this->addToolbar();
         parent::display($tpl);
     }
diff --git a/administrator/components/com_languages/src/View/Languages/HtmlView.php b/administrator/components/com_languages/src/View/Languages/HtmlView.php
index 282680011f8fe..cf3dfecf1b6a1 100644
--- a/administrator/components/com_languages/src/View/Languages/HtmlView.php
+++ b/administrator/components/com_languages/src/View/Languages/HtmlView.php
@@ -87,6 +87,11 @@ public function display($tpl = null)
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_languages/src/View/Override/HtmlView.php b/administrator/components/com_languages/src/View/Override/HtmlView.php
index b945582f7c14a..903d9ab803755 100644
--- a/administrator/components/com_languages/src/View/Override/HtmlView.php
+++ b/administrator/components/com_languages/src/View/Override/HtmlView.php
@@ -96,6 +96,11 @@ public function display($tpl = null)
         Text::script('COM_LANGUAGES_VIEW_OVERRIDE_NO_RESULTS');
         Text::script('COM_LANGUAGES_VIEW_OVERRIDE_REQUEST_ERROR');
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task')
+            ->addControlField('id', $this->item->key);
+
         $this->addToolbar();
         parent::display($tpl);
     }
diff --git a/administrator/components/com_languages/src/View/Overrides/HtmlView.php b/administrator/components/com_languages/src/View/Overrides/HtmlView.php
index 6a7da3bddbe69..a54906fd4f3b3 100644
--- a/administrator/components/com_languages/src/View/Overrides/HtmlView.php
+++ b/administrator/components/com_languages/src/View/Overrides/HtmlView.php
@@ -11,6 +11,7 @@
 namespace Joomla\Component\Languages\Administrator\View\Overrides;
 
 use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\ToolbarHelper;
@@ -59,6 +60,22 @@ class HtmlView extends BaseHtmlView
      */
     protected $languages;
 
+    /**
+     * Holds overrides indexed by language tag.
+     *
+     * @var    array
+     * @since  6.1.0
+     */
+    protected $languageOverrides;
+
+    /**
+     * Holds content languages data keyed by language tag.
+     *
+     * @var    array
+     * @since  6.1.0
+     */
+    protected $contentLanguages;
+
     /**
      * Form object for search filters
      *
@@ -88,11 +105,19 @@ public function display($tpl = null)
         $model = $this->getModel();
         $model->setUseExceptions(true);
 
-        $this->state         = $model->getState();
-        $this->items         = $model->getOverrides();
-        $this->pagination    = $model->getPagination();
-        $this->filterForm    = $model->getFilterForm();
-        $this->activeFilters = $model->getActiveFilters();
+        $this->state             = $model->getState();
+        $this->items             = $model->getOverrides();
+        $this->pagination        = $model->getPagination();
+        $this->filterForm        = $model->getFilterForm();
+        $this->activeFilters     = $model->getActiveFilters();
+        $this->languages         = $model->getLanguages();
+        $this->languageOverrides = $model->getLanguageOverrides();
+        $this->contentLanguages  = LanguageHelper::getLanguages('lang_code');
+
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
 
         $this->addToolbar();
         parent::display($tpl);
diff --git a/administrator/components/com_languages/tmpl/installed/default.php b/administrator/components/com_languages/tmpl/installed/default.php
index 02e4a83886341..582b5daa41c3d 100644
--- a/administrator/components/com_languages/tmpl/installed/default.php
+++ b/administrator/components/com_languages/tmpl/installed/default.php
@@ -135,9 +135,8 @@
                     <?php echo $this->pagination->getListFooter(); ?>
 
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_languages/tmpl/language/edit.php b/administrator/components/com_languages/tmpl/language/edit.php
index 3288093d4fb89..8ddd5db4914c5 100644
--- a/administrator/components/com_languages/tmpl/language/edit.php
+++ b/administrator/components/com_languages/tmpl/language/edit.php
@@ -83,6 +83,5 @@
 
     <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_languages/tmpl/languages/default.php b/administrator/components/com_languages/tmpl/languages/default.php
index b9930320a5626..844dd1fe08147 100644
--- a/administrator/components/com_languages/tmpl/languages/default.php
+++ b/administrator/components/com_languages/tmpl/languages/default.php
@@ -165,9 +165,8 @@
                     <?php echo $this->pagination->getListFooter(); ?>
 
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_languages/tmpl/override/edit.php b/administrator/components/com_languages/tmpl/override/edit.php
index 6df1ece2e9778..c37c2602107ce 100644
--- a/administrator/components/com_languages/tmpl/override/edit.php
+++ b/administrator/components/com_languages/tmpl/override/edit.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -83,10 +82,7 @@
                 </span>
             </fieldset>
 
-            <input type="hidden" name="task" value="">
-            <input type="hidden" name="id" value="<?php echo $this->item->key; ?>">
-
-            <?php echo HTMLHelper::_('form.token'); ?>
+            <?php echo $this->form->renderControlFields(); ?>
         </div>
     </div>
 </form>
diff --git a/administrator/components/com_languages/tmpl/overrides/default.php b/administrator/components/com_languages/tmpl/overrides/default.php
index 66b295bd8c4c3..ad17d212bc2a4 100644
--- a/administrator/components/com_languages/tmpl/overrides/default.php
+++ b/administrator/components/com_languages/tmpl/overrides/default.php
@@ -23,15 +23,19 @@
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
-$client    = $this->state->get('filter.client') == 'site' ? Text::_('JSITE') : Text::_('JADMINISTRATOR');
-$language  = $this->state->get('filter.language');
-$listOrder = $this->escape($this->state->get('list.ordering'));
-$listDirn  = $this->escape($this->state->get('list.direction'));
+$client            = $this->state->get('filter.client') == 'site' ? Text::_('JSITE') : Text::_('JADMINISTRATOR');
+$language          = $this->state->get('filter.language');
+$listOrder         = $this->escape($this->state->get('list.ordering'));
+$listDirn          = $this->escape($this->state->get('list.direction'));
+$filterClientValue = $this->state->get('filter.client') === 'administrator' ? 1 : 0;
 
 $oppositeClient   = $this->state->get('filter.client') == 'administrator' ? Text::_('JSITE') : Text::_('JADMINISTRATOR');
 $oppositeFilename = constant('JPATH_' . strtoupper($this->state->get('filter.client') === 'site' ? 'administrator' : 'site'))
     . '/language/overrides/' . $this->state->get('filter.language', 'en-GB') . '.override.ini';
 $oppositeStrings  = LanguageHelper::parseIniFile($oppositeFilename);
+$languageOverrides = $this->languageOverrides ?? [];
+$installedLanguages = $this->languages ?? [];
+$contentLanguages   = $this->contentLanguages ?? [];
 ?>
 
 <form action="<?php echo Route::_('index.php?option=com_languages&view=overrides'); ?>" method="post" name="adminForm" id="adminForm">
@@ -69,10 +73,17 @@
                                 <th scope="col" class="d-none d-md-table-cell">
                                     <?php echo Text::_('JCLIENT'); ?>
                                 </th>
+                                <th scope="col" class="d-none d-md-table-cell">
+                                    <?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDES_OVERRIDE'); ?>
+                                </th>
+                                <th scope="col" class="d-none d-md-table-cell">
+                                    <?php echo Text::_('COM_LANGUAGES_VIEW_OVERRIDES_NO_OVERRIDE'); ?>
+                                </th>
                             </tr>
                         </thead>
                         <tbody>
                         <?php $canEdit = $this->getCurrentUser()->authorise('core.edit', 'com_languages'); ?>
+                        <?php $canCreate = $this->getCurrentUser()->authorise('core.create', 'com_languages'); ?>
                         <?php $i = 0; ?>
                         <?php foreach ($this->items as $key => $text) : ?>
                             <tr class="row<?php echo $i % 2; ?>" id="overriderrow<?php echo $i; ?>">
@@ -101,6 +112,63 @@
                                     endif;
                                     ?>
                                 </td>
+                                <?php
+                                $translatedBadges   = [];
+                                $untranslatedBadges = [];
+
+                                foreach ($installedLanguages as $tag => $langData) :
+                                    if ($tag === $language) :
+                                        continue;
+                                    endif;
+
+                                    $hasOverride     = isset($languageOverrides[$tag][$key]);
+                                    $contentLanguage = $contentLanguages[$tag] ?? null;
+                                    $languageTitle   = $contentLanguage->title ?? ($langData['nativeName'] ?? $langData['name'] ?? $tag);
+
+                                    $query = [
+                                        'option'          => 'com_languages',
+                                        'task'            => $hasOverride ? 'override.edit' : 'override.add',
+                                        'filter_language' => $tag,
+                                        'filter_client'   => $filterClientValue,
+                                        'source_language' => $language,
+                                        'source_key'      => $key,
+                                    ];
+
+                                    if ($hasOverride) {
+                                        $query['id'] = $key;
+                                    } else {
+                                        $query['source_text'] = $text;
+                                    }
+
+                                    $link = ($hasOverride && $canEdit) || (!$hasOverride && $canCreate)
+                                        ? Route::_('index.php?' . http_build_query($query, '', '&', PHP_QUERY_RFC3986))
+                                        : '';
+                                    $title = $hasOverride
+                                        ? Text::sprintf('COM_LANGUAGES_VIEW_OVERRIDES_EXISTS', $languageTitle)
+                                        : Text::sprintf('COM_LANGUAGES_VIEW_OVERRIDES_CREATE', $languageTitle);
+                                    $badgeClass = $hasOverride ? 'badge bg-secondary' : 'badge bg-warning';
+
+                                    $badgeHtml = $link
+                                        ? '<a class="' . $badgeClass . '" href="' . $link . '" title="' . $this->escape($title) . '">' . $this->escape($tag) . '</a>'
+                                        : '<span class="' . $badgeClass . '" title="' . $this->escape($title) . '">' . $this->escape($tag) . '</span>';
+
+                                    if ($hasOverride) {
+                                        $translatedBadges[] = $badgeHtml;
+                                    } else {
+                                        $untranslatedBadges[] = $badgeHtml;
+                                    }
+                                endforeach;
+                                ?>
+                                <td class="d-none d-md-table-cell">
+                                    <div class="d-flex flex-wrap gap-1">
+                                        <?php echo implode('', $translatedBadges); ?>
+                                    </div>
+                                </td>
+                                <td class="d-none d-md-table-cell">
+                                    <div class="d-flex flex-wrap gap-1">
+                                        <?php echo implode('', $untranslatedBadges); ?>
+                                    </div>
+                                </td>
                             </tr>
                             <?php $i++; ?>
                         <?php endforeach; ?>
@@ -112,9 +180,7 @@
 
                 <?php endif; ?>
 
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_login/src/Model/LoginModel.php b/administrator/components/com_login/src/Model/LoginModel.php
index 3ee47f7e6810e..6b67eff495238 100644
--- a/administrator/components/com_login/src/Model/LoginModel.php
+++ b/administrator/components/com_login/src/Model/LoginModel.php
@@ -139,7 +139,7 @@ protected static function _load($module)
         $loader = function () use ($app, $lang, $module) {
             $db = Factory::getDbo();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     $db->quoteName(
                         [
diff --git a/administrator/components/com_mails/src/Field/MailtemplateLayoutField.php b/administrator/components/com_mails/src/Field/MailtemplateLayoutField.php
index 4d43928dcba33..3a351d257d86c 100644
--- a/administrator/components/com_mails/src/Field/MailtemplateLayoutField.php
+++ b/administrator/components/com_mails/src/Field/MailtemplateLayoutField.php
@@ -50,7 +50,7 @@ protected function getInput()
 
         // Get the database object and a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the query.
         $query->select('element, name')
diff --git a/administrator/components/com_mails/src/Model/TemplateModel.php b/administrator/components/com_mails/src/Model/TemplateModel.php
index 10ef8e8b0d3f7..6251622911d5b 100644
--- a/administrator/components/com_mails/src/Model/TemplateModel.php
+++ b/administrator/components/com_mails/src/Model/TemplateModel.php
@@ -11,13 +11,16 @@
 namespace Joomla\Component\Mails\Administrator\Model;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model\AfterSaveEvent;
+use Joomla\CMS\Event\Model\BeforeSaveEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
+use Joomla\Database\ParameterType;
 use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
@@ -49,39 +52,22 @@ class TemplateModel extends AdminModel
      */
     public $typeAlias = 'com_mails.template';
 
-    /**
-     * Method to test whether a record can be deleted.
-     *
-     * @param   object  $record  A record object.
-     *
-     * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
-     *
-     * @since   4.0.0
-     */
-    protected function canDelete($record)
-    {
-        return false;
-    }
-
     /**
      * Method to get the record form.
      *
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form|bool  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   4.0.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
         // Get the form.
         $form = $this->loadForm('com_mails.template', 'template', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         $params = ComponentHelper::getParams('com_mails');
 
         if ($params->get('mail_style', 'plaintext') == 'plaintext') {
@@ -176,9 +162,9 @@ public function getItem($pk = null)
             }
         }
 
-        // Convert to the CMSObject before adding other data.
+        // Convert to an object before adding other data.
         $properties = $table->getProperties(1);
-        $item       = ArrayHelper::toObject($properties, CMSObject::class);
+        $item       = ArrayHelper::toObject($properties);
 
         if (property_exists($item, 'params')) {
             $registry     = new Registry($item->params);
@@ -222,9 +208,9 @@ public function getMaster($pk = null)
             }
         }
 
-        // Convert to the CMSObject before adding other data.
+        // Convert to an object before adding other data.
         $properties = $table->getProperties(1);
-        $item       = ArrayHelper::toObject($properties, CMSObject::class);
+        $item       = ArrayHelper::toObject($properties);
 
         if (property_exists($item, 'params')) {
             $registry     = new Registry($item->params);
@@ -317,7 +303,8 @@ public function save($data)
         $isNew       = true;
 
         // Include the plugins for the save events.
-        \Joomla\CMS\Plugin\PluginHelper::importPlugin($this->events_map['save']);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['save'], null, true, $dispatcher);
 
         // Allow an exception to be thrown.
         try {
@@ -349,7 +336,12 @@ public function save($data)
             }
 
             // Trigger the before save event.
-            $result = Factory::getApplication()->triggerEvent($this->event_before_save, [$context, $table, $isNew, $data]);
+            $result = $dispatcher->dispatch($this->event_before_save, new BeforeSaveEvent($this->event_before_save, [
+                'context' => $context,
+                'subject' => $table,
+                'isNew'   => $isNew,
+                'data'    => $data,
+            ]))->getArgument('result', []);
 
             if (\in_array(false, $result, true)) {
                 $this->setError($table->getError());
@@ -368,7 +360,12 @@ public function save($data)
             $this->cleanCache();
 
             // Trigger the after save event.
-            Factory::getApplication()->triggerEvent($this->event_after_save, [$context, $table, $isNew, $data]);
+            $dispatcher->dispatch($this->event_after_save, new AfterSaveEvent($this->event_after_save, [
+                'context' => $context,
+                'subject' => $table,
+                'isNew'   => $isNew,
+                'data'    => $data,
+            ]));
         } catch (\Exception $e) {
             $this->setError($e->getMessage());
 
@@ -410,4 +407,29 @@ protected function populateState()
         $language = Factory::getApplication()->getInput()->getCmd('language');
         $this->setState($this->getName() . '.language', $language);
     }
+
+    /**
+     * Method to delete one or more records.
+     *
+     * @param   array  &$pks  An array of record primary keys.
+     *
+     * @return  boolean  True if successful, false if an error occurs.
+     *
+     * @since   1.6
+     */
+    public function delete(&$pks)
+    {
+        $pks = (array)$pks;
+        foreach ($pks as $i => $pk) {
+            if (!$this->canDelete((object)['template_id' => $pk])) {
+                return false;
+            }
+        }
+
+        $db    = $this->getDatabase();
+        $query = $db->createQuery();
+        $query->delete($db->quoteName('#__mail_templates'))
+            ->whereIn($db->quoteName('template_id'), $pks, ParameterType::STRING);
+        return $db->setQuery($query)->execute();
+    }
 }
diff --git a/administrator/components/com_mails/src/Model/TemplatesModel.php b/administrator/components/com_mails/src/Model/TemplatesModel.php
index ac28287c4483b..1fddea2c6f5c0 100644
--- a/administrator/components/com_mails/src/Model/TemplatesModel.php
+++ b/administrator/components/com_mails/src/Model/TemplatesModel.php
@@ -91,7 +91,7 @@ public function getItems()
         $id    = '';
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('language'))
             ->from($db->quoteName('#__mail_templates'))
             ->where($db->quoteName('template_id') . ' = :id')
@@ -119,7 +119,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
@@ -155,7 +155,7 @@ protected function getListQuery()
                 ->bind(':extension', $extension);
         } else {
             // Only show mail template from enabled extensions
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select($db->quoteName('name'))
                 ->from($db->quoteName('#__extensions'))
                 ->where($db->quoteName('enabled') . ' = 1');
@@ -193,12 +193,12 @@ protected function getListQuery()
     public function getExtensions()
     {
         $db       = $this->getDatabase();
-        $subQuery = $db->getQuery(true)
+        $subQuery = $db->createQuery()
             ->select($db->quoteName('name'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('enabled') . ' = 1');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('extension'))
             ->from($db->quoteName('#__mail_templates'))
             ->where($db->quoteName('extension') . ' IN (' . $subQuery . ')');
diff --git a/administrator/components/com_mails/src/View/Template/HtmlView.php b/administrator/components/com_mails/src/View/Template/HtmlView.php
index dac94d2f5240c..accb985c9518e 100644
--- a/administrator/components/com_mails/src/View/Template/HtmlView.php
+++ b/administrator/components/com_mails/src/View/Template/HtmlView.php
@@ -13,7 +13,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Mails\Administrator\Helper\MailsHelper;
 use Joomla\Component\Mails\Administrator\Model\TemplateModel;
@@ -60,7 +59,7 @@ class HtmlView extends BaseHtmlView
     /**
      * Master data for the mail template
      *
-     * @var  CMSObject
+     * @var  \stdClass
      */
     protected $master;
 
@@ -112,6 +111,11 @@ public function display($tpl = null)
             }
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task')
+            ->addControlField('return', Factory::getApplication()->getInput()->get('return', '', 'BASE64'));
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_mails/src/View/Templates/HtmlView.php b/administrator/components/com_mails/src/View/Templates/HtmlView.php
index d3bc86c5c0c9d..17caf61596334 100644
--- a/administrator/components/com_mails/src/View/Templates/HtmlView.php
+++ b/administrator/components/com_mails/src/View/Templates/HtmlView.php
@@ -119,6 +119,11 @@ public function display($tpl = null)
             MailsHelper::loadTranslationFiles($extension, $currentLanguageTag);
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_mails/tmpl/template/edit.php b/administrator/components/com_mails/tmpl/template/edit.php
index 5cd1385fb84a5..b39f2fc828af1 100644
--- a/administrator/components/com_mails/tmpl/template/edit.php
+++ b/administrator/components/com_mails/tmpl/template/edit.php
@@ -116,7 +116,6 @@
     </div>
     <?php echo $this->form->renderField('template_id'); ?>
     <?php echo $this->form->renderField('language'); ?>
-    <input type="hidden" name="task" value="">
-    <input type="hidden" name="return" value="<?php echo $input->get('return', null, 'BASE64'); ?>">
-    <?php echo HTMLHelper::_('form.token'); ?>
+
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_mails/tmpl/templates/default.php b/administrator/components/com_mails/tmpl/templates/default.php
index 86690895985b8..b0d56a46f35a1 100644
--- a/administrator/components/com_mails/tmpl/templates/default.php
+++ b/administrator/components/com_mails/tmpl/templates/default.php
@@ -113,9 +113,7 @@
                     <?php echo $this->pagination->getListFooter(); ?>
                 <?php endif; ?>
 
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_media/helpers/media.php b/administrator/components/com_media/helpers/media.php
index 6e9aa05cd81fd..57f5788769644 100644
--- a/administrator/components/com_media/helpers/media.php
+++ b/administrator/components/com_media/helpers/media.php
@@ -10,8 +10,6 @@
  * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-use Joomla\CMS\Object\CMSObject;
-
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -26,26 +24,24 @@ abstract class MediaHelper
     /**
      * Generates the URL to the object in the action logs component
      *
-     * @param   string     $contentType  The content type
-     * @param   integer    $id           The integer id
-     * @param   CMSObject  $mediaObject  The media object being uploaded
+     * @param   string    $contentType  The content type
+     * @param   integer   $id           The integer id
+     * @param   \stdClass  $mediaObject  The media object being uploaded
      *
      * @return  string  The link for the action log
      *
      * @since   3.9.27
      */
-    public static function getContentTypeLink($contentType, $id, CMSObject $mediaObject)
+    public static function getContentTypeLink($contentType, $id, \stdClass $mediaObject)
     {
         if ($contentType === 'com_media.file') {
             return '';
         }
 
-        $link         = 'index.php?option=com_media';
-        $adapter      = $mediaObject->get('adapter');
-        $uploadedPath = $mediaObject->get('path');
+        $link = 'index.php?option=com_media';
 
-        if (!empty($adapter) && !empty($uploadedPath)) {
-            $link .= '&path=' . $adapter . ':' . $uploadedPath;
+        if (!empty($mediaObject->adapter) && !empty($mediaObject->path)) {
+            $link .= '&path=' . $mediaObject->adapter . ':' . $mediaObject->path;
         }
 
         return $link;
diff --git a/administrator/components/com_media/src/Controller/PluginController.php b/administrator/components/com_media/src/Controller/PluginController.php
index b97b636fdeb71..38f145e5bd717 100644
--- a/administrator/components/com_media/src/Controller/PluginController.php
+++ b/administrator/components/com_media/src/Controller/PluginController.php
@@ -59,14 +59,15 @@ public function oauthcallback()
             }
 
             // Only import our required plugin, not entire group
-            PluginHelper::importPlugin('filesystem', $pluginName);
+            $dispatcher = $this->getDispatcher();
+            PluginHelper::importPlugin('filesystem', $pluginName, true, $dispatcher);
 
             // Event parameters
             $eventParameters = ['context' => $pluginName, 'input' => $this->input];
             $event           = new OAuthCallbackEvent('onFileSystemOAuthCallback', $eventParameters);
 
             // Get results from event
-            $eventResults = (array) $this->app->triggerEvent('onFileSystemOAuthCallback', $event);
+            $eventResults = (array) $dispatcher->dispatch('onFileSystemOAuthCallback', $event)->getArgument('result', []);
 
             // If event was not triggered in the selected Plugin, raise a warning and fallback to Control Panel
             if (!$eventResults) {
diff --git a/administrator/components/com_media/src/Model/ApiModel.php b/administrator/components/com_media/src/Model/ApiModel.php
index d98f24e0cf1fa..07f15808faa54 100644
--- a/administrator/components/com_media/src/Model/ApiModel.php
+++ b/administrator/components/com_media/src/Model/ApiModel.php
@@ -11,10 +11,13 @@
 namespace Joomla\Component\Media\Administrator\Model;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model\AfterDeleteEvent;
+use Joomla\CMS\Event\Model\AfterSaveEvent;
+use Joomla\CMS\Event\Model\BeforeDeleteEvent;
+use Joomla\CMS\Event\Model\BeforeSaveEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Component\Media\Administrator\Event\FetchMediaItemEvent;
 use Joomla\Component\Media\Administrator\Event\FetchMediaItemsEvent;
@@ -146,7 +149,7 @@ public function getFiles($adapter, $path = '/', $options = [])
         $files = array_values($files);
 
         $event = new FetchMediaItemsEvent('onFetchMediaItems', ['items' => $files]);
-        Factory::getApplication()->getDispatcher()->dispatch($event->getName(), $event);
+        $this->getDispatcher()->dispatch($event->getName(), $event);
 
         return $event->getArgument('items');
     }
@@ -179,15 +182,20 @@ public function createFolder($adapter, $name, $path, $override)
             throw new FileExistsException();
         }
 
-        $app               = Factory::getApplication();
-        $object            = new CMSObject();
+        $object            = new \stdClass();
         $object->adapter   = $adapter;
         $object->name      = $name;
         $object->path      = $path;
 
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
-        $result = $app->triggerEvent('onContentBeforeSave', ['com_media.folder', $object, true, $object]);
+        $result = $dispatcher->dispatch('onContentBeforeSave', new BeforeSaveEvent('onContentBeforeSave', [
+            'context' => 'com_media.folder',
+            'subject' => $object,
+            'isNew'   => true,
+            'data'    => $object,
+        ]))->getArgument('result', []);
 
         if (\in_array(false, $result, true)) {
             throw new \Exception($object->getError());
@@ -195,7 +203,12 @@ public function createFolder($adapter, $name, $path, $override)
 
         $object->name = $this->getAdapter($object->adapter)->createFolder($object->name, $object->path);
 
-        $app->triggerEvent('onContentAfterSave', ['com_media.folder', $object, true, $object]);
+        $dispatcher->dispatch('onContentAfterSave', new AfterSaveEvent('onContentAfterSave', [
+            'context' => 'com_media.folder',
+            'subject' => $object,
+            'isNew'   => true,
+            'data'    => $object,
+        ]));
 
         return $object->name;
     }
@@ -234,20 +247,25 @@ public function createFile($adapter, $name, $path, $data, $override)
             throw new InvalidPathException(Text::_('JLIB_MEDIA_ERROR_WARNFILETYPE'));
         }
 
-        $app               = Factory::getApplication();
-        $object            = new CMSObject();
+        $object            = new \stdClass();
         $object->adapter   = $adapter;
         $object->name      = $name;
         $object->path      = $path;
         $object->data      = $data;
         $object->extension = strtolower(File::getExt($name));
 
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         // Also include the filesystem plugins, perhaps they support batch processing too
-        PluginHelper::importPlugin('media-action');
+        PluginHelper::importPlugin('media-action', null, true, $dispatcher);
 
-        $result = $app->triggerEvent('onContentBeforeSave', ['com_media.file', $object, true, $object]);
+        $result = $dispatcher->dispatch('onContentBeforeSave', new BeforeSaveEvent('onContentBeforeSave', [
+            'context' => 'com_media.file',
+            'subject' => $object,
+            'isNew'   => true,
+            'data'    => $object,
+        ]))->getArgument('result', []);
 
         if (\in_array(false, $result, true)) {
             throw new \Exception($object->getError());
@@ -255,7 +273,12 @@ public function createFile($adapter, $name, $path, $data, $override)
 
         $object->name = $this->getAdapter($object->adapter)->createFile($object->name, $object->path, $object->data);
 
-        $app->triggerEvent('onContentAfterSave', ['com_media.file', $object, true, $object]);
+        $dispatcher->dispatch('onContentAfterSave', new AfterSaveEvent('onContentAfterSave', [
+            'context' => 'com_media.file',
+            'subject' => $object,
+            'isNew'   => true,
+            'data'    => $object,
+        ]));
 
         return $object->name;
     }
@@ -282,20 +305,25 @@ public function updateFile($adapter, $name, $path, $data)
             throw new InvalidPathException();
         }
 
-        $app               = Factory::getApplication();
-        $object            = new CMSObject();
+        $object            = new \stdClass();
         $object->adapter   = $adapter;
         $object->name      = $name;
         $object->path      = $path;
         $object->data      = $data;
         $object->extension = strtolower(File::getExt($name));
 
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         // Also include the filesystem plugins, perhaps they support batch processing too
-        PluginHelper::importPlugin('media-action');
+        PluginHelper::importPlugin('media-action', null, true, $dispatcher);
 
-        $result = $app->triggerEvent('onContentBeforeSave', ['com_media.file', $object, false, $object]);
+        $result = $dispatcher->dispatch('onContentBeforeSave', new BeforeSaveEvent('onContentBeforeSave', [
+            'context' => 'com_media.file',
+            'subject' => $object,
+            'isNew'   => false,
+            'data'    => $object,
+        ]))->getArgument('result', []);
 
         if (\in_array(false, $result, true)) {
             throw new \Exception($object->getError());
@@ -303,7 +331,12 @@ public function updateFile($adapter, $name, $path, $data)
 
         $this->getAdapter($object->adapter)->updateFile($object->name, $object->path, $object->data);
 
-        $app->triggerEvent('onContentAfterSave', ['com_media.file', $object, false, $object]);
+        $dispatcher->dispatch('onContentAfterSave', new AfterSaveEvent('onContentAfterSave', [
+            'context' => 'com_media.file',
+            'subject' => $object,
+            'isNew'   => false,
+            'data'    => $object,
+        ]));
     }
 
     /**
@@ -329,17 +362,20 @@ public function delete($adapter, $path)
         }
 
         $type              = $file->type === 'file' ? 'file' : 'folder';
-        $app               = Factory::getApplication();
-        $object            = new CMSObject();
+        $object            = new \stdClass();
         $object->adapter   = $adapter;
         $object->path      = $path;
 
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         // Also include the filesystem plugins, perhaps they support batch processing too
-        PluginHelper::importPlugin('media-action');
+        PluginHelper::importPlugin('media-action', null, true, $dispatcher);
 
-        $result = $app->triggerEvent('onContentBeforeDelete', ['com_media.' . $type, $object]);
+        $result = $dispatcher->dispatch('onContentBeforeDelete', new BeforeDeleteEvent('onContentBeforeDelete', [
+            'context' => 'com_media.' . $type,
+            'subject' => $object,
+        ]))->getArgument('result', []);
 
         if (\in_array(false, $result, true)) {
             throw new \Exception($object->getError());
@@ -347,7 +383,10 @@ public function delete($adapter, $path)
 
         $this->getAdapter($object->adapter)->delete($object->path);
 
-        $app->triggerEvent('onContentAfterDelete', ['com_media.' . $type, $object]);
+        $dispatcher->dispatch('onContentAfterDelete', new AfterDeleteEvent('onContentAfterDelete', [
+            'context' => 'com_media.' . $type,
+            'subject' => $object,
+        ]));
     }
 
     /**
diff --git a/administrator/components/com_media/src/Model/FileModel.php b/administrator/components/com_media/src/Model/FileModel.php
index 4404350924182..2005ec2382084 100644
--- a/administrator/components/com_media/src/Model/FileModel.php
+++ b/administrator/components/com_media/src/Model/FileModel.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Media\Administrator\Model;
 
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormHelper;
 use Joomla\CMS\MVC\Model\FormModel;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -31,9 +32,10 @@ class FileModel extends FormModel
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   4.0.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -43,13 +45,7 @@ public function getForm($data = [], $loadData = true)
         FormHelper::addFormPath(JPATH_ADMINISTRATOR . '/components/com_media/forms');
 
         // Get the form.
-        $form = $this->loadForm('com_media.file', 'file', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_media.file', 'file', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
diff --git a/administrator/components/com_media/src/Provider/ProviderManagerHelperTrait.php b/administrator/components/com_media/src/Provider/ProviderManagerHelperTrait.php
index 863aad4e01c09..da7cc7980c491 100644
--- a/administrator/components/com_media/src/Provider/ProviderManagerHelperTrait.php
+++ b/administrator/components/com_media/src/Provider/ProviderManagerHelperTrait.php
@@ -17,6 +17,7 @@
 use Joomla\Component\Media\Administrator\Adapter\AdapterInterface;
 use Joomla\Component\Media\Administrator\Event\MediaProviderEvent;
 use Joomla\Component\Media\Administrator\Exception\ProviderAccountNotFoundException;
+use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -61,7 +62,7 @@ public function getProviderManager(): ProviderManager
             $eventParameters = ['context' => 'AdapterManager', 'providerManager' => new ProviderManager()];
             $event           = new MediaProviderEvent('onSetupProviders', $eventParameters);
             PluginHelper::importPlugin('filesystem');
-            Factory::getApplication()->triggerEvent('onSetupProviders', $event);
+            Factory::getContainer()->get(DispatcherInterface::class)->dispatch('onSetupProviders', $event);
             $this->providerManager = $event->getProviderManager();
         }
 
diff --git a/administrator/components/com_menus/forms/item.xml b/administrator/components/com_menus/forms/item.xml
index 3bef3c301d8e2..db58e1cd3cd7a 100644
--- a/administrator/components/com_menus/forms/item.xml
+++ b/administrator/components/com_menus/forms/item.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form addfieldprefix="Joomla\Component\Menus\Administrator\Field">
+	<config>
+		<inlinehelp button="show"/>
+	</config>
 	<fieldset>
 		<field
 			name="id"
diff --git a/administrator/components/com_menus/helpers/menus.php b/administrator/components/com_menus/helpers/menus.php
index d800209188449..53023c25fc53c 100644
--- a/administrator/components/com_menus/helpers/menus.php
+++ b/administrator/components/com_menus/helpers/menus.php
@@ -19,7 +19,7 @@
  *
  * @since       1.6
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Menus\Administrator\Helper\MenusHelper instead
  */
 class MenusHelper extends \Joomla\Component\Menus\Administrator\Helper\MenusHelper
diff --git a/administrator/components/com_menus/presets/alternate.xml b/administrator/components/com_menus/presets/alternate.xml
index e47035a07e4d8..18e7767b74d07 100644
--- a/administrator/components/com_menus/presets/alternate.xml
+++ b/administrator/components/com_menus/presets/alternate.xml
@@ -290,13 +290,6 @@
 			quicktask="index.php?option=com_categories&amp;extension=com_content&amp;task=category.add"
 		/>
 
-		<menuitem
-			title="COM_CONTENT_MENUS_FEATURED"
-			type="component"
-			element="com_content"
-			link="index.php?option=com_content&amp;view=featured"
-		/>
-
 		<menuitem
 			type="separator"
 		/>
@@ -576,7 +569,7 @@
 			type="url"
 			target="_blank"
 			title="MOD_MENU_HELP_DOCUMENTATION"
-			link="https://docs.joomla.org"
+			link="https://guide.joomla.org"
 			scope="help"
 		/>
 
diff --git a/administrator/components/com_menus/presets/default.xml b/administrator/components/com_menus/presets/default.xml
index 2683557626ce5..b4a1c6ce40659 100644
--- a/administrator/components/com_menus/presets/default.xml
+++ b/administrator/components/com_menus/presets/default.xml
@@ -37,14 +37,6 @@
 			quicktask="index.php?option=com_categories&amp;extension=com_content&amp;task=category.add"
 		/>
 
-		<menuitem
-			title="COM_CONTENT_MENUS_FEATURED"
-			type="component"
-			element="com_content"
-			link="index.php?option=com_content&amp;view=featured"
-			class="class:featured"
-		/>
-
 		<menuitem
 			title="COM_CONTENT_MENUS_WORKFLOW"
 			type="component"
diff --git a/administrator/components/com_menus/presets/help.xml b/administrator/components/com_menus/presets/help.xml
index 72e4032a09ec8..4477506190b98 100644
--- a/administrator/components/com_menus/presets/help.xml
+++ b/administrator/components/com_menus/presets/help.xml
@@ -28,7 +28,7 @@
 			title="MOD_MENU_HELP_DOCUMENTATION"
 			type="url"
 			target="_blank"
-			link="https://docs.joomla.org"
+			link="https://guide.joomla.org"
 		/>
 
 		<menuitem
diff --git a/administrator/components/com_menus/src/Controller/AjaxController.php b/administrator/components/com_menus/src/Controller/AjaxController.php
index abad401c45737..a2740f22b915b 100644
--- a/administrator/components/com_menus/src/Controller/AjaxController.php
+++ b/administrator/components/com_menus/src/Controller/AjaxController.php
@@ -10,12 +10,14 @@
 
 namespace Joomla\Component\Menus\Administrator\Controller;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\Session\Session;
+use Joomla\CMS\Table\Menu;
 use Joomla\CMS\Table\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -62,7 +64,7 @@ public function fetchAssociations()
 
             // Add the title to each of the associated records
             Table::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_menus/tables');
-            $menuTable = Table::getInstance('Menu', '\\Joomla\\CMS\\Table\\', []);
+            $menuTable = new Menu(Factory::getDbo());
 
             foreach ($associations as $association) {
                 $menuTable->load($association->id);
diff --git a/administrator/components/com_menus/src/Field/MenuItemByComponentField.php b/administrator/components/com_menus/src/Field/MenuItemByComponentField.php
index 929a5cf40c714..53068e1c67648 100644
--- a/administrator/components/com_menus/src/Field/MenuItemByComponentField.php
+++ b/administrator/components/com_menus/src/Field/MenuItemByComponentField.php
@@ -43,7 +43,7 @@ protected function getOptions()
         $db      = $this->getDatabase();
         $options = [];
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select('DISTINCT ' . $db->quoteName('extensions.element'))
             ->from($db->quoteName('#__menu', 'menu'))
             ->join(
diff --git a/administrator/components/com_menus/src/Field/MenuItemByTypeField.php b/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
index b61f54500888f..7399a0de3fb12 100644
--- a/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
+++ b/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
@@ -188,7 +188,7 @@ protected function getGroups()
         if ($menuType) {
             // If the menutype is empty, group the items by menutype.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__menu_types'))
                 ->where($db->quoteName('menutype') . ' = :menuType')
diff --git a/administrator/components/com_menus/src/Field/MenuOrderingField.php b/administrator/components/com_menus/src/Field/MenuOrderingField.php
index 63009de9eaadb..c3af813e96a58 100644
--- a/administrator/components/com_menus/src/Field/MenuOrderingField.php
+++ b/administrator/components/com_menus/src/Field/MenuOrderingField.php
@@ -54,7 +54,7 @@ protected function getOptions()
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id', 'value'),
diff --git a/administrator/components/com_menus/src/Field/MenuParentField.php b/administrator/components/com_menus/src/Field/MenuParentField.php
index 432293e6c6970..4bd84e2a93fab 100644
--- a/administrator/components/com_menus/src/Field/MenuParentField.php
+++ b/administrator/components/com_menus/src/Field/MenuParentField.php
@@ -46,7 +46,7 @@ protected function getOptions()
         $options = [];
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     'DISTINCT ' . $db->quoteName('a.id', 'value'),
diff --git a/administrator/components/com_menus/src/Field/Modal/MenuField.php b/administrator/components/com_menus/src/Field/Modal/MenuField.php
index 683583a150444..f86ce5e4364b1 100644
--- a/administrator/components/com_menus/src/Field/Modal/MenuField.php
+++ b/administrator/components/com_menus/src/Field/Modal/MenuField.php
@@ -241,7 +241,7 @@ protected function getValueTitle()
         if ($value) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('title'))
                     ->from($db->quoteName('#__menu'))
                     ->where($db->quoteName('id') . ' = :id')
diff --git a/administrator/components/com_menus/src/Helper/AssociationsHelper.php b/administrator/components/com_menus/src/Helper/AssociationsHelper.php
index e7cb3817d68b8..be9560f3562a0 100644
--- a/administrator/components/com_menus/src/Helper/AssociationsHelper.php
+++ b/administrator/components/com_menus/src/Helper/AssociationsHelper.php
@@ -11,7 +11,9 @@
 namespace Joomla\Component\Menus\Administrator\Helper;
 
 use Joomla\CMS\Association\AssociationExtensionHelper;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Table\Menu;
 use Joomla\CMS\Table\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -117,7 +119,7 @@ public function getItem($typeName, $id)
 
         switch ($typeName) {
             case 'item':
-                $table = Table::getInstance('menu');
+                $table = new Menu(Factory::getDbo());
                 break;
         }
 
diff --git a/administrator/components/com_menus/src/Helper/MenusHelper.php b/administrator/components/com_menus/src/Helper/MenusHelper.php
index 1e9261698cf3d..57c2d81dd3044 100644
--- a/administrator/components/com_menus/src/Helper/MenusHelper.php
+++ b/administrator/components/com_menus/src/Helper/MenusHelper.php
@@ -19,7 +19,7 @@
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Menu\AdministratorMenuItem;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Menu;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\File;
@@ -106,9 +106,10 @@ public static function getLinkKey($request)
     public static function getMenuTypes($clientId = 0)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('a.menutype'))
-            ->from($db->quoteName('#__menu_types', 'a'));
+            ->from($db->quoteName('#__menu_types', 'a'))
+            ->order($db->quoteName('ordering'));
 
         if (isset($clientId)) {
             $clientId = (int) $clientId;
@@ -142,7 +143,7 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0,
         $clientId    = (int) $clientId;
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     'DISTINCT ' . $db->quoteName('a.id', 'value'),
@@ -217,13 +218,13 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0,
 
         if (empty($menuType)) {
             // If the menutype is empty, group the items by menutype.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__menu_types'))
                 ->where($db->quoteName('menutype') . ' <> ' . $db->quote(''))
                 ->order(
                     [
-                        $db->quoteName('title'),
+                        $db->quoteName('ordering'),
                         $db->quoteName('menutype'),
                     ]
                 );
@@ -302,7 +303,7 @@ public static function getMenuItems($menutype, $enabledOnly = false, $exclude =
     {
         $root  = new AdministratorMenuItem();
         $db    = Factory::getContainer()->get(DatabaseInterface::class);
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Prepare the query.
         $query->select($db->quoteName('m') . '.*')
@@ -428,7 +429,7 @@ public static function installPreset($preset, $menutype)
     protected static function installPresetItems($node, $menutype)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $items = $node->getChildren();
 
         static $components = [];
@@ -455,8 +456,7 @@ protected static function installPresetItems($node, $menutype)
         ]))->getArgument('subject', $items);
 
         foreach ($items as $item) {
-            /** @var \Joomla\CMS\Table\Menu $table */
-            $table = Table::getInstance('Menu');
+            $table = new Menu($db);
 
             $item->alias = $menutype . '-' . $item->title;
 
@@ -509,7 +509,7 @@ protected static function installPresetItems($node, $menutype)
                     }
                 }
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('id'))
                     ->from($db->quoteName('#__menu'))
                     ->whereIn($db->quoteName('component_id'), $hideitems);
@@ -697,7 +697,7 @@ public static function resolveAlias(&$item)
             $aliasTo = (int) $obj->getParams()->get('aliasoptions');
 
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query->select(
                 [
                     $db->quoteName('a.id'),
@@ -790,7 +790,7 @@ protected static function loadXml($elements, $parent, $replace = [])
                 $iJoin  = (string) $element['sql_innerjoin'];
 
                 $db    = Factory::getDbo();
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
                 $query->select($select)->from($from);
 
                 if ($where) {
diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php
index 756a26e94ccb0..418ed43c5125b 100644
--- a/administrator/components/com_menus/src/Model/ItemModel.php
+++ b/administrator/components/com_menus/src/Model/ItemModel.php
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model\AfterSaveEvent;
+use Joomla\CMS\Event\Model\BeforeSaveEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Associations;
@@ -157,7 +159,7 @@ protected function batchCopy($value, $pks, $contexts)
 
         $table  = $this->getTable();
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $newIds = [];
 
         // Check that the parent exists
@@ -234,7 +236,7 @@ protected function batchCopy($value, $pks, $contexts)
             }
 
             // Copy is a bit tricky, because we also need to copy the children
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__menu'))
                 ->where(
@@ -409,7 +411,7 @@ protected function batchMove($value, $pks, $contexts)
             // Check if we are moving to a different menu
             if ($menuType != $table->menutype) {
                 // Add the child node ids to the children array.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('id'))
                     ->from($db->quoteName('#__menu'))
                     ->where($db->quoteName('lft') . ' BETWEEN :lft AND :rgt')
@@ -448,7 +450,7 @@ protected function batchMove($value, $pks, $contexts)
             $children = ArrayHelper::toInteger($children);
 
             // Update the menutype field in all nodes where necessary.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__menu'))
                 ->set($db->quoteName('menutype') . ' = :menuType')
                 ->whereIn($db->quoteName('id'), $children)
@@ -491,9 +493,10 @@ protected function canSave($data = [], $key = 'id')
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  mixed  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -517,10 +520,6 @@ public function getForm($data = [], $loadData = true)
             $form = $this->loadForm('com_menus.item', 'item', ['control' => 'jform', 'load_data' => $loadData], true);
         }
 
-        if (empty($form)) {
-            return false;
-        }
-
         if ($loadData) {
             $data = $this->loadFormData();
         }
@@ -784,7 +783,7 @@ public function getModules()
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         /**
          * Join on the module-to-menu mapping table.
@@ -808,7 +807,7 @@ public function getModules()
                     . ' AND ' . $db->quoteName('map.menuid') . ' IN (' . implode(',', $query->bindArray([0, $id, -$id])) . ')'
             );
 
-        $subQuery = $db->getQuery(true)
+        $subQuery = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__modules_menu'))
             ->where(
@@ -860,7 +859,7 @@ public function getModules()
     public function getViewLevels()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Get all the available view levels
         $query->select($db->quoteName('id'))
@@ -1060,7 +1059,7 @@ protected function getMenuTypeId($menutype)
      *
      * @return  array  An array of menu item objects with id, title, and level properties.
      *
-     * @since   5.4.8
+     * @since   6.1.3
      */
     public function getParentItems(string $menutype): array
     {
@@ -1287,7 +1286,7 @@ public function rebuild()
     {
         // Initialise variables.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $table = $this->getTable();
 
         try {
@@ -1327,7 +1326,7 @@ public function rebuild()
             return false;
         }
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__menu'))
             ->set($db->quoteName('params') . ' = :params')
             ->where($db->quoteName('id') . ' = :id')
@@ -1369,12 +1368,13 @@ public function save($data)
         $pk      = $data['id'] ?? (int) $this->getState('item.id');
         $isNew   = true;
         $db      = $this->getDatabase();
-        $query   = $db->getQuery(true);
+        $query   = $db->createQuery();
         $table   = $this->getTable();
         $context = $this->option . '.' . $this->name;
 
         // Include the plugins for the on save events.
-        PluginHelper::importPlugin($this->events_map['save']);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['save'], null, true, $dispatcher);
 
         // Load the row if saving an existing item.
         if ($pk > 0) {
@@ -1456,7 +1456,12 @@ public function save($data)
         }
 
         // Trigger the before save event.
-        $result = Factory::getApplication()->triggerEvent($this->event_before_save, [$context, &$table, $isNew, $data]);
+        $result = $dispatcher->dispatch($this->event_before_save, new BeforeSaveEvent($this->event_before_save, [
+            'context' => $context,
+            'subject' => $table,
+            'isNew'   => $isNew,
+            'data'    => $data,
+        ]))->getArgument('result', []);
 
         // Store the data.
         if (\in_array(false, $result, true) || !$table->store()) {
@@ -1466,7 +1471,12 @@ public function save($data)
         }
 
         // Trigger the after save event.
-        Factory::getApplication()->triggerEvent($this->event_after_save, [$context, &$table, $isNew]);
+        $dispatcher->dispatch($this->event_after_save, new AfterSaveEvent($this->event_after_save, [
+            'context' => $context,
+            'subject' => $table,
+            'isNew'   => $isNew,
+            'data'    => $data,
+        ]));
 
         // Rebuild the tree path.
         if (!$table->rebuildPath($table->id)) {
@@ -1489,7 +1499,7 @@ public function save($data)
             $children = ArrayHelper::toInteger($children);
 
             // Update the menutype field in all nodes where necessary.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__menu'))
                 ->set($db->quoteName('menutype') . ' = :menutype')
                 ->whereIn($db->quoteName('id'), $children)
@@ -1531,7 +1541,7 @@ public function save($data)
 
             // Get associationskey for edited item
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('key'))
                 ->from($db->quoteName('#__associations'))
                 ->where(
@@ -1548,7 +1558,7 @@ public function save($data)
             if ($associations || $oldKey !== null) {
                 // Deleting old associations for the associated items
                 $where = [];
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__associations'))
                     ->where($db->quoteName('context') . ' = :context')
                     ->bind(':context', $this->associationsContext);
@@ -1582,7 +1592,7 @@ public function save($data)
             if (\count($associations) > 1) {
                 // Adding new association for these items
                 $key   = md5(json_encode($associations));
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->insert($db->quoteName('#__associations'))
                     ->columns(
                         [
@@ -1801,15 +1811,13 @@ protected function generateNewTitle($parentId, $alias, $title)
     /**
      * Custom clean the cache
      *
-     * @param   string   $group     Cache group name.
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_menus');
         parent::cleanCache('com_modules');
diff --git a/administrator/components/com_menus/src/Model/ItemsModel.php b/administrator/components/com_menus/src/Model/ItemsModel.php
index 8b66b49bbc3ce..ef802abfbc58f 100644
--- a/administrator/components/com_menus/src/Model/ItemsModel.php
+++ b/administrator/components/com_menus/src/Model/ItemsModel.php
@@ -225,7 +225,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
         $user     = $this->getCurrentUser();
         $clientId = (int) $this->getState('filter.client_id');
 
@@ -302,7 +302,7 @@ protected function getListQuery()
 
         // Join over the associations.
         if (Associations::isEnabled()) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName('asso1.id') . ') > 1')
                 ->from($db->quoteName('#__associations', 'asso1'))
                 ->join('INNER', $db->quoteName('#__associations', 'asso2'), $db->quoteName('asso1.key') . ' = ' . $db->quoteName('asso2.key'))
@@ -368,7 +368,7 @@ protected function getListQuery()
 
         if ($parentId) {
             // Create a subquery for the sub-items list
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select($db->quoteName('sub.id'))
                 ->from($db->quoteName('#__menu', 'sub'))
                 ->join(
@@ -406,7 +406,7 @@ protected function getListQuery()
         // A value "" means all
         if ($menuType == '') {
             // Load all menu types we have manage access
-            $query2 = $db->getQuery(true)
+            $query2 = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('id'),
@@ -416,7 +416,7 @@ protected function getListQuery()
                 ->from($db->quoteName('#__menu_types'))
                 ->where($db->quoteName('client_id') . ' = :clientId')
                 ->bind(':clientId', $clientId, ParameterType::INTEGER)
-                ->order($db->quoteName('title'));
+                ->order($db->quoteName('ordering'));
 
             // Show protected items on explicit filter only
             $query->where($db->quoteName('a.menutype') . ' != ' . $db->quote('main'));
@@ -518,7 +518,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
     protected function getMenu($menuType, $check = false)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('a') . '.*')
             ->from($db->quoteName('#__menu_types', 'a'))
diff --git a/administrator/components/com_menus/src/Model/MenuModel.php b/administrator/components/com_menus/src/Model/MenuModel.php
index 27f2feee24c41..958949cde8053 100644
--- a/administrator/components/com_menus/src/Model/MenuModel.php
+++ b/administrator/components/com_menus/src/Model/MenuModel.php
@@ -11,10 +11,13 @@
 namespace Joomla\Component\Menus\Administrator\Model;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model\AfterDeleteEvent;
+use Joomla\CMS\Event\Model\AfterSaveEvent;
+use Joomla\CMS\Event\Model\BeforeDeleteEvent;
+use Joomla\CMS\Event\Model\BeforeSaveEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
 use Joomla\Registry\Registry;
@@ -121,7 +124,7 @@ protected function populateState()
      *
      * @param   integer  $itemId  The id of the menu item to get.
      *
-     * @return  mixed  Menu item data object on success, false on failure.
+     * @return  \stdClass|false  Menu item data object on success, false on failure.
      *
      * @since   1.6
      */
@@ -143,7 +146,7 @@ public function getItem($itemId = null)
         }
 
         $properties = $table->getProperties(1);
-        $value      = ArrayHelper::toObject($properties, CMSObject::class);
+        $value      = ArrayHelper::toObject($properties);
 
         return $value;
     }
@@ -154,19 +157,16 @@ public function getItem($itemId = null)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean    A Form object on success, false on failure
+     * @return  Form    A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
         // Get the form.
         $form = $this->loadForm('com_menus.menu', 'menu', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         if (!$this->getState('client_id', 0)) {
             $form->removeField('preset');
         }
@@ -243,7 +243,8 @@ public function save($data)
         $table = $this->getTable();
 
         // Include the plugins for the save events.
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         // Load the row if saving an existing item.
         if ($id > 0) {
@@ -266,7 +267,12 @@ public function save($data)
         }
 
         // Trigger the before event.
-        $result = Factory::getApplication()->triggerEvent('onContentBeforeSave', [$this->_context, &$table, $isNew, $data]);
+        $result = $dispatcher->dispatch('onContentBeforeSave', new BeforeSaveEvent('onContentBeforeSave', [
+            'context' => $this->_context,
+            'subject' => $table,
+            'isNew'   => $isNew,
+            'data'    => $data,
+        ]))->getArgument('result', []);
 
         // Store the data.
         if (\in_array(false, $result, true) || !$table->store()) {
@@ -276,7 +282,12 @@ public function save($data)
         }
 
         // Trigger the after save event.
-        Factory::getApplication()->triggerEvent('onContentAfterSave', [$this->_context, &$table, $isNew]);
+        $dispatcher->dispatch('onContentAfterSave', new AfterSaveEvent('onContentAfterSave', [
+            'context' => $this->_context,
+            'subject' => $table,
+            'isNew'   => $isNew,
+            'data'    => $data,
+        ]));
 
         $this->setState('menu.id', $table->id);
 
@@ -304,13 +315,20 @@ public function delete(&$pks)
         $table = $this->getTable();
 
         // Include the plugins for the delete events.
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         // Iterate the items to delete each one.
         foreach ($itemIds as $itemId) {
             if ($table->load($itemId)) {
                 // Trigger the before delete event.
-                $result = Factory::getApplication()->triggerEvent('onContentBeforeDelete', [$this->_context, $table]);
+                $result = $dispatcher->dispatch(
+                    'onContentBeforeDelete',
+                    new BeforeDeleteEvent('onContentBeforeDelete', [
+                        'context' => $this->_context,
+                        'subject' => $table,
+                    ])
+                )->getArgument('result', []);
 
                 if (\in_array(false, $result, true) || !$table->delete($itemId)) {
                     $this->setError($table->getError());
@@ -319,7 +337,10 @@ public function delete(&$pks)
                 }
 
                 // Trigger the after delete event.
-                Factory::getApplication()->triggerEvent('onContentAfterDelete', [$this->_context, $table]);
+                $dispatcher->dispatch('onContentAfterDelete', new AfterDeleteEvent('onContentAfterDelete', [
+                    'context' => $this->_context,
+                    'subject' => $table,
+                ]));
 
                 // @todo: Delete the menu associations - Menu items and Modules
             }
@@ -342,7 +363,7 @@ public function &getModules()
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id'),
@@ -388,7 +409,7 @@ public function &getModules()
     public function getExtensionElementsForMenuItems(array $itemIds): array
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query
             ->select($db->quoteName('e.element'))
@@ -402,15 +423,13 @@ public function getExtensionElementsForMenuItems(array $itemIds): array
     /**
      * Custom clean the cache
      *
-     * @param   string   $group     Cache group name.
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_menus');
         parent::cleanCache('com_modules');
diff --git a/administrator/components/com_menus/src/Model/MenusModel.php b/administrator/components/com_menus/src/Model/MenusModel.php
index 374ab7f42a4a5..a6e66f3f77ab4 100644
--- a/administrator/components/com_menus/src/Model/MenusModel.php
+++ b/administrator/components/com_menus/src/Model/MenusModel.php
@@ -84,7 +84,7 @@ public function getItems()
         $db        = $this->getDatabase();
         $menuTypes = array_column((array) $items, 'menutype');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('m.menutype'),
@@ -153,7 +153,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
         $clientId = (int) $this->getState('client_id');
 
         // Select all fields from the table.
@@ -231,7 +231,7 @@ public function getModMenuId()
     {
         $clientId = (int) $this->getState('client_id');
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true)
+        $query    = $db->createQuery()
             ->select($db->quoteName('e.extension_id'))
             ->from($db->quoteName('#__extensions', 'e'))
             ->where(
@@ -287,7 +287,7 @@ public function getMissingModuleLanguages(): array
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('m.language'))
             ->from($db->quoteName('#__modules', 'm'))
diff --git a/administrator/components/com_menus/src/Model/MenutypesModel.php b/administrator/components/com_menus/src/Model/MenutypesModel.php
index 2f9a826a0b0f5..1f3acec65a872 100644
--- a/administrator/components/com_menus/src/Model/MenutypesModel.php
+++ b/administrator/components/com_menus/src/Model/MenutypesModel.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Event\Menu\AfterGetMenuTypeOptionsEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
 use Joomla\Filesystem\Folder;
 
@@ -87,7 +86,7 @@ public function getTypeOptions()
 
         // Get the list of components.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('name'),
@@ -137,7 +136,7 @@ public function getTypeOptions()
      * Method to create the reverse lookup for link-to-name.
      * (can be used from onAfterGetMenuTypeOptions handlers)
      *
-     * @param   CMSObject  $option  Object with request array or string and title public variables
+     * @param   \stdClass  $option  Object with request array or string and title public variables
      *
      * @return  void
      *
@@ -184,7 +183,7 @@ protected function getTypeOptionsByComponent($component)
      * @param   string  $file       File path
      * @param   string  $component  Component option as in URL
      *
-     * @return  array|boolean
+     * @return  \stdClass|boolean
      *
      * @since   1.6
      */
@@ -207,7 +206,7 @@ protected function getTypeOptionsFromXml($file, $component)
         // If we have no options to parse, just add the base component to the list of options.
         if (!empty($menu['options']) && $menu['options'] == 'none') {
             // Create the menu option for the component.
-            $o              = new CMSObject();
+            $o              = new \stdClass();
             $o->title       = (string) $menu['name'];
             $o->description = (string) $menu['msg'];
             $o->request     = ['option' => $component];
@@ -233,7 +232,7 @@ protected function getTypeOptionsFromXml($file, $component)
         foreach ($children as $child) {
             if ($child->getName() == 'option') {
                 // Create the menu option for the component.
-                $o              = new CMSObject();
+                $o              = new \stdClass();
                 $o->title       = (string) $child['name'];
                 $o->description = (string) $child['msg'];
                 $o->request     = ['option' => $component, (string) $optionsNode['var'] => (string) $child['value']];
@@ -241,7 +240,7 @@ protected function getTypeOptionsFromXml($file, $component)
                 $options[] = $o;
             } elseif ($child->getName() == 'default') {
                 // Create the menu option for the component.
-                $o              = new CMSObject();
+                $o              = new \stdClass();
                 $o->title       = (string) $child['name'];
                 $o->description = (string) $child['msg'];
                 $o->request     = ['option' => $component];
@@ -258,7 +257,7 @@ protected function getTypeOptionsFromXml($file, $component)
      *
      * @param   string  $component  Component option like in URLs
      *
-     * @return  array|boolean
+     * @return  \stdClass[]|boolean
      *
      * @since   1.6
      */
@@ -307,7 +306,7 @@ protected function getTypeOptionsFromMvc($component)
                                     foreach ($children as $child) {
                                         if ($child->getName() == 'option') {
                                             // Create the menu option for the component.
-                                            $o              = new CMSObject();
+                                            $o              = new \stdClass();
                                             $o->title       = (string) $child['name'];
                                             $o->description = (string) $child['msg'];
                                             $o->request     = ['option' => $component, 'view' => $view, (string) $optionsNode['var'] => (string) $child['value']];
@@ -315,7 +314,7 @@ protected function getTypeOptionsFromMvc($component)
                                             $options[] = $o;
                                         } elseif ($child->getName() == 'default') {
                                             // Create the menu option for the component.
-                                            $o              = new CMSObject();
+                                            $o              = new \stdClass();
                                             $o->title       = (string) $child['name'];
                                             $o->description = (string) $child['msg'];
                                             $o->request     = ['option' => $component, 'view' => $view];
@@ -345,7 +344,7 @@ protected function getTypeOptionsFromMvc($component)
      *
      * @param   string  $component  Component option like in URLs
      *
-     * @return  array|boolean
+     * @return  \stdClass[]|boolean
      *
      * @since   3.7.0
      */
@@ -419,7 +418,7 @@ protected function getTypeOptionsFromManifest($component)
                 return \strlen($value);
             });
 
-            $options[]  = new CMSObject($o);
+            $options[]  = $o;
 
             // Do not repeat the default view link (index.php?option=com_abc).
             if (\count($o->request) == 1) {
@@ -428,7 +427,7 @@ protected function getTypeOptionsFromManifest($component)
         }
 
         if ($ro) {
-            $options[] = new CMSObject($ro);
+            $options[] = $ro;
         }
 
         return $options;
@@ -440,7 +439,7 @@ protected function getTypeOptionsFromManifest($component)
      * @param   string  $component  Component option as in URLs
      * @param   string  $view       Name of the view
      *
-     * @return  array
+     * @return  \stdClass[]
      *
      * @since   1.6
      */
@@ -516,7 +515,7 @@ protected function getTypeOptionsFromLayouts($component, $view)
                 $layout = basename($layout, '.xml');
 
                 // Create the menu option for the layout.
-                $o              = new CMSObject();
+                $o              = new \stdClass();
                 $o->title       = ucfirst($layout);
                 $o->description = '';
                 $o->request     = ['option' => $component, 'view' => $view];
diff --git a/administrator/components/com_menus/src/Service/HTML/Menus.php b/administrator/components/com_menus/src/Service/HTML/Menus.php
index 081f6bce55368..4aa3fe7fe9308 100644
--- a/administrator/components/com_menus/src/Service/HTML/Menus.php
+++ b/administrator/components/com_menus/src/Service/HTML/Menus.php
@@ -52,7 +52,7 @@ public function association($itemid)
         if ($associations = MenusHelper::getAssociations($itemid)) {
             // Get the associated menu items
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('m.id'),
diff --git a/administrator/components/com_menus/src/Table/MenuTable.php b/administrator/components/com_menus/src/Table/MenuTable.php
index 8d4153e514fb2..2056d07e03694 100644
--- a/administrator/components/com_menus/src/Table/MenuTable.php
+++ b/administrator/components/com_menus/src/Table/MenuTable.php
@@ -42,7 +42,7 @@ public function delete($pk = null, $children = false)
         if ($return) {
             // Delete key from the #__modules_menu table
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__modules_menu'))
                 ->where($db->quoteName('menuid') . ' = :pk')
                 ->bind(':pk', $pk, ParameterType::INTEGER);
diff --git a/administrator/components/com_menus/src/View/Item/HtmlView.php b/administrator/components/com_menus/src/View/Item/HtmlView.php
index 173d95d085125..130395cebb589 100644
--- a/administrator/components/com_menus/src/View/Item/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Item/HtmlView.php
@@ -131,7 +131,7 @@ public function display($tpl = null)
 
         // Add form control fields
         $this->form
-            ->addControlField('task', '')
+            ->addControlField('task')
             ->addControlField('forcedLanguage', $forcedLanguage)
             ->addControlField('menutype', $input->get('menutype', ''))
             ->addControlField('fieldtype', '', ['id' => 'fieldtype']);
@@ -233,6 +233,7 @@ function (Toolbar $childBar) use ($isNew, $checkedOut, $canDo) {
             $url = $help->url;
         }
 
+        $toolbar->inlinehelp();
         $toolbar->help($help->key, $help->local, $url);
     }
 
diff --git a/administrator/components/com_menus/src/View/Items/HtmlView.php b/administrator/components/com_menus/src/View/Items/HtmlView.php
index f9454fb5d9447..0b64478528587 100644
--- a/administrator/components/com_menus/src/View/Items/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Items/HtmlView.php
@@ -290,7 +290,7 @@ public function display($tpl = null)
 
         // Add form control fields
         $this->filterForm
-            ->addControlField('task', '')
+            ->addControlField('task')
             ->addControlField('boxchecked', '0');
 
         // Allow a system plugin to insert dynamic menu types to the list shown in menus:
diff --git a/administrator/components/com_menus/src/View/Menu/HtmlView.php b/administrator/components/com_menus/src/View/Menu/HtmlView.php
index 9075a8254f5a2..d23c63c941cdb 100644
--- a/administrator/components/com_menus/src/View/Menu/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Menu/HtmlView.php
@@ -84,7 +84,7 @@ public function display($tpl = null)
         }
 
         // Add form control fields
-        $this->form->addControlField('task', '');
+        $this->form->addControlField('task');
 
         parent::display($tpl);
         $this->addToolbar();
diff --git a/administrator/components/com_menus/src/View/Menutypes/HtmlView.php b/administrator/components/com_menus/src/View/Menutypes/HtmlView.php
index 7061caabc73b6..dae25d49a82d9 100644
--- a/administrator/components/com_menus/src/View/Menutypes/HtmlView.php
+++ b/administrator/components/com_menus/src/View/Menutypes/HtmlView.php
@@ -13,7 +13,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Menus\Administrator\Model\MenutypesModel;
 
@@ -39,7 +38,7 @@ class HtmlView extends BaseHtmlView
     /**
      * Array of menu types
      *
-     * @var    CMSObject[]
+     * @var    \stdClass[]
      *
      * @since  3.7.0
      */
@@ -140,28 +139,28 @@ protected function addCustomTypes(&$types)
 
         // Adding System Links
         $list           = [];
-        $o              = new CMSObject();
+        $o              = new \stdClass();
         $o->title       = 'COM_MENUS_TYPE_EXTERNAL_URL';
         $o->type        = 'url';
         $o->description = 'COM_MENUS_TYPE_EXTERNAL_URL_DESC';
         $o->request     = null;
         $list[]         = $o;
 
-        $o              = new CMSObject();
+        $o              = new \stdClass();
         $o->title       = 'COM_MENUS_TYPE_ALIAS';
         $o->type        = 'alias';
         $o->description = 'COM_MENUS_TYPE_ALIAS_DESC';
         $o->request     = null;
         $list[]         = $o;
 
-        $o              = new CMSObject();
+        $o              = new \stdClass();
         $o->title       = 'COM_MENUS_TYPE_SEPARATOR';
         $o->type        = 'separator';
         $o->description = 'COM_MENUS_TYPE_SEPARATOR_DESC';
         $o->request     = null;
         $list[]         = $o;
 
-        $o              = new CMSObject();
+        $o              = new \stdClass();
         $o->title       = 'COM_MENUS_TYPE_HEADING';
         $o->type        = 'heading';
         $o->description = 'COM_MENUS_TYPE_HEADING_DESC';
@@ -169,7 +168,7 @@ protected function addCustomTypes(&$types)
         $list[]         = $o;
 
         if ($this->state->get('client_id') == 1) {
-            $o              = new CMSObject();
+            $o              = new \stdClass();
             $o->title       = 'COM_MENUS_TYPE_CONTAINER';
             $o->type        = 'container';
             $o->description = 'COM_MENUS_TYPE_CONTAINER_DESC';
diff --git a/administrator/components/com_menus/tmpl/item/edit.php b/administrator/components/com_menus/tmpl/item/edit.php
index 34b88ce707969..0cc3d0e36f20b 100644
--- a/administrator/components/com_menus/tmpl/item/edit.php
+++ b/administrator/components/com_menus/tmpl/item/edit.php
@@ -24,6 +24,11 @@
 Text::script('ERROR');
 Text::script('JGLOBAL_VALIDATION_FORM_FAILED');
 Text::script('JGLOBAL_ROOT_PARENT');
+Text::script('JLIB_JS_AJAX_ERROR_CONNECTION_ABORT');
+Text::script('JLIB_JS_AJAX_ERROR_NO_CONTENT');
+Text::script('JLIB_JS_AJAX_ERROR_OTHER');
+Text::script('JLIB_JS_AJAX_ERROR_PARSE');
+Text::script('JLIB_JS_AJAX_ERROR_TIMEOUT');
 
 $this->getDocument()->addScriptOptions('menu-item', ['itemId' => (int) $this->item->id]);
 
diff --git a/administrator/components/com_menus/tmpl/items/default_batch_body.php b/administrator/components/com_menus/tmpl/items/default_batch_body.php
index 266830db1368f..1d431c7886247 100644
--- a/administrator/components/com_menus/tmpl/items/default_batch_body.php
+++ b/administrator/components/com_menus/tmpl/items/default_batch_body.php
@@ -24,11 +24,12 @@
 $published = (int) $this->state->get('filter.published');
 $clientId  = (int) $this->state->get('filter.client_id');
 
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('joomla.batch-copymove');
+
 if ($clientId == 1) {
-    /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-    $wa = $this->getDocument()->getWebAssetManager();
     $wa->useScript('com_menus.batch-body');
-    $wa->useScript('joomla.batch-copymove');
 }
 ?>
 <div class="p-3">
diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php
index 62ade8a302d58..dfe011ba5b96e 100644
--- a/administrator/components/com_menus/tmpl/items/modal.php
+++ b/administrator/components/com_menus/tmpl/items/modal.php
@@ -30,7 +30,7 @@
 $wa = $this->getDocument()->getWebAssetManager();
 $wa->useScript('com_menus.admin-items-modal')->useScript('modal-content-select');
 
-// @todo: Use of Function and Editor is deprecated and should be removed in 6.0. It stays only for backward compatibility.
+// @todo: Use of Function and Editor is deprecated and should be removed in 7.0. It stays only for backward compatibility.
 $function  = $app->getInput()->get('function', 'jSelectMenuItem', 'cmd');
 $editor    = $app->getInput()->getCmd('editor', '');
 $listOrder = $this->escape($this->state->get('list.ordering'));
diff --git a/administrator/components/com_messages/src/Field/UserMessagesField.php b/administrator/components/com_messages/src/Field/UserMessagesField.php
index 939460035fdcb..2f34f01f5f29e 100644
--- a/administrator/components/com_messages/src/Field/UserMessagesField.php
+++ b/administrator/components/com_messages/src/Field/UserMessagesField.php
@@ -44,7 +44,7 @@ protected function getGroups()
     {
         // Compute usergroups
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('id')
             ->from('#__usergroups');
         $db->setQuery($query);
diff --git a/administrator/components/com_messages/src/Model/ConfigModel.php b/administrator/components/com_messages/src/Model/ConfigModel.php
index 4153c5fe9993f..714616a20b441 100644
--- a/administrator/components/com_messages/src/Model/ConfigModel.php
+++ b/administrator/components/com_messages/src/Model/ConfigModel.php
@@ -11,9 +11,10 @@
 namespace Joomla\Component\Messages\Administrator\Model;
 
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\MVC\Model\FormModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Database\ParameterType;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -53,17 +54,17 @@ protected function populateState()
     /**
      * Method to get a single record.
      *
-     * @return  mixed  Object on success, false on failure.
+     * @return  \stdClass|false  Object on success, false on failure.
      *
      * @since   1.6
      */
     public function getItem()
     {
-        $item   = new CMSObject();
+        $item   = new Registry();
         $userid = (int) $this->getState('user.id');
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('cfg_name'),
@@ -86,7 +87,7 @@ public function getItem()
 
         foreach ($rows as $row) {
             $property        = $row->cfg_name;
-            $item->$property = $row->cfg_value;
+            $item->set($property, $row->cfg_value);
         }
 
         $this->preprocessData('com_messages.config', $item);
@@ -100,20 +101,14 @@ public function getItem()
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form|bool  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_messages.config', 'config', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_messages.config', 'config', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -130,7 +125,7 @@ public function save($data)
         $db = $this->getDatabase();
 
         if ($userId = (int) $this->getState('user.id')) {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__messages_cfg'))
                 ->where($db->quoteName('user_id') . ' = :userid')
                 ->bind(':userid', $userId, ParameterType::INTEGER);
@@ -145,7 +140,7 @@ public function save($data)
             }
 
             if (\count($data)) {
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->insert($db->quoteName('#__messages_cfg'))
                     ->columns(
                         [
diff --git a/administrator/components/com_messages/src/Model/MessageModel.php b/administrator/components/com_messages/src/Model/MessageModel.php
index 6d071dd75dc21..a3d910fbfd785 100644
--- a/administrator/components/com_messages/src/Model/MessageModel.php
+++ b/administrator/components/com_messages/src/Model/MessageModel.php
@@ -14,15 +14,19 @@
 use Joomla\CMS\Access\Rule;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Table\Asset;
-use Joomla\CMS\Table\Table;
 use Joomla\CMS\User\User;
 use Joomla\CMS\User\UserFactoryAwareInterface;
 use Joomla\CMS\User\UserFactoryAwareTrait;
@@ -38,9 +42,11 @@
  *
  * @since  1.6
  */
-class MessageModel extends AdminModel implements UserFactoryAwareInterface
+class MessageModel extends AdminModel implements UserFactoryAwareInterface, MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * Message
@@ -144,7 +150,7 @@ public function getItem($pk = null)
                     if ($replyId = (int) $this->getState('reply.id')) {
                         // If replying to a message, preload some data.
                         $db    = $this->getDatabase();
-                        $query = $db->getQuery(true)
+                        $query = $db->createQuery()
                             ->select($db->quoteName(['subject', 'user_id_from', 'user_id_to']))
                             ->from($db->quoteName('#__messages'))
                             ->where($db->quoteName('message_id') . ' = :messageid')
@@ -164,11 +170,12 @@ public function getItem($pk = null)
                             return false;
                         }
 
-                        $this->item->set('user_id_to', $message->user_id_from);
+                        $this->item->user_id_to = $message->user_id_from;
+
                         $re = Text::_('COM_MESSAGES_RE');
 
                         if (stripos($message->subject, $re) !== 0) {
-                            $this->item->set('subject', $re . ' ' . $message->subject);
+                            $this->item->subject = $re . ' ' . $message->subject;
                         }
                     }
                 } elseif ($this->item->user_id_to != $this->getCurrentUser()->id) {
@@ -178,7 +185,7 @@ public function getItem($pk = null)
                 } else {
                     // Mark message read
                     $db    = $this->getDatabase();
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->update($db->quoteName('#__messages'))
                         ->set($db->quoteName('state') . ' = 1')
                         ->where($db->quoteName('message_id') . ' = :messageid')
@@ -189,7 +196,7 @@ public function getItem($pk = null)
 
             // Get the user name for an existing message.
             if ($this->item->user_id_from && $fromUser = new User($this->item->user_id_from)) {
-                $this->item->set('from_user_name', $fromUser->name);
+                $this->item->from_user_name = $fromUser->name;
             }
         }
 
@@ -202,20 +209,14 @@ public function getItem($pk = null)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form|bool  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_messages.message', 'message', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_messages.message', 'message', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -378,7 +379,12 @@ public function save($data)
             $message  = strip_tags(html_entity_decode($table->message, ENT_COMPAT, 'UTF-8'));
 
             // Send the email
-            $mailer = new MailTemplate('com_messages.new_message', $lang->getTag());
+            $mailer = new MailTemplate(
+                'com_messages.new_message',
+                $lang->getTag(),
+                $this->getMailerFactory()->createMailer(),
+                $this->getLanguageFactory()
+            );
             $data   = [
                 'subject'   => $subject,
                 'message'   => $message,
@@ -426,8 +432,7 @@ public function notifySuperUsers($subject, $message, $fromUser = null)
         $db = $this->getDatabase();
 
         try {
-            /** @var Asset $table */
-            $table  = Table::getInstance('Asset');
+            $table  = new Asset($db);
             $rootId = $table->getRootId();
 
             /** @var Rule[] $rules */
@@ -454,7 +459,7 @@ public function notifySuperUsers($subject, $message, $fromUser = null)
                 return false;
             }
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('map.user_id'))
                 ->from($db->quoteName('#__user_usergroup_map', 'map'))
                 ->join(
diff --git a/administrator/components/com_messages/src/Model/MessagesModel.php b/administrator/components/com_messages/src/Model/MessagesModel.php
index 76dacc7e90503..2479d3497d13b 100644
--- a/administrator/components/com_messages/src/Model/MessagesModel.php
+++ b/administrator/components/com_messages/src/Model/MessagesModel.php
@@ -108,7 +108,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
         $id    = (int) $user->id;
 
@@ -179,7 +179,7 @@ protected function getListQuery()
     public function purge(int $userId): void
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['cfg_name', 'cfg_value']))
             ->from($db->quoteName('#__messages_cfg'))
             ->where(
@@ -206,7 +206,7 @@ public function purge(int $userId): void
             // Purge old messages at day set in message configuration
             $past = Factory::getDate(time() - $purge * 86400)->toSql();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__messages'))
                 ->where(
                     [
diff --git a/administrator/components/com_messages/src/View/Config/HtmlView.php b/administrator/components/com_messages/src/View/Config/HtmlView.php
index abb53a485e360..e3d2ce6938fd9 100644
--- a/administrator/components/com_messages/src/View/Config/HtmlView.php
+++ b/administrator/components/com_messages/src/View/Config/HtmlView.php
@@ -70,6 +70,10 @@ public function display($tpl = null)
         // Bind the record to the form.
         $this->form->bind($this->item);
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_messages/src/View/Message/HtmlView.php b/administrator/components/com_messages/src/View/Message/HtmlView.php
index cb75bb39d2d5b..305c255dbc1e9 100644
--- a/administrator/components/com_messages/src/View/Message/HtmlView.php
+++ b/administrator/components/com_messages/src/View/Message/HtmlView.php
@@ -76,6 +76,10 @@ public function display($tpl = null)
             throw new GenericDataException(Text::_('JERROR_ALERTNOAUTHOR'), 403);
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         parent::display($tpl);
         $this->addToolbar();
     }
diff --git a/administrator/components/com_messages/src/View/Messages/HtmlView.php b/administrator/components/com_messages/src/View/Messages/HtmlView.php
index 5e897d6d3c430..ed2d8d9b8e307 100644
--- a/administrator/components/com_messages/src/View/Messages/HtmlView.php
+++ b/administrator/components/com_messages/src/View/Messages/HtmlView.php
@@ -98,6 +98,11 @@ public function display($tpl = null)
             $this->setLayout('emptystate');
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_messages/tmpl/config/default.php b/administrator/components/com_messages/tmpl/config/default.php
index a366045716225..9cdf2f65105a9 100644
--- a/administrator/components/com_messages/tmpl/config/default.php
+++ b/administrator/components/com_messages/tmpl/config/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -36,6 +35,5 @@
         </div>
     </div>
 
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_messages/tmpl/message/default.php b/administrator/components/com_messages/tmpl/message/default.php
index 9d0a626586d3e..dbec384a36b3c 100644
--- a/administrator/components/com_messages/tmpl/message/default.php
+++ b/administrator/components/com_messages/tmpl/message/default.php
@@ -33,7 +33,7 @@
     <div class="card-body">
         <dl class="mb-0">
             <dt><?php echo Text::_('COM_MESSAGES_FIELD_USER_ID_FROM_LABEL'); ?></dt>
-            <dd><?php echo $this->item->get('from_user_name'); ?></dd>
+            <dd><?php echo $this->item->from_user_name; ?></dd>
 
             <dt><?php echo Text::_('COM_MESSAGES_FIELD_DATE_TIME_LABEL'); ?></dt>
             <dd><?php echo HTMLHelper::_('date', $this->item->date_time, Text::_('DATE_FORMAT_LC2')); ?></dd>
diff --git a/administrator/components/com_messages/tmpl/message/edit.php b/administrator/components/com_messages/tmpl/message/edit.php
index ac0fe33e81b54..35ef50855f078 100644
--- a/administrator/components/com_messages/tmpl/message/edit.php
+++ b/administrator/components/com_messages/tmpl/message/edit.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -41,6 +40,6 @@
             </div>
         </div>
     </div>
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_messages/tmpl/messages/default.php b/administrator/components/com_messages/tmpl/messages/default.php
index f79eb7488bdd7..abf0723a9c2c2 100644
--- a/administrator/components/com_messages/tmpl/messages/default.php
+++ b/administrator/components/com_messages/tmpl/messages/default.php
@@ -89,10 +89,7 @@
             <?php echo $this->pagination->getListFooter(); ?>
 
         <?php endif; ?>
-        <div>
-            <input type="hidden" name="task" value="">
-            <input type="hidden" name="boxchecked" value="0">
-            <?php echo HTMLHelper::_('form.token'); ?>
-        </div>
+
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_messages/tmpl/messages/emptystate.php b/administrator/components/com_messages/tmpl/messages/emptystate.php
index 5b4eb77cbdf61..362c22b6aa95d 100644
--- a/administrator/components/com_messages/tmpl/messages/emptystate.php
+++ b/administrator/components/com_messages/tmpl/messages/emptystate.php
@@ -19,6 +19,8 @@
     'formURL'    => 'index.php?option=com_messages&view=messages',
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Private_Messages',
     'icon'       => 'icon-envelope inbox',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 if (
diff --git a/administrator/components/com_modules/config.xml b/administrator/components/com_modules/config.xml
index 3d758260108c7..cd14b9b6f2548 100644
--- a/administrator/components/com_modules/config.xml
+++ b/administrator/components/com_modules/config.xml
@@ -19,6 +19,28 @@
 			<option value="admin">JADMINISTRATOR</option>
 			<option value="site">JSITE</option>
 		</field>
+
+		<field
+			name="save_history"
+			type="radio"
+			label="JGLOBAL_SAVE_HISTORY_OPTIONS_LABEL"
+			layout="joomla.form.field.radio.switcher"
+			default="0"
+			>
+			<option value="0">JNO</option>
+			<option value="1">JYES</option>
+		</field>
+
+		<field
+			name="history_limit"
+			type="number"
+			label="JGLOBAL_HISTORY_LIMIT_OPTIONS_LABEL"
+			filter="integer"
+			validate="number"
+			min="0"
+			default="10"
+			showon="save_history:1"
+		/>
 	</fieldset>
 
 	<fieldset
diff --git a/administrator/components/com_modules/forms/filter_modules.xml b/administrator/components/com_modules/forms/filter_modules.xml
index 2edcb05938e67..7fc4293515184 100644
--- a/administrator/components/com_modules/forms/filter_modules.xml
+++ b/administrator/components/com_modules/forms/filter_modules.xml
@@ -101,6 +101,8 @@
 			<option value="pages DESC">COM_MODULES_HEADING_PAGES_DESC</option>
 			<option value="ag.title ASC">JGRID_HEADING_ACCESS_ASC</option>
 			<option value="ag.title DESC">JGRID_HEADING_ACCESS_DESC</option>
+			<option value="association ASC" requires="associations">JASSOCIATIONS_ASC</option>
+			<option value="association DESC" requires="associations">JASSOCIATIONS_DESC</option>
 			<option value="l.title ASC" requires="multilanguage">JGRID_HEADING_LANGUAGE_ASC</option>
 			<option value="l.title DESC" requires="multilanguage">JGRID_HEADING_LANGUAGE_DESC</option>
 			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
diff --git a/administrator/components/com_modules/forms/module.xml b/administrator/components/com_modules/forms/module.xml
index 7207d5976e2fd..0f4c00a6ac94e 100644
--- a/administrator/components/com_modules/forms/module.xml
+++ b/administrator/components/com_modules/forms/module.xml
@@ -4,14 +4,6 @@
 		<inlinehelp button="show"/>
 	</config>
 	<fieldset addfieldprefix="Joomla\Component\Modules\Administrator\Field">
-		<field
-			name="id"
-			type="number"
-			label="JGLOBAL_FIELD_ID_LABEL"
-			default="0"
-			readonly="true"
-		/>
-
 		<field
 			name="title"
 			type="text"
@@ -27,6 +19,13 @@
 			maxlength="255"
 		/>
 
+		<field
+			name="version_note"
+			type="text"
+			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+			maxlength="255"
+		/>
+
 		<field
 			name="module"
 			type="hidden"
@@ -134,6 +133,11 @@
 			type="hidden"
 		/>
 
+		<field
+			name="id"
+			type="hidden"
+		/>
+
 		<field
 			name="asset_id"
 			type="hidden"
diff --git a/administrator/components/com_modules/forms/moduleadmin.xml b/administrator/components/com_modules/forms/moduleadmin.xml
index 41448891f4aad..1c4641b5c942f 100644
--- a/administrator/components/com_modules/forms/moduleadmin.xml
+++ b/administrator/components/com_modules/forms/moduleadmin.xml
@@ -4,14 +4,6 @@
 		<inlinehelp button="show"/>
 	</config>
 	<fieldset addfieldprefix="Joomla\Component\Modules\Administrator\Field">
-		<field
-			name="id"
-			type="number"
-			label="JGLOBAL_FIELD_ID_LABEL"
-			default="0"
-			readonly="true"
-		/>
-
 		<field
 			name="title"
 			type="text"
@@ -27,6 +19,13 @@
 			maxlength="255"
 		/>
 
+		<field
+			name="version_note"
+			type="text"
+			label="JGLOBAL_FIELD_VERSION_NOTE_LABEL"
+			maxlength="255"
+		/>
+
 		<field
 			name="module"
 			type="hidden"
@@ -134,6 +133,11 @@
 			filter="unset"
 		/>
 
+		<field
+			name="id"
+			type="hidden"
+		/>
+
 		<field
 			name="rules"
 			type="rules"
diff --git a/administrator/components/com_modules/helpers/modules.php b/administrator/components/com_modules/helpers/modules.php
index 247c03b59a1bc..e17a8b6cd8dbb 100644
--- a/administrator/components/com_modules/helpers/modules.php
+++ b/administrator/components/com_modules/helpers/modules.php
@@ -19,7 +19,7 @@
  *
  * @since       1.6
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Modules\Administrator\Helper\ModulesHelper instead
  */
 abstract class ModulesHelper extends \Joomla\Component\Modules\Administrator\Helper\ModulesHelper
diff --git a/administrator/components/com_modules/services/provider.php b/administrator/components/com_modules/services/provider.php
index d4eda1ea53f14..f3fb60e0daabf 100644
--- a/administrator/components/com_modules/services/provider.php
+++ b/administrator/components/com_modules/services/provider.php
@@ -10,6 +10,7 @@
 
 \defined('_JEXEC') or die;
 
+use Joomla\CMS\Association\AssociationExtensionInterface;
 use Joomla\CMS\Dispatcher\ComponentDispatcherFactoryInterface;
 use Joomla\CMS\Extension\ComponentInterface;
 use Joomla\CMS\Extension\Service\Provider\ComponentDispatcherFactory;
@@ -17,6 +18,7 @@
 use Joomla\CMS\HTML\Registry;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\Component\Modules\Administrator\Extension\ModulesComponent;
+use Joomla\Component\Modules\Administrator\Helper\AssociationsHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 
@@ -37,6 +39,8 @@
      */
     public function register(Container $container)
     {
+        $container->set(AssociationExtensionInterface::class, new AssociationsHelper());
+
         $container->registerServiceProvider(new MVCFactory('\\Joomla\\Component\\Modules'));
         $container->registerServiceProvider(new ComponentDispatcherFactory('\\Joomla\\Component\\Modules'));
 
@@ -45,8 +49,9 @@ public function register(Container $container)
             function (Container $container) {
                 $component = new ModulesComponent($container->get(ComponentDispatcherFactoryInterface::class));
 
-                $component->setMVCFactory($container->get(MVCFactoryInterface::class));
                 $component->setRegistry($container->get(Registry::class));
+                $component->setMVCFactory($container->get(MVCFactoryInterface::class));
+                $component->setAssociationExtension($container->get(AssociationExtensionInterface::class));
 
                 return $component;
             }
diff --git a/administrator/components/com_modules/src/Controller/ModuleController.php b/administrator/components/com_modules/src/Controller/ModuleController.php
index f6b14678e9f69..6a480a9e31deb 100644
--- a/administrator/components/com_modules/src/Controller/ModuleController.php
+++ b/administrator/components/com_modules/src/Controller/ModuleController.php
@@ -18,6 +18,7 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\Versioning\VersionableControllerTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -30,6 +31,8 @@
  */
 class ModuleController extends FormController
 {
+    use VersionableControllerTrait;
+
     /**
      * Override parent add method.
      *
@@ -149,11 +152,7 @@ protected function allowEdit($data = [], $key = 'id')
         }
 
         // Check edit on the record asset (explicit or inherited)
-        if ($this->app->getIdentity()->authorise('core.edit', 'com_modules.module.' . $recordId)) {
-            return true;
-        }
-
-        return false;
+        return $this->app->getIdentity()->authorise('core.edit', 'com_modules.module.' . $recordId);
     }
 
     /**
@@ -232,7 +231,7 @@ public function save($key = null, $urlVar = null)
             $model      = $this->getModel();
             $data       = $this->input->post->get('jform', [], 'array');
             $item       = $model->getItem($this->input->get('id'));
-            $properties = $item->getProperties();
+            $properties = get_object_vars($item);
 
             if (isset($data['params'])) {
                 unset($properties['params']);
diff --git a/administrator/components/com_modules/src/Extension/ModulesComponent.php b/administrator/components/com_modules/src/Extension/ModulesComponent.php
index 2fb82863c7921..6de089d1cf44f 100644
--- a/administrator/components/com_modules/src/Extension/ModulesComponent.php
+++ b/administrator/components/com_modules/src/Extension/ModulesComponent.php
@@ -10,10 +10,13 @@
 
 namespace Joomla\Component\Modules\Administrator\Extension;
 
+use Joomla\CMS\Association\AssociationServiceInterface;
+use Joomla\CMS\Association\AssociationServiceTrait;
 use Joomla\CMS\Extension\BootableExtensionInterface;
 use Joomla\CMS\Extension\MVCComponent;
 use Joomla\CMS\HTML\HTMLRegistryAwareTrait;
 use Joomla\Component\Modules\Administrator\Service\HTML\Modules;
+use Joomla\Database\DatabaseInterface;
 use Psr\Container\ContainerInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -25,8 +28,9 @@
  *
  * @since  4.0.0
  */
-class ModulesComponent extends MVCComponent implements BootableExtensionInterface
+class ModulesComponent extends MVCComponent implements BootableExtensionInterface, AssociationServiceInterface
 {
+    use AssociationServiceTrait;
     use HTMLRegistryAwareTrait;
 
     /**
@@ -44,6 +48,9 @@ class ModulesComponent extends MVCComponent implements BootableExtensionInterfac
      */
     public function boot(ContainerInterface $container)
     {
-        $this->getRegistry()->register('modules', new Modules());
+        $modules = new Modules();
+        $modules->setDatabase($container->get(DatabaseInterface::class));
+
+        $this->getRegistry()->register('modules', $modules);
     }
 }
diff --git a/administrator/components/com_modules/src/Field/Modal/ModuleField.php b/administrator/components/com_modules/src/Field/Modal/ModuleField.php
new file mode 100644
index 0000000000000..62e20f86b5586
--- /dev/null
+++ b/administrator/components/com_modules/src/Field/Modal/ModuleField.php
@@ -0,0 +1,239 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Modules\Administrator\Field\Modal;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Field\ModalSelectField;
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Language\LanguageHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\FileLayout;
+use Joomla\CMS\Session\Session;
+use Joomla\CMS\Uri\Uri;
+use Joomla\Database\ParameterType;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Supports a modal menu item picker.
+ *
+ * @since  6.1.0
+ */
+class ModuleField extends ModalSelectField
+{
+    /**
+     * The form field type.
+     *
+     * @var     string
+     * @since   6.1.0
+     */
+    protected $type = 'Modal_Module';
+
+
+    /**
+     * Method to attach a Form object to the field.
+     *
+     * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+     * @param   mixed              $value    The form field value to validate.
+     * @param   string             $group    The field name group control value. This acts as an array container for the field.
+     *                                        For example if the field has name="foo" and the group value is set to "bar" then the
+     *                                      full field name would end up being "bar[foo]".
+     *
+     * @return  boolean  True on success.
+     *
+     * @see     FormField::setup()
+     * @since   6.1.0
+     */
+    public function setup(\SimpleXMLElement $element, $value, $group = null)
+    {
+        // Check if the value consist with id:alias, extract the id only
+        if ($value && str_contains($value, ':')) {
+            [$id]  = explode(':', $value, 2);
+            $value = (int) $id;
+        }
+
+        $return = parent::setup($element, $value, $group);
+
+        if (!$return) {
+            return $return;
+        }
+
+        $app = Factory::getApplication();
+
+        $app->getLanguage()->load('com_modules', JPATH_ADMINISTRATOR);
+
+        $languages = LanguageHelper::getContentLanguages([0, 1], false);
+        $language  = (string) $this->element['language'];
+        $clientId  = (int) $this->element['clientid'];
+
+        // Prepare enabled actions
+        $this->canDo['propagate']  = ((string) $this->element['propagate'] === 'true') && \count($languages) > 2;
+
+        // Creating/editing module items is not supported in frontend.
+        if (!$app->isClient('administrator')) {
+            $this->canDo['new']  = false;
+            $this->canDo['edit'] = false;
+        }
+
+        // Prepare Urls
+        $linkItems = (new Uri())->setPath(Uri::base(true) . '/index.php');
+        $linkItems->setQuery([
+            'option'                => 'com_modules',
+            'view'                  => 'modules',
+            'layout'                => 'modal',
+            'tmpl'                  => 'component',
+            'client_id'             => $clientId,
+            'eid'                   => $this->getExtensionId(),
+            Session::getFormToken() => 1,
+        ]);
+        $linkItem = clone $linkItems;
+        $linkItem->setVar('view', 'module');
+        $linkCheckin = (new Uri())->setPath(Uri::base(true) . '/index.php');
+        $linkCheckin->setQuery([
+            'option'                => 'com_modules',
+            'task'                  => 'modules.checkin',
+            'format'                => 'json',
+            Session::getFormToken() => 1,
+        ]);
+
+        if ($language) {
+            $linkItems->setVar('forcedLanguage', $language);
+            $linkItem->setVar('forcedLanguage', $language);
+
+            $modalTitle = Text::_('COM_MODULES_SELECT_A_MODULE') . ' &#8212; ' . $this->getTitle();
+
+            $this->dataAttributes['data-language'] = $language;
+        } else {
+            $modalTitle = Text::_('COM_MODULES_SELECT_A_MODULE');
+        }
+
+        $urlSelect = $linkItems;
+        $urlEdit   = clone $linkItem;
+        $urlEdit->setVar('task', 'module.edit');
+        $urlNew    = clone $linkItem;
+        $urlNew->setVar('task', 'module.add');
+
+        $this->urls['select']  = (string) $urlSelect;
+        $this->urls['new']     = (string) $urlNew;
+        $this->urls['edit']    = (string) $urlEdit;
+        $this->urls['checkin'] = (string) $linkCheckin;
+
+        // Prepare titles
+        $this->modalTitles['select']  = $modalTitle;
+        $this->modalTitles['new']     = Text::_('COM_MODULES_NEW_MODULE');
+        $this->modalTitles['edit']    = Text::_('COM_MODULES_EDIT_MODULE');
+
+        $this->hint = $this->hint ?: Text::_('COM_MODULES_SELECT_A_MODULE');
+
+        return $return;
+    }
+
+
+    /**
+     * Method to retrieve the title of selected item.
+     *
+     * @return string
+     *
+     * @since   6.1.0
+     */
+    protected function getExtensionId()
+    {
+        $data = $this->form->getData();
+
+        $module = $data->get('module', '');
+
+        $eid = 0;
+
+        if ($module) {
+            try {
+                $db    = $this->getDatabase();
+                $query = $db->createQuery()
+                    ->select($db->quoteName('extension_id'))
+                    ->from($db->quoteName('#__extensions'))
+                    ->where($db->quoteName('element') . ' = :module')
+                    ->bind(':module', $module, ParameterType::STRING);
+                $db->setQuery($query);
+
+                $eid = $db->loadResult();
+            } catch (\Throwable $e) {
+                Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+            }
+        }
+
+        return $eid;
+    }
+
+    /**
+     * Method to retrieve the title of selected item.
+     *
+     * @return string
+     *
+     * @since   6.1.0
+     */
+    protected function getValueTitle()
+    {
+        $value = (int) $this->value ?: '';
+        $title = '';
+
+        if ($value) {
+            try {
+                $db    = $this->getDatabase();
+                $query = $db->createQuery()
+                    ->select($db->quoteName('title'))
+                    ->from($db->quoteName('#__modules'))
+                    ->where($db->quoteName('id') . ' = :id')
+                    ->bind(':id', $value, ParameterType::INTEGER);
+                $db->setQuery($query);
+
+                $title = $db->loadResult();
+            } catch (\Throwable $e) {
+                Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+            }
+        }
+
+        return $title ?: $value;
+    }
+
+    /**
+     * Method to get the data to be passed to the layout for rendering.
+     *
+     * @return  array
+     *
+     * @since 6.1.0
+     */
+    protected function getLayoutData()
+    {
+        $data             = parent::getLayoutData();
+        $data['language'] = (string) $this->element['language'];
+
+        return $data;
+    }
+
+    /**
+     * Get the renderer
+     *
+     * @param   string  $layoutId  Id to load
+     *
+     * @return  FileLayout
+     *
+     * @since   6.1.0
+     */
+    protected function getRenderer($layoutId = 'default')
+    {
+        $layout = parent::getRenderer($layoutId);
+        $layout->setComponent('com_modules');
+        $layout->setClient((int) $this->element['clientid']);
+
+        return $layout;
+    }
+}
diff --git a/administrator/components/com_modules/src/Helper/AssociationsHelper.php b/administrator/components/com_modules/src/Helper/AssociationsHelper.php
new file mode 100644
index 0000000000000..1f579c6a01c48
--- /dev/null
+++ b/administrator/components/com_modules/src/Helper/AssociationsHelper.php
@@ -0,0 +1,224 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Modules\Administrator\Helper;
+
+use Joomla\CMS\Association\AssociationExtensionHelper;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Table\Module;
+use Joomla\CMS\Table\Table;
+use Joomla\Database\ParameterType;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Module associations helper.
+ *
+ * @since  6.1.0
+ */
+class AssociationsHelper extends AssociationExtensionHelper
+{
+    /**
+     * The extension name
+     *
+     * @var     array   $extension
+     *
+     * @since   6.1.0
+     */
+    protected $extension = 'com_modules';
+
+    /**
+     * Array of item types
+     *
+     * @var     array   $itemTypes
+     *
+     * @since   6.1.0
+     */
+    protected $itemTypes = ['module'];
+
+    /**
+     * Has the extension association support
+     *
+     * @var     boolean   $associationsSupport
+     *
+     * @since   6.1.0
+     */
+    protected $associationsSupport = true;
+
+    /**
+     * Method to get the associations for a given item.
+     *
+     * @param   integer  $id    Id of the item
+     * @param   string   $view  Name of the view
+     *
+     * @return  array   Array of associations for the item
+     *
+     * @since  6.1.0
+     */
+    public function getAssociationsForItem($id = 0, $view = null)
+    {
+        return $this->getAssociations('item', $id);
+    }
+
+    /**
+     * Get the associated items for an item
+     *
+     * @param   string  $typeName  The item type
+     * @param   int     $id        The id of item for which we need the associated items
+     *
+     * @return  array
+     *
+     * @since   6.1.0
+     */
+    public function getAssociations($typeName, $id)
+    {
+        $type    = $this->getType($typeName);
+        $context = $this->extension . '.item';
+
+        // Get the associations.
+        $associations = Associations::getAssociations(
+            $this->extension,
+            $type['tables']['a'],
+            $context,
+            $id,
+            'id',
+            '',
+            ''
+        );
+
+        return $associations;
+    }
+
+    /**
+     * Get item information
+     *
+     * @param   string  $typeName  The item type
+     * @param   int     $id        The id of item for which we need the associated items
+     *
+     * @return  Table|null
+     *
+     * @since   6.1.0
+     */
+    public function getItem($typeName, $id)
+    {
+        if (empty($id)) {
+            return null;
+        }
+
+        $table = new Module(Factory::getDbo());
+
+        if (\is_null($table)) {
+            return null;
+        }
+
+        $table->load($id);
+
+        return $table;
+    }
+
+    /**
+     * Get information about the type
+     *
+     * @param   string  $typeName  The item type
+     *
+     * @return  array  Array of item types
+     *
+     * @since   6.1.0
+     */
+    public function getType($typeName = '')
+    {
+        $fields          = $this->getFieldsTemplate();
+        $fields['state'] = 'a.published';
+        $fields['catid'] = '';
+
+        // Next line looks odd, and it is, it is because of a bug. I am going to make another PR to fix it.
+        // We should be able to set the alias field to empty
+        $fields['alias']           = 'a.title';
+        $fields['created_user_id'] = '';
+
+        $tables  = ['a' => '#__modules'];
+        $joins   = [];
+
+        $support              = $this->getSupportTemplate();
+        $support['state']     = true;
+        $support['acl']       = true;
+        $support['checkout']  = true;
+        $support['save2copy'] = false;
+
+        $title   = 'module';
+
+        $urlOptions = $this->getUrlOptions();
+
+        return [
+            'fields'     => $fields,
+            'support'    => $support,
+            'tables'     => $tables,
+            'joins'      => $joins,
+            'title'      => $title,
+            'urlOptions' => $urlOptions,
+        ];
+    }
+
+    /**
+     * Get options we need for the associations side by side view
+     *
+     * @param   string  $type   The item type
+     *
+     * @return  array
+     *
+     * @since   6.1.0
+     */
+    public function getUrlOptions($type = '')
+    {
+        return [
+            'eid' => [
+                'functionName' => 'getExtensionId',
+                'params'       => [
+                    'id',
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Method to retrieve the title of selected item.
+     *
+     * @return string
+     *
+     * @since   6.1.0
+     */
+    public function getExtensionId($id)
+    {
+        $data   = $this->getItem('module', $id);
+        $module = $data->module;
+        $eid    = 0;
+
+        if ($module) {
+            try {
+                $db    = Factory::getDbo();
+                $query = $db->createQuery()
+                    ->select($db->quoteName('extension_id'))
+                    ->from($db->quoteName('#__extensions'))
+                    ->where($db->quoteName('element') . ' = :module')
+                    ->bind(':module', $module, ParameterType::STRING);
+                $db->setQuery($query);
+
+                $eid = $db->loadResult();
+            } catch (\Throwable $e) {
+                Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+            }
+        }
+
+        return $eid;
+    }
+}
diff --git a/administrator/components/com_modules/src/Helper/ModulesHelper.php b/administrator/components/com_modules/src/Helper/ModulesHelper.php
index fac753b736857..6be307a0fc0b0 100644
--- a/administrator/components/com_modules/src/Helper/ModulesHelper.php
+++ b/administrator/components/com_modules/src/Helper/ModulesHelper.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\Database\ParameterType;
 use Joomla\Utilities\ArrayHelper;
@@ -27,6 +28,27 @@
  */
 abstract class ModulesHelper
 {
+    /**
+     * Get the associations
+     *
+     * @param   integer  $pk  Module item id
+     *
+     * @return  array
+     *
+     * @since   6.1.0
+     */
+    public static function getAssociations($pk)
+    {
+        $langAssociations = Associations::getAssociations('com_modules', '#__modules', 'com_modules.item', $pk, 'id', '', '');
+        $associations     = [];
+
+        foreach ($langAssociations as $langAssociation) {
+            $associations[$langAssociation->language] = $langAssociation->id;
+        }
+
+        return $associations;
+    }
+
     /**
      * Get a list of filter options for the state of a module.
      *
@@ -71,7 +93,7 @@ public static function getPositions($clientId, $editPositions = false)
     {
         $db       = Factory::getDbo();
         $clientId = (int) $clientId;
-        $query    = $db->getQuery(true)
+        $query    = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('position'))
             ->from($db->quoteName('#__modules'))
             ->where($db->quoteName('client_id') . ' = :clientid')
@@ -120,7 +142,7 @@ public static function getTemplates($clientId = 0, $state = '', $template = '')
         $clientId = (int) $clientId;
 
         // Get the database object and a new query object.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the query.
         $query->select($db->quoteName(['element', 'name', 'enabled']))
@@ -157,7 +179,7 @@ public static function getTemplates($clientId = 0, $state = '', $template = '')
     public static function getModules($clientId)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('element AS value, name AS text')
             ->from('#__extensions as e')
             ->where('e.client_id = ' . (int) $clientId)
diff --git a/administrator/components/com_modules/src/Model/ModuleModel.php b/administrator/components/com_modules/src/Model/ModuleModel.php
index 9e8d5b17d57c0..9024b83e51f65 100644
--- a/administrator/components/com_modules/src/Model/ModuleModel.php
+++ b/administrator/components/com_modules/src/Model/ModuleModel.php
@@ -12,16 +12,22 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model\AfterDeleteEvent;
+use Joomla\CMS\Event\Model\AfterSaveEvent;
+use Joomla\CMS\Event\Model\BeforeDeleteEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Table\Table;
+use Joomla\CMS\Versioning\VersionableModelInterface;
+use Joomla\CMS\Versioning\VersionableModelTrait;
 use Joomla\Component\Modules\Administrator\Helper\ModulesHelper;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\Folder;
@@ -39,8 +45,10 @@
  *
  * @since  1.6
  */
-class ModuleModel extends AdminModel
+class ModuleModel extends AdminModel implements VersionableModelInterface
 {
+    use VersionableModelTrait;
+
     /**
      * The type alias for this content type.
      *
@@ -49,6 +57,14 @@ class ModuleModel extends AdminModel
      */
     public $typeAlias = 'com_modules.module';
 
+    /**
+     * The context used for the associations table
+     *
+     * @var    string
+     * @since  6.1.0
+     */
+    protected $associationsContext = 'com_modules.item';
+
     /**
      * @var    string  The prefix to use with controller messages.
      * @since  1.6
@@ -160,7 +176,10 @@ protected function batchCopy($value, $pks, $contexts)
         $newIds = [];
 
         foreach ($pks as $pk) {
-            if ($user->authorise('core.create', 'com_modules')) {
+            if (
+                $user->authorise('core.create', 'com_modules')
+                && $user->authorise('core.edit', $contexts[$pk])
+            ) {
                 $table->reset();
                 $table->load($pk);
 
@@ -202,7 +221,7 @@ protected function batchCopy($value, $pks, $contexts)
 
                 // Now we need to handle the module assignments
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('menuid'))
                     ->from($db->quoteName('#__modules_menu'))
                     ->where($db->quoteName('moduleid') . ' = :moduleid')
@@ -327,14 +346,14 @@ protected function canEditState($record)
      */
     public function delete(&$pks)
     {
-        $app        = Factory::getApplication();
         $pks        = (array) $pks;
         $user       = $this->getCurrentUser();
         $table      = $this->getTable();
         $context    = $this->option . '.' . $this->name;
 
         // Include the plugins for the on delete events.
-        PluginHelper::importPlugin($this->events_map['delete']);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['delete'], null, true, $dispatcher);
 
         // Iterate the items to delete each one.
         foreach ($pks as $pk) {
@@ -347,7 +366,10 @@ public function delete(&$pks)
                 }
 
                 // Trigger the before delete event.
-                $result = $app->triggerEvent($this->event_before_delete, [$context, $table]);
+                $result = $dispatcher->dispatch($this->event_before_delete, new BeforeDeleteEvent($this->event_before_delete, [
+                    'context' => $context,
+                    'subject' => $table,
+                ]))->getArgument('result', []);
 
                 if (\in_array(false, $result, true) || !$table->delete($pk)) {
                     throw new \Exception($table->getError());
@@ -356,7 +378,7 @@ public function delete(&$pks)
                 // Delete the menu assignments
                 $pk    = (int) $pk;
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__modules_menu'))
                     ->where($db->quoteName('moduleid') . ' = :moduleid')
                     ->bind(':moduleid', $pk, ParameterType::INTEGER);
@@ -364,7 +386,10 @@ public function delete(&$pks)
                 $db->execute();
 
                 // Trigger the after delete event.
-                $app->triggerEvent($this->event_after_delete, [$context, $table]);
+                $dispatcher->dispatch($this->event_after_delete, new AfterDeleteEvent($this->event_after_delete, [
+                    'context' => $context,
+                    'subject' => $table,
+                ]));
 
                 // Clear module cache
                 parent::cleanCache($table->module);
@@ -426,7 +451,7 @@ public function duplicate(&$pks)
                 }
 
                 $pk    = (int) $pk;
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('menuid'))
                     ->from($db->quoteName('#__modules_menu'))
                     ->where($db->quoteName('moduleid') . ' = :moduleid')
@@ -445,7 +470,7 @@ public function duplicate(&$pks)
 
         if (!empty($tuples)) {
             // Module-Menu Mapping: Do it in one query
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->insert($db->quoteName('#__modules_menu'))
                 ->columns($db->quoteName(['moduleid', 'menuid']))
                 ->values($tuples);
@@ -508,9 +533,10 @@ public function &getClient()
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|bool  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -546,10 +572,6 @@ public function getForm($data = [], $loadData = true)
             $form = $this->loadForm('com_modules.module', 'module', ['control' => 'jform', 'load_data' => $loadData], true);
         }
 
-        if (empty($form)) {
-            return false;
-        }
-
         $user = $this->getCurrentUser();
 
         /**
@@ -597,12 +619,12 @@ protected function loadFormData()
 
             // Pre-select some filters (Status, Module Position, Language, Access Level) in edit form if those have been selected in Module Manager
             if (!$data->id) {
-                $clientId = $input->getInt('client_id', 0);
-                $filters  = (array) $app->getUserState('com_modules.modules.' . $clientId . '.filter');
-                $data->set('published', $input->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null)));
-                $data->set('position', $input->getInt('position', (!empty($filters['position']) ? $filters['position'] : null)));
-                $data->set('language', $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));
-                $data->set('access', $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access'))));
+                $clientId        = $input->getInt('client_id', 0);
+                $filters         = (array) $app->getUserState('com_modules.modules.' . $clientId . '.filter');
+                $data->published = $input->getInt('published', ((isset($filters['state']) && $filters['state'] !== '') ? $filters['state'] : null));
+                $data->position  = $input->getInt('position', (!empty($filters['position']) ? $filters['position'] : null));
+                $data->language  = $input->getString('language', (!empty($filters['language']) ? $filters['language'] : null));
+                $data->access    = $input->getInt('access', (!empty($filters['access']) ? $filters['access'] : $app->get('access')));
             }
 
             // Avoid to delete params of a second module opened in a new browser tab while new one is not saved yet.
@@ -611,7 +633,7 @@ protected function loadFormData()
                 $params = $app->getUserState('com_modules.add.module.params');
 
                 if (\is_array($params)) {
-                    $data->set('params', $params);
+                    $data->params = $params;
                 }
             }
         }
@@ -626,7 +648,7 @@ protected function loadFormData()
      *
      * @param   integer  $pk  The id of the primary key.
      *
-     * @return  mixed  Object on success, false on failure.
+     * @return  \stdClass|false  Object on success, false on failure.
      *
      * @since   1.6
      */
@@ -652,7 +674,7 @@ public function getItem($pk = null)
             // Check if we are creating a new extension.
             if (empty($pk)) {
                 if ($extensionId = (int) $this->getState('extension.id')) {
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select($db->quoteName(['element', 'client_id']))
                         ->from($db->quoteName('#__extensions'))
                         ->where($db->quoteName('extension_id') . ' = :extensionid')
@@ -684,16 +706,16 @@ public function getItem($pk = null)
                 }
             }
 
-            // Convert to the \Joomla\CMS\Object\CMSObject before adding other data.
+            // Convert to an object before adding other data.
             $properties        = $table->getProperties(1);
-            $this->_cache[$pk] = ArrayHelper::toObject($properties, CMSObject::class);
+            $this->_cache[$pk] = ArrayHelper::toObject($properties);
 
             // Convert the params field to an array.
             $registry                  = new Registry($table->params);
             $this->_cache[$pk]->params = $registry->toArray();
 
             // Determine the page assignment mode.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('menuid'))
                 ->from($db->quoteName('#__modules_menu'))
                 ->where($db->quoteName('moduleid') . ' = :moduleid')
@@ -729,6 +751,21 @@ public function getItem($pk = null)
             } else {
                 $this->_cache[$pk]->xml = null;
             }
+
+            // Load associated module items
+            $assoc = Associations::isEnabled();
+
+            if ($assoc) {
+                $this->_cache[$pk]->associations = [];
+
+                if ($this->_cache[$pk]->id != null && $this->_cache[$pk]->client_id === 0) {
+                    $associations = Associations::getAssociations('com_modules', '#__modules', 'com_modules.item', $this->_cache[$pk]->id, 'id', '', '');
+
+                    foreach ($associations as $tag => $association) {
+                        $this->_cache[$pk]->associations[$tag] = $association->id;
+                    }
+                }
+            }
         }
 
         return $this->_cache[$pk];
@@ -863,6 +900,35 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
             }
         }
 
+        // Association for modules
+        if (Associations::isEnabled()) {
+            $languages = LanguageHelper::getContentLanguages(false, false, null, 'ordering', 'asc');
+
+            if (\count($languages) > 1) {
+                $addform = new \SimpleXMLElement('<form />');
+                $fields  = $addform->addChild('fields');
+                $fields->addAttribute('name', 'associations');
+                $fieldset = $fields->addChild('fieldset');
+                $fieldset->addAttribute('name', 'item_associations');
+                $fieldset->addAttribute('addfieldprefix', 'Joomla\Component\Modules\Administrator\Field');
+
+                foreach ($languages as $language) {
+                    $field = $fieldset->addChild('field');
+                    $field->addAttribute('name', $language->lang_code);
+                    $field->addAttribute('type', 'modal_module');
+                    $field->addAttribute('language', $language->lang_code);
+                    $field->addAttribute('label', $language->title);
+                    $field->addAttribute('translate_label', 'false');
+                    $field->addAttribute('select', 'true');
+                    $field->addAttribute('new', 'true');
+                    $field->addAttribute('edit', 'true');
+                    $field->addAttribute('clear', 'true');
+                    $field->addAttribute('propagate', 'true');
+                }
+
+                $form->load($addform, false);
+            }
+        }
         // Trigger the default form events.
         parent::preprocessForm($form, $data, $group);
     }
@@ -907,7 +973,8 @@ public function save($data)
         $context    = $this->option . '.' . $this->name;
 
         // Include the plugins for the save event.
-        PluginHelper::importPlugin($this->events_map['save']);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['save'], null, true, $dispatcher);
 
         // Load the row if saving an existing record.
         if ($pk > 0) {
@@ -926,50 +993,24 @@ public function save($data)
             }
         }
 
-        // Bind the data.
-        if (!$table->bind($data)) {
-            $this->setError($table->getError());
-
-            return false;
-        }
-
-        // Prepare the row for saving
-        $this->prepareTable($table);
-
-        // Check the data.
-        if (!$table->check()) {
-            $this->setError($table->getError());
-
-            return false;
-        }
-
-        // Trigger the before save event.
-        $result = Factory::getApplication()->triggerEvent($this->event_before_save, [$context, &$table, $isNew]);
-
-        if (\in_array(false, $result, true)) {
-            $this->setError($table->getError());
-
-            return false;
-        }
-
-        // Store the data.
-        if (!$table->store()) {
-            $this->setError($table->getError());
-
+        if (!parent::save($data)) {
             return false;
         }
 
         // Process the menu link mappings.
         $assignment = $data['assignment'] ?? 0;
 
-        $table->id = (int) $table->id;
+        $id = $this->getState('module.id');
+
+        // Reload Table
+        $table->load($id);
 
         // Delete old module to menu item associations
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__modules_menu'))
             ->where($db->quoteName('moduleid') . ' = :moduleid')
-            ->bind(':moduleid', $table->id, ParameterType::INTEGER);
+            ->bind(':moduleid', $id, ParameterType::INTEGER);
         $db->setQuery($query);
 
         try {
@@ -998,7 +1039,7 @@ public function save($data)
                     ->insert($db->quoteName('#__modules_menu'))
                     ->columns($db->quoteName(['moduleid', 'menuid']))
                     ->values(implode(', ', [':moduleid', 0]))
-                    ->bind(':moduleid', $table->id, ParameterType::INTEGER);
+                    ->bind(':moduleid', $id, ParameterType::INTEGER);
                 $db->setQuery($query);
 
                 try {
@@ -1017,7 +1058,7 @@ public function save($data)
                     ->columns($db->quoteName(['moduleid', 'menuid']));
 
                 foreach ($data['assigned'] as &$pk) {
-                    $query->values((int) $table->id . ',' . (int) $pk * $sign);
+                    $query->values((int) $id . ',' . (int) $pk * $sign);
                 }
 
                 $db->setQuery($query);
@@ -1033,7 +1074,12 @@ public function save($data)
         }
 
         // Trigger the after save event.
-        Factory::getApplication()->triggerEvent($this->event_after_save, [$context, &$table, $isNew]);
+        $dispatcher->dispatch($this->event_after_save, new AfterSaveEvent($this->event_after_save, [
+            'context' => $context,
+            'subject' => $table,
+            'isNew'   => $isNew,
+            'data'    => $data,
+        ]));
 
         // Compute the extension id of this module in case the controller wants it.
         $query->clear()
@@ -1057,7 +1103,6 @@ public function save($data)
         }
 
         $this->setState('module.extension_id', $extensionId);
-        $this->setState('module.id', $table->id);
 
         // Clear modules cache
         $this->cleanCache();
@@ -1090,15 +1135,13 @@ protected function getReorderConditions($table)
     /**
      * Custom clean cache method for different clients
      *
-     * @param   string   $group     The name of the plugin group to import (defaults to null).
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_modules');
     }
diff --git a/administrator/components/com_modules/src/Model/ModulesModel.php b/administrator/components/com_modules/src/Model/ModulesModel.php
index 2ad18918777d0..d790472edc643 100644
--- a/administrator/components/com_modules/src/Model/ModulesModel.php
+++ b/administrator/components/com_modules/src/Model/ModulesModel.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
@@ -63,6 +64,10 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
                 'name', 'e.name',
                 'menuitem',
             ];
+
+            if (Associations::isEnabled()) {
+                $config['filter_fields'][] = 'association';
+            }
         }
 
         parent::__construct($config, $factory);
@@ -84,13 +89,19 @@ protected function populateState($ordering = 'a.position', $direction = 'asc')
     {
         $app = Factory::getApplication();
 
-        $layout = $app->getInput()->get('layout', '', 'cmd');
+        $forcedLanguage = $app->getInput()->get('forcedLanguage', '', 'cmd');
+        $layout         = $app->getInput()->get('layout', '', 'cmd');
 
         // Adjust the context to support modal layouts.
         if ($layout) {
             $this->context .= '.' . $layout;
         }
 
+        // Adjust the context to support forced languages.
+        if ($forcedLanguage) {
+            $this->context .= '.' . $forcedLanguage;
+        }
+
         // Make context client aware
         $this->context .= '.' . $app->getInput()->get->getInt('client_id', 0);
 
@@ -121,6 +132,11 @@ protected function populateState($ordering = 'a.position', $direction = 'asc')
 
         // List state information.
         parent::populateState($ordering, $direction);
+
+        // Force a language.
+        if (!empty($forcedLanguage)) {
+            $this->setState('filter.language', $forcedLanguage);
+        }
     }
 
     /**
@@ -249,7 +265,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields.
         $query->select(
@@ -346,7 +362,7 @@ protected function getListQuery()
             } else {
                 // If user selected the modules assigned to some particular page (menu item).
                 // Modules in "All" pages.
-                $subQuery1 = $db->getQuery(true);
+                $subQuery1 = $db->createQuery();
                 $subQuery1->select('MIN(' . $db->quoteName('menuid') . ')')
                     ->from($db->quoteName('#__modules_menu'))
                     ->where($db->quoteName('moduleid') . ' = ' . $db->quoteName('a.id'));
@@ -354,13 +370,13 @@ protected function getListQuery()
                 // Modules in "Selected" pages that have the chosen menu item id.
                 $menuItemId      = (int) $menuItemId;
                 $minusMenuItemId = $menuItemId * -1;
-                $subQuery2       = $db->getQuery(true);
+                $subQuery2       = $db->createQuery();
                 $subQuery2->select($db->quoteName('moduleid'))
                     ->from($db->quoteName('#__modules_menu'))
                     ->where($db->quoteName('menuid') . ' = :menuitemid2');
 
                 // Modules in "All except selected" pages that doesn't have the chosen menu item id.
-                $subQuery3 = $db->getQuery(true);
+                $subQuery3 = $db->createQuery();
                 $subQuery3->select($db->quoteName('moduleid'))
                     ->from($db->quoteName('#__modules_menu'))
                     ->where($db->quoteName('menuid') . ' = :menuitemid3');
@@ -410,6 +426,22 @@ protected function getListQuery()
             }
         }
 
+        // Join over the associations.
+        if (Associations::isEnabled()) {
+            $subQuery = $db->createQuery()
+                ->select('COUNT(' . $db->quoteName('asso1.id') . ') > 1')
+                ->from($db->quoteName('#__associations', 'asso1'))
+                ->join('INNER', $db->quoteName('#__associations', 'asso2'), $db->quoteName('asso1.key') . ' = ' . $db->quoteName('asso2.key'))
+                ->where(
+                    [
+                        $db->quoteName('asso1.id') . ' = ' . $db->quoteName('a.id'),
+                        $db->quoteName('asso1.context') . ' = ' . $db->quote('com_modules.item'),
+                    ]
+                );
+
+            $query->select('(' . $subQuery . ') AS ' . $db->quoteName('association'));
+        }
+
         return $query;
     }
 
diff --git a/administrator/components/com_modules/src/Model/PositionsModel.php b/administrator/components/com_modules/src/Model/PositionsModel.php
index 0351c13dc8363..3d99a58ace4e6 100644
--- a/administrator/components/com_modules/src/Model/PositionsModel.php
+++ b/administrator/components/com_modules/src/Model/PositionsModel.php
@@ -105,7 +105,7 @@ public function getItems()
 
                 // Get the database object and a new query object.
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('position', 'value'))
                     ->from($db->quoteName('#__modules'))
                     ->where($db->quoteName('client_id') . ' = :clientid')
diff --git a/administrator/components/com_modules/src/Model/SelectModel.php b/administrator/components/com_modules/src/Model/SelectModel.php
index 643ca24503046..9a2fb6212e44b 100644
--- a/administrator/components/com_modules/src/Model/SelectModel.php
+++ b/administrator/components/com_modules/src/Model/SelectModel.php
@@ -90,7 +90,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
diff --git a/administrator/components/com_modules/src/Service/HTML/Modules.php b/administrator/components/com_modules/src/Service/HTML/Modules.php
index 78b02e6e90582..a7f9736c95080 100644
--- a/administrator/components/com_modules/src/Service/HTML/Modules.php
+++ b/administrator/components/com_modules/src/Service/HTML/Modules.php
@@ -12,9 +12,13 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Router\Route;
 use Joomla\Component\Modules\Administrator\Helper\ModulesHelper;
 use Joomla\Component\Templates\Administrator\Helper\TemplatesHelper;
+use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
 use Joomla\Utilities\ArrayHelper;
 
@@ -29,6 +33,82 @@
  */
 class Modules
 {
+    use DatabaseAwareTrait;
+
+    /**
+     * Generate the markup to display the item associations
+     *
+     * @param   int  $itemid  The menu item id
+     *
+     * @return  string
+     *
+     * @since   6.1.0
+     *
+     * @throws \Exception If there is an error on the query
+     */
+    public function association($itemid)
+    {
+        // Defaults
+        $html = '';
+
+        // Get the associations
+        $associations = ModulesHelper::getAssociations($itemid);
+
+        if ($associations) {
+            // Get the associated menu items
+            $db    = $this->getDatabase();
+            $query = $db->createQuery()
+                ->select(
+                    [
+                        $db->quoteName('m.id'),
+                        $db->quoteName('m.title'),
+                        $db->quoteName('l.sef', 'lang_sef'),
+                        $db->quoteName('l.lang_code'),
+                        $db->quoteName('l.image'),
+                        $db->quoteName('l.title', 'language_title'),
+                    ]
+                )
+                ->from($db->quoteName('#__modules', 'm'))
+                ->join('LEFT', $db->quoteName('#__languages', 'l'), $db->quoteName('m.language') . ' = ' . $db->quoteName('l.lang_code'))
+                ->whereIn($db->quoteName('m.id'), array_values($associations))
+                ->where($db->quoteName('m.id') . ' != :itemid')
+                ->bind(':itemid', $itemid, ParameterType::INTEGER);
+            $db->setQuery($query);
+
+            try {
+                $items = $db->loadObjectList('id');
+            } catch (\RuntimeException $e) {
+                throw new \Exception($e->getMessage(), 500);
+            }
+
+            // Construct html
+            if ($items) {
+                $languages         = LanguageHelper::getContentLanguages([0, 1]);
+                $content_languages = array_column($languages, 'lang_code');
+
+                foreach ($items as &$item) {
+                    if (\in_array($item->lang_code, $content_languages)) {
+                        $text    = $item->lang_code;
+                        $url     = Route::_('index.php?option=com_modules&task=modules.edit&id=' . (int) $item->id);
+                        $tooltip = '<strong>' . htmlspecialchars($item->language_title, ENT_QUOTES, 'UTF-8') . '</strong><br>'
+                            . Text::sprintf('COM_MODULES_MODULE_SPRINTF', $item->title);
+                        $classes = 'badge bg-secondary';
+
+                        $item->link = '<a href="' . $url . '" class="' . $classes . '">' . $text . '</a>'
+                            . '<div role="tooltip" id="tip-' . (int) $itemid . '-' . (int) $item->id . '">' . $tooltip . '</div>';
+                    } else {
+                        // Display warning if Content Language is trashed or deleted
+                        Factory::getApplication()->enqueueMessage(Text::sprintf('JGLOBAL_ASSOCIATIONS_CONTENTLANGUAGE_WARNING', $item->lang_code), 'warning');
+                    }
+                }
+            }
+
+            $html = LayoutHelper::render('joomla.content.associations', $items);
+        }
+
+        return $html;
+    }
+
     /**
      * Builds an array of template options
      *
@@ -223,14 +303,14 @@ public function batchOptions()
      *
      * @since   2.5
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Will be removed with no replacement
      */
     public function positionList($clientId = 0)
     {
         $clientId = (int) $clientId;
-        $db       = Factory::getDbo();
-        $query    = $db->getQuery(true)
+        $db       = $this->getDatabase();
+        $query    = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('position', 'value'))
             ->select($db->quoteName('position', 'text'))
             ->from($db->quoteName('#__modules'))
diff --git a/administrator/components/com_modules/src/View/Module/HtmlView.php b/administrator/components/com_modules/src/View/Module/HtmlView.php
index 4037f50637bf7..1037dcd8071d1 100644
--- a/administrator/components/com_modules/src/View/Module/HtmlView.php
+++ b/administrator/components/com_modules/src/View/Module/HtmlView.php
@@ -10,8 +10,10 @@
 
 namespace Joomla\Component\Modules\Administrator\View\Module;
 
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\Toolbar;
@@ -100,6 +102,24 @@ public function display($tpl = null)
             return;
         }
 
+        $input          = Factory::getApplication()->getInput();
+        $forcedLanguage = $input->get('forcedLanguage', '', 'cmd');
+
+        // If we are forcing a language in modal (used for associations).
+        if ($this->getLayout() === 'modal' && $forcedLanguage) {
+            // Set the language field to the forcedLanguage and disable changing it.
+            $this->form->setValue('language', null, $forcedLanguage);
+            $this->form->setFieldAttribute('language', 'readonly', 'true');
+
+            // Only allow to select categories with All language or with the forced language.
+            $this->form->setFieldAttribute('parent_id', 'language', '*,' . $forcedLanguage);
+        }
+
+        // Add form control fields
+        $this->form
+            ->addControlField('task')
+            ->addControlField('return', Factory::getApplication()->getInput()->getBase64('return', ''));
+
         if ($this->getLayout() !== 'modal') {
             $this->addToolbar();
         } else {
@@ -170,6 +190,16 @@ function (Toolbar $childBar) use ($checkedOut, $canDo) {
             );
 
             $toolbar->cancel('module.cancel');
+
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $canDo->get('core.edit')) {
+                $toolbar->versions('com_modules.module', $this->item->id);
+            }
+
+            if (Associations::isEnabled() && ComponentHelper::isEnabled('com_associations') && $this->item->client_id === 0) {
+                $toolbar->standardButton('associations', 'JTOOLBAR_ASSOCIATIONS', 'module.editAssociations')
+                    ->icon('icon-contract')
+                    ->listCheck(false);
+            }
         }
 
         // Get the help information for the menu item.
diff --git a/administrator/components/com_modules/src/View/Modules/HtmlView.php b/administrator/components/com_modules/src/View/Modules/HtmlView.php
index f52d23592643f..b610a5a593426 100644
--- a/administrator/components/com_modules/src/View/Modules/HtmlView.php
+++ b/administrator/components/com_modules/src/View/Modules/HtmlView.php
@@ -14,12 +14,9 @@
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\MVC\View\ListView;
 use Joomla\CMS\Session\Session;
-use Joomla\CMS\Toolbar\Button\DropdownButton;
-use Joomla\CMS\Toolbar\ToolbarHelper;
-use Joomla\Component\Modules\Administrator\Model\ModulesModel;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -30,80 +27,61 @@
  *
  * @since  1.6
  */
-class HtmlView extends BaseHtmlView
+class HtmlView extends ListView
 {
     /**
-     * An array of items
+     * The client ID for the modules we're showing
      *
-     * @var  array
-     */
-    protected $items;
-
-    /**
-     * The pagination object
+     * @var int
      *
-     * @var  \Joomla\CMS\Pagination\Pagination
+     * @since 6.0.0
      */
-    protected $pagination;
+    protected $clientId;
 
     /**
-     * The model state
+     * The help link for the view
      *
-     * @var  \Joomla\Registry\Registry
+     * @var string
      */
-    protected $state;
+    protected $helpLink = 'Modules';
 
     /**
-     * Form object for search filters
+     * Constructor
      *
-     * @var    \Joomla\CMS\Form\Form
-     *
-     * @since  4.0.0
+     * @param   array  $config  An optional associative array of configuration settings.
      */
-    public $filterForm;
+    public function __construct(array $config)
+    {
+        if (empty($config['option'])) {
+            $config['option'] = 'com_modules';
+        }
 
-    /**
-     * The active search filters
-     *
-     * @var    array
-     * @since  4.0.0
-     */
-    public $activeFilters;
+        $config['toolbar_icon']   = 'cube module';
+        $config['supports_batch'] = true;
 
-    /**
-     * Is this view an Empty State
-     *
-     * @var  boolean
-     * @since 4.0.0
-     */
-    private $isEmptyState = false;
+        parent::__construct($config);
+    }
 
     /**
-     * Display the view
-     *
-     * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+     * Prepare view data
      *
      * @return  void
-     *
-     * @since   1.6
      */
-    public function display($tpl = null)
+    protected function initializeView()
     {
-        /** @var ModulesModel $model */
+        parent::initializeView();
+
+        /**
+         * @var ListModel
+         */
         $model = $this->getModel();
-        $model->setUseExceptions(true);
 
-        $this->items         = $model->getItems();
-        $this->pagination    = $model->getPagination();
-        $this->state         = $model->getState();
         $this->total         = $model->getTotal();
-        $this->filterForm    = $model->getFilterForm();
-        $this->activeFilters = $model->getActiveFilters();
-        $this->clientId      = $this->state->get('client_id');
+        $this->clientId      = (int) $this->state->get('client_id', 0);
 
-        if (!\count($this->items) && $this->isEmptyState = $model->getIsEmptyState()) {
-            $this->setLayout('emptystate');
-        }
+        $this->canDo = ContentHelper::getActions('com_modules');
+
+        $this->toolbarTitle = $this->clientId == 1 ? 'COM_MODULES_MANAGER_MODULES_ADMIN' : 'COM_MODULES_MANAGER_MODULES_SITE';
 
         /**
          * The code below make sure the remembered position will be available from filter dropdown even if there are no
@@ -138,8 +116,6 @@ public function display($tpl = null)
 
         // We don't need the toolbar in the modal window.
         if ($this->getLayout() !== 'modal') {
-            $this->addToolbar();
-
             // We do not need to filter by language when multilingual is disabled
             if (!Multilanguage::isEnabled()) {
                 unset($this->activeFilters['language']);
@@ -161,9 +137,21 @@ public function display($tpl = null)
                 */
                 $this->pagination->setAdditionalUrlParam(Session::getFormToken(), '1');
             }
-        }
 
-        parent::display($tpl);
+            // In menu associations modal we need to remove language filter if forcing a language.
+            $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD');
+
+            if ($forcedLanguage) {
+                // If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
+                $languageXml = new \SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
+                $this->filterForm->setField($languageXml, 'filter', true);
+
+                // Also, unset the active language filter so the search tools is not open by default with this filter.
+                unset($this->activeFilters['language']);
+            }
+
+            $this->filterForm->addControlField('forcedLanguage', $forcedLanguage);
+        }
     }
 
     /**
@@ -175,78 +163,42 @@ public function display($tpl = null)
      */
     protected function addToolbar()
     {
-        $state = $this->state;
-        $canDo = ContentHelper::getActions('com_modules');
-        $user  = $this->getCurrentUser();
+        $canDo = $this->canDo;
 
-        // Get the toolbar object instance
-        $toolbar = $this->getDocument()->getToolbar();
+        $canCreate = $canDo->get('core.create');
 
-        if ($state->get('client_id') == 1) {
-            ToolbarHelper::title(Text::_('COM_MODULES_MANAGER_MODULES_ADMIN'), 'cube module');
-        } else {
-            ToolbarHelper::title(Text::_('COM_MODULES_MANAGER_MODULES_SITE'), 'cube module');
+        if ($canCreate) {
+            $this->getDocument()->getToolbar()->standardButton('new', 'JTOOLBAR_NEW')
+                ->onclick("location.href='index.php?option=com_modules&amp;view=select&amp;client_id=" . $this->clientId . "'");
         }
 
-        if ($canDo->get('core.create')) {
-            $toolbar->standardButton('new', 'JTOOLBAR_NEW')
-                ->onclick("location.href='index.php?option=com_modules&amp;view=select&amp;client_id=" . $this->state->get('client_id', 0) . "'");
-        }
+        // Prevent showing default add button
+        $canDo->set('core.create', false);
 
-        if (!$this->isEmptyState && ($canDo->get('core.edit.state') || $this->getCurrentUser()->authorise('core.admin'))) {
-            /** @var DropdownButton $dropdown */
-            $dropdown = $toolbar->dropdownButton('status-group', 'JTOOLBAR_CHANGE_STATUS')
-                ->toggleSplit(false)
-                ->icon('icon-ellipsis-h')
-                ->buttonClass('btn btn-action')
-                ->listCheck(true);
+        parent::addToolbar();
 
-            $childBar = $dropdown->getChildToolbar();
+        $canDo->set('core.create', $canCreate);
 
-            if ($canDo->get('core.edit.state')) {
-                $childBar->publish('modules.publish')->listCheck(true);
+        // We add the duplicate button if there is the default dropdown
+        if ($canCreate) {
 
-                $childBar->unpublish('modules.unpublish')->listCheck(true);
-            }
+            /**
+             * @var \Joomla\CMS\Toolbar\Toolbar $toolbar
+             */
+            $toolbar = $this->getDocument()->getToolbar();
 
-            if ($this->getCurrentUser()->authorise('core.admin')) {
-                $childBar->checkin('modules.checkin')->listCheck(true);
-            }
+            $buttons = $toolbar->getItems();
 
-            if ($canDo->get('core.edit.state') && $this->state->get('filter.published') != -2) {
-                $childBar->trash('modules.trash')->listCheck(true);
-            }
+            foreach ($buttons as $button) {
+                if ($button->getName() === 'status-group') {
+                    $childBar = $button->getChildToolbar();
 
-            // Add a batch button
-            if (
-                $user->authorise('core.create', 'com_modules') && $user->authorise('core.edit', 'com_modules')
-                && $user->authorise('core.edit.state', 'com_modules')
-            ) {
-                $childBar->popupButton('batch', 'JTOOLBAR_BATCH')
-                    ->popupType('inline')
-                    ->textHeader(Text::_('COM_MODULES_BATCH_OPTIONS'))
-                    ->url('#joomla-dialog-batch')
-                    ->modalWidth('800px')
-                    ->modalHeight('fit-content')
-                    ->listCheck(true);
-            }
+                    $childBar->standardButton('copy', 'JTOOLBAR_DUPLICATE', 'modules.duplicate')
+                        ->listCheck(true);
 
-            if ($canDo->get('core.create')) {
-                $childBar->standardButton('copy', 'JTOOLBAR_DUPLICATE', 'modules.duplicate')
-                    ->listCheck(true);
+                    break;
+                }
             }
         }
-
-        if (!$this->isEmptyState && ($state->get('filter.state') == -2 && $canDo->get('core.delete'))) {
-            $toolbar->delete('modules.delete', 'JTOOLBAR_DELETE_FROM_TRASH')
-                ->message('JGLOBAL_CONFIRM_DELETE')
-                ->listCheck(true);
-        }
-
-        if ($canDo->get('core.admin')) {
-            $toolbar->preferences('com_modules');
-        }
-
-        $toolbar->help('Modules');
     }
 }
diff --git a/administrator/components/com_modules/tmpl/module/edit.php b/administrator/components/com_modules/tmpl/module/edit.php
index 45a819a54cfa9..1695523f3bbce 100644
--- a/administrator/components/com_modules/tmpl/module/edit.php
+++ b/administrator/components/com_modules/tmpl/module/edit.php
@@ -12,14 +12,13 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 
 /** @var \Joomla\Component\Modules\Administrator\View\Module\HtmlView $this */
 
-HTMLHelper::_('behavior.combobox');
-
 $hasContent          = isset($this->item->xml->customContent);
 $hasContentFieldName = 'content';
 
@@ -39,12 +38,14 @@
 
 $this->getDocument()->addScriptOptions('module-edit', ['itemId' => $this->item->id, 'state' => (int) $this->item->id == 0 ? 'Add' : 'Edit']);
 
-/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa = $this->getDocument()->getWebAssetManager();
-$wa->useScript('keepalive')
-    ->useScript('form.validate');
+$this->getDocument()->getWebAssetManager()
+    ->useScript('keepalive')
+    ->useScript('form.validate')
+    ->useScript('awesomplete');
 
-$input = Factory::getApplication()->getInput();
+$clientId  = (int) $this->item->client_id;
+$assoc     = Associations::isEnabled() && $clientId == 0;
+$input     = Factory::getApplication()->getInput();
 
 // In case of modal
 $isModal = $input->get('layout') === 'modal';
@@ -136,7 +137,8 @@
                     'access',
                     'ordering',
                     'language',
-                    'note'
+                    'note',
+                    'version_note'
                 ];
 
                 ?>
@@ -172,10 +174,23 @@
 
         <?php
         $this->fieldsets        = [];
-        $this->ignore_fieldsets = ['basic', 'description'];
+        $this->ignore_fieldsets = ['basic', 'description', 'item_associations'];
         echo LayoutHelper::render('joomla.edit.params', $this);
         ?>
 
+        <?php if (!$isModal && $assoc) : ?>
+            <?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'associations', Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS')); ?>
+            <fieldset id="fieldset-associations" class="options-form">
+                <legend><?php echo Text::_('JGLOBAL_FIELDSET_ASSOCIATIONS'); ?></legend>
+                <div>
+                    <?php echo LayoutHelper::render('joomla.edit.associations', $this); ?>
+                </div>
+            </fieldset>
+            <?php echo HTMLHelper::_('uitab.endTab'); ?>
+        <?php elseif ($isModal && $assoc) : ?>
+            <div class="hidden"><?php echo LayoutHelper::render('joomla.edit.associations', $this); ?></div>
+        <?php endif; ?>
+
         <?php if ($this->canDo->get('core.admin')) : ?>
             <?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'permissions', Text::_('COM_MODULES_FIELDSET_RULES')); ?>
             <fieldset id="fieldset-permissions" class="options-form">
@@ -189,10 +204,10 @@
 
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="return" value="<?php echo $input->get('return', null, 'BASE64'); ?>">
-        <?php echo HTMLHelper::_('form.token'); ?>
         <?php echo $this->form->getInput('module'); ?>
         <?php echo $this->form->getInput('client_id'); ?>
+        <?php echo $this->form->getInput('id'); ?>
+
+        <?php echo $this->form->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_modules/tmpl/module/modal.php b/administrator/components/com_modules/tmpl/module/modal.php
index 4d9cad46253cf..25bce0f104420 100644
--- a/administrator/components/com_modules/tmpl/module/modal.php
+++ b/administrator/components/com_modules/tmpl/module/modal.php
@@ -13,7 +13,7 @@
 /** @var \Joomla\Component\Modules\Administrator\View\Module\HtmlView $this */
 
 // A backward compatibility for bootstrap modals: hide toolbar
-// @TODO: Remove in 6.0
+// @TODO: Remove in 7.0
 $this->getDocument()->getWebAssetManager()->addInlineScript('
 if (window.parent.Joomla.Modal) {
     const modal = window.parent.Joomla.Modal.getCurrent();
diff --git a/administrator/components/com_modules/tmpl/modules/default.php b/administrator/components/com_modules/tmpl/modules/default.php
index 2962d5ae2c2c1..679f51614f2f1 100644
--- a/administrator/components/com_modules/tmpl/modules/default.php
+++ b/administrator/components/com_modules/tmpl/modules/default.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -35,6 +36,9 @@
     $saveOrderingUrl = 'index.php?option=com_modules&task=modules.saveOrderAjax&tmpl=component&' . Session::getFormToken() . '=1';
     HTMLHelper::_('draggablelist.draggable');
 }
+
+$assoc   = Associations::isEnabled() && $clientId == 0;
+
 ?>
 <form action="<?php echo Route::_('index.php?option=com_modules&view=modules&client_id=' . $clientId); ?>" method="post" name="adminForm" id="adminForm">
     <div id="j-main-container" class="j-main-container">
@@ -74,8 +78,13 @@
                         <th scope="col" class="w-10 d-none d-md-table-cell">
                             <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'ag.title', $listDirn, $listOrder); ?>
                         </th>
+                        <?php if ($assoc) : ?>
+                            <th scope="col" class="w-10 d-none d-md-table-cell">
+                                <?php echo HTMLHelper::_('searchtools.sort', 'COM_MODULES_HEADING_ASSOCIATION', 'association', $listDirn, $listOrder); ?>
+                            </th>
+                        <?php endif; ?>
                         <?php if (($clientId === 0) && (Multilanguage::isEnabled())) : ?>
-                        <th scope="col" class="w-10 d-none d-md-table-cell">
+                            <th scope="col" class="w-10 d-none d-md-table-cell">
                             <?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'l.title', $listDirn, $listOrder); ?>
                         </th>
                         <?php elseif ($clientId === 1 && ModuleHelper::isAdminMultilang()) : ?>
@@ -170,6 +179,13 @@
                         <td class="small d-none d-md-table-cell">
                             <?php echo $this->escape($item->access_level); ?>
                         </td>
+                        <?php if ($assoc) : ?>
+                            <td class="small d-none d-md-table-cell">
+                                <?php if ($item->association) : ?>
+                                    <?php echo HTMLHelper::_('modules.association', $item->id); ?>
+                                <?php endif; ?>
+                            </td>
+                        <?php endif; ?>
                         <?php if (($clientId === 0) && (Multilanguage::isEnabled())) : ?>
                         <td class="small d-none d-md-table-cell">
                             <?php echo LayoutHelper::render('joomla.content.language', $item); ?>
@@ -200,15 +216,10 @@
 
         <?php // Load the batch processing form. ?>
         <?php
-        if (
-            $user->authorise('core.create', 'com_modules')
-            && $user->authorise('core.edit', 'com_modules')
-            && $user->authorise('core.edit.state', 'com_modules')
-        ) : ?>
+        if ($this->batchAllowed) : ?>
             <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
         <?php endif; ?>
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="boxchecked" value="0">
-        <?php echo HTMLHelper::_('form.token'); ?>
+
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_modules/tmpl/modules/emptystate.php b/administrator/components/com_modules/tmpl/modules/emptystate.php
index 75450cad12077..9b31c10e17778 100644
--- a/administrator/components/com_modules/tmpl/modules/emptystate.php
+++ b/administrator/components/com_modules/tmpl/modules/emptystate.php
@@ -18,10 +18,12 @@
 $displayData = [
     'textPrefix' => 'COM_MODULES',
     'formURL'    => 'index.php?option=com_modules&view=select&client_id=' . $this->clientId,
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Module',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/modules',
     'icon'       => 'icon-cube module',
     // Although it is (almost) impossible to get to this page with no created Administrator Modules, we add this for completeness.
     'title'      => Text::_('COM_MODULES_EMPTYSTATE_TITLE_' . ($this->clientId ? 'ADMINISTRATOR' : 'SITE')),
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 if ($this->getCurrentUser()->authorise('core.create', 'com_modules')) {
diff --git a/administrator/components/com_modules/tmpl/modules/modal.php b/administrator/components/com_modules/tmpl/modules/modal.php
index 45111f6b0d5a1..198ffdf7dbb1c 100644
--- a/administrator/components/com_modules/tmpl/modules/modal.php
+++ b/administrator/components/com_modules/tmpl/modules/modal.php
@@ -37,7 +37,6 @@
 }
 ?>
 <div class="container-popup">
-
     <form action="<?php echo Route::_($link); ?>" method="post" name="adminForm" id="adminForm">
 
         <?php echo LayoutHelper::render('joomla.searchtools.default', ['view' => $this]); ?>
diff --git a/administrator/components/com_newsfeeds/helpers/newsfeeds.php b/administrator/components/com_newsfeeds/helpers/newsfeeds.php
index b474e08ee4a03..378de40b6eff7 100644
--- a/administrator/components/com_newsfeeds/helpers/newsfeeds.php
+++ b/administrator/components/com_newsfeeds/helpers/newsfeeds.php
@@ -19,7 +19,7 @@
  *
  * @since       1.6
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Newsfeeds\Administrator\Helper\NewsfeedsHelper instead
  */
 class NewsfeedsHelper extends \Joomla\Component\Newsfeeds\Administrator\Helper\NewsfeedsHelper
diff --git a/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php b/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
index 97ed426e7ce8b..834174f3e5454 100644
--- a/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
+++ b/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
@@ -138,7 +138,7 @@ protected function getValueTitle()
         if ($value) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('name'))
                     ->from($db->quoteName('#__newsfeeds'))
                     ->where($db->quoteName('id') . ' = :value')
diff --git a/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php b/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php
index a4975ea91a467..d41a20203c93b 100644
--- a/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php
+++ b/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php
@@ -44,7 +44,7 @@ protected function getOptions()
         $options = [];
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id', 'value'),
diff --git a/administrator/components/com_newsfeeds/src/Helper/AssociationsHelper.php b/administrator/components/com_newsfeeds/src/Helper/AssociationsHelper.php
index f7cbdebf3aa2c..213e3eb0b4d68 100644
--- a/administrator/components/com_newsfeeds/src/Helper/AssociationsHelper.php
+++ b/administrator/components/com_newsfeeds/src/Helper/AssociationsHelper.php
@@ -11,8 +11,11 @@
 namespace Joomla\Component\Newsfeeds\Administrator\Helper;
 
 use Joomla\CMS\Association\AssociationExtensionHelper;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Associations;
+use Joomla\CMS\Table\Category;
 use Joomla\CMS\Table\Table;
+use Joomla\Component\Newsfeeds\Administrator\Table\NewsfeedTable;
 use Joomla\Component\Newsfeeds\Site\Helper\AssociationHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -124,11 +127,11 @@ public function getItem($typeName, $id)
 
         switch ($typeName) {
             case 'newsfeed':
-                $table = Table::getInstance('NewsfeedTable', 'Joomla\\Component\\Newsfeeds\\Administrator\\Table\\');
+                $table = new NewsfeedTable(Factory::getDbo());
                 break;
 
             case 'category':
-                $table = Table::getInstance('Category');
+                $table = new Category(Factory::getDbo());
                 break;
         }
 
diff --git a/administrator/components/com_newsfeeds/src/Helper/NewsfeedsHelper.php b/administrator/components/com_newsfeeds/src/Helper/NewsfeedsHelper.php
index d2733fe1ddc32..febf63625bfa8 100644
--- a/administrator/components/com_newsfeeds/src/Helper/NewsfeedsHelper.php
+++ b/administrator/components/com_newsfeeds/src/Helper/NewsfeedsHelper.php
@@ -44,7 +44,7 @@ class NewsfeedsHelper extends ContentHelper
     public static function countItems(&$items)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('published', 'state'),
@@ -101,7 +101,7 @@ public static function countItems(&$items)
     public static function countTagItems(&$items, $extension)
     {
         $db        = Factory::getDbo();
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
         $parts     = explode('.', $extension);
         $section   = null;
 
diff --git a/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php b/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
index 90878c7430696..7fc7a53a5ad5e 100644
--- a/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
+++ b/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
@@ -17,6 +17,7 @@
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\MVC\Model\AdminModel;
+use Joomla\CMS\Versioning\VersionableModelInterface;
 use Joomla\CMS\Versioning\VersionableModelTrait;
 use Joomla\Component\Categories\Administrator\Helper\CategoriesHelper;
 use Joomla\Registry\Registry;
@@ -30,7 +31,7 @@
  *
  * @since  1.6
  */
-class NewsfeedModel extends AdminModel
+class NewsfeedModel extends AdminModel implements VersionableModelInterface
 {
     use VersionableModelTrait;
 
@@ -102,19 +103,16 @@ protected function canEditState($record)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|bool  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
         // Get the form.
         $form = $this->loadForm('com_newsfeeds.newsfeed', 'newsfeed', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         // Modify the form based on access controls.
         if (!$this->canEditState((object) $data)) {
             // Disable fields for display.
@@ -156,8 +154,8 @@ protected function loadFormData()
 
             // Prime some default values.
             if ($this->getState('newsfeed.id') == 0) {
-                $app = Factory::getApplication();
-                $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_newsfeeds.newsfeeds.filter.category_id'), 'int'));
+                $app         = Factory::getApplication();
+                $data->catid = $app->getInput()->get('catid', $app->getUserState('com_newsfeeds.newsfeeds.filter.category_id'), 'int');
             }
         }
 
@@ -310,7 +308,7 @@ protected function prepareTable($table)
             // Set ordering to the last item if not set
             if (empty($table->ordering)) {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('MAX(' . $db->quoteName('ordering') . ')')
                     ->from($db->quoteName('#__newsfeeds'));
                 $db->setQuery($query);
diff --git a/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php b/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
index 6d806ec3a06fd..e7a62b1f7c61e 100644
--- a/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
+++ b/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
@@ -147,7 +147,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
 
         // Select the required fields from the table.
@@ -191,7 +191,7 @@ protected function getListQuery()
 
         // Join over the associations.
         if (Associations::isEnabled()) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName('asso1.id') . ') > 1')
                 ->from($db->quoteName('#__associations', 'asso1'))
                 ->join('INNER', $db->quoteName('#__associations', 'asso2'), $db->quoteName('asso1.key') . ' = ' . $db->quoteName('asso2.key'))
@@ -278,7 +278,7 @@ protected function getListQuery()
                 $includeNone = true;
             }
 
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                 ->from($db->quoteName('#__contentitem_tag_map'))
                 ->where(
@@ -295,7 +295,7 @@ protected function getListQuery()
             );
 
             if ($includeNone) {
-                $subQuery2 = $db->getQuery(true)
+                $subQuery2 = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_newsfeeds.newsfeed'));
@@ -313,7 +313,7 @@ protected function getListQuery()
             $tag = (int) $tag;
 
             if ($tag === 0) {
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_newsfeeds.newsfeed'));
diff --git a/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php b/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
index 1de326795b4f3..97d94dd5d12ce 100644
--- a/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
@@ -51,7 +51,7 @@ public function association($newsfeedid)
 
             // Get the associated newsfeed items
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query
                 ->select(
                     [
diff --git a/administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php b/administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php
index 58a4f4c686695..0aa0f05208fea 100644
--- a/administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php
+++ b/administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php
@@ -177,7 +177,7 @@ public function store($updateNulls = true)
         }
 
         // Verify that the alias is unique
-        $table = Table::getInstance('NewsfeedTable', __NAMESPACE__ . '\\', ['dbo' => $this->getDatabase()]);
+        $table = new self($this->getDatabase());
 
         if ($table->load(['alias' => $this->alias, 'catid' => $this->catid]) && ($table->id != $this->id || $this->id == 0)) {
             // Is the existing newsfeed trashed?
diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
index 151f87a3f817a..a30422fedb812 100644
--- a/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
+++ b/administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php
@@ -93,7 +93,9 @@ public function display($tpl = null)
         }
 
         // If we are forcing a language in modal (used for associations).
-        if ($this->getLayout() === 'modal' && $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd')) {
+        $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'cmd');
+
+        if ($this->getLayout() === 'modal' && $forcedLanguage) {
             // Set the language field to the forcedLanguage and disable changing it.
             $this->form->setValue('language', null, $forcedLanguage);
             $this->form->setFieldAttribute('language', 'readonly', 'true');
@@ -105,6 +107,11 @@ public function display($tpl = null)
             $this->form->setFieldAttribute('tags', 'language', '*,' . $forcedLanguage);
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task')
+            ->addControlField('forcedLanguage', $forcedLanguage);
+
         if ($this->getLayout() !== 'modal') {
             $this->addToolbar();
         } else {
diff --git a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
index df52945d15a32..76d42e26fdf14 100644
--- a/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
+++ b/administrator/components/com_newsfeeds/src/View/Newsfeeds/HtmlView.php
@@ -105,6 +105,11 @@ public function display($tpl = null)
             $this->setLayout('emptystate');
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         // We don't need toolbar in the modal layout.
         if ($this->getLayout() !== 'modal') {
             $this->addToolbar();
@@ -117,7 +122,9 @@ public function display($tpl = null)
         } else {
             // In article associations modal we need to remove language filter if forcing a language.
             // We also need to change the category filter to show show categories with All or the forced language.
-            if ($forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD')) {
+            $forcedLanguage = Factory::getApplication()->getInput()->get('forcedLanguage', '', 'CMD');
+
+            if ($forcedLanguage) {
                 // If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
                 $languageXml = new \SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
                 $this->filterForm->setField($languageXml, 'filter', true);
@@ -128,6 +135,8 @@ public function display($tpl = null)
                 // One last changes needed is to change the category filter to just show categories with All language or with the forced language.
                 $this->filterForm->setFieldAttribute('category_id', 'language', '*,' . $forcedLanguage, 'filter');
             }
+
+            $this->filterForm->addControlField('forcedLanguage', $forcedLanguage);
         }
 
         parent::display($tpl);
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php
index 0122427456644..9aa2867fc0810 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeed/edit.php
@@ -116,7 +116,6 @@
 
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
     </div>
-    <input type="hidden" name="task" value="">
-    <input type="hidden" name="forcedLanguage" value="<?php echo $input->get('forcedLanguage', '', 'cmd'); ?>">
-    <?php echo HTMLHelper::_('form.token'); ?>
+
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
index 5b1cf424eb896..1d2a205d34067 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
@@ -186,9 +186,8 @@
                         <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
                     <?php endif; ?>
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php
index d9df032a63371..f9cb1223dcb72 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php
@@ -17,8 +17,10 @@
 $displayData = [
     'textPrefix' => 'COM_NEWSFEEDS',
     'formURL'    => 'index.php?option=com_newsfeeds&view=newsfeeds',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:News_Feeds',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/news-feeds/news-feeds-news-feeds',
     'icon'       => 'icon-rss newsfeeds',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 $user = $this->getCurrentUser();
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
index e048cc5bbf434..a4af92aa16535 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/modal.php
@@ -27,7 +27,7 @@
 
 $app = Factory::getApplication();
 
-// @todo: Use of Function is deprecated and should be removed in 6.0. It stays only for backward compatibility.
+// @todo: Use of Function is deprecated and should be removed in 7.0. It stays only for backward compatibility.
 $function  = $app->getInput()->getCmd('function', 'jSelectNewsfeed');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
@@ -139,10 +139,7 @@
 
         <?php endif; ?>
 
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="boxchecked" value="0">
-        <input type="hidden" name="forcedLanguage" value="<?php echo $app->getInput()->get('forcedLanguage', '', 'CMD'); ?>">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->filterForm->renderControlFields(); ?>
 
     </form>
 </div>
diff --git a/administrator/components/com_plugins/helpers/plugins.php b/administrator/components/com_plugins/helpers/plugins.php
index 35325f4f180e3..a50009e6339d1 100644
--- a/administrator/components/com_plugins/helpers/plugins.php
+++ b/administrator/components/com_plugins/helpers/plugins.php
@@ -19,7 +19,7 @@
  *
  * @since  1.6
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Plugins\Administrator\Helper\PluginsHelper instead
  */
 class PluginsHelper extends \Joomla\Component\Plugins\Administrator\Helper\PluginsHelper
diff --git a/administrator/components/com_plugins/src/Field/PluginorderingField.php b/administrator/components/com_plugins/src/Field/PluginorderingField.php
index 42e8b36257efc..396a3ae2aa2c7 100644
--- a/administrator/components/com_plugins/src/Field/PluginorderingField.php
+++ b/administrator/components/com_plugins/src/Field/PluginorderingField.php
@@ -42,7 +42,7 @@ protected function getQuery()
         $folder = $this->form->getValue('folder');
 
         // Build the query for the ordering list.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('ordering', 'value'),
diff --git a/administrator/components/com_plugins/src/Helper/PluginsHelper.php b/administrator/components/com_plugins/src/Helper/PluginsHelper.php
index a32bea364ed84..5f00603036283 100644
--- a/administrator/components/com_plugins/src/Helper/PluginsHelper.php
+++ b/administrator/components/com_plugins/src/Helper/PluginsHelper.php
@@ -13,7 +13,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Installer\Installer;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Filesystem\Path;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -52,7 +51,7 @@ public static function publishedOptions()
     public static function folderOptions()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT(folder) AS value, folder AS text')
             ->from('#__extensions')
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -77,7 +76,7 @@ public static function folderOptions()
     public static function elementOptions()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT(element) AS value, element AS text')
             ->from('#__extensions')
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -99,11 +98,11 @@ public static function elementOptions()
      * @param   string  $templateBaseDir  Base path to the template directory.
      * @param   string  $templateDir      Template directory.
      *
-     * @return  CMSObject|bool
+     * @return  \stdClass|bool
      */
     public function parseXMLTemplateFile($templateBaseDir, $templateDir)
     {
-        $data = new CMSObject();
+        $data = new \stdClass();
 
         // Check of the xml file exists.
         $filePath = Path::clean($templateBaseDir . '/templates/' . $templateDir . '/templateDetails.xml');
diff --git a/administrator/components/com_plugins/src/Model/PluginModel.php b/administrator/components/com_plugins/src/Model/PluginModel.php
index c12192d5dbd91..5a4f9bb16d1ec 100644
--- a/administrator/components/com_plugins/src/Model/PluginModel.php
+++ b/administrator/components/com_plugins/src/Model/PluginModel.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Table\Table;
 use Joomla\Filesystem\Path;
@@ -82,9 +81,10 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|bool  A Form object on success, false on failure.
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -108,10 +108,6 @@ public function getForm($data = [], $loadData = true)
         // Get the form.
         $form = $this->loadForm('com_plugins.plugin', 'plugin', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         // Modify the form based on access controls.
         if (!$this->canEditState((object) $data)) {
             // Disable fields for display.
@@ -177,9 +173,9 @@ public function getItem($pk = null)
                 return false;
             }
 
-            // Convert to the \Joomla\CMS\Object\CMSObject before adding other data.
+            // Convert to an object before adding other data.
             $properties             = $table->getProperties(1);
-            $this->_cache[$cacheId] = ArrayHelper::toObject($properties, CMSObject::class);
+            $this->_cache[$cacheId] = ArrayHelper::toObject($properties);
 
             // Convert the params field to an array.
             $registry                       = new Registry($table->params);
@@ -254,7 +250,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
 
         // Load the core and/or local language sys file(s) for the ordering field.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('element'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -361,15 +357,13 @@ public function getHelp()
     /**
      * Custom clean cache method, plugins are cached in 2 places for different clients.
      *
-     * @param   string   $group     Cache group name.
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_plugins');
     }
diff --git a/administrator/components/com_plugins/src/Model/PluginsModel.php b/administrator/components/com_plugins/src/Model/PluginsModel.php
index 50d193fd1cb5c..a20c718ab6184 100644
--- a/administrator/components/com_plugins/src/Model/PluginsModel.php
+++ b/administrator/components/com_plugins/src/Model/PluginsModel.php
@@ -203,7 +203,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
diff --git a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
index 0eeb114fd2816..36685f1e142b3 100644
--- a/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
+++ b/administrator/components/com_plugins/src/View/Plugin/HtmlView.php
@@ -81,6 +81,10 @@ public function display($tpl = null)
             return;
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         if ($this->getLayout() !== 'modal') {
             $this->addToolbar();
         } else {
diff --git a/administrator/components/com_plugins/src/View/Plugins/HtmlView.php b/administrator/components/com_plugins/src/View/Plugins/HtmlView.php
index e9713aff4a18f..f47a68cb4db39 100644
--- a/administrator/components/com_plugins/src/View/Plugins/HtmlView.php
+++ b/administrator/components/com_plugins/src/View/Plugins/HtmlView.php
@@ -83,6 +83,11 @@ public function display($tpl = null)
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_plugins/tmpl/plugin/edit.php b/administrator/components/com_plugins/tmpl/plugin/edit.php
index 1939185cd5f6d..3660b9321376f 100644
--- a/administrator/components/com_plugins/tmpl/plugin/edit.php
+++ b/administrator/components/com_plugins/tmpl/plugin/edit.php
@@ -134,6 +134,5 @@
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
     </div>
 
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_plugins/tmpl/plugin/modal.php b/administrator/components/com_plugins/tmpl/plugin/modal.php
index d44de9e1a8a77..1222c29d7bda5 100644
--- a/administrator/components/com_plugins/tmpl/plugin/modal.php
+++ b/administrator/components/com_plugins/tmpl/plugin/modal.php
@@ -13,7 +13,7 @@
 /** @var \Joomla\Component\Plugins\Administrator\View\Plugin\HtmlView $this */
 
 // A backward compatibility for bootstrap modals: hide toolbar
-// @TODO: Remove in 6.0
+// @TODO: Remove in 7.0
 $this->getDocument()->getWebAssetManager()->addInlineScript('
 if (window.parent.Joomla.Modal) {
     const modal = window.parent.Joomla.Modal.getCurrent();
@@ -33,4 +33,3 @@
     <?php $this->setLayout('edit'); ?>
     <?php echo $this->loadTemplate(); ?>
 </div>
-
diff --git a/administrator/components/com_plugins/tmpl/plugins/default.php b/administrator/components/com_plugins/tmpl/plugins/default.php
index f56129c5dacd5..d279a8e30af94 100644
--- a/administrator/components/com_plugins/tmpl/plugins/default.php
+++ b/administrator/components/com_plugins/tmpl/plugins/default.php
@@ -146,8 +146,6 @@
 
         <?php endif; ?>
 
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="boxchecked" value="0">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_postinstall/src/Model/MessagesModel.php b/administrator/components/com_postinstall/src/Model/MessagesModel.php
index 0ae8648b5fbf9..78325659a3997 100644
--- a/administrator/components/com_postinstall/src/Model/MessagesModel.php
+++ b/administrator/components/com_postinstall/src/Model/MessagesModel.php
@@ -10,7 +10,7 @@
 
 namespace Joomla\Component\Postinstall\Administrator\Model;
 
-use Joomla\CMS\Cache\CacheControllerFactoryInterface;
+use Joomla\CMS\Cache\CacheController;
 use Joomla\CMS\Cache\Controller\CallbackController;
 use Joomla\CMS\Extension\ExtensionHelper;
 use Joomla\CMS\Factory;
@@ -68,7 +68,7 @@ public function getItem($id)
         $db = $this->getDatabase();
         $id = (int) $id;
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('postinstall_message_id'),
@@ -110,7 +110,7 @@ public function unpublishMessage($id)
         $db = $this->getDatabase();
         $id = (int) $id;
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query
             ->update($db->quoteName('#__postinstall_messages'))
             ->set($db->quoteName('enabled') . ' = 0')
@@ -118,7 +118,7 @@ public function unpublishMessage($id)
             ->bind(':id', $id, ParameterType::INTEGER);
         $db->setQuery($query);
         $db->execute();
-        Factory::getCache()->clean('com_postinstall');
+        $this->getPostinstallMessagesCache()->clean('com_postinstall');
     }
 
     /**
@@ -135,7 +135,7 @@ public function archiveMessage($id)
         $db = $this->getDatabase();
         $id = (int) $id;
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query
             ->update($db->quoteName('#__postinstall_messages'))
             ->set($db->quoteName('enabled') . ' = 2')
@@ -143,7 +143,7 @@ public function archiveMessage($id)
             ->bind(':id', $id, ParameterType::INTEGER);
         $db->setQuery($query);
         $db->execute();
-        Factory::getCache()->clean('com_postinstall');
+        $this->getPostinstallMessagesCache()->clean('com_postinstall');
     }
 
     /**
@@ -160,7 +160,7 @@ public function republishMessage($id)
         $db = $this->getDatabase();
         $id = (int) $id;
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query
             ->update($db->quoteName('#__postinstall_messages'))
             ->set($db->quoteName('enabled') . ' = 1')
@@ -168,7 +168,7 @@ public function republishMessage($id)
             ->bind(':id', $id, ParameterType::INTEGER);
         $db->setQuery($query);
         $db->execute();
-        Factory::getCache()->clean('com_postinstall');
+        $this->getPostinstallMessagesCache()->clean('com_postinstall');
     }
 
     /**
@@ -187,7 +187,7 @@ public function getItems()
         $cacheId = 'postinstall_messages.' . $eid;
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('postinstall_message_id'),
@@ -216,7 +216,7 @@ public function getItems()
 
         try {
             /** @var CallbackController $cache */
-            $cache = $this->getCacheControllerFactory()->createCacheController('callback', ['defaultgroup' => 'com_postinstall']);
+            $cache = $this->getPostinstallMessagesCache();
 
             $result = $cache->get([$db, 'loadObjectList'], [], md5($cacheId), false);
         } catch (\RuntimeException $e) {
@@ -244,7 +244,7 @@ public function getItems()
     public function getItemsCount()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('language_extension'),
@@ -261,8 +261,7 @@ public function getItemsCount()
 
         try {
             /** @var CallbackController $cache */
-            $cache = Factory::getContainer()->get(CacheControllerFactoryInterface::class)
-                ->createCacheController('callback', ['defaultgroup' => 'com_postinstall']);
+            $cache = $this->getPostinstallMessagesCache();
 
             // Get the resulting data object for cache ID 'all.1' from com_postinstall group.
             $result = $cache->get([$db, 'loadObjectList'], [], md5('all.1'), false);
@@ -296,7 +295,7 @@ public function getExtensionName($eid)
         $db  = $this->getDatabase();
         $eid = (int) $eid;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('name'),
@@ -345,7 +344,7 @@ public function resetMessages($eid)
         $db  = $this->getDatabase();
         $eid = (int) $eid;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__postinstall_messages'))
             ->set($db->quoteName('enabled') . ' = 1')
             ->where($db->quoteName('extension_id') . ' = :eid')
@@ -353,7 +352,7 @@ public function resetMessages($eid)
         $db->setQuery($query);
 
         $result = $db->execute();
-        Factory::getCache()->clean('com_postinstall');
+        $this->getPostinstallMessagesCache()->clean('com_postinstall');
 
         return $result;
     }
@@ -372,7 +371,7 @@ public function hideMessages($eid)
         $db  = $this->getDatabase();
         $eid = (int) $eid;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__postinstall_messages'))
             ->set($db->quoteName('enabled') . ' = 0')
             ->where($db->quoteName('extension_id') . ' = :eid')
@@ -380,7 +379,7 @@ public function hideMessages($eid)
         $db->setQuery($query);
 
         $result = $db->execute();
-        Factory::getCache()->clean('com_postinstall');
+        $this->getPostinstallMessagesCache()->clean('com_postinstall');
 
         return $result;
     }
@@ -453,7 +452,7 @@ public function getComponentOptions()
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__postinstall_messages'))
             ->group($db->quoteName('extension_id'));
@@ -668,7 +667,7 @@ public function addPostInstallationMessage(array $options)
         $extensionId = (int) $options['extension_id'];
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName($tableName))
             ->where(
@@ -701,7 +700,7 @@ public function addPostInstallationMessage(array $options)
             }
 
             // Otherwise it's not the same row. Remove the old row before insert a new one.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName($tableName))
                 ->where(
                     [
@@ -720,7 +719,8 @@ public function addPostInstallationMessage(array $options)
         // Insert the new row
         $options = (object) $options;
         $db->insertObject($tableName, $options);
-        Factory::getCache()->clean('com_postinstall');
+
+        $this->getPostinstallMessagesCache()->clean('com_postinstall');
 
         return $this;
     }
@@ -736,4 +736,17 @@ public function getJoomlaFilesExtensionId()
     {
         return ExtensionHelper::getExtensionRecord('joomla', 'file')->extension_id;
     }
+
+    /**
+     * Get cache controller instance for postinstall messages caching.
+     *
+     * @return  CacheController
+     *
+     * @since   6.2.0
+     */
+    private function getPostinstallMessagesCache(): CacheController
+    {
+        return $this->getCacheControllerFactory()
+            ->createCacheController('callback', ['defaultgroup' => 'com_postinstall']);
+    }
 }
diff --git a/administrator/components/com_postinstall/src/View/Messages/HtmlView.php b/administrator/components/com_postinstall/src/View/Messages/HtmlView.php
index a9c596c63c491..955d80a3ecaf8 100644
--- a/administrator/components/com_postinstall/src/View/Messages/HtmlView.php
+++ b/administrator/components/com_postinstall/src/View/Messages/HtmlView.php
@@ -65,7 +65,7 @@ public function display($tpl = null)
 
         $this->toolbar();
 
-        $this->token             = Factory::getSession()->getFormToken();
+        $this->token             = Factory::getApplication()->getSession()->getFormToken();
         $this->extension_options = $model->getComponentOptions();
 
         ToolbarHelper::title(Text::sprintf('COM_POSTINSTALL_MESSAGES_TITLE', $model->getExtensionName($this->eid)), 'bell');
diff --git a/administrator/components/com_privacy/src/Helper/PrivacyHelper.php b/administrator/components/com_privacy/src/Helper/PrivacyHelper.php
index 325cfc48b3877..1d4b8250ea485 100644
--- a/administrator/components/com_privacy/src/Helper/PrivacyHelper.php
+++ b/administrator/components/com_privacy/src/Helper/PrivacyHelper.php
@@ -73,7 +73,7 @@ public static function renderDataAsXml(array $exportData)
     public static function getPrivacyConsentPluginId()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
diff --git a/administrator/components/com_privacy/src/Model/ConsentsModel.php b/administrator/components/com_privacy/src/Model/ConsentsModel.php
index ccfcbb0eec388..76617f0a97ad2 100644
--- a/administrator/components/com_privacy/src/Model/ConsentsModel.php
+++ b/administrator/components/com_privacy/src/Model/ConsentsModel.php
@@ -65,7 +65,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select($this->getState('list.select', 'a.*'));
@@ -182,7 +182,7 @@ public function invalidate($pks)
 
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__privacy_consents'))
                 ->set($db->quoteName('state') . ' = -1')
                 ->whereIn($db->quoteName('id'), $pks)
@@ -209,7 +209,7 @@ public function invalidateAll($subject)
     {
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__privacy_consents'))
                 ->set($db->quoteName('state') . ' = -1')
                 ->where($db->quoteName('subject') . ' = :subject')
diff --git a/administrator/components/com_privacy/src/Model/ExportModel.php b/administrator/components/com_privacy/src/Model/ExportModel.php
index 8ae502d1d713b..35683e2ca526f 100644
--- a/administrator/components/com_privacy/src/Model/ExportModel.php
+++ b/administrator/components/com_privacy/src/Model/ExportModel.php
@@ -14,7 +14,11 @@
 use Joomla\CMS\Event\Privacy\ExportRequestEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -37,9 +41,11 @@
  *
  * @since  3.9.0
  */
-class ExportModel extends BaseDatabaseModel implements UserFactoryAwareInterface
+class ExportModel extends BaseDatabaseModel implements UserFactoryAwareInterface, MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * Create the export document for an information request.
@@ -85,7 +91,7 @@ public function collectDataForExportRequest($id = null)
         $db = $this->getDatabase();
 
         $userId = (int) $db->setQuery(
-            $db->getQuery(true)
+            $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__users'))
                 ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
@@ -179,7 +185,7 @@ public function emailDataExport($id = null)
         $db = $this->getDatabase();
 
         $userId = (int) $db->setQuery(
-            $db->getQuery(true)
+            $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__users'))
                 ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
@@ -212,7 +218,12 @@ public function emailDataExport($id = null)
         // The mailer can be set to either throw Exceptions or return boolean false, account for both
         try {
             $app    = Factory::getApplication();
-            $mailer = new MailTemplate('com_privacy.userdataexport', $app->getLanguage()->getTag());
+            $mailer = new MailTemplate(
+                'com_privacy.userdataexport',
+                $app->getLanguage()->getTag(),
+                $this->getMailerFactory()->createMailer(),
+                $this->getLanguageFactory()
+            );
 
             $templateData = [
                 'sitename' => $app->get('sitename'),
diff --git a/administrator/components/com_privacy/src/Model/RemoveModel.php b/administrator/components/com_privacy/src/Model/RemoveModel.php
index 864e79a840455..741840031510f 100644
--- a/administrator/components/com_privacy/src/Model/RemoveModel.php
+++ b/administrator/components/com_privacy/src/Model/RemoveModel.php
@@ -81,7 +81,7 @@ public function removeDataForRequest($id = null)
         $db = $this->getDatabase();
 
         $userId = (int) $db->setQuery(
-            $db->getQuery(true)
+            $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__users'))
                 ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
diff --git a/administrator/components/com_privacy/src/Model/RequestModel.php b/administrator/components/com_privacy/src/Model/RequestModel.php
index 47b531c848b6e..3ad7988dba5a3 100644
--- a/administrator/components/com_privacy/src/Model/RequestModel.php
+++ b/administrator/components/com_privacy/src/Model/RequestModel.php
@@ -14,8 +14,12 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Router\Route;
@@ -38,9 +42,11 @@
  *
  * @since  3.9.0
  */
-class RequestModel extends AdminModel implements UserFactoryAwareInterface
+class RequestModel extends AdminModel implements UserFactoryAwareInterface, MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * Clean the cache
@@ -62,20 +68,14 @@ protected function cleanCache($group = 'com_privacy')
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   3.9.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_privacy.request', 'request', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_privacy.request', 'request', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -264,7 +264,7 @@ public function notifyUserAdminCreatedRequest($id)
         $db = $this->getDatabase();
 
         $userId = (int) $db->setQuery(
-            $db->getQuery(true)
+            $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__users'))
                 ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
@@ -324,12 +324,22 @@ public function notifyUserAdminCreatedRequest($id)
 
             switch ($table->request_type) {
                 case 'export':
-                    $mailer = new MailTemplate('com_privacy.notification.admin.export', $app->getLanguage()->getTag());
+                    $mailer = new MailTemplate(
+                        'com_privacy.notification.admin.export',
+                        $app->getLanguage()->getTag(),
+                        $this->getMailerFactory()->createMailer(),
+                        $this->getLanguageFactory()
+                    );
 
                     break;
 
                 case 'remove':
-                    $mailer = new MailTemplate('com_privacy.notification.admin.remove', $app->getLanguage()->getTag());
+                    $mailer = new MailTemplate(
+                        'com_privacy.notification.admin.remove',
+                        $app->getLanguage()->getTag(),
+                        $this->getMailerFactory()->createMailer(),
+                        $this->getLanguageFactory()
+                    );
 
                     break;
 
@@ -411,7 +421,7 @@ public function validate($form, $data, $group = null)
         // Check for an active request for this email address
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(id)')
             ->from($db->quoteName('#__privacy_requests'))
             ->where($db->quoteName('email') . ' = :email')
diff --git a/administrator/components/com_privacy/src/Model/RequestsModel.php b/administrator/components/com_privacy/src/Model/RequestsModel.php
index f28ac566aba2e..4b2724ffb377f 100644
--- a/administrator/components/com_privacy/src/Model/RequestsModel.php
+++ b/administrator/components/com_privacy/src/Model/RequestsModel.php
@@ -62,7 +62,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select($this->getState('list.select', 'a.*'));
@@ -171,7 +171,7 @@ public function getNumberUrgentRequests()
         $period = '-' . $notify;
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)');
         $query->from($db->quoteName('#__privacy_requests'));
         $query->where($db->quoteName('status') . ' = 1 ');
diff --git a/administrator/components/com_privacy/src/Plugin/PrivacyPlugin.php b/administrator/components/com_privacy/src/Plugin/PrivacyPlugin.php
index 1317ef650b634..f37560ee0446e 100644
--- a/administrator/components/com_privacy/src/Plugin/PrivacyPlugin.php
+++ b/administrator/components/com_privacy/src/Plugin/PrivacyPlugin.php
@@ -36,7 +36,7 @@ abstract class PrivacyPlugin extends CMSPlugin
      *
      * @var    \Joomla\Database\DatabaseDriver
      * @since  3.9.0
-     * @deprecated  4.4.0 will be removed in 6.0 use $this->getDatabase() instead
+     * @deprecated  4.4.0 will be removed in 7.0 use $this->getDatabase() instead
      */
     protected $db;
 
diff --git a/administrator/components/com_privacy/src/View/Consents/HtmlView.php b/administrator/components/com_privacy/src/View/Consents/HtmlView.php
index 95bfd32591708..9b45e340fdeb3 100644
--- a/administrator/components/com_privacy/src/View/Consents/HtmlView.php
+++ b/administrator/components/com_privacy/src/View/Consents/HtmlView.php
@@ -105,6 +105,11 @@ public function display($tpl = null)
             $this->setLayout('emptystate');
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_privacy/src/View/Request/HtmlView.php b/administrator/components/com_privacy/src/View/Request/HtmlView.php
index 968e806e8a2c0..1862bd11ed1b4 100644
--- a/administrator/components/com_privacy/src/View/Request/HtmlView.php
+++ b/administrator/components/com_privacy/src/View/Request/HtmlView.php
@@ -98,6 +98,10 @@ public function display($tpl = null)
         // Variables only required for the edit layout
         if ($this->getLayout() === 'edit') {
             $this->form = $model->getForm();
+
+            // Add form control fields
+            $this->form
+                ->addControlField('task');
         }
 
         $this->addToolbar();
diff --git a/administrator/components/com_privacy/src/View/Requests/HtmlView.php b/administrator/components/com_privacy/src/View/Requests/HtmlView.php
index 14e52693dc7b5..0ec21d7b7ee19 100644
--- a/administrator/components/com_privacy/src/View/Requests/HtmlView.php
+++ b/administrator/components/com_privacy/src/View/Requests/HtmlView.php
@@ -117,6 +117,11 @@ public function display($tpl = null)
             $this->setLayout('emptystate');
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_privacy/tmpl/consents/default.php b/administrator/components/com_privacy/tmpl/consents/default.php
index 73d9e7fd90c28..0f26a4228b6a8 100644
--- a/administrator/components/com_privacy/tmpl/consents/default.php
+++ b/administrator/components/com_privacy/tmpl/consents/default.php
@@ -123,8 +123,6 @@
             </table>
         <?php endif; ?>
 
-        <input type="hidden" name="task" value="" />
-        <input type="hidden" name="boxchecked" value="0" />
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_privacy/tmpl/consents/emptystate.php b/administrator/components/com_privacy/tmpl/consents/emptystate.php
index c9f60e961f396..370fbe14c5b94 100644
--- a/administrator/components/com_privacy/tmpl/consents/emptystate.php
+++ b/administrator/components/com_privacy/tmpl/consents/emptystate.php
@@ -17,6 +17,8 @@
     'formURL'    => 'index.php?option=com_privacy&view=consents',
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Privacy:_Consents',
     'icon'       => 'icon-lock',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 echo LayoutHelper::render('joomla.content.emptystate', $displayData);
diff --git a/administrator/components/com_privacy/tmpl/request/edit.php b/administrator/components/com_privacy/tmpl/request/edit.php
index c29e4134b394e..15aa480caa16f 100644
--- a/administrator/components/com_privacy/tmpl/request/edit.php
+++ b/administrator/components/com_privacy/tmpl/request/edit.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -35,7 +34,6 @@
             </div>
         </div>
 
-        <input type="hidden" name="task" value="" />
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->form->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_privacy/tmpl/requests/default.php b/administrator/components/com_privacy/tmpl/requests/default.php
index 954c9ec399d1b..7ac43b100299a 100644
--- a/administrator/components/com_privacy/tmpl/requests/default.php
+++ b/administrator/components/com_privacy/tmpl/requests/default.php
@@ -82,11 +82,11 @@
                                     <?php if ($item->status == 1 && $item->request_type === 'export') : ?>
                                         <a class="btn tbody-icon" href="<?php echo Route::_('index.php?option=com_privacy&task=request.export&format=xml&id=' . (int) $item->id); ?>" title="<?php echo Text::_('COM_PRIVACY_ACTION_EXPORT_DATA'); ?>"><span class="icon-download" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('COM_PRIVACY_ACTION_EXPORT_DATA'); ?></span></a>
                                         <?php if ($this->sendMailEnabled) : ?>
-                                            <a class="btn tbody-icon" href="<?php echo Route::_('index.php?option=com_privacy&task=request.emailexport&id=' . (int) $item->id . '&' . Factory::getSession()->getFormToken() . '=1'); ?>" title="<?php echo Text::_('COM_PRIVACY_ACTION_EMAIL_EXPORT_DATA'); ?>"><span class="icon-mail" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('COM_PRIVACY_ACTION_EMAIL_EXPORT_DATA'); ?></span></a>
+                                            <a class="btn tbody-icon" href="<?php echo Route::_('index.php?option=com_privacy&task=request.emailexport&id=' . (int) $item->id . '&' . Factory::getApplication()->getSession()->getFormToken() . '=1'); ?>" title="<?php echo Text::_('COM_PRIVACY_ACTION_EMAIL_EXPORT_DATA'); ?>"><span class="icon-mail" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('COM_PRIVACY_ACTION_EMAIL_EXPORT_DATA'); ?></span></a>
                                         <?php endif; ?>
                                     <?php endif; ?>
                                     <?php if ($item->status == 1 && $item->request_type === 'remove') : ?>
-                                        <a class="btn tbody-icon" href="<?php echo Route::_('index.php?option=com_privacy&task=request.remove&id=' . (int) $item->id . '&' . Factory::getSession()->getFormToken() . '=1'); ?>" title="<?php echo Text::_('COM_PRIVACY_ACTION_DELETE_DATA'); ?>"><span class="icon-times" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('COM_PRIVACY_ACTION_DELETE_DATA'); ?></span></a>
+                                        <a class="btn tbody-icon" href="<?php echo Route::_('index.php?option=com_privacy&task=request.remove&id=' . (int) $item->id . '&' . Factory::getApplication()->getSession()->getFormToken() . '=1'); ?>" title="<?php echo Text::_('COM_PRIVACY_ACTION_DELETE_DATA'); ?>"><span class="icon-times" aria-hidden="true"></span><span class="visually-hidden"><?php echo Text::_('COM_PRIVACY_ACTION_DELETE_DATA'); ?></span></a>
                                     <?php endif; ?>
                                 </div>
                             </td>
@@ -123,8 +123,6 @@
 
         <?php endif; ?>
 
-        <input type="hidden" name="task" value="" />
-        <input type="hidden" name="boxchecked" value="0" />
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_privacy/tmpl/requests/emptystate.php b/administrator/components/com_privacy/tmpl/requests/emptystate.php
index 804dd09f628ef..65216d3857b48 100644
--- a/administrator/components/com_privacy/tmpl/requests/emptystate.php
+++ b/administrator/components/com_privacy/tmpl/requests/emptystate.php
@@ -18,6 +18,8 @@
     'formURL'    => 'index.php?option=com_privacy&view=requests',
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Privacy:_Information_Requests',
     'icon'       => 'icon-lock',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 if (Factory::getApplication()->get('mailonline', 1)) {
diff --git a/administrator/components/com_redirect/helpers/redirect.php b/administrator/components/com_redirect/helpers/redirect.php
index 5013c15cac79b..4fac1bc0efd24 100644
--- a/administrator/components/com_redirect/helpers/redirect.php
+++ b/administrator/components/com_redirect/helpers/redirect.php
@@ -18,7 +18,7 @@
  * Redirect component helper.
  *
  * @since       1.6
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Redirect\Administrator\Helper\RedirectHelp instead
  */
 class RedirectHelper extends \Joomla\Component\Redirect\Administrator\Helper\RedirectHelper
diff --git a/administrator/components/com_redirect/src/Helper/RedirectHelper.php b/administrator/components/com_redirect/src/Helper/RedirectHelper.php
index 8cf148fd8ab85..0adc03fec439d 100644
--- a/administrator/components/com_redirect/src/Helper/RedirectHelper.php
+++ b/administrator/components/com_redirect/src/Helper/RedirectHelper.php
@@ -63,7 +63,7 @@ public static function publishedOptions()
     public static function getRedirectPluginId()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
diff --git a/administrator/components/com_redirect/src/Model/LinkModel.php b/administrator/components/com_redirect/src/Model/LinkModel.php
index 69af0758524a1..ae1d51f229ca3 100644
--- a/administrator/components/com_redirect/src/Model/LinkModel.php
+++ b/administrator/components/com_redirect/src/Model/LinkModel.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\AdminModel;
@@ -58,19 +59,16 @@ protected function canDelete($record)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form A Form object on success, false on failure
+     * @return  Form A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
         // Get the form.
         $form = $this->loadForm('com_redirect.link', 'link', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         // Modify the form based on access controls.
         if (!$this->canEditState((object)$data)) {
             // Disable fields for display.
@@ -145,7 +143,7 @@ public function activate(&$pks, $url, $comment = null)
 
         if (!empty($pks)) {
             // Update the link rows.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__redirect_links'))
                 ->set($db->quoteName('new_url') . ' = :url')
                 ->set($db->quoteName('published') . ' = 1')
@@ -199,7 +197,7 @@ public function duplicateUrls(&$pks, $url, $comment = null)
             $date = Factory::getDate()->toSql();
 
             // Update the link rows.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__redirect_links'))
                 ->set($db->quoteName('new_url') . ' = :url')
                 ->set($db->quoteName('modified_date') . ' = :date')
diff --git a/administrator/components/com_redirect/src/Model/LinksModel.php b/administrator/components/com_redirect/src/Model/LinksModel.php
index 8fde16f511534..4f7eef13414b5 100644
--- a/administrator/components/com_redirect/src/Model/LinksModel.php
+++ b/administrator/components/com_redirect/src/Model/LinksModel.php
@@ -65,7 +65,7 @@ public function purge()
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->delete('#__redirect_links')->where($db->quoteName('published') . '= 0');
 
@@ -136,7 +136,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
@@ -204,7 +204,7 @@ protected function getListQuery()
     public function batchProcess($batchUrls)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $params  = ComponentHelper::getParams('com_redirect');
         $state   = (int) $params->get('defaultImportState', 0);
diff --git a/administrator/components/com_redirect/src/Table/LinkTable.php b/administrator/components/com_redirect/src/Table/LinkTable.php
index 73f4172137d99..b75bb302fb0e2 100644
--- a/administrator/components/com_redirect/src/Table/LinkTable.php
+++ b/administrator/components/com_redirect/src/Table/LinkTable.php
@@ -99,7 +99,7 @@ public function check()
         $db = $this->getDatabase();
 
         // Check for existing name
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->select($db->quoteName('old_url'))
             ->from($db->quoteName('#__redirect_links'))
diff --git a/administrator/components/com_redirect/src/View/Link/HtmlView.php b/administrator/components/com_redirect/src/View/Link/HtmlView.php
index b976c02115c3c..63488d23b0d87 100644
--- a/administrator/components/com_redirect/src/View/Link/HtmlView.php
+++ b/administrator/components/com_redirect/src/View/Link/HtmlView.php
@@ -74,6 +74,10 @@ public function display($tpl = null)
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         $this->addToolbar();
         parent::display($tpl);
     }
diff --git a/administrator/components/com_redirect/src/View/Links/HtmlView.php b/administrator/components/com_redirect/src/View/Links/HtmlView.php
index c7e60655172b7..6d2e71c2afb0d 100644
--- a/administrator/components/com_redirect/src/View/Links/HtmlView.php
+++ b/administrator/components/com_redirect/src/View/Links/HtmlView.php
@@ -139,6 +139,11 @@ public function display($tpl = null)
             $this->redirectPluginId = RedirectHelper::getRedirectPluginId();
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_redirect/tmpl/link/edit.php b/administrator/components/com_redirect/tmpl/link/edit.php
index 6cc9b7d0cb9f0..f746eb9cf4234 100644
--- a/administrator/components/com_redirect/tmpl/link/edit.php
+++ b/administrator/components/com_redirect/tmpl/link/edit.php
@@ -43,7 +43,6 @@
             <?php echo HTMLHelper::_('uitab.endTab'); ?>
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
-        <input type="hidden" name="task" value="">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->form->renderControlFields(); ?>
     </fieldset>
 </form>
diff --git a/administrator/components/com_redirect/tmpl/links/default.php b/administrator/components/com_redirect/tmpl/links/default.php
index e3264a20df01d..7c85bf5754872 100644
--- a/administrator/components/com_redirect/tmpl/links/default.php
+++ b/administrator/components/com_redirect/tmpl/links/default.php
@@ -177,8 +177,6 @@
                 <template id="joomla-dialog-batch"><?php echo $this->loadTemplate('batch_body'); ?></template>
             <?php endif; ?>
 
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="boxchecked" value="0">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_redirect/tmpl/links/emptystate.php b/administrator/components/com_redirect/tmpl/links/emptystate.php
index c5b709f637558..12fcaed2dd1d1 100644
--- a/administrator/components/com_redirect/tmpl/links/emptystate.php
+++ b/administrator/components/com_redirect/tmpl/links/emptystate.php
@@ -25,6 +25,8 @@
     'formURL'    => 'index.php?option=com_redirect&view=links',
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Redirects:_Links',
     'icon'       => 'icon-map-signs redirect',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 $app  = Factory::getApplication();
diff --git a/administrator/components/com_scheduler/src/Model/LogModel.php b/administrator/components/com_scheduler/src/Model/LogModel.php
index 825c5b0a1aa4e..0218e867f05cf 100644
--- a/administrator/components/com_scheduler/src/Model/LogModel.php
+++ b/administrator/components/com_scheduler/src/Model/LogModel.php
@@ -31,7 +31,7 @@ class LogModel extends AdminModel
      * @param   array  $data      Data that needs to go into the form
      * @param   bool   $loadData  Should the form load its data from the DB?
      *
-     * @return Form|boolean  A Form object on success, false on failure.
+     * @return Form|boolean  A Form object, false on failure.
      *
      * @since  5.3.0
      * @throws \Exception
diff --git a/administrator/components/com_scheduler/src/Model/LogsModel.php b/administrator/components/com_scheduler/src/Model/LogsModel.php
index 3823e6da9a423..3da2e19fab4ad 100644
--- a/administrator/components/com_scheduler/src/Model/LogsModel.php
+++ b/administrator/components/com_scheduler/src/Model/LogsModel.php
@@ -130,7 +130,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
diff --git a/administrator/components/com_scheduler/src/Model/TaskModel.php b/administrator/components/com_scheduler/src/Model/TaskModel.php
index ab09cf12f872e..889c1059f5e70 100644
--- a/administrator/components/com_scheduler/src/Model/TaskModel.php
+++ b/administrator/components/com_scheduler/src/Model/TaskModel.php
@@ -20,7 +20,6 @@
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
 use Joomla\Component\Scheduler\Administrator\Helper\ExecRuleHelper;
@@ -154,7 +153,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null,
      * @param   array  $data      Data that needs to go into the form
      * @param   bool   $loadData  Should the form load its data from the DB?
      *
-     * @return Form|boolean  A Form object on success, false on failure.
+     * @return Form  A Form object
      *
      * @since  4.1.0
      * @throws \Exception
@@ -170,10 +169,6 @@ public function getForm($data = [], $loadData = true)
          */
         $form = $this->loadForm('com_scheduler.task', 'task', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         $user = $this->app->getIdentity();
 
         // If new entry, set task type from state
@@ -274,7 +269,6 @@ protected function loadFormData()
 
         // If the data from UserState is empty, we fetch it with getItem()
         if (empty($data)) {
-            /** @var CMSObject $data */
             $data = $this->getItem();
 
             // @todo : further data processing goes here
@@ -323,14 +317,14 @@ public function getItem($pk = null)
         }
 
         // Parent call leaves `execution_rules` and `cron_rules` JSON encoded
-        $item->set('execution_rules', json_decode($item->get('execution_rules', '')));
-        $item->set('cron_rules', json_decode($item->get('cron_rules', '')));
+        $item->execution_rules = json_decode($item->execution_rules ?? '');
+        $item->cron_rules      = json_decode($item->cron_rules ?? '');
 
         $taskOption = SchedulerHelper::getTaskOptions()->findOption(
             ($item->id ?? 0) ? ($item->type ?? 0) : $this->getState('task.type')
         );
 
-        $item->set('taskOption', $taskOption);
+        $item->taskOption = $taskOption;
 
         return $item;
     }
@@ -424,7 +418,7 @@ private function hasRunningTasks($db): bool
         $timeout   = ComponentHelper::getParams('com_scheduler')->get('timeout', 300);
         $threshold = (clone $now)->modify("-$timeout seconds")->toSql();
 
-        $lockCountQuery = $db->getQuery(true)
+        $lockCountQuery = $db->createQuery()
             ->select('COUNT(id)')
             ->from($db->quoteName(self::TASK_TABLE))
             ->where($db->quoteName('locked') . ' IS NOT NULL')
@@ -456,7 +450,7 @@ private function hasRunningTasks($db): bool
      */
     private function buildLockQuery($db, $now, $options)
     {
-        $lockQuery = $db->getQuery(true)
+        $lockQuery = $db->createQuery()
             ->update($db->quoteName(self::TASK_TABLE))
             ->set($db->quoteName('locked') . ' = :now1')
             ->bind(':now1', $now);
@@ -501,7 +495,7 @@ static function (TaskOption $taskOption): string {
      */
     private function getNextTaskId($db, $now, $options)
     {
-        $idQuery = $db->getQuery(true)
+        $idQuery = $db->createQuery()
             ->from($db->quoteName(self::TASK_TABLE))
             ->select($db->quoteName('id'));
 
@@ -549,7 +543,7 @@ static function (TaskOption $taskOption): string {
      */
     private function fetchTask($db, $now): ?\stdClass
     {
-        $getQuery = $db->getQuery(true)
+        $getQuery = $db->createQuery()
             ->select('*')
             ->from($db->quoteName(self::TASK_TABLE))
             ->where($db->quoteName('locked') . ' = :now')
@@ -619,7 +613,7 @@ public function save($data): bool
             $basisDayOfMonth           = $data['execution_rules']['exec-day'];
             [$basisHour, $basisMinute] = explode(':', $data['execution_rules']['exec-time']);
 
-            $data['last_execution'] = Factory::getDate('now', 'GMT')->format('Y-m')
+            $data['last_execution'] = Factory::getDate('now', 'UTC')->format('Y-m')
                 . "-$basisDayOfMonth $basisHour:$basisMinute:00";
         } else {
             $item = $this->getItem($id);
diff --git a/administrator/components/com_scheduler/src/Model/TasksModel.php b/administrator/components/com_scheduler/src/Model/TasksModel.php
index 3e04c9ebef29a..946e0c1a29d7d 100644
--- a/administrator/components/com_scheduler/src/Model/TasksModel.php
+++ b/administrator/components/com_scheduler/src/Model/TasksModel.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Component\Scheduler\Administrator\Helper\SchedulerHelper;
 use Joomla\Component\Scheduler\Administrator\Task\TaskOption;
 use Joomla\Database\ParameterType;
@@ -113,7 +112,7 @@ protected function getListQuery(): QueryInterface
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         /**
          * Select the required fields from the table.
@@ -254,7 +253,7 @@ static function (TaskOption $taskOption): string {
         $due = $this->getState('filter.due');
 
         if (is_numeric($due) && $due != 0) {
-            $now      = Factory::getDate('now', 'GMT')->toSql();
+            $now      = Factory::getDate('now', 'UTC')->toSql();
             $operator = $due == 1 ? ' <= ' : ' > ';
             $filterCount++;
             $query->where($db->quoteName('a.next_execution') . $operator . ':now')
@@ -271,7 +270,7 @@ static function (TaskOption $taskOption): string {
         $locked = $this->getState('filter.locked');
 
         if (is_numeric($locked) && $locked != 0) {
-            $now              = Factory::getDate('now', 'GMT');
+            $now              = Factory::getDate('now', 'UTC');
             $timeout          = ComponentHelper::getParams('com_scheduler')->get('timeout', 300);
             $timeout          = new \DateInterval(\sprintf('PT%dS', $timeout));
             $timeoutThreshold = (clone $now)->sub($timeout)->toSql();
@@ -385,25 +384,7 @@ protected function _getList($query, $limitstart = 0, $limit = 0): array
         // Set limit parameters and get object list
         $query->setLimit($limit, $limitstart);
         $this->getDatabase()->setQuery($query);
-
-        // Return optionally an extended class.
-        // @todo: Use something other than CMSObject..
-        if ($this->getState('list.customClass')) {
-            $responseList = array_map(
-                static function (array $arr) {
-                    $o = new CMSObject();
-
-                    foreach ($arr as $k => $v) {
-                        $o->{$k} = $v;
-                    }
-
-                    return $o;
-                },
-                $this->getDatabase()->loadAssocList() ?: []
-            );
-        } else {
-            $responseList = $this->getDatabase()->loadObjectList();
-        }
+        $responseList = $this->getDatabase()->loadObjectList();
 
         // Attach TaskOptions objects and a safe type title
         $this->attachTaskOptions($responseList);
@@ -506,7 +487,7 @@ public function hasDueTasks(Date $time): bool
         $timeout   = ComponentHelper::getParams('com_scheduler')->get('timeout', 300);
         $threshold = (clone $time)->modify("-$timeout seconds")->toSql();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             // Count due tasks
             ->select('SUM(CASE WHEN ' . $db->quoteName('a.next_execution') . ' <= :now THEN 1 ELSE 0 END) AS due_count')
             // Count locked tasks
diff --git a/administrator/components/com_scheduler/src/Scheduler/Scheduler.php b/administrator/components/com_scheduler/src/Scheduler/Scheduler.php
index f5eb2260990f1..76e5f705247d7 100644
--- a/administrator/components/com_scheduler/src/Scheduler/Scheduler.php
+++ b/administrator/components/com_scheduler/src/Scheduler/Scheduler.php
@@ -123,7 +123,7 @@ public function runTask(array $options): ?Task
 
         $app->getLanguage()->load('com_scheduler', JPATH_ADMINISTRATOR);
 
-        $options['text_entry_format'] = '{DATE}	{TIME}	{PRIORITY}	{MESSAGE}';
+        $options['text_entry_format'] = "{DATE}\t{TIME}\t{PRIORITY}\t{MESSAGE}";
         $options['text_file']         = 'joomla_scheduler.php';
         Log::addLogger($options, Log::ALL, $task->logCategory);
 
@@ -344,13 +344,7 @@ public static function isAuthorizedToRun(object $taskRecord, User $user): bool
          * We allow the user to run a task if they have the permission or if they created the task & still have the authority
          * to create tasks.
          */
-        if (
-            $user->authorise('core.testrun', 'com_scheduler.task.' . $taskRecord->id)
-            || ($user->id == $taskRecord->created_by && $user->authorise('core.create', 'com_scheduler'))
-        ) {
-            return true;
-        }
-
-        return false;
+        return $user->authorise('core.testrun', 'com_scheduler.task.' . $taskRecord->id)
+            || ($user->id == $taskRecord->created_by && $user->authorise('core.create', 'com_scheduler'));
     }
 }
diff --git a/administrator/components/com_scheduler/src/Table/TaskTable.php b/administrator/components/com_scheduler/src/Table/TaskTable.php
index 19e34778e81e9..a710d8ab487d3 100644
--- a/administrator/components/com_scheduler/src/Table/TaskTable.php
+++ b/administrator/components/com_scheduler/src/Table/TaskTable.php
@@ -289,7 +289,7 @@ public function unlock(array $pks = [], ?int $userId = null): bool
 
         foreach ($pks as $pk) {
             // Update the publishing state for rows with the given primary keys.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($this->_tbl)
                 ->set($db->quoteName($lockedField) . ' = NULL');
 
diff --git a/administrator/components/com_scheduler/src/Task/Task.php b/administrator/components/com_scheduler/src/Task/Task.php
index 7144be82153c2..a73bf360e0653 100644
--- a/administrator/components/com_scheduler/src/Task/Task.php
+++ b/administrator/components/com_scheduler/src/Task/Task.php
@@ -148,7 +148,7 @@ public function __construct(object $record)
         if ($this->get('params.individual_log')) {
             $logFile = $this->get('params.log_file') ?? 'task_' . $this->get('id') . '.log.php';
 
-            $options['text_entry_format'] = '{DATE}	{TIME}	{PRIORITY}	{MESSAGE}';
+            $options['text_entry_format'] = "{DATE}\t{TIME}\t{PRIORITY}\t{MESSAGE}";
             $options['text_file']         = $logFile;
             Log::addLogger($options, Log::ALL, [$this->logCategory]);
         }
@@ -305,9 +305,9 @@ public function getContent(): array
     public function acquireLock(): bool
     {
         $db    = $this->db;
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $id    = $this->get('id');
-        $now   = Factory::getDate('now', 'GMT');
+        $now   = Factory::getDate('now', 'UTC');
 
         $timeout          = ComponentHelper::getParams('com_scheduler')->get('timeout', 300);
         $timeout          = new \DateInterval(\sprintf('PT%dS', $timeout));
@@ -361,7 +361,7 @@ public function acquireLock(): bool
     public function releaseLock(bool $update = true): bool
     {
         $db    = $this->db;
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $id    = $this->get('id');
 
         $query->update($db->quoteName('#__scheduler_tasks', 't'))
@@ -433,7 +433,7 @@ public function log(string $message, string $priority = 'info'): void
     public function skipExecution(): void
     {
         $db    = $this->db;
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $id       = $this->get('id');
         $nextExec = (new ExecRuleHelper($this->taskRegistry->toObject()))->nextExec(true, true);
@@ -553,10 +553,6 @@ public static function isValidId(string $id): bool
     {
         $id = is_numeric($id) ? ($id + 0) : $id;
 
-        if (!\is_int($id) || $id <= 0) {
-            return false;
-        }
-
-        return true;
+        return \is_int($id) && $id > 0;
     }
 }
diff --git a/administrator/components/com_scheduler/src/Traits/TaskPluginTrait.php b/administrator/components/com_scheduler/src/Traits/TaskPluginTrait.php
index 6461cb26915a4..57a545cc7f7f4 100644
--- a/administrator/components/com_scheduler/src/Traits/TaskPluginTrait.php
+++ b/administrator/components/com_scheduler/src/Traits/TaskPluginTrait.php
@@ -169,6 +169,10 @@ public function advertiseRoutines(EventInterface $event): void
     {
         $options = [];
 
+        // In case if the plugin is lazy loaded we might not initialise the object
+        // That means autoloading the language is not executed
+        $this->loadLanguage();
+
         foreach (self::TASKS_MAP as $routineId => $details) {
             // Sanity check against non-compliant plugins
             if (isset($details['langConstPrefix'])) {
diff --git a/administrator/components/com_scheduler/src/View/Logs/HtmlView.php b/administrator/components/com_scheduler/src/View/Logs/HtmlView.php
index 5b3a0160ab208..3a65a89fc270d 100644
--- a/administrator/components/com_scheduler/src/View/Logs/HtmlView.php
+++ b/administrator/components/com_scheduler/src/View/Logs/HtmlView.php
@@ -10,13 +10,13 @@
 
 namespace Joomla\Component\Scheduler\Administrator\View\Logs;
 
+use Joomla\CMS\Document\HtmlDocument;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Pagination\Pagination;
-use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Registry\Registry;
 
@@ -93,6 +93,11 @@ public function display($tpl = null): void
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
         parent::display($tpl);
     }
@@ -106,8 +111,10 @@ public function display($tpl = null): void
      */
     protected function addToolbar(): void
     {
-        $canDo   = ContentHelper::getActions('com_scheduler');
-        $toolbar = Toolbar::getInstance();
+        /** @var HtmlDocument $document */
+        $document = $this->getDocument();
+        $canDo    = ContentHelper::getActions('com_scheduler');
+        $toolbar  = $document->getToolbar();
 
         ToolbarHelper::title(Text::_('COM_SCHEDULER_FIELDSET_EXEC_HIST'), 'list');
 
diff --git a/administrator/components/com_scheduler/src/View/Task/HtmlView.php b/administrator/components/com_scheduler/src/View/Task/HtmlView.php
index f7fbeff76443a..4ace46cf69048 100644
--- a/administrator/components/com_scheduler/src/View/Task/HtmlView.php
+++ b/administrator/components/com_scheduler/src/View/Task/HtmlView.php
@@ -118,6 +118,10 @@ public function display($tpl = null): void
         $this->state = $model->getState();
         $this->canDo = ContentHelper::getActions('com_scheduler', 'task', $this->item->id);
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php b/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php
index 6119990e7357c..72e2e88cb1786 100644
--- a/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php
+++ b/administrator/components/com_scheduler/src/View/Tasks/HtmlView.php
@@ -106,6 +106,11 @@ public function display($tpl = null): void
             $this->setLayout('empty_state');
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_scheduler/tmpl/logs/default.php b/administrator/components/com_scheduler/tmpl/logs/default.php
index 20e656982ecba..8872b6ce28196 100644
--- a/administrator/components/com_scheduler/tmpl/logs/default.php
+++ b/administrator/components/com_scheduler/tmpl/logs/default.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\Uri\Uri;
 
 /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa = $this->document->getWebAssetManager();
+$wa = $this->getDocument()->getWebAssetManager();
 $wa->useScript('table.columns')
     ->useScript('multiselect');
 
@@ -133,9 +133,8 @@
                     ?>
                     <?php echo $this->pagination->getListFooter(); ?>
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_scheduler/tmpl/select/default.php b/administrator/components/com_scheduler/tmpl/select/default.php
index 10d4939f39a50..fefbc189718b2 100644
--- a/administrator/components/com_scheduler/tmpl/select/default.php
+++ b/administrator/components/com_scheduler/tmpl/select/default.php
@@ -16,9 +16,8 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\Component\Scheduler\Administrator\View\Select\HtmlView;
 
-/** @var  HtmlView  $this */
+/** @var  \Joomla\Component\Scheduler\Administrator\View\Select\HtmlView  $this */
 
 $app = $this->app;
 
diff --git a/administrator/components/com_scheduler/tmpl/task/edit.php b/administrator/components/com_scheduler/tmpl/task/edit.php
index 8240b1996cb4e..1608277851139 100644
--- a/administrator/components/com_scheduler/tmpl/task/edit.php
+++ b/administrator/components/com_scheduler/tmpl/task/edit.php
@@ -17,9 +17,8 @@
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Scheduler\Administrator\Task\TaskOption;
-use Joomla\Component\Scheduler\Administrator\View\Task\HtmlView;
 
-/** @var  HtmlView $this */
+/** @var  \Joomla\Component\Scheduler\Administrator\View\Task\HtmlView $this */
 
 $wa = $this->getDocument()->getWebAssetManager();
 
@@ -198,7 +197,7 @@ class="form-validate">
         <?php endif; ?>
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
         <?php echo $this->form->getInput('context'); ?>
-        <input type="hidden" name="task" value="">
-        <?php echo HTMLHelper::_('form.token'); ?>
+
+        <?php echo $this->form->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_scheduler/tmpl/tasks/default.php b/administrator/components/com_scheduler/tmpl/tasks/default.php
index 5d02098463977..abef34beaa7b7 100644
--- a/administrator/components/com_scheduler/tmpl/tasks/default.php
+++ b/administrator/components/com_scheduler/tmpl/tasks/default.php
@@ -20,9 +20,8 @@
 use Joomla\CMS\Session\Session;
 use Joomla\Component\Scheduler\Administrator\Scheduler\Scheduler;
 use Joomla\Component\Scheduler\Administrator\Task\Status;
-use Joomla\Component\Scheduler\Administrator\View\Tasks\HtmlView;
 
-/** @var  HtmlView  $this*/
+/** @var  \Joomla\Component\Scheduler\Administrator\View\Tasks\HtmlView  $this*/
 
 /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->getDocument()->getWebAssetManager();
@@ -301,8 +300,6 @@ class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="
 
         <?php endif; ?>
 
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="boxchecked" value="0">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_scheduler/tmpl/tasks/empty_state.php b/administrator/components/com_scheduler/tmpl/tasks/empty_state.php
index 0665fd68284d0..dd82ce3cdf777 100644
--- a/administrator/components/com_scheduler/tmpl/tasks/empty_state.php
+++ b/administrator/components/com_scheduler/tmpl/tasks/empty_state.php
@@ -15,10 +15,11 @@
 /** @var \Joomla\Component\Scheduler\Administrator\View\Tasks\HtmlView $this */
 
 $displayData = [
-    'textPrefix' => 'COM_SCHEDULER',
-    'formURL' => 'index.php?option=com_scheduler&task=task.add',
-    'helpURL' => 'https://docs.joomla.org/Special:MyLanguage/J4.x:Task_Scheduler',
-    'icon' => 'icon-clock clock',
+    'textPrefix'    => 'COM_SCHEDULER',
+    'formURL'       => 'index.php?option=com_scheduler&task=task.add',
+    'helpURL'       => 'https://docs.joomla.org/Special:MyLanguage/J4.x:Task_Scheduler',
+    'icon'          => 'icon-clock clock',
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 if ($this->getCurrentUser()->authorise('core.create', 'com_scheduler')) {
diff --git a/administrator/components/com_tags/src/Model/TagModel.php b/administrator/components/com_tags/src/Model/TagModel.php
index b4e1901670743..06ed62fa7ae39 100644
--- a/administrator/components/com_tags/src/Model/TagModel.php
+++ b/administrator/components/com_tags/src/Model/TagModel.php
@@ -12,10 +12,16 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Date\Date;
+use Joomla\CMS\Event\Model\AfterSaveEvent;
+use Joomla\CMS\Event\Model\BeforeSaveEvent;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Versioning\VersionableModelInterface;
 use Joomla\CMS\Versioning\VersionableModelTrait;
+use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 
@@ -28,7 +34,7 @@
  *
  * @since  3.1
  */
-class TagModel extends AdminModel
+class TagModel extends AdminModel implements VersionableModelInterface
 {
     use VersionableModelTrait;
 
@@ -44,6 +50,15 @@ class TagModel extends AdminModel
      */
     public $typeAlias = 'com_tags.tag';
 
+    /**
+     * Batch copy/move command. If set to false,
+     * the batch copy/move command is not supported.
+     *
+     * @var    string
+     * @since  6.1.0
+     */
+    protected $batch_copymove = 'tag_id';
+
     /**
      * Allowed batch commands
      *
@@ -73,6 +88,22 @@ protected function canDelete($record)
         return parent::canDelete($record);
     }
 
+    /**
+     * Method to get a table object, load it if necessary.
+     *
+     * @param   string  $type    The table name. Optional.
+     * @param   string  $prefix  The class prefix. Optional.
+     * @param   array   $config  Configuration array for model. Optional.
+     *
+     * @return  \Joomla\Cms\Table\Table|\Joomla\Cms\Table\Nested  A Table object
+     *
+     * @since   6.1.0
+     */
+    public function getTable($type = 'Tag', $prefix = 'Administrator', $config = [])
+    {
+        return parent::getTable($type, $prefix, $config);
+    }
+
     /**
      * Auto-populate the model state.
      *
@@ -148,9 +179,10 @@ public function getItem($pk = null)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  bool|\Joomla\CMS\Form\Form  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   3.1
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -159,10 +191,6 @@ public function getForm($data = [], $loadData = true)
         // Get the form.
         $form = $this->loadForm('com_tags.tag', 'tag', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         $user = $this->getCurrentUser();
 
         if (!$user->authorise('core.edit.state', 'com_tags' . $jinput->get('id'))) {
@@ -219,7 +247,8 @@ public function save($data)
         $context    = $this->option . '.' . $this->name;
 
         // Include the plugins for the save events.
-        PluginHelper::importPlugin($this->events_map['save']);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['save'], null, true, $dispatcher);
 
         try {
             // Load the row if saving an existing tag.
@@ -267,7 +296,12 @@ public function save($data)
             }
 
             // Trigger the before save event.
-            $result = Factory::getApplication()->triggerEvent($this->event_before_save, [$context, $table, $isNew, $data]);
+            $result = $dispatcher->dispatch($this->event_before_save, new BeforeSaveEvent($this->event_before_save, [
+                'context' => $context,
+                'subject' => $table,
+                'isNew'   => $isNew,
+                'data'    => $data,
+            ]))->getArgument('result', []);
 
             if (\in_array(false, $result, true)) {
                 $this->setError($table->getError());
@@ -283,7 +317,12 @@ public function save($data)
             }
 
             // Trigger the after save event.
-            Factory::getApplication()->triggerEvent($this->event_after_save, [$context, $table, $isNew]);
+            $dispatcher->dispatch($this->event_after_save, new AfterSaveEvent($this->event_after_save, [
+                'context' => $context,
+                'subject' => $table,
+                'isNew'   => $isNew,
+                'data'    => $data,
+            ]));
 
             // Rebuild the path for the tag:
             if (!$table->rebuildPath($table->id)) {
@@ -307,6 +346,9 @@ public function save($data)
         $this->setState($this->getName() . '.id', $table->id);
         $this->setState($this->getName() . '.new', $isNew);
 
+        // Save version history.
+        $this->saveHistory($data, $context);
+
         // Clear the cache
         $this->cleanCache();
 
@@ -403,11 +445,295 @@ protected function generateNewTitle($parentId, $alias, $title)
 
         $table = $this->getTable();
 
-        while ($table->load(['alias' => $alias, 'parent_id' => $parentId])) {
+        while ($table->load(['alias' => $alias])) {
             $title = ($table->title != $title) ? $title : StringHelper::increment($title);
             $alias = StringHelper::increment($alias, 'dash');
         }
 
         return [$title, $alias];
     }
+
+
+    /**
+     * Batch copy tags to a new tag or parent.
+     *
+     * @param   integer  $value     The new tag or sub-item.
+     * @param   array    $pks       An array of row IDs.
+     * @param   array    $contexts  An array of item contexts.
+     *
+     * @return  array|false  An array of new IDs on success, boolean false on failure.
+     *
+     * @since   6.1.0
+     */
+    protected function batchCopy($value, $pks, $contexts)
+    {
+        $parentId  = (int) $value;
+        $table     = $this->getTable();
+        $db        = $this->getDatabase();
+        $query     = $db->getQuery(true);
+        $newIds    = [];
+
+        // Check that the parent exists
+        if ($parentId) {
+            if (!$table->load($parentId)) {
+                if ($error = $table->getError()) {
+                    // Fatal error
+                    $this->setError($error);
+
+                    return false;
+                }
+                // Non-fatal error
+                $this->setError(Text::_('JGLOBAL_BATCH_MOVE_PARENT_NOT_FOUND'));
+                $parentId = 0;
+            }
+        }
+
+        // If the parent is 0, set it to the ID of the root item in the tree
+        if (empty($parentId)) {
+            if (!$parentId = $table->getRootId()) {
+                $this->setError($table->getError());
+
+                return false;
+            }
+        }
+
+        // Check that user has create permission for tags
+        if (!$this->getCurrentUser()->authorise('core.create', 'com_tags')) {
+            $this->setError(Text::_('COM_TAGS_BATCH_COPY_MOVE_CANNOT_CREATE'));
+
+            return false;
+        }
+
+        // We need to log the parent ID
+        $parents = [];
+
+        // Calculate the emergency stop count as a precaution against a runaway loop bug
+        $query->select('COUNT(' . $db->quoteName('id') . ')')
+            ->from($db->quoteName('#__tags'));
+        $db->setQuery($query);
+
+        try {
+            $count = $db->loadResult();
+        } catch (\RuntimeException $e) {
+            $this->setError($e->getMessage());
+
+            return false;
+        }
+
+        // Parent exists so let's proceed
+        while (!empty($pks) && $count > 0) {
+            // Pop the first id off the stack
+            $pk = array_shift($pks);
+
+            $table->reset();
+
+            // Check that the row actually exists
+            if (!$table->load($pk)) {
+                if ($error = $table->getError()) {
+                    // Fatal error
+                    $this->setError($error);
+
+                    return false;
+                }
+                // Non-fatal error
+                $this->setError(Text::sprintf('JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+                continue;
+            }
+
+            // Check that the user is allowed to access the item
+            if (!$this->user->authorise('core.edit', $contexts[$pk])) {
+                $this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+                return false;
+            }
+
+            // Copy is a bit tricky, because we also need to copy the children
+            $query = $db->getQuery(true)
+                ->select($db->quoteName('id'))
+                ->from($db->quoteName('#__tags'))
+                ->where(
+                    [
+                        $db->quoteName('lft') . ' > :lft',
+                        $db->quoteName('rgt') . ' < :rgt',
+                    ]
+                )
+                ->bind(':lft', $table->lft, ParameterType::INTEGER)
+                ->bind(':rgt', $table->rgt, ParameterType::INTEGER);
+            $db->setQuery($query);
+            $childIds = $db->loadColumn();
+
+            // Add child IDs to the array only if they aren't already there.
+            foreach ($childIds as $childId) {
+                if (!\in_array($childId, $pks)) {
+                    $pks[] = $childId;
+                }
+            }
+
+            // Make a copy of the old ID and Parent ID
+            $oldId       = $table->id;
+            $oldParentId = $table->parent_id;
+
+            // Reset the id because we are making a copy.
+            $table->id = 0;
+
+            // If we are copying children, the Old ID will turn up in the parents list
+            // otherwise it's a new top level item
+            $table->parent_id = $parents[$oldParentId] ?? $parentId;
+
+            // Set the new location in the tree for the node.
+            $table->setLocation($table->parent_id, 'last-child');
+
+            // @todo: Deal with ordering?
+            // $table->ordering = 1;
+            $table->level = null;
+            $table->lft   = null;
+            $table->rgt   = null;
+
+            // Alter the title & alias
+            [$title, $alias] = $this->generateNewTitle($table->parent_id, $table->alias, $table->title);
+            $table->title    = $title;
+            $table->alias    = $alias;
+
+            // Unpublish because we are making a copy
+            $table->published = 0;
+
+            // Check the row.
+            if (!$table->check()) {
+                $this->setError($table->getError());
+
+                return false;
+            }
+
+            // Store the row.
+            if (!$table->store()) {
+                $this->setError($table->getError());
+
+                return false;
+            }
+
+            // Get the new item ID
+            $newId = $table->id;
+
+            // Add the new ID to the array
+            $newIds[$pk] = $newId;
+
+            // Now we log the old 'parent' to the new 'parent'
+            $parents[$oldId] = $table->id;
+            $count--;
+        }
+
+        // Rebuild the hierarchy.
+        if (!$table->rebuild()) {
+            $this->setError($table->getError());
+
+            return false;
+        }
+
+        // Rebuild the tree path.
+        if (!$table->rebuildPath($table->id)) {
+            $this->setError($table->getError());
+
+            return false;
+        }
+
+        // Clean the cache
+        $this->cleanCache();
+
+        return $newIds;
+    }
+
+    /**
+     * Batch move tags to a new tag or parent.
+     *
+     * @param   integer  $value     The new tag or sub-item.
+     * @param   array    $pks       An array of row IDs.
+     * @param   array    $contexts  An array of item contexts.
+     *
+     * @return  boolean  True on success.
+     *
+     * @since   6.1.0
+     */
+    protected function batchMove($value, $pks, $contexts)
+    {
+        $parentId  = (int) $value;
+        $table     = $this->getTable();
+
+        // Check that the parent exists.
+        if ($parentId) {
+            if (!$table->load($parentId)) {
+                if ($error = $table->getError()) {
+                    // Fatal error
+                    $this->setError($error);
+
+                    return false;
+                }
+                // Non-fatal error
+                $this->setError(Text::_('JGLOBAL_BATCH_MOVE_PARENT_NOT_FOUND'));
+                $parentId = 0;
+            }
+        }
+
+        // Check that user has create and edit permission for tags
+        $user = $this->getCurrentUser();
+
+        if (!$user->authorise('core.create', 'com_tags')) {
+            $this->setError(Text::_('COM_TAGS_BATCH_COPY_MOVE_CANNOT_CREATE'));
+
+            return false;
+        }
+
+        if (!$user->authorise('core.edit', 'com_tags')) {
+            $this->setError(Text::_('COM_TAGS_BATCH_COPY_MOVE_CANNOT_EDIT'));
+
+            return false;
+        }
+
+        // Parent exists so let's proceed
+        foreach ($pks as $pk) {
+            // Check that the row actually exists
+            if (!$table->load($pk)) {
+                if ($error = $table->getError()) {
+                    // Fatal error
+                    $this->setError($error);
+
+                    return false;
+                }
+                // Non-fatal error
+                $this->setError(Text::sprintf('JGLOBAL_BATCH_MOVE_ROW_NOT_FOUND', $pk));
+                continue;
+            }
+
+            // Set the new location in the tree for the node.
+            $table->setLocation($parentId, 'last-child');
+
+            // Set the new Parent Id
+            $table->parent_id = $parentId;
+
+            // Check the row.
+            if (!$table->check()) {
+                $this->setError($table->getError());
+
+                return false;
+            }
+
+            // Store the row.
+            if (!$table->store()) {
+                $this->setError($table->getError());
+
+                return false;
+            }
+
+            // Rebuild the tree path.
+            if (!$table->rebuildPath()) {
+                $this->setError($table->getError());
+
+                return false;
+            }
+        }
+
+        // Clean the cache
+        $this->cleanCache();
+
+        return true;
+    }
 }
diff --git a/administrator/components/com_tags/src/Model/TagsModel.php b/administrator/components/com_tags/src/Model/TagsModel.php
index 2dde7f9b3a5e6..e9319d0e2fe79 100644
--- a/administrator/components/com_tags/src/Model/TagsModel.php
+++ b/administrator/components/com_tags/src/Model/TagsModel.php
@@ -147,7 +147,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
 
         // Select the required fields from the table.
@@ -183,7 +183,7 @@ protected function getListQuery()
             ->join('LEFT', $db->quoteName('#__viewlevels', 'ug'), $db->quoteName('ug.id') . ' = ' . $db->quoteName('a.access'));
 
         // Count Items
-        $subQueryCountTaggedItems = $db->getQuery(true);
+        $subQueryCountTaggedItems = $db->createQuery();
         $subQueryCountTaggedItems
             ->select('COUNT(' . $db->quoteName('tag_map.content_item_id') . ')')
             ->from($db->quoteName('#__contentitem_tag_map', 'tag_map'))
diff --git a/administrator/components/com_tags/src/Table/TagTable.php b/administrator/components/com_tags/src/Table/TagTable.php
index d130fc92cc0b4..307e0a647c4ac 100644
--- a/administrator/components/com_tags/src/Table/TagTable.php
+++ b/administrator/components/com_tags/src/Table/TagTable.php
@@ -17,7 +17,6 @@
 use Joomla\CMS\Table\Nested;
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
-use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Event\DispatcherInterface;
 use Joomla\String\StringHelper;
@@ -31,7 +30,7 @@
  *
  * @since  3.1
  */
-class TagTable extends Nested implements VersionableTableInterface, CurrentUserInterface
+class TagTable extends Nested implements CurrentUserInterface
 {
     use CurrentUserTrait;
 
diff --git a/administrator/components/com_tags/src/View/Tag/HtmlView.php b/administrator/components/com_tags/src/View/Tag/HtmlView.php
index 465dc376268da..ed9bf66b428d0 100644
--- a/administrator/components/com_tags/src/View/Tag/HtmlView.php
+++ b/administrator/components/com_tags/src/View/Tag/HtmlView.php
@@ -93,6 +93,10 @@ public function display($tpl = null)
         $this->item  = $model->getItem();
         $this->state = $model->getState();
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_tags/src/View/Tags/HtmlView.php b/administrator/components/com_tags/src/View/Tags/HtmlView.php
index 986f2648bcc94..fd022137589f8 100644
--- a/administrator/components/com_tags/src/View/Tags/HtmlView.php
+++ b/administrator/components/com_tags/src/View/Tags/HtmlView.php
@@ -113,6 +113,11 @@ public function display($tpl = null)
             $this->ordering[$item->parent_id][] = $item->id;
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         // We don't need toolbar in the modal window.
         if ($this->getLayout() !== 'modal') {
             $this->addToolbar();
diff --git a/administrator/components/com_tags/tmpl/tag/edit.php b/administrator/components/com_tags/tmpl/tag/edit.php
index 9b23c6acec63c..d269eeac902c0 100644
--- a/administrator/components/com_tags/tmpl/tag/edit.php
+++ b/administrator/components/com_tags/tmpl/tag/edit.php
@@ -74,6 +74,6 @@
 
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
     </div>
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_tags/tmpl/tags/default.php b/administrator/components/com_tags/tmpl/tags/default.php
index a3b20bea037f1..d033dbf341b38 100644
--- a/administrator/components/com_tags/tmpl/tags/default.php
+++ b/administrator/components/com_tags/tmpl/tags/default.php
@@ -10,6 +10,7 @@
 
 defined('_JEXEC') or die;
 
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
@@ -17,7 +18,6 @@
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Session\Session;
-use Joomla\String\Inflector;
 
 /** @var \Joomla\Component\Tags\Administrator\View\Tags\HtmlView $this */
 
@@ -40,10 +40,10 @@
 
 if (count($parts) > 1) {
     $section = $parts[1];
-    $inflector = Inflector::getInstance();
+    $inflector = InflectorFactory::create()->build();
 
-    if (!$inflector->isPlural($section)) {
-        $section = $inflector->toPlural($section);
+    if ($inflector->pluralize($inflector->singularize($section)) !== $section) {
+        $section = $inflector->pluralize($section);
     }
 }
 
@@ -263,8 +263,6 @@
             <?php endif; ?>
         <?php endif; ?>
 
-        <input type="hidden" name="task" value="">
-        <input type="hidden" name="boxchecked" value="0">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->filterForm->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_tags/tmpl/tags/default_batch_body.php b/administrator/components/com_tags/tmpl/tags/default_batch_body.php
index ad996a4f58883..bf3ded2f3e1a3 100644
--- a/administrator/components/com_tags/tmpl/tags/default_batch_body.php
+++ b/administrator/components/com_tags/tmpl/tags/default_batch_body.php
@@ -10,9 +10,19 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
+
+$options = [
+    HTMLHelper::_('select.option', 'c', Text::_('JLIB_HTML_BATCH_COPY')),
+    HTMLHelper::_('select.option', 'm', Text::_('JLIB_HTML_BATCH_MOVE'))
+];
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('joomla.batch-copymove');
 ?>
 
 <div class="p-3">
@@ -30,6 +40,24 @@
             </div>
         </div>
     </div>
+    <div class="row">
+        <div class="form-group col-md-6">
+            <div id="batch-choose-action" class="control-group">
+                <label id="batch-choose-action-lbl" for="batch-tag-copy-move-id">
+                    <?php echo Text::_('COM_TAGS_BATCH_TAG_LABEL'); ?>
+                </label>
+                <select class="form-select" name="batch[tag_id]" id="batch-tag-copy-move-id">
+                    <option value=""><?php echo Text::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
+                    <option value="1"><?php echo Text::_('JGLOBAL_ROOT'); ?></option>
+                    <?php echo HTMLHelper::_('select.options', HTMLHelper::_('tag.tags')); ?>
+                </select>
+            </div>
+            <div id="batch-copy-move">
+                <?php echo Text::_('JLIB_HTML_BATCH_MOVE_QUESTION'); ?>
+                <?php echo HTMLHelper::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
+            </div>
+        </div>
+    </div>
 </div>
 <div class="btn-toolbar p-3">
     <joomla-toolbar-button task="tag.batch" class="ms-auto">
diff --git a/administrator/components/com_tags/tmpl/tags/emptystate.php b/administrator/components/com_tags/tmpl/tags/emptystate.php
index ab70fe7c796d7..d48e8cc7a993a 100644
--- a/administrator/components/com_tags/tmpl/tags/emptystate.php
+++ b/administrator/components/com_tags/tmpl/tags/emptystate.php
@@ -17,8 +17,10 @@
 $displayData = [
     'textPrefix' => 'COM_TAGS',
     'formURL'    => 'index.php?option=com_tags&task=tag.add',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/J4.x:How_To_Use_Content_Tags_in_Joomla',
+    'helpURL'    => 'https://guide.joomla.org/user-manual/tags',
     'icon'       => 'icon-tags tags',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 if ($this->getCurrentUser()->authorise('core.create', 'com_tags')) {
diff --git a/administrator/components/com_templates/helpers/template.php b/administrator/components/com_templates/helpers/template.php
index 466fd798258af..eb822df1920e5 100644
--- a/administrator/components/com_templates/helpers/template.php
+++ b/administrator/components/com_templates/helpers/template.php
@@ -19,7 +19,7 @@
  *
  * @since       3.2
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Templates\Administrator\Helper\TemplateHelper instead
  */
 abstract class TemplateHelper extends \Joomla\Component\Templates\Administrator\Helper\TemplateHelper
diff --git a/administrator/components/com_templates/helpers/templates.php b/administrator/components/com_templates/helpers/templates.php
index 9b583f2cd99b8..8819852e56f7b 100644
--- a/administrator/components/com_templates/helpers/templates.php
+++ b/administrator/components/com_templates/helpers/templates.php
@@ -19,7 +19,7 @@
  *
  * @since       1.6
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Templates\Administrator\Helper\TemplatesHelper instead
  */
 class TemplatesHelper extends \Joomla\Component\Templates\Administrator\Helper\TemplatesHelper
diff --git a/administrator/components/com_templates/src/Controller/StyleController.php b/administrator/components/com_templates/src/Controller/StyleController.php
index c9df25cb8fc4b..1549908cd32e0 100644
--- a/administrator/components/com_templates/src/Controller/StyleController.php
+++ b/administrator/components/com_templates/src/Controller/StyleController.php
@@ -58,9 +58,9 @@ public function save($key = null, $urlVar = null)
             $item = $model->getItem($this->app->getTemplate(true)->id);
 
             // Setting received params
-            $item->set('params', $data);
+            $item->params = $data;
 
-            $data = $item->getProperties();
+            $data = get_object_vars($item);
             unset($data['xml']);
 
             $key = $table->getKeyName();
diff --git a/administrator/components/com_templates/src/Helper/TemplateHelper.php b/administrator/components/com_templates/src/Helper/TemplateHelper.php
index 2b1297e2c111b..a50a62f4d11f7 100644
--- a/administrator/components/com_templates/src/Helper/TemplateHelper.php
+++ b/administrator/components/com_templates/src/Helper/TemplateHelper.php
@@ -67,7 +67,7 @@ public static function canUpload($file, $err = '')
             'exe', 'phtml','java', 'perl', 'py', 'asp','dll', 'go', 'jar',
             'ade', 'adp', 'bat', 'chm', 'cmd', 'com', 'cpl', 'hta', 'ins', 'isp',
             'jse', 'lib', 'mde', 'msc', 'msp', 'mst', 'pif', 'scr', 'sct', 'shb',
-            'sys', 'vb', 'vbe', 'vbs', 'vxd', 'wsc', 'wsf', 'wsh',
+            'sys', 'vb', 'vbe', 'vbs', 'vxd', 'wsc', 'wsf', 'wsh', 'shtml', 'shtm', 'sht', 'stm',
         ];
         $explodedFileName = explode('.', $file['name']);
 
@@ -143,28 +143,6 @@ public static function canUpload($file, $err = '')
             return false;
         }
 
-        $xss_check = file_get_contents($file['tmp_name'], false, null, -1, 256);
-        $html_tags = [
-            'abbr', 'acronym', 'address', 'applet', 'area', 'audioscope', 'base', 'basefont', 'bdo', 'bgsound', 'big', 'blackface', 'blink', 'blockquote',
-            'body', 'bq', 'br', 'button', 'caption', 'center', 'cite', 'code', 'col', 'colgroup', 'comment', 'custom', 'dd', 'del', 'dfn', 'dir', 'div',
-            'dl', 'dt', 'em', 'embed', 'fieldset', 'fn', 'font', 'form', 'frame', 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
-            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'keygen', 'kbd', 'label', 'layer', 'legend', 'li', 'limittext', 'link', 'listing',
-            'map', 'marquee', 'menu', 'meta', 'multicol', 'nobr', 'noembed', 'noframes', 'noscript', 'nosmartquotes', 'object', 'ol', 'optgroup', 'option',
-            'param', 'plaintext', 'pre', 'rt', 'ruby', 's', 'samp', 'script', 'select', 'server', 'shadow', 'sidebar', 'small', 'spacer', 'span', 'strike',
-            'strong', 'style', 'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'title', 'tr', 'tt', 'ul', 'var', 'wbr', 'xml',
-            'xmp', '!DOCTYPE', '!--',
-        ];
-
-        foreach ($html_tags as $tag) {
-            // A tag is '<tagname ', so we need to add < and a space or '<tagname>'
-            if (stristr($xss_check, '<' . $tag . ' ') || stristr($xss_check, '<' . $tag . '>')) {
-                $app = Factory::getApplication();
-                $app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_WARNIEXSS'), 'error');
-
-                return false;
-            }
-        }
-
         return true;
     }
 }
diff --git a/administrator/components/com_templates/src/Helper/TemplatesHelper.php b/administrator/components/com_templates/src/Helper/TemplatesHelper.php
index 615354706b65b..ae92fd48a37ab 100644
--- a/administrator/components/com_templates/src/Helper/TemplatesHelper.php
+++ b/administrator/components/com_templates/src/Helper/TemplatesHelper.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\Path;
 
@@ -55,7 +54,7 @@ public static function getTemplateOptions($clientId = '*')
     {
         // Build the filter options.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('element', 'value'))
             ->select($db->quoteName('name', 'text'))
@@ -82,11 +81,11 @@ public static function getTemplateOptions($clientId = '*')
      * @param   string  $templateBaseDir
      * @param   string  $templateDir
      *
-     * @return boolean|CMSObject
+     * @return \stdClass|false
      */
     public static function parseXMLTemplateFile($templateBaseDir, $templateDir)
     {
-        $data = new CMSObject();
+        $data = new \stdClass();
 
         // Check of the xml file exists
         $filePath = Path::clean($templateBaseDir . '/templates/' . $templateDir . '/templateDetails.xml');
diff --git a/administrator/components/com_templates/src/Model/StyleModel.php b/administrator/components/com_templates/src/Model/StyleModel.php
index ee5ed39d665aa..027afb4fe85b9 100644
--- a/administrator/components/com_templates/src/Model/StyleModel.php
+++ b/administrator/components/com_templates/src/Model/StyleModel.php
@@ -11,6 +11,10 @@
 namespace Joomla\Component\Templates\Administrator\Model;
 
 use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Event\Model\AfterDeleteEvent;
+use Joomla\CMS\Event\Model\AfterSaveEvent;
+use Joomla\CMS\Event\Model\BeforeDeleteEvent;
+use Joomla\CMS\Event\Model\BeforeSaveEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Multilanguage;
@@ -18,7 +22,7 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Extension;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\Path;
 use Joomla\String\StringHelper;
@@ -93,7 +97,8 @@ public function delete(&$pks)
         $table      = $this->getTable();
         $context    = $this->option . '.' . $this->name;
 
-        PluginHelper::importPlugin($this->events_map['delete']);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['delete'], null, true, $dispatcher);
 
         // Iterate the items to delete each one.
         foreach ($pks as $pk) {
@@ -111,7 +116,13 @@ public function delete(&$pks)
                 }
 
                 // Trigger the before delete event.
-                $result = Factory::getApplication()->triggerEvent($this->event_before_delete, [$context, $table]);
+                $result = $dispatcher->dispatch(
+                    $this->event_before_delete,
+                    new BeforeDeleteEvent($this->event_before_delete, [
+                        'context' => $context,
+                        'subject' => $table,
+                    ])
+                )->getArgument('result', []);
 
                 if (\in_array(false, $result, true) || !$table->delete($pk)) {
                     $this->setError($table->getError());
@@ -120,7 +131,10 @@ public function delete(&$pks)
                 }
 
                 // Trigger the after delete event.
-                Factory::getApplication()->triggerEvent($this->event_after_delete, [$context, $table]);
+                $dispatcher->dispatch($this->event_after_delete, new AfterDeleteEvent($this->event_after_delete, [
+                    'context' => $context,
+                    'subject' => $table,
+                ]));
             } else {
                 $this->setError($table->getError());
 
@@ -155,7 +169,8 @@ public function duplicate(&$pks)
         $context    = $this->option . '.' . $this->name;
 
         // Include the plugins for the save events.
-        PluginHelper::importPlugin($this->events_map['save']);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['save'], null, true, $dispatcher);
 
         $table = $this->getTable();
 
@@ -176,14 +191,22 @@ public function duplicate(&$pks)
                 }
 
                 // Trigger the before save event.
-                $result = Factory::getApplication()->triggerEvent($this->event_before_save, [$context, &$table, true]);
+                $result = $dispatcher->dispatch($this->event_before_save, new BeforeSaveEvent($this->event_before_save, [
+                    'context' => $context,
+                    'subject' => $table,
+                    'isNew'   => true,
+                ]))->getArgument('result', []);
 
                 if (\in_array(false, $result, true) || !$table->store()) {
                     throw new \Exception($table->getError());
                 }
 
                 // Trigger the after save event.
-                Factory::getApplication()->triggerEvent($this->event_after_save, [$context, &$table, true]);
+                $dispatcher->dispatch($this->event_after_save, new AfterSaveEvent($this->event_after_save, [
+                    'context' => $context,
+                    'subject' => $table,
+                    'isNew'   => true,
+                ]));
             } else {
                 throw new \Exception($table->getError());
             }
@@ -224,9 +247,10 @@ protected function generateNewTitle($categoryId, $alias, $title)
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -290,7 +314,7 @@ protected function loadFormData()
      *
      * @param   integer  $pk  The id of the primary key.
      *
-     * @return  mixed  Object on success, false on failure.
+     * @return  \stdClass|false  Object on success, false on failure.
      */
     public function getItem($pk = null)
     {
@@ -397,7 +421,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
     public function save($data)
     {
         // Detect disabled extension
-        $extension = Table::getInstance('Extension', 'Joomla\\CMS\\Table\\');
+        $extension = new Extension($this->getDatabase());
 
         if ($extension->load(['enabled' => 0, 'type' => 'template', 'element' => $data['template'], 'client_id' => $data['client_id']])) {
             $this->setError(Text::_('COM_TEMPLATES_ERROR_SAVE_DISABLED_TEMPLATE'));
@@ -411,7 +435,8 @@ public function save($data)
         $isNew      = true;
 
         // Include the extension plugins for the save events.
-        PluginHelper::importPlugin($this->events_map['save']);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['save'], null, true, $dispatcher);
 
         // Load the row if saving an existing record.
         if ($pk > 0) {
@@ -443,7 +468,12 @@ public function save($data)
         }
 
         // Trigger the before save event.
-        $result = Factory::getApplication()->triggerEvent($this->event_before_save, ['com_templates.style', &$table, $isNew]);
+        $result = $dispatcher->dispatch($this->event_before_save, new BeforeSaveEvent($this->event_before_save, [
+            'context' => 'com_templates.style',
+            'subject' => $table,
+            'isNew'   => $isNew,
+            'data'    => $data,
+        ]))->getArgument('result', []);
 
         // Store the data.
         if (\in_array(false, $result, true) || !$table->store()) {
@@ -465,7 +495,7 @@ public function save($data)
                 $data['assigned'] = ArrayHelper::toInteger($data['assigned']);
 
                 // Update the mapping for menu items that this style IS assigned to.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->update($db->quoteName('#__menu'))
                     ->set($db->quoteName('template_style_id') . ' = :newtsid')
                     ->whereIn($db->quoteName('id'), $data['assigned'])
@@ -481,7 +511,7 @@ public function save($data)
 
             // Remove style mappings for menu items this style is NOT assigned to.
             // If unassigned then all existing maps will be removed.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__menu'))
                 ->set($db->quoteName('template_style_id') . ' = 0');
 
@@ -507,7 +537,12 @@ public function save($data)
         $this->cleanCache();
 
         // Trigger the after save event.
-        Factory::getApplication()->triggerEvent($this->event_after_save, ['com_templates.style', &$table, $isNew]);
+        $dispatcher->dispatch($this->event_after_save, new AfterSaveEvent($this->event_after_save, [
+            'context' => 'com_templates.style',
+            'subject' => $table,
+            'isNew'   => $isNew,
+            'data'    => $data,
+        ]));
 
         $this->setState('style.id', $table->id);
 
@@ -540,7 +575,7 @@ public function setHome($id = 0)
         }
 
         // Detect disabled extension
-        $extension = Table::getInstance('Extension', 'Joomla\\CMS\\Table\\');
+        $extension = new Extension($this->getDatabase());
 
         if ($extension->load(['enabled' => 0, 'type' => 'template', 'element' => $style->template, 'client_id' => $style->client_id])) {
             throw new \Exception(Text::_('COM_TEMPLATES_ERROR_SAVE_DISABLED_TEMPLATE'));
@@ -550,7 +585,7 @@ public function setHome($id = 0)
         $id       = (int) $id;
 
         // Reset the home fields for the client_id.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__template_styles'))
             ->set($db->quoteName('home') . ' = ' . $db->quote('0'))
             ->where($db->quoteName('client_id') . ' = :clientid')
@@ -560,7 +595,7 @@ public function setHome($id = 0)
         $db->execute();
 
         // Set the new home style.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__template_styles'))
             ->set($db->quoteName('home') . ' = ' . $db->quote('1'))
             ->where($db->quoteName('id') . ' = :id')
@@ -596,7 +631,7 @@ public function unsetHome($id = 0)
         $id = (int) $id;
 
         // Lookup the client_id.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['client_id', 'home']))
             ->from($db->quoteName('#__template_styles'))
             ->where($db->quoteName('id') . ' = :id')
@@ -613,7 +648,7 @@ public function unsetHome($id = 0)
         }
 
         // Set the new home style.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__template_styles'))
             ->set($db->quoteName('home') . ' = ' . $db->quote('0'))
             ->where($db->quoteName('id') . ' = :id')
@@ -651,8 +686,8 @@ public function getHelp()
     public function getAdminTemplate(int $styleId): \stdClass
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
-            ->select($db->quoteName(['s.template', 's.params', 's.inheritable', 's.parent']))
+        $query = $db->createQuery()
+            ->select($db->quoteName(['s.template', 's.params', 's.inheritable', 's.parent', 'e.custom_data']))
             ->from($db->quoteName('#__template_styles', 's'))
             ->join(
                 'LEFT',
@@ -696,8 +731,8 @@ public function getAdminTemplate(int $styleId): \stdClass
     public function getSiteTemplates(): array
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
-            ->select($db->quoteName(['id', 'home', 'template', 's.params', 'inheritable', 'parent']))
+        $query = $db->createQuery()
+            ->select($db->quoteName(['id', 'home', 'template', 's.params', 'inheritable', 'parent', 'e.custom_data']))
             ->from($db->quoteName('#__template_styles', 's'))
             ->where(
                 [
@@ -721,15 +756,13 @@ public function getSiteTemplates(): array
     /**
      * Custom clean cache method
      *
-     * @param   string   $group     The cache group
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   1.6
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_templates');
         parent::cleanCache('_system');
diff --git a/administrator/components/com_templates/src/Model/StylesModel.php b/administrator/components/com_templates/src/Model/StylesModel.php
index ea93fa73af4a2..c370e330aa040 100644
--- a/administrator/components/com_templates/src/Model/StylesModel.php
+++ b/administrator/components/com_templates/src/Model/StylesModel.php
@@ -117,7 +117,7 @@ protected function getListQuery()
 
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
@@ -201,14 +201,14 @@ protected function getListQuery()
                 // If user selected the templates styles assigned to particular pages.
                 // Subquery to get the language of the selected menu item.
                 $menuItemId               = (int) $menuItemId;
-                $menuItemLanguageSubQuery = $db->getQuery(true);
+                $menuItemLanguageSubQuery = $db->createQuery();
                 $menuItemLanguageSubQuery->select($db->quoteName('language'))
                     ->from($db->quoteName('#__menu'))
                     ->where($db->quoteName('id') . ' = :menuitemid');
                 $query->bind(':menuitemid', $menuItemId, ParameterType::INTEGER);
 
                 // Subquery to get the language of the selected menu item.
-                $templateStylesMenuItemsSubQuery = $db->getQuery(true);
+                $templateStylesMenuItemsSubQuery = $db->createQuery();
                 $templateStylesMenuItemsSubQuery->select($db->quoteName('id'))
                     ->from($db->quoteName('#__menu'))
                     ->where($db->quoteName('template_style_id') . ' = ' . $db->quoteName('a.id'));
diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php
index 39f9056c1ada4..112876f14ca83 100644
--- a/administrator/components/com_templates/src/Model/TemplateModel.php
+++ b/administrator/components/com_templates/src/Model/TemplateModel.php
@@ -129,7 +129,7 @@ public function getTemplateList()
         $db = $this->getDatabase();
 
         // Create a new query object.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table
         $query->select(
@@ -169,7 +169,7 @@ public function getUpdatedList($state = false, $all = false, $cleanup = false)
         $db = $this->getDatabase();
 
         // Create a new query object.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table
         $query->select(
@@ -316,7 +316,7 @@ public function publish($ids, $value, $exid)
 
         foreach ($ids as $id) {
             if ($value === -3) {
-                $deleteQuery = $db->getQuery(true)
+                $deleteQuery = $db->createQuery()
                     ->delete($db->quoteName('#__template_overrides'))
                     ->where($db->quoteName('hash_id') . ' = :hashid')
                     ->where($db->quoteName('extension_id') . ' = :exid')
@@ -331,7 +331,7 @@ public function publish($ids, $value, $exid)
                     return $e;
                 }
             } elseif ($value === 1 || $value === 0) {
-                $updateQuery = $db->getQuery(true)
+                $updateQuery = $db->createQuery()
                     ->update($db->quoteName('#__template_overrides'))
                     ->set($db->quoteName('state') . ' = :state')
                     ->where($db->quoteName('hash_id') . ' = :hashid')
@@ -370,12 +370,14 @@ public function getFiles()
             $path   = Path::clean($client->path . '/templates/' . $template->element . '/');
             $lang   = Factory::getLanguage();
 
-            // Load the core and/or local language file(s).
+            // Load the parent and child overrides for template language constants
+            if (!empty($template->xmldata->parent)) {
+                $lang->load('tpl_' . $template->xmldata->parent, $client->path)
+                    || $lang->load('tpl_' . $template->xmldata->parent, $client->path . '/templates/' . $template->xmldata->parent);
+            }
+
             $lang->load('tpl_' . $template->element, $client->path)
-            || (!empty($template->xmldata->parent) && $lang->load('tpl_' . $template->xmldata->parent, $client->path))
-            || $lang->load('tpl_' . $template->element, $client->path . '/templates/' . $template->element)
-            || (!empty($template->xmldata->parent) && $lang->load('tpl_' . $template->xmldata->parent, $client->path . '/templates/' . $template->xmldata->parent));
-            $this->element = $path;
+                || $lang->load('tpl_' . $template->element, $client->path . '/templates/' . $template->element);
 
             if (!is_writable($path)) {
                 $app->enqueueMessage(Text::_('COM_TEMPLATES_DIRECTORY_NOT_WRITABLE'), 'error');
@@ -645,7 +647,7 @@ public function getTemplate()
             $app = Factory::getApplication();
 
             // Get the template information.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['extension_id', 'client_id', 'element', 'name', 'manifest_cache']))
                 ->from($db->quoteName('#__extensions'))
                 ->where($db->quoteName('extension_id') . ' = :pk')
@@ -691,7 +693,7 @@ public function checkNewName()
     {
         $db    = $this->getDatabase();
         $name  = $this->getState('new_name');
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('name') . ' = :name')
@@ -777,11 +779,7 @@ public function copy()
             }
 
             // Adjust to new template name
-            if (!$this->fixTemplateName()) {
-                return false;
-            }
-
-            return true;
+            return $this->fixTemplateName();
         }
 
         $app->enqueueMessage(Text::_('COM_TEMPLATES_ERROR_INVALID_FROM_NAME'), 'error');
@@ -825,6 +823,11 @@ protected function fixTemplateName()
         $oldName  = $template->element;
         $manifest = json_decode($template->manifest_cache);
 
+        // When copying a child template we need to prefix it with the parent template name
+        if (!empty($template->xmldata->parent)) {
+            $newName = $template->xmldata->parent . '_' . $newName;
+        }
+
         foreach ($files as $file) {
             $newFile = '/' . str_replace($oldName, $newName, basename($file));
 
@@ -864,9 +867,10 @@ protected function fixTemplateName()
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean    A Form object on success, false on failure
+     * @return  Form    A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -874,7 +878,7 @@ public function getForm($data = [], $loadData = true)
 
         // Codemirror or Editor None should be enabled
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from('#__extensions as a')
             ->where(
@@ -891,13 +895,7 @@ public function getForm($data = [], $loadData = true)
         }
 
         // Get the form.
-        $form = $this->loadForm('com_templates.source', 'source', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_templates.source', 'source', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -1394,8 +1392,10 @@ public function uploadFile($file, $location)
                 return false;
             }
 
+            // Allow "unsafe" files: template files legitimately contain PHP, which the File::upload()
+            // safety scan (default since joomla/filesystem 4.2.0) would reject. Super-User-only action.
             try {
-                File::upload($file['tmp_name'], Path::check($path . '/' . $location . '/' . $fileName));
+                File::upload($file['tmp_name'], Path::check($path . '/' . $location . '/' . $fileName), false, true);
             } catch (FilesystemException) {
                 $app->enqueueMessage(Text::_('COM_TEMPLATES_FILE_UPLOAD_ERROR'), 'error');
 
@@ -1661,7 +1661,7 @@ public function getPreview()
     {
         $app   = Factory::getApplication();
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName(['id', 'client_id']));
         $query->from($db->quoteName('#__template_styles'));
@@ -2053,14 +2053,16 @@ public function child()
         $media->addChild('folder', 'images');
         $media->addChild('folder', 'scss');
 
-        $xml->name = $template->element . '_' . $newName;
+        $element = (!empty($template->xmldata->parent) ? $template->xmldata->parent : $template->element);
+
+        $xml->name = $element . '_' . $newName;
 
         if (isset($xml->namespace)) {
             $xml->namespace .= '_' . ucfirst($newName);
         }
 
         $xml->inheritable = 0;
-        $files            = $xml->addChild('parent', $template->element);
+        $files            = $xml->addChild('parent', $element);
 
         $dom                     = new \DOMDocument();
         $dom->preserveWhiteSpace = false;
@@ -2076,17 +2078,11 @@ public function child()
         }
 
         // Create an empty media folder structure
-        if (
-            !Folder::create($toPath . '/media')
-            || !Folder::create($toPath . '/media/css')
-            || !Folder::create($toPath . '/media/js')
-            || !Folder::create($toPath . '/media/images')
-            || !Folder::create($toPath . '/media/scss')
-        ) {
-            return false;
-        }
-
-        return true;
+        return Folder::create($toPath . '/media')
+            && Folder::create($toPath . '/media/css')
+            && Folder::create($toPath . '/media/js')
+            && Folder::create($toPath . '/media/images')
+            && Folder::create($toPath . '/media/scss');
     }
 
     /**
@@ -2105,7 +2101,7 @@ public function getAllTemplateStyles()
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName(['id', 'title']))
             ->from($db->quoteName('#__template_styles'))
@@ -2139,7 +2135,7 @@ public function copyStyles()
         $db = $this->getDatabase();
 
         // Create a new query object.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName(['title', 'params']))
             ->from($db->quoteName('#__template_styles'))
@@ -2156,7 +2152,7 @@ public function copyStyles()
         }
 
         foreach ($parentStyle as $style) {
-            $query     = $db->getQuery(true);
+            $query     = $db->createQuery();
             $styleName = Text::sprintf('COM_TEMPLATES_COPY_CHILD_TEMPLATE_STYLES', ucfirst($template->element . '_' . $newName), $style->title);
 
             // Insert columns and values
diff --git a/administrator/components/com_templates/src/Model/TemplatesModel.php b/administrator/components/com_templates/src/Model/TemplatesModel.php
index 13047daa92d06..450565ede5599 100644
--- a/administrator/components/com_templates/src/Model/TemplatesModel.php
+++ b/administrator/components/com_templates/src/Model/TemplatesModel.php
@@ -96,7 +96,7 @@ public function updated($exid)
         $db = $this->getDatabase();
 
         // Select the required fields from the table
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('template'))
             ->from($db->quoteName('#__template_overrides'))
             ->where($db->quoteName('extension_id') . ' = :extensionid')
@@ -127,7 +127,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
diff --git a/administrator/components/com_templates/src/Service/HTML/Templates.php b/administrator/components/com_templates/src/Service/HTML/Templates.php
index a72d198689565..1d74a9b424e5c 100644
--- a/administrator/components/com_templates/src/Service/HTML/Templates.php
+++ b/administrator/components/com_templates/src/Service/HTML/Templates.php
@@ -31,10 +31,10 @@ class Templates
      * Display the thumb for the template.
      *
      * @param   string|object  $template  The name of the template or the template object.
-     *                                    @deprecated   4.3 will be removed in 6.0
+     *                                    @deprecated   4.3 will be removed in 7.0
      *                                    The argument $template must be an object only
      * @param   integer        $clientId  No longer used, will be removed without replacement
-     *                                    @deprecated   4.3 will be removed in 6.0
+     *                                    @deprecated   4.3 will be removed in 7.0
      *
      * @return  string  The html string
      *
@@ -89,10 +89,10 @@ public function thumb($template, $clientId = 0)
      * Renders the html for the modal linked to thumb.
      *
      * @param   string|object  $template  The name of the template or the template object.
-     *                                    @deprecated   4.3 will be removed in 6.0
+     *                                    @deprecated   4.3 will be removed in 7.0
      *                                    The argument $template must be an object only
      * @param   integer        $clientId  No longer used, will be removed without replacement
-     *                                    @deprecated   4.3 will be removed in 6.0
+     *                                    @deprecated   4.3 will be removed in 7.0
      *
      * @return  string  The html string
      *
diff --git a/administrator/components/com_templates/src/Table/StyleTable.php b/administrator/components/com_templates/src/Table/StyleTable.php
index 37dd1af4bcb26..6568a2c37b9cf 100644
--- a/administrator/components/com_templates/src/Table/StyleTable.php
+++ b/administrator/components/com_templates/src/Table/StyleTable.php
@@ -108,7 +108,7 @@ public function store($updateNulls = false)
         if ($this->home != '0') {
             $clientId = (int)$this->client_id;
             $db       = $this->getDatabase();
-            $query    = $db->getQuery(true)
+            $query    = $db->createQuery()
                 ->update($db->quoteName('#__template_styles'))
                 ->set($db->quoteName('home') . ' = ' . $db->quote('0'))
                 ->where($db->quoteName('client_id') . ' = :clientid')
@@ -139,7 +139,7 @@ public function delete($pk = null)
         if (!\is_null($pk)) {
             $clientId = (int)$this->client_id;
             $db       = $this->getDatabase();
-            $query    = $db->getQuery(true)
+            $query    = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__template_styles'))
                 ->where($db->quoteName('client_id') . ' = :clientid')
diff --git a/administrator/components/com_templates/src/View/Style/HtmlView.php b/administrator/components/com_templates/src/View/Style/HtmlView.php
index e325f838acb70..2e5855752351d 100644
--- a/administrator/components/com_templates/src/View/Style/HtmlView.php
+++ b/administrator/components/com_templates/src/View/Style/HtmlView.php
@@ -88,6 +88,10 @@ public function display($tpl = null)
         $this->form  = $model->getForm();
         $this->canDo = ContentHelper::getActions('com_templates');
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_templates/src/View/Styles/HtmlView.php b/administrator/components/com_templates/src/View/Styles/HtmlView.php
index 5efffed718699..1dcf39b99948d 100644
--- a/administrator/components/com_templates/src/View/Styles/HtmlView.php
+++ b/administrator/components/com_templates/src/View/Styles/HtmlView.php
@@ -101,6 +101,11 @@ public function display($tpl = null)
             $this->filterForm->removeField('menuitem', 'filter');
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_templates/src/View/Template/HtmlView.php b/administrator/components/com_templates/src/View/Template/HtmlView.php
index 1c7a2ae5d084d..941cda3543095 100644
--- a/administrator/components/com_templates/src/View/Template/HtmlView.php
+++ b/administrator/components/com_templates/src/View/Template/HtmlView.php
@@ -275,9 +275,9 @@ protected function addToolbar()
                     // Add a copy/child template button
                     if (isset($this->template->xmldata->inheritable) && (string) $this->template->xmldata->inheritable === '1') {
                         ToolbarHelper::modal('childModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_TEMPLATE_CHILD');
-                    } elseif (empty($this->template->xmldata->parent) && empty($this->template->xmldata->namespace)) {
-                        // We can't copy parent templates nor namespaced templates
-                        ToolbarHelper::modal('copyModal', 'icon-copy', 'COM_TEMPLATES_BUTTON_COPY_TEMPLATE');
+                    } elseif (empty($this->template->xmldata->namespace)) {
+                        // We can't copy namespaced templates
+                        ToolbarHelper::modal('copyModal', 'icon-copy', !empty($this->template->xmldata->parent) ? 'COM_TEMPLATES_BUTTON_COPY_CHILD_TEMPLATE' : 'COM_TEMPLATES_BUTTON_COPY_TEMPLATE');
                     }
 
                     break;
diff --git a/administrator/components/com_templates/src/View/Templates/HtmlView.php b/administrator/components/com_templates/src/View/Templates/HtmlView.php
index 0cf8257ff1e0b..29627d405f842 100644
--- a/administrator/components/com_templates/src/View/Templates/HtmlView.php
+++ b/administrator/components/com_templates/src/View/Templates/HtmlView.php
@@ -118,6 +118,11 @@ public function display($tpl = null)
         $this->file          = base64_encode('home');
         $this->pluginState   = PluginHelper::isEnabled('installer', 'override');
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_templates/tmpl/style/edit.php b/administrator/components/com_templates/tmpl/style/edit.php
index 56b4fb41d92f7..d263626ccab9e 100644
--- a/administrator/components/com_templates/tmpl/style/edit.php
+++ b/administrator/components/com_templates/tmpl/style/edit.php
@@ -143,7 +143,6 @@ class="form-validate">
 
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
-        <input type="hidden" name="task" value="">
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->form->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_templates/tmpl/styles/default.php b/administrator/components/com_templates/tmpl/styles/default.php
index c708fdd97315d..e8e07afc17fe1 100644
--- a/administrator/components/com_templates/tmpl/styles/default.php
+++ b/administrator/components/com_templates/tmpl/styles/default.php
@@ -146,9 +146,7 @@
 
                 <?php endif; ?>
 
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_templates/tmpl/template/default.php b/administrator/components/com_templates/tmpl/template/default.php
index 1467d9d7f532a..4474b252c0f10 100644
--- a/administrator/components/com_templates/tmpl/template/default.php
+++ b/administrator/components/com_templates/tmpl/template/default.php
@@ -21,16 +21,21 @@
 
 /** @var \Joomla\Component\Templates\Administrator\View\Template\HtmlView $this */
 
-HTMLHelper::_('behavior.multiselect', 'updateForm');
-HTMLHelper::_('bootstrap.modal');
+$app = Factory::getApplication();
+$doc = $app->getDocument();
+
+// Pass the required options to the javascript
+$doc->addScriptOptions('js-multiselect', ['formName' => 'updateForm']);
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa    = $this->getDocument()->getWebAssetManager();
-$input = Factory::getApplication()->getInput();
+$wa    = $doc->getWebAssetManager();
+$input = $app->getInput();
 
 // Enable assets
 $wa->useScript('form.validate')
     ->useScript('keepalive')
+    ->useScript('bootstrap.modal')
+    ->useScript('multiselect')
     ->useScript('com_templates.admin-template-toggle-switch')
     ->useScript('com_templates.admin-templates')
     ->useStyle('com_templates.admin-templates');
@@ -109,7 +114,7 @@
                         <?php echo HTMLHelper::_('form.token'); ?>
                         <p><?php echo Text::_('COM_TEMPLATES_HOME_TEXT'); ?></p>
                         <p>
-                            <a href="https://docs.joomla.org/Special:MyLanguage/J4.x:Template_Overrides" target="_blank" rel="noopener" class="btn btn-primary btn-lg">
+                            <a href="https://guide.joomla.org/user-manual/templates/templates-template-overrides" target="_blank" rel="noopener" class="btn btn-primary btn-lg">
                                 <?php echo Text::_('COM_TEMPLATES_HOME_BUTTON'); ?>
                             </a>
                         </p>
@@ -391,7 +396,7 @@
     $copyModalData = [
         'selector' => $taskName . 'Modal',
         'params'   => [
-            'title'  => Text::_('COM_TEMPLATES_TEMPLATE_' . strtoupper($taskName)),
+            'title'  => Text::_('COM_TEMPLATES_TEMPLATE_' . strtoupper($taskName) . (isset($this->template->xmldata->parent) && (string) $this->template->xmldata->parent !== '' ? '_CHILD' : '')),
             'footer' => $this->loadTemplate('modal_' . $taskName . '_footer')
         ],
         'body' => $this->loadTemplate('modal_' . $taskName . '_body')
diff --git a/administrator/components/com_templates/tmpl/template/default_description.php b/administrator/components/com_templates/tmpl/template/default_description.php
index 8d8f1ca2eb41c..616f37d8b77ec 100644
--- a/administrator/components/com_templates/tmpl/template/default_description.php
+++ b/administrator/components/com_templates/tmpl/template/default_description.php
@@ -27,5 +27,5 @@
     <h2><?php echo ucfirst($this->template->element); ?></h2>
     <?php $client = ApplicationHelper::getClientInfo($this->template->client_id); ?>
     <p><?php $this->template->xmldata = TemplatesHelper::parseXMLTemplateFile($client->path, $this->template->element); ?></p>
-    <p><?php echo Text::_($this->template->xmldata->get('description')); ?></p>
+    <p><?php echo Text::_($this->template->xmldata->description); ?></p>
 </div>
diff --git a/administrator/components/com_templates/tmpl/template/default_modal_copy_footer.php b/administrator/components/com_templates/tmpl/template/default_modal_copy_footer.php
index 17d0f3f17a4de..6d53da8526b4b 100644
--- a/administrator/components/com_templates/tmpl/template/default_modal_copy_footer.php
+++ b/administrator/components/com_templates/tmpl/template/default_modal_copy_footer.php
@@ -14,4 +14,4 @@
 
 ?>
 <button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_CLOSE'); ?></button>
-<button type="submit" class="btn btn-primary"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_COPY'); ?></button>
+<button type="submit" class="btn btn-primary"><?php echo Text::_('COM_TEMPLATES_TEMPLATE_COPY' . (isset($this->template->xmldata->parent) && (string) $this->template->xmldata->parent !== '' ? '_CHILD' : '')); ?></button>
diff --git a/administrator/components/com_templates/tmpl/templates/default.php b/administrator/components/com_templates/tmpl/templates/default.php
index a15338f9455f5..aafcd5c299b74 100644
--- a/administrator/components/com_templates/tmpl/templates/default.php
+++ b/administrator/components/com_templates/tmpl/templates/default.php
@@ -98,21 +98,21 @@
                                     <?php endif; ?>
                                 </th>
                                 <td class="small d-none d-md-table-cell text-center">
-                                    <?php echo $this->escape($item->xmldata->get('version')); ?>
+                                    <?php echo $this->escape($item->xmldata->version); ?>
                                 </td>
                                 <td class="small d-none d-md-table-cell text-center">
-                                    <?php echo $this->escape($item->xmldata->get('creationDate')); ?>
+                                    <?php echo $this->escape($item->xmldata->creationDate); ?>
                                 </td>
                                 <td class="d-none d-md-table-cell text-center">
-                                    <?php if ($author = $item->xmldata->get('author')) : ?>
+                                    <?php if ($author = $item->xmldata->author) : ?>
                                         <div><?php echo $this->escape($author); ?></div>
                                     <?php else : ?>
                                         &mdash;
                                     <?php endif; ?>
-                                    <?php if ($email = $item->xmldata->get('authorEmail')) : ?>
+                                    <?php if ($email = $item->xmldata->authorEmail) : ?>
                                         <div><?php echo $this->escape($email); ?></div>
                                     <?php endif; ?>
-                                    <?php if ($url = $item->xmldata->get('authorUrl')) : ?>
+                                    <?php if ($url = $item->xmldata->authorUrl) : ?>
                                         <div><a href="<?php echo $this->escape($url); ?>"><?php echo $this->escape($url); ?></a></div>
                                     <?php endif; ?>
                                 </td>
@@ -137,9 +137,7 @@
 
                 <?php endif; ?>
 
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_users/config.xml b/administrator/components/com_users/config.xml
index 025629b98fc6c..652a307306e2a 100644
--- a/administrator/components/com_users/config.xml
+++ b/administrator/components/com_users/config.xml
@@ -124,7 +124,7 @@
 			label="COM_USERS_CONFIG_FIELD_DOMAINS_LABEL"
 			hiddenLabel="true"
 			multiple="true"
-			layout="joomla.form.field.subform.repeatable-table"
+			layout="joomla.form.field.subform.repeatable-grid"
 			formsource="administrator/components/com_users/forms/config_domain.xml"
 		/>
 	</fieldset>
@@ -258,7 +258,6 @@
 			label="COM_USERS_CONFIG_NEVERMFAUSERGROUPS_LABEL"
 			description="COM_USERS_CONFIG_NEVERMFAUSERGROUPS_DESC"
 			layout="joomla.form.field.list-fancy-select"
-			checksuperusergroup="1"
 			default=""
 			multiple="1"
 			>
@@ -271,7 +270,6 @@
 			label="COM_USERS_CONFIG_FORCEMFAUSERGROUPS_LABEL"
 			description="COM_USERS_CONFIG_FORCEMFAUSERGROUPS_DESC"
 			layout="joomla.form.field.list-fancy-select"
-			checksuperusergroup="1"
 			default=""
 			multiple="1"
 			>
diff --git a/administrator/components/com_users/helpers/debug.php b/administrator/components/com_users/helpers/debug.php
index b9a25cd50064c..88857a20cdc38 100644
--- a/administrator/components/com_users/helpers/debug.php
+++ b/administrator/components/com_users/helpers/debug.php
@@ -21,7 +21,7 @@
  *
  * @since       1.6
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Users\Administrator\Helper\DebugHelper instead
  */
 class UsersHelperDebug extends DebugHelper
diff --git a/administrator/components/com_users/helpers/users.php b/administrator/components/com_users/helpers/users.php
index 8e15208d23858..521dc31a39ee8 100644
--- a/administrator/components/com_users/helpers/users.php
+++ b/administrator/components/com_users/helpers/users.php
@@ -19,7 +19,7 @@
  *
  * @since       1.6
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Users\Administrator\Helper\UsersHelper instead
  */
 class UsersHelper extends \Joomla\Component\Users\Administrator\Helper\UsersHelper
diff --git a/administrator/components/com_users/postinstall/multifactorauth.php b/administrator/components/com_users/postinstall/multifactorauth.php
index d1ca2b0f46c21..aecf8858b059c 100644
--- a/administrator/components/com_users/postinstall/multifactorauth.php
+++ b/administrator/components/com_users/postinstall/multifactorauth.php
@@ -44,7 +44,7 @@ function com_users_postinstall_mfa_action(): void
     $db             = Factory::getContainer()->get(DatabaseInterface::class);
     $coreMfaPlugins = ['email', 'totp', 'webauthn', 'yubikey'];
 
-    $query = $db->getQuery(true)
+    $query = $db->createQuery()
         ->update($db->quoteName('#__extensions'))
         ->set($db->quoteName('enabled') . ' = 1')
         ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
diff --git a/administrator/components/com_users/src/Controller/CaptiveController.php b/administrator/components/com_users/src/Controller/CaptiveController.php
index 3d47fda0f1c0b..35ec3478803ff 100644
--- a/administrator/components/com_users/src/Controller/CaptiveController.php
+++ b/administrator/components/com_users/src/Controller/CaptiveController.php
@@ -153,7 +153,7 @@ public function validate($cachable = false, $urlparameters = [])
 
         if (!$model->checkTryLimit($record)) {
             // The try limit is reached, show error and return
-            $captiveURL = Route::_('index.php?option=com_users&view=captive&task=select', false);
+            $captiveURL = Route::_('index.php?option=com_users&view=captive&task=captive.select', false);
             $message    = Text::_('COM_USERS_MFA_TRY_LIMIT_REACHED');
             $this->setRedirect($captiveURL, $message, 'error');
 
diff --git a/administrator/components/com_users/src/Controller/UserController.php b/administrator/components/com_users/src/Controller/UserController.php
index 390753331d231..83827ec9a142a 100644
--- a/administrator/components/com_users/src/Controller/UserController.php
+++ b/administrator/components/com_users/src/Controller/UserController.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
+use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 
@@ -160,4 +161,36 @@ public function batch($model = null)
     protected function postSaveHook(BaseDatabaseModel $model, $validData = [])
     {
     }
+
+    /**
+     * Get the XHR request to activate a user
+     * js: media/com_users/js/activate-user-send-email
+     *
+     * @return void
+     *
+     * @since  6.0.0
+     */
+    public function active(): void
+    {
+        $this->checkToken();
+
+        // Get the ID of the user
+        $userId = $this->input->getString('userid', '');
+
+        // Prepare the default response
+        $responseError   = false;
+        $responseMessage = null;
+
+        // Set the model
+        $model = $this->getModel('User', 'Administrator', []);
+
+        // Activate the user and send the email
+        if (!$model->activate($userId)) {
+            $responseError = true;
+        }
+
+        $responseMessage = \Joomla\CMS\Factory::getApplication()->getMessageQueue();
+
+        echo new JsonResponse(null, $responseMessage, $responseError);
+    }
 }
diff --git a/administrator/components/com_users/src/Controller/UsersController.php b/administrator/components/com_users/src/Controller/UsersController.php
index 9840b5708dd2e..5024b3de5bdb8 100644
--- a/administrator/components/com_users/src/Controller/UsersController.php
+++ b/administrator/components/com_users/src/Controller/UsersController.php
@@ -11,12 +11,12 @@
 namespace Joomla\Component\Users\Administrator\Controller;
 
 use Joomla\CMS\Application\CMSApplication;
-use Joomla\CMS\Input\Input;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Response\JsonResponse;
+use Joomla\Input\Input;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -39,7 +39,7 @@ class UsersController extends AdminController
     /**
      * Constructor.
      *
-     * @param   array                $config   An optional associative array of configuration settings.
+     * @param   array                 $config   An optional associative array of configuration settings.
      * @param   ?MVCFactoryInterface  $factory  The factory.
      * @param   ?CMSApplication       $app      The CMSApplication for the dispatcher
      * @param   ?Input                $input    Input
diff --git a/administrator/components/com_users/src/Dispatcher/Dispatcher.php b/administrator/components/com_users/src/Dispatcher/Dispatcher.php
index f32aa23a36a34..8e41ea41dfe99 100644
--- a/administrator/components/com_users/src/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_users/src/Dispatcher/Dispatcher.php
@@ -34,16 +34,11 @@ protected function checkAccess()
     {
         $task         = $this->input->getCmd('task');
         $view         = $this->input->getCmd('view');
-        $layout       = $this->input->getCmd('layout');
-        $allowedTasks = ['user.edit', 'user.apply', 'user.save', 'user.cancel'];
 
-        // If the user editing layout is called, we assume its the user.edit task
-        if (!$task && $view === 'user' && $layout === 'edit') {
-            $task = 'user.edit';
-        }
+        $allowedTasks = ['user.edit', 'user.apply', 'user.save', 'user.cancel'];
 
         // Allow users to edit their own account
-        if (\in_array($task, $allowedTasks, true) || ($view === 'user' && $layout === 'edit')) {
+        if (\in_array($task, $allowedTasks, true) || (\in_array($view, ['user']) && !$task)) {
             $user = $this->app->getIdentity();
             $id   = $this->input->getInt('id');
 
@@ -60,16 +55,13 @@ protected function checkAccess()
          * are trying to modify. Implementing these checks in the Dispatcher would violate the
          * separation of concerns.
          */
-        $allowedViews  = ['callback', 'captive', 'method', 'methods'];
-        $isAllowedTask = array_reduce(
-            $allowedViews,
-            function ($carry, $taskPrefix) use ($task) {
-                return $carry || str_starts_with($task ?? '', $taskPrefix . '.');
-            },
-            false
-        );
+        $allowedTasks =  [
+            'captive.captive', 'captive.validate', 'callback.callback', 'captive.select',
+            'method.add', 'method.edit', 'method.regenerateBackupCodes', 'method.delete', 'method.save',
+            'methods.display', 'methods.disable', 'methods.doNotShowThisAgain',
+        ];
 
-        if (\in_array(strtolower($view ?? ''), $allowedViews) || $isAllowedTask) {
+        if (\in_array($task, $allowedTasks) || (\in_array($view, ['captive', 'methods', 'method']) && !$task)) {
             return;
         }
 
diff --git a/administrator/components/com_users/src/Helper/DebugHelper.php b/administrator/components/com_users/src/Helper/DebugHelper.php
index dda89bf802f11..718a70b64730b 100644
--- a/administrator/components/com_users/src/Helper/DebugHelper.php
+++ b/administrator/components/com_users/src/Helper/DebugHelper.php
@@ -38,7 +38,7 @@ public static function getComponents()
     {
         // Initialise variable.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('name AS text, element AS value')
             ->from('#__extensions')
             ->where('enabled >= 1')
diff --git a/administrator/components/com_users/src/Helper/Mfa.php b/administrator/components/com_users/src/Helper/Mfa.php
index 5dbaa0734d931..ea4e4ca4e1195 100644
--- a/administrator/components/com_users/src/Helper/Mfa.php
+++ b/administrator/components/com_users/src/Helper/Mfa.php
@@ -264,7 +264,7 @@ public static function getUserMfaRecords(?int $userId): array
 
         /** @var DatabaseInterface $db */
         $db    = Factory::getContainer()->get(DatabaseInterface::class);
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__user_mfa'))
             ->where($db->quoteName('user_id') . ' = :user_id')
diff --git a/administrator/components/com_users/src/Helper/UsersHelper.php b/administrator/components/com_users/src/Helper/UsersHelper.php
index f727cf60bec77..d961af51653bb 100644
--- a/administrator/components/com_users/src/Helper/UsersHelper.php
+++ b/administrator/components/com_users/src/Helper/UsersHelper.php
@@ -125,7 +125,7 @@ public static function getRangeOptions()
      * @since   3.2.0
      * @throws  \Exception
      *
-     * @deprecated  4.2 will be removed in 6.0
+     * @deprecated  4.2 will be removed in 7.0
      *              No longer used, will be removed without replacement
      */
     public static function getTwoFactorMethods()
@@ -151,7 +151,7 @@ public static function getVisibleByGroups($rules)
         }
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title', 'text'))
             ->from($db->quoteName('#__usergroups'))
             ->whereIn($db->quoteName('id'), $rules);
@@ -174,7 +174,7 @@ public static function getVisibleByGroups($rules)
      * @since       3.7.0
      * @throws      \Exception
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use \Joomla\Component\Users\Administrator\Extension\UsersComponent::validateSection() instead.
      */
     public static function validateSection($section)
@@ -189,7 +189,7 @@ public static function validateSection($section)
      *
      * @since       3.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use \Joomla\Component\Users\Administrator\Extension\UsersComponent::getContexts() instead.
      */
     public static function getContexts()
diff --git a/administrator/components/com_users/src/Model/BackupcodesModel.php b/administrator/components/com_users/src/Model/BackupcodesModel.php
index 33271b4f73c99..aff8effd799a1 100644
--- a/administrator/components/com_users/src/Model/BackupcodesModel.php
+++ b/administrator/components/com_users/src/Model/BackupcodesModel.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Users\Administrator\Model;
 
-use Joomla\CMS\Crypt\Crypt;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
@@ -259,7 +258,7 @@ public function isBackupCode($code, ?User $user = null): bool
         }
 
         for ($i = 0; $i < $restLength; $i++) {
-            if (Crypt::timingSafeCompare($temp1[$i], $code)) {
+            if (hash_equals($temp1[$i], $code)) {
                 $otherResult  = $otherResult || true;
                 $newArray[]   = '';
                 $dummyArray[] = $temp1[$i];
diff --git a/administrator/components/com_users/src/Model/DebuggroupModel.php b/administrator/components/com_users/src/Model/DebuggroupModel.php
index ad28a6009cce7..e458f20356b38 100644
--- a/administrator/components/com_users/src/Model/DebuggroupModel.php
+++ b/administrator/components/com_users/src/Model/DebuggroupModel.php
@@ -177,7 +177,7 @@ public function getGroup()
         $groupId = (int) $this->getState('group_id');
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'title']))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('id') . ' = :id')
@@ -207,7 +207,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
diff --git a/administrator/components/com_users/src/Model/DebuguserModel.php b/administrator/components/com_users/src/Model/DebuguserModel.php
index 5766b292aa5aa..190b4b011a8ea 100644
--- a/administrator/components/com_users/src/Model/DebuguserModel.php
+++ b/administrator/components/com_users/src/Model/DebuguserModel.php
@@ -196,7 +196,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
diff --git a/administrator/components/com_users/src/Model/GroupModel.php b/administrator/components/com_users/src/Model/GroupModel.php
index bcb16170e0977..17ca3f701cc55 100644
--- a/administrator/components/com_users/src/Model/GroupModel.php
+++ b/administrator/components/com_users/src/Model/GroupModel.php
@@ -18,7 +18,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\AdminModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
 use Joomla\String\StringHelper;
@@ -84,20 +83,14 @@ public function getTable($type = 'Usergroup', $prefix = 'Joomla\\CMS\\Table\\',
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|bool  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_users.group', 'group', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_users.group', 'group', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -136,7 +129,7 @@ protected function loadFormData()
      */
     protected function preprocessForm(Form $form, $data, $group = '')
     {
-        $obj = \is_array($data) ? ArrayHelper::toObject($data, CMSObject::class) : $data;
+        $obj = \is_array($data) ? ArrayHelper::toObject($data) : $data;
 
         if (isset($obj->parent_id) && $obj->parent_id == 0 && $obj->id > 0) {
             $form->setFieldAttribute('parent_id', 'type', 'hidden');
diff --git a/administrator/components/com_users/src/Model/GroupsModel.php b/administrator/components/com_users/src/Model/GroupsModel.php
index 868c02229d4d1..8606f17f644b8 100644
--- a/administrator/components/com_users/src/Model/GroupsModel.php
+++ b/administrator/components/com_users/src/Model/GroupsModel.php
@@ -140,7 +140,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
@@ -195,7 +195,7 @@ private function populateExtraData(array $items)
         $db = $this->getDatabase();
 
         // Get total enabled users in group.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Count the objects in the user group.
         $query->select('map.group_id, COUNT(DISTINCT map.user_id) AS user_count')
diff --git a/administrator/components/com_users/src/Model/LevelModel.php b/administrator/components/com_users/src/Model/LevelModel.php
index 398309e41fff6..04321b8216976 100644
--- a/administrator/components/com_users/src/Model/LevelModel.php
+++ b/administrator/components/com_users/src/Model/LevelModel.php
@@ -18,6 +18,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Table\Table;
+use Joomla\String\StringHelper;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -52,7 +53,7 @@ public function delete(&$pks)
             if ($table->load($pk)) {
                 // Check if the access level is being used.
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('DISTINCT access');
 
                 // Get all tables that have the access field
@@ -189,20 +190,14 @@ public function getItem($pk = null)
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|bool  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_users.level', 'level', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_users.level', 'level', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -262,9 +257,36 @@ public function save($data)
 
         $data['title'] = InputFilter::getInstance()->clean($data['title'], 'TRIM');
 
+        if (Factory::getApplication()->getInput()->get('task') === 'save2copy') {
+            $data['title'] = $this->generateLevelTitle($data['title']);
+        }
+
         return parent::save($data);
     }
 
+    /**
+     * Method to generate the title of access level on Save as Copy action
+     *
+     * @param   string  $title  The title of the access level
+     *
+     * @return  string  Contains the modified title.
+     *
+     * @since   6.2.0
+     */
+    protected function generateLevelTitle($title)
+    {
+        // Alter the title
+        $table = $this->getTable();
+
+        while ($table->load(['title' => $title])) {
+            if ($title === $table->title) {
+                $title = StringHelper::increment($title);
+            }
+        }
+
+        return $title;
+    }
+
     /**
      * Method to validate the form data.
      *
diff --git a/administrator/components/com_users/src/Model/LevelsModel.php b/administrator/components/com_users/src/Model/LevelsModel.php
index a00d3376773ff..5c8de890426da 100644
--- a/administrator/components/com_users/src/Model/LevelsModel.php
+++ b/administrator/components/com_users/src/Model/LevelsModel.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\ViewLevel;
 use Joomla\Database\ParameterType;
 use Joomla\Database\QueryInterface;
 
@@ -102,7 +102,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
@@ -154,7 +154,7 @@ public function reorder($pk, $direction = 0)
         $user = $this->getCurrentUser();
 
         // Get an instance of the record's table.
-        $table = Table::getInstance('ViewLevel', 'Joomla\\CMS\Table\\');
+        $table = new ViewLevel($this->getDatabase());
 
         // Load the row.
         if (!$table->load($pk)) {
@@ -191,7 +191,7 @@ public function reorder($pk, $direction = 0)
      */
     public function saveorder($pks, $order)
     {
-        $table      = Table::getInstance('viewlevel', 'Joomla\\CMS\Table\\');
+        $table      = new ViewLevel($this->getDatabase());
         $user       = $this->getCurrentUser();
         $conditions = [];
 
diff --git a/administrator/components/com_users/src/Model/MailModel.php b/administrator/components/com_users/src/Model/MailModel.php
index 34562773f20f2..1b1047ea8fb5d 100644
--- a/administrator/components/com_users/src/Model/MailModel.php
+++ b/administrator/components/com_users/src/Model/MailModel.php
@@ -15,9 +15,13 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\Database\ParameterType;
@@ -32,28 +36,25 @@
  *
  * @since  1.6
  */
-class MailModel extends AdminModel
+class MailModel extends AdminModel implements MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
+
     /**
      * Method to get the row form.
      *
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form    A Form object on success, false on failure
+     * @return  Form    A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_users.mail', 'mail', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_users.mail', 'mail', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -136,7 +137,7 @@ public function send()
         } else {
             // Get all users email and group except for senders
             $uid   = (int) $user->id;
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('email'),
@@ -173,7 +174,12 @@ public function send()
         }
 
         // Get the Mailer
-        $mailer = new MailTemplate('com_users.massmail.mail', $language->getTag());
+        $mailer = new MailTemplate(
+            'com_users.massmail.mail',
+            $language->getTag(),
+            $this->getMailerFactory()->createMailer(),
+            $this->getLanguageFactory()
+        );
         $params = ComponentHelper::getParams('com_users');
 
         try {
diff --git a/administrator/components/com_users/src/Model/MethodsModel.php b/administrator/components/com_users/src/Model/MethodsModel.php
index 0efe426b28c1c..542f77c7d66e3 100644
--- a/administrator/components/com_users/src/Model/MethodsModel.php
+++ b/administrator/components/com_users/src/Model/MethodsModel.php
@@ -97,7 +97,7 @@ public function deleteAll(?User $user = null): void
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__user_mfa'))
             ->where($db->quoteName('user_id') . ' = :user_id')
             ->bind(':user_id', $user->id, ParameterType::INTEGER);
@@ -187,7 +187,7 @@ public function setFlag(User $user, bool $flag = true): void
     {
         $db         = $this->getDatabase();
         $profileKey = 'mfa.dontshow';
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->select($db->quoteName('profile_value'))
             ->from($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = :user_id')
diff --git a/administrator/components/com_users/src/Model/NoteModel.php b/administrator/components/com_users/src/Model/NoteModel.php
index 6573c0fbecae2..c0110e56ec394 100644
--- a/administrator/components/com_users/src/Model/NoteModel.php
+++ b/administrator/components/com_users/src/Model/NoteModel.php
@@ -10,9 +10,12 @@
 
 namespace Joomla\Component\Users\Administrator\Model;
 
+use Joomla\CMS\Event\Model\PrepareDataEvent;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Versioning\VersionableModelInterface;
 use Joomla\CMS\Versioning\VersionableModelTrait;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -24,7 +27,7 @@
  *
  * @since  2.5
  */
-class NoteModel extends AdminModel
+class NoteModel extends AdminModel implements VersionableModelInterface
 {
     use VersionableModelTrait;
 
@@ -42,20 +45,14 @@ class NoteModel extends AdminModel
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form|bool  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   2.5
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_users.note', 'note', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_users.note', 'note', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -73,13 +70,17 @@ public function getItem($pk = null)
         $result = parent::getItem($pk);
 
         // Get the dispatcher and load the content plugins.
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         // Load the user plugins for backward compatibility (v3.3.3 and earlier).
-        PluginHelper::importPlugin('user');
+        PluginHelper::importPlugin('user', null, true, $dispatcher);
 
         // Trigger the data preparation event.
-        Factory::getApplication()->triggerEvent('onContentPrepareData', ['com_users.note', $result]);
+        $dispatcher->dispatch('onContentPrepareData', new PrepareDataEvent('onContentPrepareData', [
+            'context' => 'com_users.note',
+            'data'    => $result,
+        ]));
 
         return $result;
     }
@@ -105,7 +106,7 @@ protected function loadFormData()
 
             // Prime some default values.
             if ($this->getState('note.id') == 0) {
-                $data->set('catid', $app->getInput()->get('catid', $app->getUserState('com_users.notes.filter.category_id'), 'int'));
+                $data->catid = $app->getInput()->get('catid', $app->getUserState('com_users.notes.filter.category_id'), 'int');
             }
 
             $userId = $app->getInput()->get('u_id', 0, 'int');
diff --git a/administrator/components/com_users/src/Model/NotesModel.php b/administrator/components/com_users/src/Model/NotesModel.php
index 311eed443982b..62d65740b04ef 100644
--- a/administrator/components/com_users/src/Model/NotesModel.php
+++ b/administrator/components/com_users/src/Model/NotesModel.php
@@ -69,7 +69,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
diff --git a/administrator/components/com_users/src/Model/UserModel.php b/administrator/components/com_users/src/Model/UserModel.php
index a11f59afc45a1..bfd3913c1c2c1 100644
--- a/administrator/components/com_users/src/Model/UserModel.php
+++ b/administrator/components/com_users/src/Model/UserModel.php
@@ -12,10 +12,19 @@
 
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\User\AfterDeleteEvent;
+use Joomla\CMS\Event\User\AfterSaveEvent;
+use Joomla\CMS\Event\User\BeforeDeleteEvent;
+use Joomla\CMS\Event\User\BeforeSaveEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
+use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -35,9 +44,11 @@
  *
  * @since  1.6
  */
-class UserModel extends AdminModel implements UserFactoryAwareInterface
+class UserModel extends AdminModel implements UserFactoryAwareInterface, MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * An item.
@@ -119,19 +130,16 @@ public function getItem($pk = null)
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|bool  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
         // Get the form.
         $form = $this->loadForm('com_users.user', 'user', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         $user = $this->getCurrentUser();
 
         // If the user needs to change their password, mark the password fields as required
@@ -224,9 +232,8 @@ protected function preprocessForm(Form $form, $data, $group = 'user')
      */
     public function save($data)
     {
-        $pk   = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('user.id');
-        $user = $this->getUserFactory()->loadUserById($pk);
-
+        $pk            = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('user.id');
+        $user          = $this->getUserFactory()->loadUserById($pk);
         $my            = $this->getCurrentUser();
         $iAmSuperAdmin = $my->authorise('core.admin');
 
@@ -292,7 +299,7 @@ public function save($data)
         }
 
         // Destroy all active sessions for the user after changing the password or blocking him
-        if (!empty($data['password2']) || $data['block']) {
+        if (!empty($data['password2']) || !empty($data['block'])) {
             UserHelper::destroyUserSessions($user->id, true);
         }
 
@@ -320,7 +327,8 @@ public function delete(&$pks)
         // Check if I am a Super Admin
         $iAmSuperAdmin = $user->authorise('core.admin');
 
-        PluginHelper::importPlugin($this->events_map['delete']);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['delete'], null, true, $dispatcher);
 
         if (\in_array($user->id, $pks)) {
             $this->setError(Text::_('COM_USERS_USERS_ERROR_CANNOT_DELETE_SELF'));
@@ -342,7 +350,12 @@ public function delete(&$pks)
                     $user_to_delete = $this->getUserFactory()->loadUserById($pk);
 
                     // Fire the before delete event.
-                    Factory::getApplication()->triggerEvent($this->event_before_delete, [$table->getProperties()]);
+                    $dispatcher->dispatch(
+                        $this->event_before_delete,
+                        new BeforeDeleteEvent($this->event_before_delete, [
+                            'subject' => $table->getProperties(),
+                        ])
+                    );
 
                     if (!$table->delete($pk)) {
                         $this->setError($table->getError());
@@ -351,7 +364,14 @@ public function delete(&$pks)
                     }
 
                     // Trigger the after delete event.
-                    Factory::getApplication()->triggerEvent($this->event_after_delete, [ArrayHelper::fromObject($user_to_delete, false), true, $this->getError()]);
+                    $dispatcher->dispatch(
+                        $this->event_after_delete,
+                        new AfterDeleteEvent($this->event_after_delete, [
+                            'subject'        => ArrayHelper::fromObject($user_to_delete, false),
+                            'deletingResult' => true,
+                            'errorMessage'   => $this->getError(),
+                        ])
+                    );
                 } else {
                     // Prune items that you can't change.
                     unset($pks[$i]);
@@ -380,15 +400,16 @@ public function delete(&$pks)
      */
     public function block(&$pks, $value = 1)
     {
-        $app        = Factory::getApplication();
-        $user       = $this->getCurrentUser();
+        $app  = Factory::getApplication();
+        $user = $this->getCurrentUser();
 
         // Check if I am a Super Admin
         $iAmSuperAdmin = $user->authorise('core.admin');
         $table         = $this->getTable();
         $pks           = (array) $pks;
 
-        PluginHelper::importPlugin($this->events_map['save']);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['save'], null, true, $dispatcher);
 
         // Prepare the logout options.
         $options = [
@@ -431,7 +452,14 @@ public function block(&$pks, $value = 1)
                         }
 
                         // Trigger the before save event.
-                        $result = Factory::getApplication()->triggerEvent($this->event_before_save, [$old, false, $table->getProperties()]);
+                        $result = $dispatcher->dispatch(
+                            $this->event_before_save,
+                            new BeforeSaveEvent($this->event_before_save, [
+                                'subject' => $old,
+                                'isNew'   => false,
+                                'data'    => $table->getProperties(),
+                            ])
+                        )->getArgument('result', []);
 
                         if (\in_array(false, $result, true)) {
                             // Plugin will have to raise its own error or throw an exception.
@@ -450,7 +478,12 @@ public function block(&$pks, $value = 1)
                         }
 
                         // Trigger the after save event
-                        Factory::getApplication()->triggerEvent($this->event_after_save, [$table->getProperties(), false, true, null]);
+                        $dispatcher->dispatch($this->event_after_save, new AfterSaveEvent($this->event_after_save, [
+                            'subject'      => $table->getProperties(),
+                            'isNew'        => false,
+                            'savingResult' => true,
+                            'errorMessage' => null,
+                        ]));
                     } catch (\Exception $e) {
                         $this->setError($e->getMessage());
 
@@ -484,26 +517,86 @@ public function block(&$pks, $value = 1)
      */
     public function activate(&$pks)
     {
-        $user = $this->getCurrentUser();
+        $app  = Factory::getApplication();
+        $user = $app->getIdentity();
 
-        // Check if I am a Super Admin
+        // Check if I am a super admin
         $iAmSuperAdmin = $user->authorise('core.admin');
-        $table         = $this->getTable();
-        $pks           = (array) $pks;
 
-        PluginHelper::importPlugin($this->events_map['save']);
+        // Load user table
+        $table = $this->getTable();
+        $pks   = (array) $pks;
 
-        // Access checks.
+        // Compile the user activated notification mail default values.
+        $mailData             = [];
+        $mailData['siteurl']  = \Joomla\CMS\Uri\Uri::root();
+        $mailData['fromname'] = $app->get('fromname');
+        $mailData['mailfrom'] = $app->get('mailfrom');
+        $mailData['sitename'] = $app->get('sitename');
+
+        // Load com_users site language strings, the mail template use it
+        $app->getLanguage()->load('com_users', JPATH_SITE);
+
+        $sendMailTo = function ($userData) use ($app, $mailData) {
+            $mailData['name']     = $userData['name'];
+            $mailData['username'] = $userData['username'];
+
+            // Use the default language
+            $langTag = ComponentHelper::getParams('com_languages')->get('site', 'en-GB');
+
+            $mailer = new MailTemplate(
+                'com_users.registration.user.admin_activated',
+                $langTag,
+                $this->getMailerFactory()->createMailer(),
+                $this->getLanguageFactory()
+            );
+            $mailer->addTemplateData($mailData);
+            $mailer->addRecipient($userData['email']);
+
+            try {
+                $return = $mailer->send();
+            } catch (\Exception $exception) {
+                try {
+                    \Joomla\CMS\Log\Log::add(Text::_($exception->getMessage()), \Joomla\CMS\Log\Log::WARNING, 'jerror');
+
+                    $return = false;
+                } catch (\RuntimeException $exception) {
+                    $app->enqueueMessage(Text::_($exception->errorMessage()), $app::MSG_WARNING);
+
+                    $return = false;
+                }
+            }
+
+            // Check for an error.
+            if ($return !== true) {
+                $app->enqueueMessage(Text::_('COM_USERS_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED'), $app::MSG_WARNING);
+
+                return false;
+            }
+
+            $app->enqueueMessage(Text::_('COM_USERS_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_SUCCESS'), $app::MSG_INFO);
+            return true;
+        };
+
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($this->events_map['save'], null, true, $dispatcher);
+
+        // Activate and send the notification email
         foreach ($pks as $i => $pk) {
             if ($table->load($pk)) {
-                $old   = $table->getProperties();
-                $allow = $user->authorise('core.edit.state', 'com_users');
+                $prevUserData = $table->getProperties();
+                $allow        = $user->authorise('core.edit.state', 'com_users');
 
-                // Don't allow non-super-admin to delete a super admin
+                // Don't allow non-super-admin to edit the active status of a super admin
                 $allow = (!$iAmSuperAdmin && Access::check($pk, 'core.admin')) ? false : $allow;
 
+                // Ignore activated accounts but check if we can still
+                // resend the notification email
                 if (empty($table->activation)) {
-                    // Ignore activated accounts.
+                    if (\is_null($table->lastvisitDate)) {
+                        $sendMailTo($prevUserData);
+                    }
+
                     unset($pks[$i]);
                 } elseif ($allow) {
                     $table->block      = 0;
@@ -518,7 +611,15 @@ public function activate(&$pks)
                         }
 
                         // Trigger the before save event.
-                        $result = Factory::getApplication()->triggerEvent($this->event_before_save, [$old, false, $table->getProperties()]);
+                        $result = $dispatcher->dispatch(
+                            $this->event_before_save,
+                            new BeforeSaveEvent($this->event_before_save, [
+                                'subject' => $prevUserData,
+                                'isNew'   => false,
+                                'data'    => $table->getProperties(),
+                            ])
+                        )->getArgument('result', []);
+
 
                         if (\in_array(false, $result, true)) {
                             // Plugin will have to raise it's own error or throw an exception.
@@ -533,7 +634,17 @@ public function activate(&$pks)
                         }
 
                         // Fire the after save event
-                        Factory::getApplication()->triggerEvent($this->event_after_save, [$table->getProperties(), false, true, null]);
+                        $dispatcher->dispatch($this->event_after_save, new AfterSaveEvent($this->event_after_save, [
+                            'subject'      => $table->getProperties(),
+                            'isNew'        => false,
+                            'savingResult' => true,
+                            'errorMessage' => null,
+                        ]));
+
+                        // Send the email
+                        if (!$sendMailTo($prevUserData)) {
+                            return false;
+                        }
                     } catch (\Exception $e) {
                         $this->setError($e->getMessage());
 
@@ -542,7 +653,7 @@ public function activate(&$pks)
                 } else {
                     // Prune items that you can't change.
                     unset($pks[$i]);
-                    Factory::getApplication()->enqueueMessage(Text::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), 'error');
+                    $app->enqueueMessage(Text::_('JLIB_APPLICATION_ERROR_EDITSTATE_NOT_PERMITTED'), 'error');
                 }
             }
         }
@@ -662,7 +773,7 @@ public function batchReset($userIds, $action)
 
         $userIds = ArrayHelper::toInteger($userIds);
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Update the reset flag
         $query->update($db->quoteName('#__users'))
@@ -747,12 +858,12 @@ public function batchUser($groupId, $userIds, $action)
         // Remove the users from the group if requested.
         if (isset($doDelete)) {
             /*
-            * First we need to check that the user is part of more than one group
-            * otherwise we will end up with a user that is not part of any group
-            * unless we are moving the user to a new group.
-            */
+             * First we need to check that the user is part of more than one group
+             * otherwise we will end up with a user that is not part of any group
+             * unless we are moving the user to a new group.
+             */
             if ($doDelete === 'group') {
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
                 $query->select($db->quoteName('user_id'))
                     ->from($db->quoteName('#__user_usergroup_map'))
                     ->whereIn($db->quoteName('user_id'), $userIds);
@@ -795,7 +906,7 @@ public function batchUser($groupId, $userIds, $action)
                     ->bind(':group_id', $groupId, ParameterType::INTEGER);
                 $db->setQuery($query);
             } elseif ($doDelete === 'all') {
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
                 $query->delete($db->quoteName('#__user_usergroup_map'))
                     ->whereIn($db->quoteName('user_id'), $userIds);
             }
@@ -812,7 +923,7 @@ public function batchUser($groupId, $userIds, $action)
 
         // Assign the users to the group if requested.
         if (isset($doAssign)) {
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // First, we need to check if the user is already assigned to a group
             $query->select($db->quoteName('user_id'))
@@ -891,8 +1002,8 @@ public function getAssignedGroups($userId = null)
         $userId = (!empty($userId)) ? $userId : (int) $this->getState('user.id');
 
         if (empty($userId)) {
-            $result   = [];
-            $form     = $this->getForm();
+            $result = [];
+            $form   = $this->getForm();
 
             if ($form) {
                 $groupsIDs = $form->getValue('groups');
@@ -923,7 +1034,7 @@ public function getAssignedGroups($userId = null)
      *
      * @since   3.2
      *
-     * @deprecated   4.2 will be removed in 6.0.
+     * @deprecated   4.2 will be removed in 7.0.
      *               Will be removed without replacement
      */
     public function getOtpConfig($userId = null)
@@ -954,7 +1065,7 @@ public function getOtpConfig($userId = null)
      *
      * @since   3.2
      *
-     * @deprecated   4.2 will be removed in 5.0.
+     * @deprecated   4.2 will be removed in 7.0.
      *               Will be removed without replacement
      */
     public function setOtpConfig($userId, $otpConfig)
@@ -977,7 +1088,7 @@ public function setOtpConfig($userId, $otpConfig)
      *
      * @since   3.2
      *
-     * @deprecated   4.2 will be removed in 6.0.
+     * @deprecated   4.2 will be removed in 7.0.
      *               Use \Joomla\CMS\Factory::getApplication()->get('secret') instead'
      */
     public function getOtpConfigEncryptionKey()
@@ -1003,7 +1114,7 @@ public function getOtpConfigEncryptionKey()
      * @since   3.2
      * @throws  \Exception
      *
-     * @deprecated   4.2 will be removed in 5.0.
+     * @deprecated   4.2 will be removed in 7.0.
      *               Will be removed without replacement
      */
     public function getTwofactorform($userId = null)
@@ -1029,7 +1140,7 @@ public function getTwofactorform($userId = null)
      *
      * @since   3.2
      *
-     * @deprecated   4.2 will be removed in 5.0
+     * @deprecated   4.2 will be removed in 7.0
      *               Will be removed without replacement
      */
     public function generateOteps($userId, $count = 10)
@@ -1057,7 +1168,7 @@ public function generateOteps($userId, $count = 10)
      * @since   3.2
      * @throws  \Exception
      *
-     * @deprecated   4.2 will be removed in 5.0
+     * @deprecated   4.2 will be removed in 7.0
      *               Will be removed without replacement
      */
     public function isValidSecretKey($userId, $secretKey, $options = [])
@@ -1084,7 +1195,7 @@ public function isValidSecretKey($userId, $secretKey, $options = [])
      *
      * @since   3.2
      *
-     * @deprecated   4.2 will be removed in 5.0
+     * @deprecated   4.2 will be removed in 7.0
      *               Will be removed without replacement
      */
     public function isValidOtep($userId, $otep, $otpConfig = null)
diff --git a/administrator/components/com_users/src/Model/UsersModel.php b/administrator/components/com_users/src/Model/UsersModel.php
index 587f82482c2a8..c2ef69f501ae1 100644
--- a/administrator/components/com_users/src/Model/UsersModel.php
+++ b/administrator/components/com_users/src/Model/UsersModel.php
@@ -196,7 +196,7 @@ public function getItems()
 
             // Get the counts from the database only for the users in the list.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Join over the group mapping table.
             $query->select('map.user_id, COUNT(map.group_id) AS group_count')
@@ -289,7 +289,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
@@ -303,7 +303,7 @@ protected function getListQuery()
 
         // Include MFA information
         if (PluginHelper::isEnabled('multifactorauth')) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select(
                     [
                         'MIN(' . $db->quoteName('user_id') . ') AS ' . $db->quoteName('uid'),
@@ -575,7 +575,7 @@ private function buildDateRange($range)
                 $dStart->setTime(0, 0, 0);
 
                 // Now change the timezone back to UTC.
-                $tz = new \DateTimeZone('GMT');
+                $tz = new \DateTimeZone('UTC');
                 $dStart->setTimezone($tz);
                 break;
             case 'never':
@@ -597,7 +597,7 @@ private function buildDateRange($range)
     protected function getUserDisplayedGroups($userId)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__usergroups', 'ug'))
             ->join('LEFT', $db->quoteName('#__user_usergroup_map', 'map') . ' ON (ug.id = map.group_id)')
diff --git a/administrator/components/com_users/src/Service/HTML/Users.php b/administrator/components/com_users/src/Service/HTML/Users.php
index 83adfbc60a489..a81dd5fe98ba7 100644
--- a/administrator/components/com_users/src/Service/HTML/Users.php
+++ b/administrator/components/com_users/src/Service/HTML/Users.php
@@ -299,7 +299,7 @@ public function templatestyle($value)
         }
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__template_styles'))
             ->where($db->quoteName('id') . ' = :id')
@@ -403,7 +403,7 @@ public function editor($value)
 
         $db    = Factory::getDbo();
         $lang  = Factory::getLanguage();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('name'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('element') . ' = :element')
diff --git a/administrator/components/com_users/src/Table/MfaTable.php b/administrator/components/com_users/src/Table/MfaTable.php
index c6b3fd7c5c10e..bec60ee2f2203 100644
--- a/administrator/components/com_users/src/Table/MfaTable.php
+++ b/administrator/components/com_users/src/Table/MfaTable.php
@@ -314,7 +314,7 @@ private function switchDefaultRecord(): void
          * user.
          */
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__user_mfa'))
             ->set($db->quoteName('default') . ' = 0')
             ->where($db->quoteName('user_id') . ' = :user_id')
@@ -367,7 +367,7 @@ private function afterDelete($pk): void
              * the `backupcodes` because we might just be regenerating the backup codes.
              */
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__user_mfa'))
                 ->where($db->quoteName('user_id') . ' = :user_id')
                 ->bind(':user_id', $this->deleteFlags[$pk]['user_id'], ParameterType::INTEGER);
@@ -381,7 +381,7 @@ private function afterDelete($pk): void
         // This was the default record. Promote the next available record to default.
         if ($this->deleteFlags[$pk]['default']) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__user_mfa'))
                 ->where($db->quoteName('user_id') . ' = :user_id')
@@ -394,7 +394,7 @@ private function afterDelete($pk): void
             }
 
             $id    = array_shift($ids);
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__user_mfa'))
                 ->set($db->quoteName('default') . ' = 1')
                 ->where($db->quoteName('id') . ' = :id')
@@ -415,7 +415,7 @@ private function afterDelete($pk): void
     private function getNumRecords(int $userId): int
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__user_mfa'))
             ->where($db->quoteName('user_id') . ' = :user_id')
diff --git a/administrator/components/com_users/src/View/Debuggroup/HtmlView.php b/administrator/components/com_users/src/View/Debuggroup/HtmlView.php
index 267231e44defb..7e0ca7e058edc 100644
--- a/administrator/components/com_users/src/View/Debuggroup/HtmlView.php
+++ b/administrator/components/com_users/src/View/Debuggroup/HtmlView.php
@@ -107,6 +107,11 @@ public function display($tpl = null)
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_users/src/View/Debuguser/HtmlView.php b/administrator/components/com_users/src/View/Debuguser/HtmlView.php
index 4c833ca2c364f..572667a30e257 100644
--- a/administrator/components/com_users/src/View/Debuguser/HtmlView.php
+++ b/administrator/components/com_users/src/View/Debuguser/HtmlView.php
@@ -107,6 +107,11 @@ public function display($tpl = null)
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_users/src/View/Group/HtmlView.php b/administrator/components/com_users/src/View/Group/HtmlView.php
index 6e7fed5737c36..8f4554368b8d6 100644
--- a/administrator/components/com_users/src/View/Group/HtmlView.php
+++ b/administrator/components/com_users/src/View/Group/HtmlView.php
@@ -83,6 +83,10 @@ public function display($tpl = null)
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         $this->addToolbar();
         parent::display($tpl);
     }
diff --git a/administrator/components/com_users/src/View/Groups/HtmlView.php b/administrator/components/com_users/src/View/Groups/HtmlView.php
index 27eaef554984b..07cbc25beedb8 100644
--- a/administrator/components/com_users/src/View/Groups/HtmlView.php
+++ b/administrator/components/com_users/src/View/Groups/HtmlView.php
@@ -87,6 +87,11 @@ public function display($tpl = null)
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
         parent::display($tpl);
     }
diff --git a/administrator/components/com_users/src/View/Level/HtmlView.php b/administrator/components/com_users/src/View/Level/HtmlView.php
index 239b653d82c76..b0821a7334bad 100644
--- a/administrator/components/com_users/src/View/Level/HtmlView.php
+++ b/administrator/components/com_users/src/View/Level/HtmlView.php
@@ -74,6 +74,10 @@ public function display($tpl = null)
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         $this->addToolbar();
         parent::display($tpl);
     }
diff --git a/administrator/components/com_users/src/View/Levels/HtmlView.php b/administrator/components/com_users/src/View/Levels/HtmlView.php
index 5ce9a9ff6b535..ca36fb0755a52 100644
--- a/administrator/components/com_users/src/View/Levels/HtmlView.php
+++ b/administrator/components/com_users/src/View/Levels/HtmlView.php
@@ -87,6 +87,11 @@ public function display($tpl = null)
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
         parent::display($tpl);
     }
diff --git a/administrator/components/com_users/src/View/Mail/HtmlView.php b/administrator/components/com_users/src/View/Mail/HtmlView.php
index 501aacf8a7880..646e2edd23778 100644
--- a/administrator/components/com_users/src/View/Mail/HtmlView.php
+++ b/administrator/components/com_users/src/View/Mail/HtmlView.php
@@ -57,6 +57,10 @@ public function display($tpl = null)
         // Get data from the model
         $this->form = $model->getForm();
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         $this->addToolbar();
         parent::display($tpl);
     }
diff --git a/administrator/components/com_users/src/View/Note/HtmlView.php b/administrator/components/com_users/src/View/Note/HtmlView.php
index aafbaa17fb600..a777fd425012e 100644
--- a/administrator/components/com_users/src/View/Note/HtmlView.php
+++ b/administrator/components/com_users/src/View/Note/HtmlView.php
@@ -81,6 +81,10 @@ public function display($tpl = null)
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         parent::display($tpl);
         $this->addToolbar();
     }
diff --git a/administrator/components/com_users/src/View/Notes/HtmlView.php b/administrator/components/com_users/src/View/Notes/HtmlView.php
index 35d332ac04b85..4285ea4cf0a53 100644
--- a/administrator/components/com_users/src/View/Notes/HtmlView.php
+++ b/administrator/components/com_users/src/View/Notes/HtmlView.php
@@ -119,6 +119,11 @@ public function display($tpl = null)
             $item->cparams = new Registry($item->category_params);
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
         parent::display($tpl);
     }
diff --git a/administrator/components/com_users/src/View/User/HtmlView.php b/administrator/components/com_users/src/View/User/HtmlView.php
index a4b00358769df..fb4e51dd001a3 100644
--- a/administrator/components/com_users/src/View/User/HtmlView.php
+++ b/administrator/components/com_users/src/View/User/HtmlView.php
@@ -136,6 +136,11 @@ public function display($tpl = null)
             }
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task')
+            ->addControlField('return', Factory::getApplication()->getInput()->getBase64('return', ''));
+
         parent::display($tpl);
 
         $this->addToolbar();
@@ -190,6 +195,26 @@ function (Toolbar $childBar) use ($canDo, $isProfile) {
             $toolbar->cancel('user.cancel');
         }
 
+        // Check lastvisitDate for allow resend the activation email
+        $userIsNotActive = !empty($this->item->activation) || \is_null($this->item->lastvisitDate);
+
+        if ($this->item->id > 0 && $userIsNotActive) {
+            $buttonText = !empty($this->item->activation)
+                ? Text::_('COM_USERS_USER_ACTIVATE_AND_MAIL')
+                : Text::_('COM_USERS_USER_ACTIVATION_REMINDER');
+
+            $toolbar->standardButton('activate', $buttonText)
+                ->buttonClass('btn activate-send-mail')
+                ->attributes([
+                    'data-option' => 'com_users',
+                    'data-task'   => 'user.active',
+                    'data-format' => 'json',
+                    'data-userid' => $this->item->id,
+                ])
+                ->icon('icon-mail')
+                ->onclick('');
+        }
+
         $toolbar->divider();
         $toolbar->help('Users:_Edit_Profile');
     }
diff --git a/administrator/components/com_users/src/View/Users/HtmlView.php b/administrator/components/com_users/src/View/Users/HtmlView.php
index d2f819015fcbf..31e64fcfa86a8 100644
--- a/administrator/components/com_users/src/View/Users/HtmlView.php
+++ b/administrator/components/com_users/src/View/Users/HtmlView.php
@@ -10,14 +10,12 @@
 
 namespace Joomla\Component\Users\Administrator\View\Users;
 
-use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
 use Joomla\CMS\Toolbar\Button\DropdownButton;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Component\Users\Administrator\Model\UsersModel;
-use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -79,18 +77,6 @@ class HtmlView extends BaseHtmlView
      */
     protected $canDo;
 
-    /**
-     * An instance of DatabaseDriver.
-     *
-     * @var    DatabaseDriver
-     * @since  3.6.3
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Will be removed without replacement use database from the container instead
-     *              Example: Factory::getContainer()->get(DatabaseInterface::class);
-     */
-    protected $db;
-
     /**
      * Display the view
      *
@@ -110,7 +96,11 @@ public function display($tpl = null)
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
         $this->canDo         = ContentHelper::getActions('com_users');
-        $this->db            = Factory::getDbo();
+
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
 
         $this->addToolbar();
         parent::display($tpl);
@@ -169,6 +159,7 @@ protected function addToolbar()
 
             if ($canDo->get('core.delete')) {
                 $childBar->delete('users.delete', 'JTOOLBAR_DELETE')
+                    ->icon('icon-exclamation-triangle')
                     ->message('JGLOBAL_CONFIRM_DELETE')
                     ->listCheck(true);
             }
diff --git a/administrator/components/com_users/tmpl/captive/default.php b/administrator/components/com_users/tmpl/captive/default.php
index 56ccc18ea80d2..3579ea8897fdc 100644
--- a/administrator/components/com_users/tmpl/captive/default.php
+++ b/administrator/components/com_users/tmpl/captive/default.php
@@ -117,7 +117,7 @@ class="btn btn-danger btn-sm"
                 <?php if (count($this->records) > 1) : ?>
                     <a id="users-mfa-captive-form-choose-another"
                        class="btn btn-link"
-                       href="<?php echo Route::_('index.php?option=com_users&view=captive&task=select') ?>">
+                       href="<?php echo Route::_('index.php?option=com_users&view=captive&task=captive.select') ?>">
                         <?php echo Text::_('COM_USERS_MFA_USE_DIFFERENT_METHOD'); ?>
                     </a>
                 <?php endif; ?>
diff --git a/administrator/components/com_users/tmpl/captive/select.php b/administrator/components/com_users/tmpl/captive/select.php
index e3afe6ef28f05..a062464d23ccb 100644
--- a/administrator/components/com_users/tmpl/captive/select.php
+++ b/administrator/components/com_users/tmpl/captive/select.php
@@ -14,9 +14,8 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
-use Joomla\Component\Users\Administrator\View\Captive\HtmlView;
 
-/** @var HtmlView $this */
+/** @var \Joomla\Component\Users\Administrator\View\Captive\HtmlView $this */
 
 $shownMethods = [];
 
diff --git a/administrator/components/com_users/tmpl/debuggroup/default.php b/administrator/components/com_users/tmpl/debuggroup/default.php
index 105c04627585c..7e8e3a4360e3a 100644
--- a/administrator/components/com_users/tmpl/debuggroup/default.php
+++ b/administrator/components/com_users/tmpl/debuggroup/default.php
@@ -154,9 +154,7 @@
             <?php // load the pagination. ?>
             <?php echo $this->pagination->getListFooter(); ?>
 
-            <input type="hidden" name="task" value="">
-            <input type="hidden" name="boxchecked" value="0">
-            <?php echo HTMLHelper::_('form.token'); ?>
+            <?php echo $this->filterForm->renderControlFields(); ?>
         <?php endif; ?>
     </div>
 </form>
diff --git a/administrator/components/com_users/tmpl/debuguser/default.php b/administrator/components/com_users/tmpl/debuguser/default.php
index c7af6108f9fe6..b9a831ca10143 100644
--- a/administrator/components/com_users/tmpl/debuguser/default.php
+++ b/administrator/components/com_users/tmpl/debuguser/default.php
@@ -157,9 +157,7 @@
             <?php // load the pagination. ?>
             <?php echo $this->pagination->getListFooter(); ?>
 
-            <input type="hidden" name="task" value="">
-            <input type="hidden" name="boxchecked" value="0">
-            <?php echo HTMLHelper::_('form.token'); ?>
+            <?php echo $this->filterForm->renderControlFields(); ?>
         <?php endif; ?>
     </div>
 </form>
diff --git a/administrator/components/com_users/tmpl/group/edit.php b/administrator/components/com_users/tmpl/group/edit.php
index 77af501d105ec..4fb32df00674f 100644
--- a/administrator/components/com_users/tmpl/group/edit.php
+++ b/administrator/components/com_users/tmpl/group/edit.php
@@ -37,6 +37,5 @@
     <?php echo LayoutHelper::render('joomla.edit.params', $this); ?>
     <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_users/tmpl/groups/default.php b/administrator/components/com_users/tmpl/groups/default.php
index d016623675712..0384da71b69dc 100644
--- a/administrator/components/com_users/tmpl/groups/default.php
+++ b/administrator/components/com_users/tmpl/groups/default.php
@@ -137,9 +137,7 @@
 
                 <?php endif; ?>
 
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_users/tmpl/level/edit.php b/administrator/components/com_users/tmpl/level/edit.php
index 60f15b12bcfb6..1ad17237b9c2d 100644
--- a/administrator/components/com_users/tmpl/level/edit.php
+++ b/administrator/components/com_users/tmpl/level/edit.php
@@ -20,37 +20,18 @@
 $wa = $this->getDocument()->getWebAssetManager();
 $wa->useScript('keepalive')
     ->useScript('form.validate');
-
 ?>
 
 <form action="<?php echo Route::_('index.php?option=com_users&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="level-form" aria-label="<?php echo Text::_('COM_USERS_LEVEL_FORM_' . ((int) $this->item->id === 0 ? 'NEW' : 'EDIT'), true); ?>" class="form-validate main-card">
-    <?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => 'details', 'recall' => true, 'breakpoint' => 768]); ?>
-
-        <?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', Text::_('COM_USERS_LEVEL_DETAILS')); ?>
-            <fieldset class="options-form">
-                <legend><?php echo Text::_('COM_USERS_LEVEL_DETAILS'); ?></legend>
-                <div class="control-group">
-                    <div class="control-label">
-                        <?php echo $this->form->getLabel('title'); ?>
-                    </div>
-                    <div class="controls">
-                        <?php echo $this->form->getInput('title'); ?>
-                    </div>
-                </div>
-            </fieldset>
-        <?php echo HTMLHelper::_('uitab.endTab'); ?>
-
-        <?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'groups', Text::_('COM_USERS_USER_GROUPS_HAVING_ACCESS')); ?>
+    <?php echo HTMLHelper::_('uitab.startTabSet', 'myTab', ['active' => 'groups', 'recall' => true, 'breakpoint' => 768]); ?>
+        <?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'groups', Text::_('COM_USERS_USERGROUP_DETAILS')); ?>
+            <?php echo $this->form->renderField('title'); ?>
             <fieldset class="options-form">
                 <legend><?php echo Text::_('COM_USERS_USER_GROUPS_HAVING_ACCESS'); ?></legend>
-                <div>
-                    <?php echo HTMLHelper::_('access.usergroups', 'jform[rules]', $this->item->rules, true); ?>
-                </div>
+                <?php echo HTMLHelper::_('access.usergroups', 'jform[rules]', $this->item->rules, true); ?>
             </fieldset>
         <?php echo HTMLHelper::_('uitab.endTab'); ?>
-
     <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_users/tmpl/levels/default.php b/administrator/components/com_users/tmpl/levels/default.php
index baf162c273f81..f59078ab215f0 100644
--- a/administrator/components/com_users/tmpl/levels/default.php
+++ b/administrator/components/com_users/tmpl/levels/default.php
@@ -136,9 +136,8 @@
                     <?php echo $this->pagination->getListFooter(); ?>
 
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_users/tmpl/mail/default.php b/administrator/components/com_users/tmpl/mail/default.php
index 212e57bc93e32..3e5bcb81e948f 100644
--- a/administrator/components/com_users/tmpl/mail/default.php
+++ b/administrator/components/com_users/tmpl/mail/default.php
@@ -11,7 +11,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -57,6 +56,6 @@
             <?php echo $this->form->renderField('group'); ?>
         </div>
     </div>
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_users/tmpl/method/backupcodes.php b/administrator/components/com_users/tmpl/method/backupcodes.php
index 56cb30780d3dc..942d2b9c63e34 100644
--- a/administrator/components/com_users/tmpl/method/backupcodes.php
+++ b/administrator/components/com_users/tmpl/method/backupcodes.php
@@ -15,9 +15,8 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\Component\Users\Administrator\View\Method\HtmlView;
 
-/** @var  HtmlView $this */
+/** @var  \Joomla\Component\Users\Administrator\View\Method\HtmlView $this */
 
 HTMLHelper::_('bootstrap.tooltip', '.hasTooltip');
 
diff --git a/administrator/components/com_users/tmpl/method/edit.php b/administrator/components/com_users/tmpl/method/edit.php
index 74a86977a401a..5b8cd6866a4d1 100644
--- a/administrator/components/com_users/tmpl/method/edit.php
+++ b/administrator/components/com_users/tmpl/method/edit.php
@@ -14,10 +14,9 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\Component\Users\Administrator\View\Method\HtmlView;
 use Joomla\Utilities\ArrayHelper;
 
-/** @var  HtmlView  $this */
+/** @var  \Joomla\Component\Users\Administrator\View\Method\HtmlView  $this */
 
 $cancelURL = Route::_('index.php?option=com_users&task=methods.display&user_id=' . $this->user->id);
 
diff --git a/administrator/components/com_users/tmpl/methods/default.php b/administrator/components/com_users/tmpl/methods/default.php
index f9a325a3436a2..c1edba9148dbe 100644
--- a/administrator/components/com_users/tmpl/methods/default.php
+++ b/administrator/components/com_users/tmpl/methods/default.php
@@ -14,9 +14,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\Component\Users\Administrator\View\Methods\HtmlView;
 
-/** @var HtmlView $this */
+/** @var \Joomla\Component\Users\Administrator\View\Methods\HtmlView $this */
 ?>
 <div id="com-users-methods-list">
     <div id="com-users-methods-reset-container" class="d-flex align-items-center border border-1 rounded-3 p-2">
diff --git a/administrator/components/com_users/tmpl/methods/firsttime.php b/administrator/components/com_users/tmpl/methods/firsttime.php
index 58c474bb12076..8c1360697f3c8 100644
--- a/administrator/components/com_users/tmpl/methods/firsttime.php
+++ b/administrator/components/com_users/tmpl/methods/firsttime.php
@@ -14,9 +14,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\Component\Users\Administrator\View\Methods\HtmlView;
 
-/** @var HtmlView $this */
+/** @var \Joomla\Component\Users\Administrator\View\Methods\HtmlView $this */
 
 $headingLevel = 2;
 ?>
diff --git a/administrator/components/com_users/tmpl/methods/list.php b/administrator/components/com_users/tmpl/methods/list.php
index 889209626334b..557fb28a7a37b 100644
--- a/administrator/components/com_users/tmpl/methods/list.php
+++ b/administrator/components/com_users/tmpl/methods/list.php
@@ -18,9 +18,8 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Users\Administrator\Helper\Mfa as MfaHelper;
 use Joomla\Component\Users\Administrator\Model\MethodsModel;
-use Joomla\Component\Users\Administrator\View\Methods\HtmlView;
 
-/** @var HtmlView $this */
+/** @var \Joomla\Component\Users\Administrator\View\Methods\HtmlView $this */
 
 HTMLHelper::_('bootstrap.tooltip', '.hasTooltip');
 
diff --git a/administrator/components/com_users/tmpl/note/edit.php b/administrator/components/com_users/tmpl/note/edit.php
index 9387a31e49929..2cd299cbbca14 100644
--- a/administrator/components/com_users/tmpl/note/edit.php
+++ b/administrator/components/com_users/tmpl/note/edit.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -35,13 +34,13 @@
                 <?php echo $this->form->renderField('review_time'); ?>
                 <?php echo $this->form->renderField('version_note'); ?>
 
-
-                <input type="hidden" name="task" value="">
-                <?php echo HTMLHelper::_('form.token'); ?>
+                <?php echo $this->form->renderControlFields(); ?>
                 </div>
                 <div class="col-12">
                     <?php echo $this->form->renderField('body'); ?>
                 </div>
+
+
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_users/tmpl/notes/default.php b/administrator/components/com_users/tmpl/notes/default.php
index d1665b2b956bc..81b016c4df119 100644
--- a/administrator/components/com_users/tmpl/notes/default.php
+++ b/administrator/components/com_users/tmpl/notes/default.php
@@ -119,11 +119,7 @@
 
                 <?php endif; ?>
 
-                <div>
-                    <input type="hidden" name="task" value="">
-                    <input type="hidden" name="boxchecked" value="0">
-                    <?php echo HTMLHelper::_('form.token'); ?>
-                </div>
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_users/tmpl/notes/emptystate.php b/administrator/components/com_users/tmpl/notes/emptystate.php
index 87792bafa261d..9ca2946029231 100644
--- a/administrator/components/com_users/tmpl/notes/emptystate.php
+++ b/administrator/components/com_users/tmpl/notes/emptystate.php
@@ -19,6 +19,8 @@
     'formURL'    => 'index.php?option=com_users&view=notes',
     'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:User_Notes',
     'icon'       => 'icon-users user',
+
+    'controlFields' => $this->filterForm->renderControlFields(),
 ];
 
 if ($this->getCurrentUser()->authorise('core.create', 'com_users')) {
diff --git a/administrator/components/com_users/tmpl/user/edit.php b/administrator/components/com_users/tmpl/user/edit.php
index 69f400e57cf8e..8dc949474038b 100644
--- a/administrator/components/com_users/tmpl/user/edit.php
+++ b/administrator/components/com_users/tmpl/user/edit.php
@@ -21,7 +21,8 @@
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $this->getDocument()->getWebAssetManager();
 $wa->useScript('keepalive')
-    ->useScript('form.validate');
+    ->useScript('form.validate')
+    ->useScript('com_users.activate-user-send-email');
 
 $input = Factory::getApplication()->getInput();
 
@@ -76,7 +77,5 @@
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
     </div>
 
-    <input type="hidden" name="task" value="">
-    <input type="hidden" name="return" value="<?php echo $input->getBase64('return'); ?>">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_users/tmpl/user/edit_groups.php b/administrator/components/com_users/tmpl/user/edit_groups.php
index 4525c00d0dd08..24f8aa377d40d 100644
--- a/administrator/components/com_users/tmpl/user/edit_groups.php
+++ b/administrator/components/com_users/tmpl/user/edit_groups.php
@@ -11,8 +11,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\Component\Users\Administrator\View\User\HtmlView;
 
-/** @var HtmlView $this */
+/** @var \Joomla\Component\Users\Administrator\View\User\HtmlView $this */
 
 echo HTMLHelper::_('access.usergroups', 'jform[groups]', $this->groups, true);
diff --git a/administrator/components/com_users/tmpl/users/default.php b/administrator/components/com_users/tmpl/users/default.php
index b02e1b66fe5ee..3d2c8400f2d9c 100644
--- a/administrator/components/com_users/tmpl/users/default.php
+++ b/administrator/components/com_users/tmpl/users/default.php
@@ -220,9 +220,7 @@
                     <?php endif; ?>
                 <?php endif; ?>
 
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_workflow/layouts/toolbar/shortcuts.php b/administrator/components/com_workflow/layouts/toolbar/shortcuts.php
new file mode 100644
index 0000000000000..9602fecf29a63
--- /dev/null
+++ b/administrator/components/com_workflow/layouts/toolbar/shortcuts.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_workflow
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+
+Factory::getApplication()->getDocument()->getWebAssetManager()
+    ->useScript('webcomponent.toolbar-button');
+
+$shortcutsPopupOptions = json_encode([
+    'src'             => '#shortcuts-popup-content',
+    'width'           => '800px',
+    'height'          => 'fit-content',
+    'textHeader'      => Text::_('COM_WORKFLOW_GRAPH_SHORTCUTS_TITLE'),
+    'preferredParent' => 'body',
+]);
+?>
+<joomla-toolbar-button>
+    <button
+        class="btn btn-info action-button"
+        data-joomla-dialog="<?php echo htmlspecialchars($shortcutsPopupOptions, ENT_QUOTES, 'UTF-8'); ?>"
+    >
+        <span class="fa fa-keyboard" aria-hidden="true"></span>
+        <?php echo Text::_('COM_WORKFLOW_GRAPH_SHORTCUTS'); ?>
+    </button>
+</joomla-toolbar-button>
diff --git a/administrator/components/com_workflow/src/Controller/DisplayController.php b/administrator/components/com_workflow/src/Controller/DisplayController.php
index d78369db70b8d..030e0aad3ccaf 100644
--- a/administrator/components/com_workflow/src/Controller/DisplayController.php
+++ b/administrator/components/com_workflow/src/Controller/DisplayController.php
@@ -10,13 +10,13 @@
 
 namespace Joomla\Component\Workflow\Administrator\Controller;
 
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
 use Joomla\Input\Input;
-use Joomla\String\Inflector;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -110,7 +110,9 @@ public function display($cachable = false, $urlparams = [])
                 $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id), 'error');
             }
 
-            $url = 'index.php?option=com_workflow&view=' . Inflector::pluralize($view) . '&extension=' . $this->input->getCmd('extension');
+            $inflector = InflectorFactory::create()->build();
+
+            $url = 'index.php?option=com_workflow&view=' . $inflector->pluralize($view) . '&extension=' . $this->input->getCmd('extension');
 
             $this->setRedirect(Route::_($url, false));
 
diff --git a/administrator/components/com_workflow/src/Controller/GraphController.php b/administrator/components/com_workflow/src/Controller/GraphController.php
new file mode 100644
index 0000000000000..6ea2d0dffcbbf
--- /dev/null
+++ b/administrator/components/com_workflow/src/Controller/GraphController.php
@@ -0,0 +1,513 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_workflow
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Workflow\Administrator\Controller;
+
+use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Controller\AdminController;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\CMS\Response\JsonResponse;
+use Joomla\Utilities\ArrayHelper;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+
+/**
+ * The workflow Graphical View and Api controller
+ *
+ * @since 6.1.0
+ */
+class GraphController extends AdminController
+{
+    /**
+     * Present workflow id
+     *
+     * @var    integer
+     * @since  6.1.0
+     */
+    protected $workflowId;
+
+    /**
+     * The extension
+     *
+     * @var    string
+     * @since  6.1.0
+     */
+    protected $extension;
+
+    /**
+     * The component name
+     *
+     * @var    string
+     * @since  6.1.0
+     */
+    protected $component;
+
+    /**
+     * The section of the current extension
+     *
+     * @var    string
+     * @since  6.1.0
+     */
+    protected $section;
+
+    /**
+     * The prefix to use with controller messages.
+     *
+     * @var    string
+     * @since  6.1.0
+     */
+    protected $text_prefix = 'COM_WORKFLOW_GRAPH';
+
+    /**
+     * Transitions of present workflow, used for permission checks
+     *
+     * @var    array
+     * @since  6.1.0
+     */
+    protected $transitions;
+
+
+    public function __construct($config = [], ?MVCFactoryInterface $factory = null, $app = null, $input = null)
+    {
+        parent::__construct($config, $factory, $app, $input);
+
+        $this->registerTask('trash', 'publish');
+
+        // If workflow id is not set try to get it from input or throw an exception
+        if (empty($this->workflowId)) {
+            $this->workflowId = $this->input->getInt('id');
+            if (empty($this->workflowId)) {
+                $this->workflowId = $this->input->getInt('workflow_id');
+            }
+
+            if (empty($this->workflowId)) {
+                throw new \InvalidArgumentException(Text::_('COM_WORKFLOW_GRAPH_ERROR_WORKFLOW_ID_NOT_SET'));
+            }
+        }
+
+        // If extension is not set try to get it from input or throw an exception
+        if (empty($this->extension)) {
+            $extension = $this->input->getCmd('extension');
+
+            $parts = explode('.', $extension);
+
+            $this->component = reset($parts);
+
+            $this->extension = array_shift($parts);
+
+            if (!empty($parts)) {
+                $this->section = array_shift($parts);
+            }
+
+            if (empty($this->extension)) {
+                throw new \InvalidArgumentException(Text::_('COM_WORKFLOW_GRAPH_ERROR_EXTENSION_NOT_SET'));
+            }
+        }
+    }
+
+
+    /**
+     * Retrieves workflow data for graphical display in the workflow graph view.
+     *
+     * This method fetches the workflow details by ID, checks user permissions,
+     * and returns the workflow information as a JSON response for use in the
+     * graphical workflow editor or API consumers.
+     *
+     * @return  void  Outputs a JSON response with workflow data or error message.
+     *
+     * @since   6.1.0
+     */
+    public function getWorkflow(): void
+    {
+
+        try {
+            $id    = $this->workflowId;
+            $model = $this->getModel('Workflow');
+
+            if (empty($id)) {
+                throw new \InvalidArgumentException(Text::_('COM_WORKFLOW_GRAPH_ERROR_INVALID_ID'));
+            }
+
+            $workflow = $model->getItem($id);
+
+            if (empty($workflow->id)) {
+                throw new \RuntimeException(Text::_('COM_WORKFLOW_GRAPH_ERROR_WORKFLOW_NOT_FOUND'));
+            }
+
+            $user = $this->app->getIdentity();
+
+            // Check permissions
+            if (!$user->authorise('core.edit', $this->extension . '.workflow.' . $id) && !$this->hasAnyTransitionPermission($id)) {
+                throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'));
+            }
+
+            $canDo        = ContentHelper::getActions($this->extension, 'workflow', $workflow->id);
+            $canCreate    = $canDo->get('core.create');
+
+            $response = [
+                'id'          => $workflow->id,
+                'title'       => Text::_($workflow->title),
+                'description' => Text::_($workflow->description),
+                'published'   => (bool) $workflow->published,
+                'default'     => (bool) $workflow->default,
+                'extension'   => $workflow->extension,
+                'canCreate'   => $canCreate,
+            ];
+
+            echo new JsonResponse($response);
+        } catch (\Exception $e) {
+            $this->app->setHeader('status', 500);
+            echo new JsonResponse($e->getMessage(), 'error', true);
+        }
+
+        $this->app->close();
+    }
+
+    /**
+     * Retrieves all stages for the specified workflow to be used in the workflow graph view.
+     *
+     * Fetches stages by workflow ID, decodes position data if available, and returns
+     * the result as a JSON response for graphical editors or API consumers.
+     *
+     * @return  void  Outputs a JSON response with stages data or error message.
+     *
+     * @since   6.1.0
+     */
+    public function getStages()
+    {
+        try {
+            $workflowId = $this->workflowId;
+            $model      = $this->getModel('Stages');
+
+            if (empty($workflowId)) {
+                throw new \InvalidArgumentException(Text::_('COM_WORKFLOW_GRAPH_ERROR_INVALID_ID'));
+            }
+
+            $user     = $this->app->getIdentity();
+
+            if (!$user->authorise('core.edit', $this->extension . '.workflow.' . $workflowId) && !$this->hasAnyTransitionPermission($workflowId)) {
+                throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'));
+            }
+
+
+            $model->setState('filter.workflow_id', $workflowId);
+            $model->setState('list.limit', 0); // Get all stages
+
+            $stages   = $model->getItems();
+
+            if (empty($stages)) {
+                throw new \RuntimeException(Text::_('COM_WORKFLOW_GRAPH_ERROR_STAGES_NOT_FOUND'));
+            }
+
+            $response        = [];
+            $canEditWorkflow = $user->authorise('core.edit', $this->extension . '.workflow.' . $workflowId);
+
+            $allowedStageIds = [];
+
+            if (!$canEditWorkflow) {
+                $transitions = $this->getWorkflowTransitions($workflowId);
+
+                foreach ($transitions as $transition) {
+                    if (
+                        $user->authorise('core.execute.transition', $this->extension . '.transition.' . (int) $transition->id)
+                        || $user->authorise('core.edit', $this->extension . '.transition.' . (int) $transition->id)
+                        || $user->authorise('core.delete', $this->extension . '.transition.' . (int) $transition->id)
+                    ) {
+                        if ((int) $transition->from_stage_id !== -1) {
+                            $allowedStageIds[] = (int) $transition->from_stage_id;
+                        }
+                        $allowedStageIds[] = (int) $transition->to_stage_id;
+                    }
+                }
+                $allowedStageIds = array_unique($allowedStageIds);
+            }
+
+            foreach ($stages as $stage) {
+                $canEdit    = $user->authorise('core.edit', $this->extension . '.stage.' . $stage->id);
+                $canDelete  = $user->authorise('core.delete', $this->extension . '.stage.' . $stage->id);
+
+                if (!$canEditWorkflow && !$canEdit && !$canDelete && !\in_array((int) $stage->id, $allowedStageIds)) {
+                    continue;
+                }
+
+                $response[] = [
+                    'id'          => (int) $stage->id,
+                    'title'       => Text::_($stage->title),
+                    'description' => Text::_($stage->description),
+                    'published'   => (bool) $stage->published,
+                    'default'     => (bool) $stage->default,
+                    'ordering'    => (int) $stage->ordering,
+                    'position'    => $stage->position ? json_decode($stage->position, true) : null,
+                    'workflow_id' => $stage->workflow_id,
+                    'permissions' => [
+                        'edit'   => $canEdit,
+                        'delete' => $canDelete,
+                    ],
+                ];
+            }
+            echo new JsonResponse($response);
+        } catch (\Exception $e) {
+            $this->app->setHeader('status', 500);
+            echo new JsonResponse($e->getMessage(), 'error', true);
+        }
+
+        $this->app->close();
+    }
+
+
+    /**
+     * Retrieves all transitions for the specified workflow to be used in the workflow graph view.
+     *
+     * Fetches transitions by workflow ID and returns the result as a JSON response
+     * for graphical editors or API consumers.
+     *
+     * @return  void  Outputs a JSON response with transitions data or error message.
+     *
+     * @since   6.1.0
+     */
+    public function getTransitions()
+    {
+
+        try {
+            $workflowId = $this->workflowId;
+
+            if (empty($workflowId)) {
+                throw new \InvalidArgumentException(Text::_('COM_WORKFLOW_GRAPH_ERROR_INVALID_ID'));
+            }
+
+            $user        = $this->app->getIdentity();
+
+            if (
+                !$user->authorise('core.edit', $this->extension . '.workflow.' . $workflowId)
+                && !$this->hasAnyTransitionPermission($workflowId)
+            ) {
+                throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'));
+            }
+
+            $transitions = $this->getWorkflowTransitions($workflowId);
+
+            $response    = [];
+
+            $canEditWorkflow = $user->authorise('core.edit', $this->extension . '.workflow.' . $workflowId);
+            foreach ($transitions as $transition) {
+                $canEdit   = $user->authorise('core.edit', $this->extension . '.transition.' . (int) $transition->id);
+                $canDelete = $user->authorise('core.delete', $this->extension . '.transition.' . (int) $transition->id);
+                $canRun    = $user->authorise('core.execute.transition', $this->extension . '.transition.' . (int) $transition->id);
+
+                if (!$canEditWorkflow && !$canEdit && !$canDelete && !$canRun) {
+                    continue;
+                }
+
+                $response[] = [
+                    'id'            => (int) $transition->id,
+                    'title'         => Text::_($transition->title),
+                    'description'   => Text::_($transition->description),
+                    'published'     => (bool) $transition->published,
+                    'from_stage_id' => (int) $transition->from_stage_id,
+                    'to_stage_id'   => (int) $transition->to_stage_id,
+                    'ordering'      => (int) $transition->ordering,
+                    'workflow_id'   => (int) $transition->workflow_id,
+                    'permissions'   => [
+                        'edit'           => $canEdit,
+                        'delete'         => $canDelete,
+                        'run_transition' => $canRun,
+                    ],
+                ];
+            }
+
+            echo new JsonResponse($response);
+        } catch (\Exception $e) {
+            $this->app->setHeader('status', 500);
+            echo new JsonResponse($e->getMessage(), 'error', true);
+        }
+
+        $this->app->close();
+    }
+
+
+    public function publish($type = 'stage')
+    {
+
+        try {
+            // Check for request forgeries
+            if (!$this->checkToken('post', false)) {
+                throw new \RuntimeException(Text::_('JINVALID_TOKEN'));
+            }
+
+            // Check if the user has permission to publish items
+            if (!$this->app->getIdentity()->authorise('core.edit.state', $this->extension . '.workflow.' . $this->workflowId)) {
+                throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'));
+            }
+
+            // Get items to publish from the request.
+            $cid   = (array) $this->input->get('cid', [], 'int');
+            $data  = ['publish' => 1, 'unpublish' => 0, 'archive' => 2, 'trash' => -2, 'report' => -3];
+            $task  = $this->getTask();
+            $type  = $this->input->getCmd('type');
+            $value = ArrayHelper::getValue($data, $task, 0, 'int');
+
+            if (empty($type)) {
+                throw new \RuntimeException(Text::_($this->text_prefix . '_' . strtoupper($type) . '_NO_ITEM_SELECTED'));
+            }
+
+            // Remove zero values resulting from input filter
+            $cid = array_filter($cid);
+
+            if (empty($cid)) {
+                throw new \RuntimeException(Text::_($this->text_prefix . '_' . strtoupper($type) . '_NO_ITEM_SELECTED'));
+            }
+            // Get the model.
+            $model = $this->getModel($type);
+
+
+            $model->publish($cid, $value);
+            $errors = $model->getErrors();
+            $ntext  = null;
+
+            if ($value === 1) {
+                if ($errors) {
+                    echo new JsonResponse(Text::plural($this->text_prefix . '_' . strtoupper($type) . '_N_ITEMS_FAILED_PUBLISHING', \count($cid)), 'error', true);
+                } else {
+                    $ntext = $this->text_prefix . '_' . strtoupper($type) . '_N_ITEMS_PUBLISHED';
+                }
+            } elseif ($value === 0) {
+                $ntext = $this->text_prefix . '_' . strtoupper($type) . '_N_ITEMS_UNPUBLISHED';
+            } elseif ($value === 2) {
+                $ntext = $this->text_prefix . '_' . strtoupper($type) . '_N_ITEMS_ARCHIVED';
+            } else {
+                $ntext = $this->text_prefix . '_' . strtoupper($type) . '_N_ITEMS_TRASHED';
+            }
+
+            $response = [
+                'success' => true,
+                'message' => Text::plural($ntext, \count($cid)),
+            ];
+
+            if (\count($cid)) {
+                echo new JsonResponse($response);
+            }
+        } catch (\Exception $e) {
+            $this->app->setHeader('status', 500);
+            echo new JsonResponse($e->getMessage(), 'error', true);
+        }
+        $this->app->close();
+    }
+
+    public function delete($type = 'stage')
+    {
+        try {
+            // Check for request forgeries
+            if (!$this->checkToken('post', false)) {
+                throw new \RuntimeException(Text::_('JINVALID_TOKEN'));
+            }
+
+            // Get items to remove from the request.
+            $cid   = (array) $this->input->get('cid', [], 'int');
+            $type  = $this->input->getCmd('type');
+            $cid   = array_filter($cid);
+
+            if (empty($cid)) {
+                throw new \RuntimeException(Text::_($this->text_prefix . '_' . strtoupper($type) . '_NO_ITEM_SELECTED'));
+            }
+            // Get the model.
+            $model = $this->getModel($type);
+
+            // Remove the items.
+            if ($model->delete($cid)) {
+                $response = [
+                    'success' => true,
+                    'message' => Text::plural($this->text_prefix . '_' . strtoupper($type) . '_N_ITEMS_DELETED', \count($cid)),
+                ];
+            } else {
+                throw new \RuntimeException(Text::plural($this->text_prefix . '_' . strtoupper($type) . '_N_ITEMS_FAILED_DELETING', \count($cid)));
+            }
+
+            if (isset($response)) {
+                echo new JsonResponse($response);
+            }
+
+            // Invoke the postDelete method to allow for the child class to access the model.
+            $this->postDeleteHook($model, $cid);
+        } catch (\Exception $e) {
+            $this->app->setHeader('status', 500);
+            echo new JsonResponse($e->getMessage(), 'error', true);
+        }
+
+        $this->app->close();
+    }
+
+    /**
+     * Method to get a model object, loading it if required.
+     *
+     * @param   string  $name    The model name. Optional.
+     * @param   string  $prefix  The class prefix. Optional.
+     * @param   array   $config  Configuration array for model. Optional.
+     *
+     * @return  BaseDatabaseModel|boolean  Model object on success; otherwise false on failure.
+     *
+     * @since   6.1.0
+     */
+    public function getModel($name = '', $prefix = 'Administrator', $config = ['ignore_request' => true])
+    {
+        return parent::getModel($name, $prefix, $config);
+    }
+
+    /**
+     * Get the transitions for a workflow.
+     *
+     * @param   integer  $workflowId  The workflow id
+     *
+     * @return  array
+     *
+     * @since   6.1.0
+     */
+    protected function getWorkflowTransitions($workflowId): array
+    {
+        if ($this->transitions === null) {
+            $model = $this->getModel('Transitions');
+            $model->setState('filter.workflow_id', $workflowId);
+            $model->setState('list.limit', 0);
+            $this->transitions = $model->getItems();
+        }
+
+        return $this->transitions;
+    }
+
+    /**
+     * Check if the user has permission to at least one transition in the workflow.
+     *
+     * @param   integer  $workflowId  The workflow id
+     *
+     * @return  boolean
+     *
+     * @since   6.1.0
+     */
+    protected function hasAnyTransitionPermission($workflowId): bool
+    {
+        $transitions = $this->getWorkflowTransitions($workflowId);
+        $user        = $this->app->getIdentity();
+
+        foreach ($transitions as $transition) {
+            if (
+                $user->authorise('core.execute.transition', $this->extension . '.transition.' . (int) $transition->id)
+                || $user->authorise('core.edit', $this->extension . '.transition.' . (int) $transition->id)
+                || $user->authorise('core.delete', $this->extension . '.transition.' . (int) $transition->id)
+            ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/administrator/components/com_workflow/src/Controller/StageController.php b/administrator/components/com_workflow/src/Controller/StageController.php
index b113d32619212..4c191984b229e 100644
--- a/administrator/components/com_workflow/src/Controller/StageController.php
+++ b/administrator/components/com_workflow/src/Controller/StageController.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\CMS\Router\Route;
 use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -174,4 +175,56 @@ protected function getRedirectToListAppend()
 
         return $append;
     }
+
+    /**
+     * Method to save a record.
+     *
+     * @param   string  $key     The name of the primary key of the URL variable.
+     * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+     *
+     * @return  boolean  True if successful, false otherwise.
+     *
+     * @since   6.1.0
+     */
+    public function save($key = null, $urlVar = null)
+    {
+        $result  = parent::save($key, $urlVar);
+        $input   = $this->input;
+        $isModal = $input->get('layout') === 'modal' || $input->get('tmpl') === 'component';
+        $task    = $this->getTask();
+
+        if ($isModal && $result && $task === 'save') {
+            $id     = $this->input->get('id');
+            $return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+                . '&layout=modalreturn&from-task=save';
+
+            $this->setRedirect(Route::_($return, false));
+        }
+        return $result;
+    }
+
+    /**
+     * Method to cancel an edit.
+     *
+     * @param   string  $key  The name of the primary key of the URL variable.
+     *
+     * @return  boolean  True if access level checks pass, false otherwise.
+     *
+     * @since   6.1.0
+     */
+    public function cancel($key = null)
+    {
+        $result  = parent::cancel($key);
+        $input   = $this->input;
+        $isModal = $input->get('layout') === 'modal' || $input->get('tmpl') === 'component';
+
+        if ($isModal) {
+            $id     = $this->input->get('id');
+            $return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+                . '&layout=modalreturn&from-task=cancel';
+
+            $this->setRedirect(Route::_($return, false));
+        }
+        return $result;
+    }
 }
diff --git a/administrator/components/com_workflow/src/Controller/StagesController.php b/administrator/components/com_workflow/src/Controller/StagesController.php
index bd5c25f62b935..ae86156575217 100644
--- a/administrator/components/com_workflow/src/Controller/StagesController.php
+++ b/administrator/components/com_workflow/src/Controller/StagesController.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\AdminController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\Router\Route;
 use Joomla\Input\Input;
 use Joomla\Utilities\ArrayHelper;
@@ -195,4 +196,45 @@ protected function getRedirectToListAppend()
     {
         return '&extension=' . $this->extension . ($this->section ? '.' . $this->section : '') . '&workflow_id=' . $this->workflowId;
     }
+
+    /**
+     * Method to save stage positions
+     *
+     * @return  boolean  True if successful, false otherwise.
+     *
+     * @since   6.1.0
+     */
+    public function updateStagesPosition()
+    {
+        try {
+            // Check for request forgeries
+            if (!$this->checkToken('post', false)) {
+                throw new \RuntimeException(Text::_('JINVALID_TOKEN'));
+            }
+
+            // Check if the user has permission to publish items
+            if (!$this->app->getIdentity()->authorise('core.edit.state', $this->extension . '.workflow.' . $this->workflowId)) {
+                throw new \RuntimeException(Text::_('JERROR_ALERTNOAUTHOR'));
+            }
+
+            $app        = $this->app;
+            $input      = $app->getInput();
+            $workflowId = $input->getInt('id');
+            $positions  = $input->get('positions', [], 'array');
+            $model      = $this->getModel('Stages', 'Administrator');
+
+            $response = [];
+            $success  = $model->updatePositions($positions, $workflowId);
+
+            $response = [
+                'success' => true,
+                'message' => Text::_('COM_WORKFLOW_POSITIONS_SAVED'),
+            ];
+            echo new JsonResponse($response);
+        } catch (\Exception $e) {
+            $this->app->setHeader('status', 500);
+            echo new JsonResponse($e->getMessage(), 'error', true);
+        }
+        $this->app->close();
+    }
 }
diff --git a/administrator/components/com_workflow/src/Controller/TransitionController.php b/administrator/components/com_workflow/src/Controller/TransitionController.php
index e78227550dab3..c63b65f741c18 100644
--- a/administrator/components/com_workflow/src/Controller/TransitionController.php
+++ b/administrator/components/com_workflow/src/Controller/TransitionController.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\CMS\Router\Route;
 use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -175,4 +176,56 @@ protected function getRedirectToListAppend()
 
         return $append;
     }
+
+    /**
+     * Method to save a request.
+     *
+     * @param   string  $key  The name of the primary key of the URL variable.
+     * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+     *
+     * @return  boolean  True if access level checks pass, false otherwise.
+     *
+     * @since   6.1.0
+     */
+    public function save($key = null, $urlVar = null)
+    {
+        $result  = parent::save($key, $urlVar);
+        $input   = $this->input;
+        $isModal = $input->get('layout') === 'modal' || $input->get('tmpl') === 'component';
+        $task    = $this->getTask();
+
+        if ($isModal && $result && $task === 'save') {
+            $id     = $this->input->get('id');
+            $return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+                . '&layout=modalreturn&from-task=save';
+
+            $this->setRedirect(Route::_($return, false));
+        }
+        return $result;
+    }
+
+    /**
+     * Method to cancel an edit.
+     *
+     * @param   string  $key  The name of the primary key of the URL variable.
+     *
+     * @return  boolean  True if access level checks pass, false otherwise.
+     *
+     * @since   6.1.0
+     */
+    public function cancel($key = null)
+    {
+        $result  = parent::cancel($key);
+        $input   = $this->input;
+        $isModal = $input->get('layout') === 'modal' || $input->get('tmpl') === 'component';
+
+        if ($isModal) {
+            $id     = $this->input->get('id');
+            $return = 'index.php?option=' . $this->option . '&view=' . $this->view_item . $this->getRedirectToItemAppend($id)
+                . '&layout=modalreturn&from-task=cancel';
+
+            $this->setRedirect(Route::_($return, false));
+        }
+        return $result;
+    }
 }
diff --git a/administrator/components/com_workflow/src/Controller/WorkflowController.php b/administrator/components/com_workflow/src/Controller/WorkflowController.php
index 077e43c0445ae..af0c52bfdfb12 100644
--- a/administrator/components/com_workflow/src/Controller/WorkflowController.php
+++ b/administrator/components/com_workflow/src/Controller/WorkflowController.php
@@ -184,7 +184,7 @@ public function postSaveHook(BaseDatabaseModel $model, $validData = [])
 
             // @todo Moves queries out of the controller.
             $db    = $model->getDbo();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->select('*')
                 ->from($db->quoteName('#__workflow_stages'))
@@ -214,7 +214,7 @@ public function postSaveHook(BaseDatabaseModel $model, $validData = [])
                 $mapping[$oldID] = (int) $table->id;
             }
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__workflow_transitions'))
                 ->where($db->quoteName('workflow_id') . ' = :id')
diff --git a/administrator/components/com_workflow/src/Dispatcher/Dispatcher.php b/administrator/components/com_workflow/src/Dispatcher/Dispatcher.php
index 5633363111185..77acbe6da1a16 100644
--- a/administrator/components/com_workflow/src/Dispatcher/Dispatcher.php
+++ b/administrator/components/com_workflow/src/Dispatcher/Dispatcher.php
@@ -31,12 +31,26 @@ class Dispatcher extends ComponentDispatcher
      */
     protected function checkAccess()
     {
-        $extension = $this->getApplication()->getInput()->getCmd('extension');
+        $input      = $this->app->getInput();
+        $view       = $input->getCmd('view');
+        $layout     = $input->getCmd('layout');
+        $task       = $input->getCmd('task');
+        $extension  = $input->getCmd('extension');
+        $parts      = explode('.', $extension);
 
-        $parts = explode('.', $extension);
+        $allowedTasks = [
+            'graph.getWorkflow',
+            'graph.getStages',
+            'graph.getTransitions',
+        ];
 
-        // Check the user has permission to access this component if in the backend
-        if ($this->app->isClient('administrator') && !$this->app->getIdentity()->authorise('core.manage.workflow', $parts[0])) {
+        // Allow access to the 'graph' view for all users with access
+        if ($this->app->isClient('administrator') && $view === 'graph' && \in_array($task, $allowedTasks, true)) {
+            return;
+        }
+
+        // Check the user has permission to edit this component
+        if (!$this->app->getIdentity()->authorise('core.manage.workflow', $parts[0])) {
             throw new NotAllowed($this->app->getLanguage()->_('JERROR_ALERTNOAUTHOR'), 403);
         }
     }
diff --git a/administrator/components/com_workflow/src/Field/ComponentsWorkflowField.php b/administrator/components/com_workflow/src/Field/ComponentsWorkflowField.php
index cd4ed6361082a..8b520e005b55d 100644
--- a/administrator/components/com_workflow/src/Field/ComponentsWorkflowField.php
+++ b/administrator/components/com_workflow/src/Field/ComponentsWorkflowField.php
@@ -48,7 +48,7 @@ protected function getOptions()
         // Initialise variable.
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT a.name AS text, a.element AS value')
             ->from('#__extensions as a')
             ->where('a.enabled >= 1')
diff --git a/administrator/components/com_workflow/src/Model/GraphModel.php b/administrator/components/com_workflow/src/Model/GraphModel.php
new file mode 100644
index 0000000000000..840ac089026d3
--- /dev/null
+++ b/administrator/components/com_workflow/src/Model/GraphModel.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_workflow
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @since       6.1.0
+ */
+
+namespace Joomla\Component\Workflow\Administrator\Model;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\MVC\Model\AdminModel;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Model class for Graphical View of the workflow
+ *
+ * @since  6.1.0
+ */
+class GraphModel extends AdminModel
+{
+    /**
+     * Auto-populate the model state.
+     *
+     * Note. Calling getState in this method will result in recursion.
+     *
+     * @return  void
+     *
+     * @since  6.1.0
+     */
+    public function populateState()
+    {
+        parent::populateState();
+
+        $app       = Factory::getApplication();
+        $context   = $this->option . '.' . $this->name;
+        $extension = $app->getUserStateFromRequest($context . '.filter.extension', 'extension', null, 'cmd');
+
+        $this->setState('filter.extension', $extension);
+    }
+
+    /**
+     * Method to get the name of the model.
+     *
+     * @return  string  The name of the model.
+     *
+     * @since   6.1.0
+     */
+    public function getName()
+    {
+        return 'workflow'; // TODO: change it to to handle dynamically
+    }
+
+    /**
+     * Method to get the form.
+     *
+     * @param   array  $data       An optional array of data for the form to interrogate.
+     * @param   bool   $loadData   True if the form is to load its own data (default case), false if not.
+     *
+     * @return  mixed  A \Joomla\CMS\Form\Form object on success, false on failure.
+     *
+     * @since   6.1.0
+     */
+    public function getForm($data = [], $loadData = true)
+    {
+        return false;
+    }
+}
diff --git a/administrator/components/com_workflow/src/Model/StageModel.php b/administrator/components/com_workflow/src/Model/StageModel.php
index 1c3148e155454..bda6664101ab6 100644
--- a/administrator/components/com_workflow/src/Model/StageModel.php
+++ b/administrator/components/com_workflow/src/Model/StageModel.php
@@ -203,9 +203,10 @@ protected function canEditState($record)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean A Form object on success, false on failure
+     * @return  Form A Form object, false on failure
      *
      * @since   4.0.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -219,10 +220,6 @@ public function getForm($data = [], $loadData = true)
             ]
         );
 
-        if (empty($form)) {
-            return false;
-        }
-
         $id = $data['id'] ?? $form->getValue('id');
 
         $item = $this->getItem($id);
diff --git a/administrator/components/com_workflow/src/Model/StagesModel.php b/administrator/components/com_workflow/src/Model/StagesModel.php
index bd26a985bc8ea..8a600e5cd225a 100644
--- a/administrator/components/com_workflow/src/Model/StagesModel.php
+++ b/administrator/components/com_workflow/src/Model/StagesModel.php
@@ -12,6 +12,7 @@
 namespace Joomla\Component\Workflow\Administrator\Model;
 
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\Database\ParameterType;
@@ -130,7 +131,7 @@ public function getTable($type = 'Stage', $prefix = 'Administrator', $config = [
     public function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query
             ->select(
@@ -140,9 +141,11 @@ public function getListQuery()
                     $db->quoteName('s.ordering'),
                     $db->quoteName('s.default'),
                     $db->quoteName('s.published'),
+                    $db->quoteName('s.workflow_id'),
                     $db->quoteName('s.checked_out'),
                     $db->quoteName('s.checked_out_time'),
                     $db->quoteName('s.description'),
+                    $db->quoteName('s.position'),
                     $db->quoteName('uc.name', 'editor'),
                 ]
             )
@@ -200,4 +203,70 @@ public function getWorkflow()
 
         return (object) $table->getProperties();
     }
+
+    /**
+     * Update positions for multiple workflow stages
+     *
+     * @param   array  $stages  Array of stage data, each with id, x, y values
+     *
+     *
+     * @return  boolean  True on success, false on failure
+     *
+     * @since   6.1.0
+     */
+    public function updatePositions($stagePositions, $workflowId)
+    {
+        if (empty($stagePositions) || !\is_array($stagePositions)) {
+            throw new \InvalidArgumentException(Text::_('COM_WORKFLOW_GRAPH_ERROR_INVALID_STAGE_POSITIONS'));
+        }
+
+        // Convert the stage positions to the expected format
+        $stages = [];
+        foreach ($stagePositions as $id => $position) {
+            if (isset($position['x'], $position['y'])) {
+                $stages[] = [
+                    'id' => (int) $id,
+                    'x'  => (float) $position['x'],
+                    'y'  => (float) $position['y'],
+                ];
+            } else {
+                throw new \InvalidArgumentException(Text::sprintf('COM_WORKFLOW_GRAPH_ERROR_INVALID_POSITION_DATA', $id));
+            }
+        }
+
+        $db = $this->getDatabase();
+
+        try {
+            $db->transactionStart();
+
+            foreach ($stages as $stage) {
+                if (!isset($stage['id']) || !isset($stage['x']) || !isset($stage['y'])) {
+                    throw new \InvalidArgumentException(Text::_('COM_WORKFLOW_GRAPH_ERROR_INVALID_POSITION_DATA', $stage['id']));
+                }
+
+                $id = (int) $stage['id'];
+                $x  = (float) $stage['x'];
+                $y  = (float) $stage['y'];
+
+                // Format the position as a text which can later converted to json
+                $point  = '{"x":' . $x . ', "y":' . $y . '}';
+
+                $query = $db->getQuery(true)
+                    ->update($db->quoteName('#__workflow_stages'))
+                    ->set($db->quoteName('position') . ' = :position')
+                    ->where($db->quoteName('id') . ' = :id')
+                    ->bind(':position', $point, ParameterType::STRING)
+                    ->bind(':id', $id, ParameterType::INTEGER);
+                $db->setQuery($query);
+                $db->execute();
+            }
+
+            $db->transactionCommit();
+        } catch (\Exception $e) {
+            $db->transactionRollback();
+            throw new \RuntimeException(Text::_('COM_WORKFLOW_GRAPH_ERROR_FAILED_TO_UPDATE_STAGE_POSITIONS') . ': ' . $e->getMessage());
+        }
+
+        return true;
+    }
 }
diff --git a/administrator/components/com_workflow/src/Model/TransitionModel.php b/administrator/components/com_workflow/src/Model/TransitionModel.php
index e5b26901f64c2..448625d4dc658 100644
--- a/administrator/components/com_workflow/src/Model/TransitionModel.php
+++ b/administrator/components/com_workflow/src/Model/TransitionModel.php
@@ -105,7 +105,7 @@ protected function canEditState($record)
      *
      * @param   integer  $pk  The id of the primary key.
      *
-     * @return  \Joomla\CMS\Object\CMSObject|boolean  Object on success, false on failure.
+     * @return  \stdClass|boolean  Object on success, false on failure.
      *
      * @since   4.0.0
      */
@@ -210,9 +210,10 @@ protected function generateNewTitle($categoryId, $alias, $title)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   4.0.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -226,10 +227,6 @@ public function getForm($data = [], $loadData = true)
             ]
         );
 
-        if (empty($form)) {
-            return false;
-        }
-
         $id = $data['id'] ?? $form->getValue('id');
 
         $item = $this->getItem($id);
diff --git a/administrator/components/com_workflow/src/Model/TransitionsModel.php b/administrator/components/com_workflow/src/Model/TransitionsModel.php
index 7a3171c9cc6ce..68c8349e55c0a 100644
--- a/administrator/components/com_workflow/src/Model/TransitionsModel.php
+++ b/administrator/components/com_workflow/src/Model/TransitionsModel.php
@@ -131,7 +131,7 @@ protected function getReorderConditions($table)
     public function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query
             ->select(
@@ -141,6 +141,7 @@ public function getListQuery()
                     $db->quoteName('t.from_stage_id'),
                     $db->quoteName('t.to_stage_id'),
                     $db->quoteName('t.published'),
+                    $db->quoteName('t.workflow_id'),
                     $db->quoteName('t.checked_out'),
                     $db->quoteName('t.checked_out_time'),
                     $db->quoteName('t.ordering'),
diff --git a/administrator/components/com_workflow/src/Model/WorkflowModel.php b/administrator/components/com_workflow/src/Model/WorkflowModel.php
index ea47b4a7f5282..9ca07c065f60f 100644
--- a/administrator/components/com_workflow/src/Model/WorkflowModel.php
+++ b/administrator/components/com_workflow/src/Model/WorkflowModel.php
@@ -146,9 +146,10 @@ public function save($data)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  \Joomla\CMS\Form\Form|boolean A Form object on success, false on failure
+     * @return  Form A Form object
      *
      * @since   4.0.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
@@ -162,10 +163,6 @@ public function getForm($data = [], $loadData = true)
             ]
         );
 
-        if (empty($form)) {
-            return false;
-        }
-
         $id = $data['id'] ?? $form->getValue('id');
 
         $item = $this->getItem($id);
diff --git a/administrator/components/com_workflow/src/Model/WorkflowsModel.php b/administrator/components/com_workflow/src/Model/WorkflowsModel.php
index 1a2f14a0a1585..a660ad10d12cd 100644
--- a/administrator/components/com_workflow/src/Model/WorkflowsModel.php
+++ b/administrator/components/com_workflow/src/Model/WorkflowsModel.php
@@ -165,7 +165,7 @@ protected function countItems($items)
             $item->count_transitions = 0;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             [
@@ -180,7 +180,7 @@ protected function countItems($items)
 
         $status = $db->setQuery($query)->loadObjectList('workflow_id');
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             [
@@ -216,7 +216,7 @@ protected function countItems($items)
     public function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             [
diff --git a/administrator/components/com_workflow/src/Table/StageTable.php b/administrator/components/com_workflow/src/Table/StageTable.php
index 9392b80750140..f3fa0738d597d 100644
--- a/administrator/components/com_workflow/src/Table/StageTable.php
+++ b/administrator/components/com_workflow/src/Table/StageTable.php
@@ -67,7 +67,7 @@ public function delete($pk = null)
         $app = Factory::getApplication();
         $pk  = (int) $pk;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('default'))
             ->from($db->quoteName('#__workflow_stages'))
             ->where($db->quoteName('id') . ' = :id')
@@ -82,7 +82,7 @@ public function delete($pk = null)
         }
 
         try {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__workflow_transitions'))
                 ->where(
                     [
@@ -135,7 +135,7 @@ public function check()
             }
         } else {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query
                 ->select($db->quoteName('id'))
diff --git a/administrator/components/com_workflow/src/Table/WorkflowTable.php b/administrator/components/com_workflow/src/Table/WorkflowTable.php
index 58d634d1b5b15..e0b269cb3bf7f 100644
--- a/administrator/components/com_workflow/src/Table/WorkflowTable.php
+++ b/administrator/components/com_workflow/src/Table/WorkflowTable.php
@@ -73,7 +73,7 @@ public function delete($pk = null)
         $pk  = (int) $pk;
 
         // Gets the workflow information that is going to be deleted.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('default'))
             ->from($db->quoteName('#__workflows'))
             ->where($db->quoteName('id') . ' = :id')
@@ -89,14 +89,14 @@ public function delete($pk = null)
 
         // Delete the workflow states, then transitions from all tables.
         try {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__workflow_stages'))
                 ->where($db->quoteName('workflow_id') . ' = :id')
                 ->bind(':id', $pk, ParameterType::INTEGER);
 
             $db->setQuery($query)->execute();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__workflow_transitions'))
                 ->where($db->quoteName('workflow_id') . ' = :id')
                 ->bind(':id', $pk, ParameterType::INTEGER);
@@ -143,7 +143,7 @@ public function check()
             }
         } else {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query
                 ->select($db->quoteName('id'))
@@ -301,7 +301,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
 
         // Build the query to get the asset id for the parent category.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__assets'))
             ->where($db->quoteName('name') . ' = :extension')
diff --git a/administrator/components/com_workflow/src/View/Graph/HtmlView.php b/administrator/components/com_workflow/src/View/Graph/HtmlView.php
new file mode 100644
index 0000000000000..fb75e4e498e80
--- /dev/null
+++ b/administrator/components/com_workflow/src/View/Graph/HtmlView.php
@@ -0,0 +1,159 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_workflow
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Workflow\Administrator\View\Graph;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\FileLayout;
+use Joomla\CMS\MVC\View\GenericDataException;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\Component\Workflow\Administrator\Model\GraphModel;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * View class to display the entire workflow graph
+ *
+ * @since  6.1.0
+ */
+class HtmlView extends BaseHtmlView
+{
+    /**
+     * The model state
+     *
+     * @var    object
+     * @since  6.1.0
+     */
+    protected $state;
+
+    /**
+     * Items array
+     *
+     * @var    object
+     * @since  6.1.0
+     */
+    protected $item;
+
+    /**
+     * The name of current extension
+     *
+     * @var    string
+     * @since  6.1.0
+     */
+    protected $extension;
+
+    /**
+     * The ID of current workflow
+     *
+     * @var    integer
+     * @since  6.1.0
+     */
+    protected $workflow;
+
+    /**
+     * The section of the current extension
+     *
+     * @var    string
+     * @since  6.1.0
+     */
+    protected $section;
+
+    /**
+     * Display the view
+     *
+     * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+     *
+     * @return  void
+     *
+     * @since  6.1.0
+     */
+    public function display($tpl = null)
+    {
+        /** @var GraphModel $model */
+        $model = $this->getModel();
+
+        // Get the data
+        try {
+            $this->state = $model->getState();
+            $this->item  = $model->getItem();
+        } catch (\Exception $e) {
+            throw new GenericDataException(Text::_('COM_WORKFLOW_GRAPH_ERROR_FETCHING_MODEL') . $e->getMessage(), 500, $e);
+        }
+
+        $extension = $this->state->get('filter.extension');
+
+        $parts = explode('.', $extension);
+
+        $this->extension = array_shift($parts);
+
+        if (!empty($parts)) {
+            $this->section = array_shift($parts);
+        }
+
+        // Prepare workflow data for frontend
+        $options = [
+            'apiBaseUrl' => Route::_('index.php?option=com_workflow'),
+            'extension'  => $this->escape($this->extension),
+            'workflowId' => $this->item->id,
+        ];
+
+
+        // Set the toolbar
+        $this->addToolbar();
+
+        // Inject workflow data as JS options for frontend
+        $this->getDocument()->addScriptOptions('com_workflow', $options);
+
+        // Display the template
+        parent::display($tpl);
+    }
+
+    /**
+     * Add the page title and toolbar.
+     *
+     * @return  void
+     *
+     * @since  6.1.0
+     */
+    protected function addToolbar()
+    {
+        Factory::getApplication()->getInput()->set('hidemainmenu', true);
+
+        $user     = $this->getCurrentUser();
+        $userId   = $user->id;
+        $toolbar  = $this->getDocument()->getToolbar();
+
+        $canDo     = ContentHelper::getActions($this->extension, 'workflow', $this->item->id);
+
+        ToolbarHelper::title(Text::_('COM_WORKFLOW_GRAPH_WORKFLOWS_EDIT'), 'file-alt contact');
+
+        // Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
+        $itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);
+
+        $toolbar->link(
+            'JTOOLBAR_CLOSE',
+            Route::_('index.php?option=com_workflow&view=workflows&extension=' . $this->escape($this->item->extension))
+        )
+            ->icon('icon-cancel')->buttonClass('btn btn-danger');
+
+        if ($itemEditable) {
+            $toolbar->help('Workflow');
+            $shortcutsLayout = new FileLayout('toolbar.shortcuts', JPATH_ADMINISTRATOR . '/components/com_workflow/layouts');
+            $toolbar->customButton('Shortcuts')
+                ->html($shortcutsLayout->render([]));
+        }
+    }
+}
diff --git a/administrator/components/com_workflow/src/View/Stage/HtmlView.php b/administrator/components/com_workflow/src/View/Stage/HtmlView.php
index 98dfda3cc8229..60b1c9d9b68e3 100644
--- a/administrator/components/com_workflow/src/View/Stage/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Stage/HtmlView.php
@@ -100,6 +100,10 @@ public function display($tpl = null)
             $this->section = array_shift($parts);
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task', 'stage.edit');
+
         // Set the toolbar
         $this->addToolbar();
 
diff --git a/administrator/components/com_workflow/src/View/Stages/HtmlView.php b/administrator/components/com_workflow/src/View/Stages/HtmlView.php
index 151303cfa9e68..da1edabcb3ab0 100644
--- a/administrator/components/com_workflow/src/View/Stages/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Stages/HtmlView.php
@@ -150,6 +150,13 @@ public function display($tpl = null)
             $this->section = array_shift($parts);
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0')
+            ->addControlField('workflow_id', $this->workflowID)
+            ->addControlField('extension', $this->extension);
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_workflow/src/View/Transition/HtmlView.php b/administrator/components/com_workflow/src/View/Transition/HtmlView.php
index 02be9638117d2..5e4c4a04ab5e8 100644
--- a/administrator/components/com_workflow/src/View/Transition/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Transition/HtmlView.php
@@ -65,7 +65,7 @@ class HtmlView extends BaseHtmlView
     /**
      * The application input object.
      *
-     * @var    \Joomla\CMS\Input\Input
+     * @var    \Joomla\Input\Input
      * @since  4.0.0
      */
     protected $input;
@@ -138,6 +138,10 @@ public function display($tpl = null)
         // Get the ID of workflow
         $this->workflowID = $this->input->getCmd("workflow_id");
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task', 'transition.edit');
+
         // Set the toolbar
         $this->addToolbar();
 
diff --git a/administrator/components/com_workflow/src/View/Transitions/HtmlView.php b/administrator/components/com_workflow/src/View/Transitions/HtmlView.php
index aeb0ddbef80e5..1c21f2677fc43 100644
--- a/administrator/components/com_workflow/src/View/Transitions/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Transitions/HtmlView.php
@@ -143,6 +143,13 @@ public function display($tpl = null)
             $this->section = array_shift($parts);
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0')
+            ->addControlField('workflow_id', $this->workflowID)
+            ->addControlField('extension', $this->extension);
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_workflow/src/View/Workflow/HtmlView.php b/administrator/components/com_workflow/src/View/Workflow/HtmlView.php
index 30ff34caddfee..21cb043217a1b 100644
--- a/administrator/components/com_workflow/src/View/Workflow/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Workflow/HtmlView.php
@@ -104,6 +104,10 @@ public function display($tpl = null)
             $this->section = array_shift($parts);
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task', 'workflow.edit');
+
         // Set the toolbar
         $this->addToolbar();
 
diff --git a/administrator/components/com_workflow/src/View/Workflows/HtmlView.php b/administrator/components/com_workflow/src/View/Workflows/HtmlView.php
index adf2797c1959d..a132d883a8855 100644
--- a/administrator/components/com_workflow/src/View/Workflows/HtmlView.php
+++ b/administrator/components/com_workflow/src/View/Workflows/HtmlView.php
@@ -123,6 +123,11 @@ public function display($tpl = null)
             $this->section = array_shift($parts);
         }
 
+        // Add form control fields
+        $this->filterForm
+            ->addControlField('task')
+            ->addControlField('boxchecked', '0');
+
         $this->addToolbar();
 
         parent::display($tpl);
diff --git a/administrator/components/com_workflow/tmpl/graph/default.php b/administrator/components/com_workflow/tmpl/graph/default.php
new file mode 100644
index 0000000000000..24033f0c2183e
--- /dev/null
+++ b/administrator/components/com_workflow/tmpl/graph/default.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_workflow
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @since       6.1.0
+ */
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+use Joomla\CMS\Language\Text;
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('joomla.dialog-autocreate')
+    ->useScript('com_workflow.workflowgraph')
+    ->useStyle('com_workflow.workflowgraph');
+
+// Populate the language
+$this->loadTemplate('texts');
+
+$shortcuts = [
+    ['key' => 'Alt + N',                 'description' => Text::_('COM_WORKFLOW_GRAPH_ADD_STAGE')],
+    ['key' => 'Alt + M',                 'description' => Text::_('COM_WORKFLOW_GRAPH_ADD_TRANSITION')],
+    ['key' => 'Enter / SpaceBar',        'description' => Text::_('COM_WORKFLOW_GRAPH_SELECT_ITEM')],
+    ['key' => 'Select + E',              'description' => Text::_('COM_WORKFLOW_GRAPH_EDIT_ITEM')],
+    ['key' => 'Select + Delete',         'description' => Text::_('COM_WORKFLOW_GRAPH_TRASH_ITEM')],
+    ['key' => 'Select + Backspace',      'description' => Text::_('COM_WORKFLOW_GRAPH_TRASH_ITEM')],
+    ['key' => 'Select + Shift + Arrows', 'description' => Text::_('COM_WORKFLOW_GRAPH_MOVE_STAGE')],
+    ['key' => 'Escape',                  'description' => Text::_('COM_WORKFLOW_GRAPH_CLEAR_SELECTION')],
+    ['key' => '+ / =',                   'description' => Text::_('COM_WORKFLOW_GRAPH_ZOOM_IN')],
+    ['key' => '- / _',                   'description' => Text::_('COM_WORKFLOW_GRAPH_ZOOM_OUT')],
+    ['key' => 'F',                       'description' => Text::_('COM_WORKFLOW_GRAPH_FIT_VIEW')],
+    ['key' => 'Tab',                     'description' => Text::_('COM_WORKFLOW_GRAPH_FOCUS_TYPE_CHANGE')],
+    ['key' => 'Arrows',                  'description' => Text::_('COM_WORKFLOW_GRAPH_NAVIGATE_NODES')],
+    ['key' => 'Shift + Arrows',          'description' => Text::_('COM_WORKFLOW_GRAPH_MOVE_VIEW')],
+];
+
+$col1 = \array_slice($shortcuts, 0, ceil(\count($shortcuts) / 2));
+$col2 = \array_slice($shortcuts, ceil(\count($shortcuts) / 2));
+
+$shortcutsHtml   = [];
+$shortcutsHtml[] = '<section class="p-3">';
+$shortcutsHtml[] = '<div class="row">';
+$renderColumn    = function ($column) {
+    $html = '<div class="col-md-6">';
+    $html .= '<table class="table table-borderless mb-0">';
+    $html .= '<legend class="fw-bold mb-2 d-none">' . Text::_('COM_WORKFLOW_GRAPH_SHORTCUTS_TITLE') . '</legend>';
+    foreach ($column as $item) {
+        $html .= '<tr>';
+        $html .= '<th scope="row" class="fw-bold text-nowrap"><kbd>' . htmlspecialchars($item['key']) . '</kbd></th>';
+        $html .= '<td>' . $item['description'] . '</td>';
+        $html .= '</tr>';
+    }
+    $html .= '</table></div>';
+    return $html;
+};
+
+$shortcutsHtml[] = $renderColumn($col1);
+$shortcutsHtml[] = $renderColumn($col2);
+
+$shortcutsHtml[] = '</div>';
+$shortcutsHtml[] = '</section>';
+?>
+
+<template id="shortcuts-popup-content">
+    <?php echo implode($shortcutsHtml); ?>
+</template>
+<section id="workflow-graph-root" aria-label="<?php echo Text::_('COM_WORKFLOW_GRAPH'); ?>"></section>
diff --git a/administrator/components/com_workflow/tmpl/graph/default_texts.php b/administrator/components/com_workflow/tmpl/graph/default_texts.php
new file mode 100644
index 0000000000000..6b5feef6ed435
--- /dev/null
+++ b/administrator/components/com_workflow/tmpl/graph/default_texts.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_workflow
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @since       6.1.0
+ */
+
+use Joomla\CMS\Language\Text;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+// Populate the language
+$translationStrings = [
+    'COM_WORKFLOW_GRAPH',
+    'COM_WORKFLOW_GRAPH_ADD_STAGE',
+    'COM_WORKFLOW_GRAPH_ADD_STAGE_DIALOG_OPENED',
+    'COM_WORKFLOW_GRAPH_ADD_TRANSITION_DIALOG_OPENED',
+    'COM_WORKFLOW_GRAPH_ADD_TRANSITION',
+    'COM_WORKFLOW_GRAPH_API_NOT_SET',
+    'COM_WORKFLOW_GRAPH_BACKGROUND',
+    'COM_WORKFLOW_GRAPH_CANVAS_DESCRIPTION',
+    'COM_WORKFLOW_GRAPH_CANVAS_LABEL',
+    'COM_WORKFLOW_GRAPH_CANVAS_VIEW_CONTROLS',
+    'COM_WORKFLOW_GRAPH_CLEAR_SELECTION',
+    'COM_WORKFLOW_GRAPH_CLOSE_ACTIONS_MENU',
+    'COM_WORKFLOW_GRAPH_CONTROLS',
+    'COM_WORKFLOW_GRAPH_CREATING_TRANSITION',
+    'COM_WORKFLOW_GRAPH_DEFAULT',
+    'COM_WORKFLOW_GRAPH_DISABLED',
+    'COM_WORKFLOW_GRAPH_EDIT_ITEM',
+    'COM_WORKFLOW_GRAPH_EDIT_STAGE',
+    'COM_WORKFLOW_GRAPH_EDIT_TRANSITION',
+    'COM_WORKFLOW_GRAPH_ENABLED',
+    'COM_WORKFLOW_GRAPH_ERROR_CSRF_TOKEN_NOT_SET',
+    'COM_WORKFLOW_GRAPH_ERROR_EXTENSION_NOT_SET',
+    'COM_WORKFLOW_GRAPH_ERROR_FAILED_TO_UPDATE_STAGE_POSITIONS',
+    'COM_WORKFLOW_GRAPH_ERROR_FETCHING_MODEL',
+    'COM_WORKFLOW_GRAPH_ERROR_INVALID_ID',
+    'COM_WORKFLOW_GRAPH_ERROR_INVALID_POSITION_DATA',
+    'COM_WORKFLOW_GRAPH_ERROR_INVALID_STAGE_POSITIONS',
+    'COM_WORKFLOW_GRAPH_ERROR_STAGES_NOT_FOUND',
+    'COM_WORKFLOW_GRAPH_ERROR_STAGE_DEFAULT_CANT_DELETED',
+    'COM_WORKFLOW_GRAPH_ERROR_STAGE_HAS_TRANSITIONS',
+    'COM_WORKFLOW_GRAPH_ERROR_UNKNOWN',
+    'COM_WORKFLOW_GRAPH_ERROR_WORKFLOW_ID_NOT_SET',
+    'COM_WORKFLOW_GRAPH_ERROR_WORKFLOW_NOT_FOUND',
+    'COM_WORKFLOW_GRAPH_FIT_VIEW',
+    'COM_WORKFLOW_GRAPH_FOCUS_TYPE_CHANGE',
+    'COM_WORKFLOW_GRAPH_FROM_ANY',
+    'COM_WORKFLOW_GRAPH_LOADING',
+    'COM_WORKFLOW_GRAPH_MINIMAP_HIDE',
+    'COM_WORKFLOW_GRAPH_MINIMAP_LABEL',
+    'COM_WORKFLOW_GRAPH_MINIMAP_SHOW',
+    'COM_WORKFLOW_GRAPH_MOVE_STAGE',
+    'COM_WORKFLOW_GRAPH_MOVE_VIEW',
+    'COM_WORKFLOW_GRAPH_NAVIGATE_NODES',
+    'COM_WORKFLOW_GRAPH_OPEN_ACTIONS_MENU',
+    'COM_WORKFLOW_GRAPH_SELECTION_CLEARED',
+    'COM_WORKFLOW_GRAPH_SELECT_ITEM',
+    'COM_WORKFLOW_GRAPH_SHORTCUTS',
+    'COM_WORKFLOW_GRAPH_SHORTCUTS_TITLE',
+    'COM_WORKFLOW_GRAPH_STAGE',
+    'COM_WORKFLOW_GRAPH_STAGES',
+    'COM_WORKFLOW_GRAPH_STAGE_ACTIONS',
+    'COM_WORKFLOW_GRAPH_STAGE_COUNT',
+    'COM_WORKFLOW_GRAPH_STAGE_DEFAULT',
+    'COM_WORKFLOW_GRAPH_STAGE_DESCRIPTION',
+    'COM_WORKFLOW_GRAPH_STAGE_POSITIONS_UPDATED',
+    'COM_WORKFLOW_GRAPH_STAGE_REF',
+    'COM_WORKFLOW_GRAPH_STAGE_SELECTED',
+    'COM_WORKFLOW_GRAPH_STAGE_STATUS_ENABLED',
+    'COM_WORKFLOW_GRAPH_STAGE_STATUS_DISABLED',
+    'COM_WORKFLOW_GRAPH_STATUS',
+    'COM_WORKFLOW_GRAPH_TRANSITION',
+    'COM_WORKFLOW_GRAPH_TRANSITIONS',
+    'COM_WORKFLOW_GRAPH_TRANSITION_ACTIONS',
+    'COM_WORKFLOW_GRAPH_TRANSITION_COUNT',
+    'COM_WORKFLOW_GRAPH_TRANSITION_DESCRIPTION',
+    'COM_WORKFLOW_GRAPH_TRANSITION_PATH',
+    'COM_WORKFLOW_GRAPH_TRANSITION_REF',
+    'COM_WORKFLOW_GRAPH_TRANSITION_SELECTED',
+    'COM_WORKFLOW_GRAPH_TRANSITION_STATUS_ENABLED',
+    'COM_WORKFLOW_GRAPH_TRANSITION_STATUS_DISABLED',
+    'COM_WORKFLOW_GRAPH_TRASH_ITEM',
+    'COM_WORKFLOW_GRAPH_TRASH_STAGE',
+    'COM_WORKFLOW_GRAPH_TRASH_STAGE_CONFIRM',
+    'COM_WORKFLOW_GRAPH_TRASH_STAGE_FAILED',
+    'COM_WORKFLOW_GRAPH_TRASH_TRANSITION',
+    'COM_WORKFLOW_GRAPH_TRASH_TRANSITION_CONFIRM',
+    'COM_WORKFLOW_GRAPH_TRASH_TRANSITION_FAILED',
+    'COM_WORKFLOW_GRAPH_UNSAVED_CHANGES',
+    'COM_WORKFLOW_GRAPH_UPDATE_STAGE_POSITION_FAILED',
+    'COM_WORKFLOW_GRAPH_UP_TO_DATE',
+    'COM_WORKFLOW_GRAPH_WORKFLOWS_EDIT',
+    'COM_WORKFLOW_GRAPH_ZOOM_IN',
+    'COM_WORKFLOW_GRAPH_ZOOM_OUT',
+    'JNO',
+    'JYES',
+];
+
+foreach ($translationStrings as $string) {
+    Text::script($string);
+}
diff --git a/administrator/components/com_workflow/tmpl/stage/edit.php b/administrator/components/com_workflow/tmpl/stage/edit.php
index 37aaaf22b4dac..83eae9b3757a6 100644
--- a/administrator/components/com_workflow/tmpl/stage/edit.php
+++ b/administrator/components/com_workflow/tmpl/stage/edit.php
@@ -85,7 +85,7 @@
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
         <?php echo $this->form->getInput('workflow_id'); ?>
-        <input type="hidden" name="task" value="stage.edit" />
-        <?php echo HTMLHelper::_('form.token'); ?>
+
+        <?php echo $this->form->renderControlFields(); ?>
     </div>
 </form>
diff --git a/administrator/components/com_workflow/tmpl/stage/modal.php b/administrator/components/com_workflow/tmpl/stage/modal.php
new file mode 100644
index 0000000000000..7159da0909b34
--- /dev/null
+++ b/administrator/components/com_workflow/tmpl/stage/modal.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_workflow
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var \Joomla\Component\Workflow\Administrator\View\Stage\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/administrator/components/com_workflow/tmpl/stage/modalreturn.php b/administrator/components/com_workflow/tmpl/stage/modalreturn.php
new file mode 100644
index 0000000000000..ee959b6796ba2
--- /dev/null
+++ b/administrator/components/com_workflow/tmpl/stage/modalreturn.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_workflow
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$item = $this->get('Item');
+
+$icon     = 'icon-check';
+$title    = $item ? $item->title : '';
+$content  = '';
+$data     = ['contentType' => 'com_workflow.stage'];
+
+if ($item) {
+    $data['id']        = $item->id;
+    $data['title']     = $item->title;
+    $data['workflow']  = $item->workflow_id ?? '';
+}
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $this->escape($title); ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $content; ?>
+        </p>
+    </div>
+</div>
diff --git a/administrator/components/com_workflow/tmpl/stages/default.php b/administrator/components/com_workflow/tmpl/stages/default.php
index c9a053226c9b1..22ba1d112bf35 100644
--- a/administrator/components/com_workflow/tmpl/stages/default.php
+++ b/administrator/components/com_workflow/tmpl/stages/default.php
@@ -149,11 +149,8 @@
                     <?php echo $this->pagination->getListFooter(); ?>
 
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <input type="hidden" name="workflow_id" value="<?php echo (int) $this->workflowID ?>">
-                <input type="hidden" name="extension" value="<?php echo $this->extension ?>">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_workflow/tmpl/transition/edit.php b/administrator/components/com_workflow/tmpl/transition/edit.php
index 27e39dfb63392..e6894ba30c9f1 100644
--- a/administrator/components/com_workflow/tmpl/transition/edit.php
+++ b/administrator/components/com_workflow/tmpl/transition/edit.php
@@ -44,6 +44,16 @@
         <?php echo HTMLHelper::_('uitab.addTab', 'myTab', 'details', Text::_('COM_WORKFLOW_TRANSITION')); ?>
         <div class="row">
             <div class="col-lg-9">
+                <?php
+                if ($isModal) {
+                    $fromStage = $app->getInput()->get('from_stage_id');
+                    $toStage = $app->getInput()->get('to_stage_id');
+                    if ($fromStage && $toStage) {
+                        $this->form->setFieldAttribute('from_stage_id', 'default', $fromStage);
+                        $this->form->setFieldAttribute('to_stage_id', 'default', $toStage);
+                    }
+                }
+                ?>
                 <?php echo $this->form->renderField('from_stage_id'); ?>
                 <?php echo $this->form->renderField('to_stage_id'); ?>
                 <?php echo $this->form->renderField('description'); ?>
@@ -68,6 +78,6 @@
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
     </div>
     <?php echo $this->form->getInput('workflow_id'); ?>
-    <input type="hidden" name="task" value="transition.edit" />
-    <?php echo HTMLHelper::_('form.token'); ?>
+
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_workflow/tmpl/transition/modal.php b/administrator/components/com_workflow/tmpl/transition/modal.php
new file mode 100644
index 0000000000000..a30f0b983281b
--- /dev/null
+++ b/administrator/components/com_workflow/tmpl/transition/modal.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_workflow
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/** @var \Joomla\Component\Workflow\Administrator\View\Transition\HtmlView $this */
+?>
+<div class="subhead noshadow mb-3">
+    <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>
+</div>
+<div class="container-popup">
+    <?php $this->setLayout('edit'); ?>
+    <?php echo $this->loadTemplate(); ?>
+</div>
diff --git a/administrator/components/com_workflow/tmpl/transition/modalreturn.php b/administrator/components/com_workflow/tmpl/transition/modalreturn.php
new file mode 100644
index 0000000000000..253ccca36d24c
--- /dev/null
+++ b/administrator/components/com_workflow/tmpl/transition/modalreturn.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_workflow
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$item = $this->get('Item');
+
+$icon     = 'icon-check';
+$title    = $item ? $item->title : '';
+$content  = '';
+$data     = ['contentType' => 'com_workflow.transition'];
+
+if ($item) {
+    $data['id']        = $item->id;
+    $data['title']     = $item->title;
+    $data['workflow']  = $item->workflow_id ?? '';
+}
+
+// Add Content select script
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
+$wa->useScript('modal-content-select');
+
+// The data for Content select script
+$this->getDocument()->addScriptOptions('content-select-on-load', $data, false);
+?>
+
+<div class="px-4 py-5 my-5 text-center">
+    <span class="fa-8x mb-4 <?php echo $icon; ?>" aria-hidden="true"></span>
+    <h1 class="display-5 fw-bold"><?php echo $this->escape($title); ?></h1>
+    <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">
+            <?php echo $content; ?>
+        </p>
+    </div>
+</div>
diff --git a/administrator/components/com_workflow/tmpl/transitions/default.php b/administrator/components/com_workflow/tmpl/transitions/default.php
index 4f5967a2e040a..c416ff7e2acfc 100644
--- a/administrator/components/com_workflow/tmpl/transitions/default.php
+++ b/administrator/components/com_workflow/tmpl/transitions/default.php
@@ -156,11 +156,8 @@
                     <?php // load the pagination. ?>
                     <?php echo $this->pagination->getListFooter(); ?>
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <input type="hidden" name="workflow_id" value="<?php echo (int) $this->workflowID ?>">
-                <input type="hidden" name="extension" value="<?php echo $this->escape($this->workflow->extension); ?>">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_workflow/tmpl/workflow/edit.php b/administrator/components/com_workflow/tmpl/workflow/edit.php
index 5ba15fef7dd43..8c0e2a8ae1d0a 100644
--- a/administrator/components/com_workflow/tmpl/workflow/edit.php
+++ b/administrator/components/com_workflow/tmpl/workflow/edit.php
@@ -87,6 +87,6 @@
         <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
     </div>
     <?php echo $this->form->getInput('extension'); ?>
-    <input type="hidden" name="task" value="workflow.edit" />
-    <?php echo HTMLHelper::_('form.token'); ?>
+
+    <?php echo $this->form->renderControlFields(); ?>
 </form>
diff --git a/administrator/components/com_workflow/tmpl/workflows/default.php b/administrator/components/com_workflow/tmpl/workflows/default.php
index 6409e3e6e1e5e..4aef59dca7797 100644
--- a/administrator/components/com_workflow/tmpl/workflows/default.php
+++ b/administrator/components/com_workflow/tmpl/workflows/default.php
@@ -98,7 +98,10 @@
                                 <th scope="col" class="w-10 text-center d-none d-md-table-cell">
                                     <?php echo Text::_('COM_WORKFLOW_COUNT_TRANSITIONS'); ?>
                                 </th>
-                                <th scope="col" class="w-10 d-none d-md-table-cell">
+                                <th scope="col" class="w-10 text-center d-none d-md-table-cell">
+                                    <?php echo Text::_('COM_WORKFLOW_GRAPH'); ?>
+                                </th>
+                                <th scope="col" class="w-10 text-center d-none d-md-table-cell">
                                     <?php echo HTMLHelper::_('searchtools.sort', 'COM_WORKFLOW_ID', 'w.id', $listDirn, $listOrder); ?>
                                 </th>
                             </tr>
@@ -110,6 +113,7 @@
                             $states = Route::_('index.php?option=com_workflow&view=stages&workflow_id=' . $item->id . '&extension=' . $extension);
                             $transitions = Route::_('index.php?option=com_workflow&view=transitions&workflow_id=' . $item->id . '&extension=' . $extension);
                             $edit = Route::_('index.php?option=com_workflow&task=workflow.edit&id=' . $item->id . '&extension=' . $extension);
+                            $graph = Route::_('index.php?option=com_workflow&view=graph&id=' . $item->id . '&extension=' . $extension);
 
                             $canEdit    = $user->authorise('core.edit', $extension . '.workflow.' . $item->id);
                             $canCheckin = $user->authorise('core.admin', 'com_workflow') || $item->checked_out == $userId || is_null($item->checked_out);
@@ -174,19 +178,27 @@
                                         <?php echo Text::_('COM_WORKFLOW_COUNT_TRANSITIONS'); ?>
                                     </div>
                                 </td>
-                                <td class="d-none d-md-table-cell">
+                                <td class="text-center btns d-none d-md-table-cell">
+                                    <a class="btn btn-primary px-2 py-1" href="<?php echo $graph; ?>" aria-describedby="tip-graph<?php echo $i; ?>">
+                                        <span class="fa fa-diagram-project" aria-hidden="true"></span>
+                                    </a>
+                                    <div role="tooltip" id="tip-graph<?php echo $i; ?>">
+                                        <?php echo Text::_('COM_WORKFLOW_GRAPH'); ?>
+                                    </div>
+                                </td>
+                                <td class="text-center d-none d-md-table-cell">
                                     <?php echo $item->id; ?>
                                 </td>
                             </tr>
                         <?php endforeach ?>
+                        </tbody>
                     </table>
                     <?php // load the pagination. ?>
                     <?php echo $this->pagination->getListFooter(); ?>
 
                 <?php endif; ?>
-                <input type="hidden" name="task" value="">
-                <input type="hidden" name="boxchecked" value="0">
-                <?php echo HTMLHelper::_('form.token'); ?>
+
+                <?php echo $this->filterForm->renderControlFields(); ?>
             </div>
         </div>
     </div>
diff --git a/administrator/components/com_workflow/workflow.xml b/administrator/components/com_workflow/workflow.xml
index eab5374c25ca8..b4f782472383f 100644
--- a/administrator/components/com_workflow/workflow.xml
+++ b/administrator/components/com_workflow/workflow.xml
@@ -15,6 +15,8 @@
 		<files folder="admin">
 			<filename>workflow.xml</filename>
 			<folder>forms</folder>
+			<folder>layouts</folder>
+			<folder>resources</folder>
 			<folder>services</folder>
 			<folder>src</folder>
 			<folder>tmpl</folder>
diff --git a/administrator/help/en-GB/toc.json b/administrator/help/en-GB/toc.json
deleted file mode 100644
index 5af8c2abd5c5b..0000000000000
--- a/administrator/help/en-GB/toc.json
+++ /dev/null
@@ -1 +0,0 @@
-{"Articles":"ARTICLES","Articles:_Categories":"ARTICLES:_CATEGORIES","Articles:_Edit":"ARTICLES:_EDIT","Articles:_Edit_Category":"ARTICLES:_EDIT_CATEGORY","Articles:_Featured":"ARTICLES:_FEATURED","Banners":"BANNERS","Banners:_Categories":"BANNERS:_CATEGORIES","Banners:_Clients":"BANNERS:_CLIENTS","Banners:_Edit":"BANNERS:_EDIT","Banners:_New_or_Edit_Category":"BANNERS:_NEW_OR_EDIT_CATEGORY","Banners:_New_or_Edit_Client":"BANNERS:_NEW_OR_EDIT_CLIENT","Banners:_Tracks":"BANNERS:_TRACKS","Contacts":"CONTACTS","Contacts:_Categories":"CONTACTS:_CATEGORIES","Contacts:_Edit":"CONTACTS:_EDIT","Contacts:_Edit_Category":"CONTACTS:_EDIT_CATEGORY","Admin_Modules:_Action_Logs_-_Latest":"ADMIN_MODULES:_ACTION_LOGS_-_LATEST","Admin_Modules:_Administrator_Dashboard_Menu":"ADMIN_MODULES:_ADMINISTRATOR_DASHBOARD_MENU","Admin_Modules:_Administrator_Menu":"ADMIN_MODULES:_ADMINISTRATOR_MENU","Admin_Modules:_Articles_-_Latest":"ADMIN_MODULES:_ARTICLES_-_LATEST","Admin_Modules:_Custom":"ADMIN_MODULES:_CUSTOM","Admin_Modules:_Feed_Display":"ADMIN_MODULES:_FEED_DISPLAY","Admin_Modules:_Frontend_Link":"ADMIN_MODULES:_FRONTEND_LINK","Admin_Modules:_Guided_Tours":"ADMIN_MODULES:_GUIDED_TOURS","Admin_Modules:_Joomla_Version_Information":"ADMIN_MODULES:_JOOMLA_VERSION_INFORMATION","Admin_Modules:_Login_Form":"ADMIN_MODULES:_LOGIN_FORM","Admin_Modules:_Login_Support_Information":"ADMIN_MODULES:_LOGIN_SUPPORT_INFORMATION","Admin_Modules:_Messages":"ADMIN_MODULES:_MESSAGES","Admin_Modules:_Multilingual_Status":"ADMIN_MODULES:_MULTILINGUAL_STATUS","Admin_Modules:_Popular_Articles":"ADMIN_MODULES:_POPULAR_ARTICLES","Admin_Modules:_Post_Installation_Messages":"ADMIN_MODULES:_POST_INSTALLATION_MESSAGES","Admin_Modules:_Privacy_Dashboard":"ADMIN_MODULES:_PRIVACY_DASHBOARD","Admin_Modules:_Privacy_Status_Check":"ADMIN_MODULES:_PRIVACY_STATUS_CHECK","Admin_Modules:_Quick_Icons":"ADMIN_MODULES:_QUICK_ICONS","Admin_Modules:_Sample_Data":"ADMIN_MODULES:_SAMPLE_DATA","Admin_Modules:_Title":"ADMIN_MODULES:_TITLE","Admin_Modules:_Toolbar":"ADMIN_MODULES:_TOOLBAR","Articles:_Options":"ARTICLES:_OPTIONS","Banners:_Options":"BANNERS:_OPTIONS","Cache:_Options":"CACHE:_OPTIONS","Check-in:_Options":"CHECK-IN:_OPTIONS","Contacts:_Options":"CONTACTS:_OPTIONS","Edit_Update_Site":"EDIT_UPDATE_SITE","Editors":"EDITORS","Extensions:_Discover":"EXTENSIONS:_DISCOVER","Extensions:_Install":"EXTENSIONS:_INSTALL","Extensions:_Languages":"EXTENSIONS:_LANGUAGES","Extensions:_Manage":"EXTENSIONS:_MANAGE","Extensions:_Update":"EXTENSIONS:_UPDATE","Extensions:_Update_Sites":"EXTENSIONS:_UPDATE_SITES","Field_Groups":"FIELD_GROUPS","Field_Groups:_Edit":"FIELD_GROUPS:_EDIT","Fields":"FIELDS","Fields:_Edit":"FIELDS:_EDIT","Guided_Tours":"GUIDED_TOURS","Guided_Tours:_New_or_Edit_Step":"GUIDED_TOURS:_NEW_OR_EDIT_STEP","Guided_Tours:_New_or_Edit_Tour":"GUIDED_TOURS:_NEW_OR_EDIT_TOUR","Guided_Tours:_Options":"GUIDED_TOURS:_OPTIONS","Guided_Tours:_Steps":"GUIDED_TOURS:_STEPS","Home_Dashboard":"HOME_DASHBOARD","Information:_Database":"INFORMATION:_DATABASE","Information:_Warnings":"INFORMATION:_WARNINGS","Installer:_Options":"INSTALLER:_OPTIONS","Joomla_Update":"JOOMLA_UPDATE","Joomla_Update:_Options":"JOOMLA_UPDATE:_OPTIONS","Languages:_Content":"LANGUAGES:_CONTENT","Languages:_Edit_Content_Language":"LANGUAGES:_EDIT_CONTENT_LANGUAGE","Languages:_Edit_Override":"LANGUAGES:_EDIT_OVERRIDE","Languages:_Installed":"LANGUAGES:_INSTALLED","Languages:_Options":"LANGUAGES:_OPTIONS","Languages:_Overrides":"LANGUAGES:_OVERRIDES","Mail_Template:_Edit":"MAIL_TEMPLATE:_EDIT","Mail_Templates":"MAIL_TEMPLATES","Mail_Templates:_Options":"MAIL_TEMPLATES:_OPTIONS","Maintenance:_Clear_Cache":"MAINTENANCE:_CLEAR_CACHE","Maintenance:_Global_Check-in":"MAINTENANCE:_GLOBAL_CHECK-IN","Mass_Mail_Users":"MASS_MAIL_USERS","Media":"MEDIA","Media:_Options":"MEDIA:_OPTIONS","Menu_Item:_Alias":"MENU_ITEM:_ALIAS","Menu_Item:_Article_Archived":"MENU_ITEM:_ARTICLE_ARCHIVED","Menu_Item:_Compact_List_of_Tagged_Items":"MENU_ITEM:_COMPACT_LIST_OF_TAGGED_ITEMS","Menu_Item:_Components_Menu_Container":"MENU_ITEM:_COMPONENTS_MENU_CONTAINER","Menu_Item:_Confirm_Request":"MENU_ITEM:_CONFIRM_REQUEST","Menu_Item:_Create_Article":"MENU_ITEM:_CREATE_ARTICLE","Menu_Item:_Create_Contact":"MENU_ITEM:_CREATE_CONTACT","Menu_Item:_Create_Request":"MENU_ITEM:_CREATE_REQUEST","Menu_Item:_Display_Template_Options":"MENU_ITEM:_DISPLAY_TEMPLATE_OPTIONS","Menu_Item:_Extend_Consent":"MENU_ITEM:_EXTEND_CONSENT","Menu_Item:_Featured_Articles":"MENU_ITEM:_FEATURED_ARTICLES","Menu_Item:_Featured_Contacts":"MENU_ITEM:_FEATURED_CONTACTS","Menu_Item:_Heading":"MENU_ITEM:_HEADING","Menu_Item:_Iframe_Wrapper":"MENU_ITEM:_IFRAME_WRAPPER","Menu_Item:_List_All_Tags":"MENU_ITEM:_LIST_ALL_TAGS","Menu_Item:_Login_Form":"MENU_ITEM:_LOGIN_FORM","Menu_Item:_Logout":"MENU_ITEM:_LOGOUT","Menu_Item:_New_Item":"MENU_ITEM:_NEW_ITEM","Menu_Item:_Password_Reset":"MENU_ITEM:_PASSWORD_RESET","Menu_Item:_Registration_Form":"MENU_ITEM:_REGISTRATION_FORM","Menu_Item:_Search":"MENU_ITEM:_SEARCH","Menu_Item:_Separator":"MENU_ITEM:_SEPARATOR","Menu_Item:_Single_Article":"MENU_ITEM:_SINGLE_ARTICLE","Menu_Item:_Single_Contact":"MENU_ITEM:_SINGLE_CONTACT","Menu_Item:_Single_News_Feed":"MENU_ITEM:_SINGLE_NEWS_FEED","Menu_Item:_Site_Configuration_Options":"MENU_ITEM:_SITE_CONFIGURATION_OPTIONS","Menu_Item:_Tagged_Items":"MENU_ITEM:_TAGGED_ITEMS","Menu_Item:_URL":"MENU_ITEM:_URL","Menus":"MENUS","Menus:_Edit":"MENUS:_EDIT","Menus:_Items":"MENUS:_ITEMS","Menus:_Options":"MENUS:_OPTIONS","Messages:_Options":"MESSAGES:_OPTIONS","Modules":"MODULES","Modules:_Options":"MODULES:_OPTIONS","Multilingual_Associations":"MULTILINGUAL_ASSOCIATIONS","Multilingual_Associations:_Edit":"MULTILINGUAL_ASSOCIATIONS:_EDIT","Multilingual_Associations:_Options":"MULTILINGUAL_ASSOCIATIONS:_OPTIONS","My_Profile":"MY_PROFILE","News_Feed:_Options":"NEWS_FEED:_OPTIONS","News_Feeds":"NEWS_FEEDS","News_Feeds:_Categories":"NEWS_FEEDS:_CATEGORIES","News_Feeds:_Edit":"NEWS_FEEDS:_EDIT","News_Feeds:_Edit_Category":"NEWS_FEEDS:_EDIT_CATEGORY","Permissions_for_Group":"PERMISSIONS_FOR_GROUP","Permissions_for_User":"PERMISSIONS_FOR_USER","Plugin:_Options":"PLUGIN:_OPTIONS","Plugins":"PLUGINS","Plugins:_Name_of_Plugin":"PLUGINS:_NAME_OF_PLUGIN","Post-installation_Messages_for_Joomla_CMS":"POST-INSTALLATION_MESSAGES_FOR_JOOMLA_CMS","Post-installation_Messages:_Options":"POST-INSTALLATION_MESSAGES:_OPTIONS","Privacy_Dashboard":"PRIVACY_DASHBOARD","Privacy:_Consents":"PRIVACY:_CONSENTS","Privacy:_Extension_Capabilities":"PRIVACY:_EXTENSION_CAPABILITIES","Privacy:_Information_Requests":"PRIVACY:_INFORMATION_REQUESTS","Privacy:_New_Information_Request":"PRIVACY:_NEW_INFORMATION_REQUEST","Privacy:_Options":"PRIVACY:_OPTIONS","Privacy:_Review_Information_Request":"PRIVACY:_REVIEW_INFORMATION_REQUEST","Private_Messages":"PRIVATE_MESSAGES","Private_Messages:_Read":"PRIVATE_MESSAGES:_READ","Private_Messages:_Write":"PRIVATE_MESSAGES:_WRITE","Redirect:_Options":"REDIRECT:_OPTIONS","Redirects:_Links":"REDIRECTS:_LINKS","Redirects:_New_or_Edit":"REDIRECTS:_NEW_OR_EDIT","Scheduled_Tasks":"SCHEDULED_TASKS","Scheduled_Tasks:_Edit":"SCHEDULED_TASKS:_EDIT","Scheduled_Tasks:_Options":"SCHEDULED_TASKS:_OPTIONS","Site_Global_Configuration":"SITE_GLOBAL_CONFIGURATION","Site_Modules:_Articles":"SITE_MODULES:_ARTICLES","Site_Modules:_Articles_-_Archived":"SITE_MODULES:_ARTICLES_-_ARCHIVED","Site_Modules:_Articles_-_Latest":"SITE_MODULES:_ARTICLES_-_LATEST","Site_Modules:_Articles_-_Most_Read":"SITE_MODULES:_ARTICLES_-_MOST_READ","Site_Modules:_Articles_-_Newsflash":"SITE_MODULES:_ARTICLES_-_NEWSFLASH","Site_Modules:_Articles_-_Related":"SITE_MODULES:_ARTICLES_-_RELATED","Site_Modules:_Banners":"SITE_MODULES:_BANNERS","Site_Modules:_Breadcrumbs":"SITE_MODULES:_BREADCRUMBS","Site_Modules:_Custom":"SITE_MODULES:_CUSTOM","Site_Modules:_Feed_Display":"SITE_MODULES:_FEED_DISPLAY","Site_Modules:_Footer":"SITE_MODULES:_FOOTER","Site_Modules:_Language_Switcher":"SITE_MODULES:_LANGUAGE_SWITCHER","Site_Modules:_Login":"SITE_MODULES:_LOGIN","Site_Modules:_Menu":"SITE_MODULES:_MENU","Site_Modules:_Random_Image":"SITE_MODULES:_RANDOM_IMAGE","Site_Modules:_Smart_Search":"SITE_MODULES:_SMART_SEARCH","Site_Modules:_Statistics":"SITE_MODULES:_STATISTICS","Site_Modules:_Syndication_Feeds":"SITE_MODULES:_SYNDICATION_FEEDS","Site_Modules:_Tags_-_Popular":"SITE_MODULES:_TAGS_-_POPULAR","Site_Modules:_Tags_-_Similar":"SITE_MODULES:_TAGS_-_SIMILAR","Site_Modules:_Wrapper":"SITE_MODULES:_WRAPPER","Site_System_Information":"SITE_SYSTEM_INFORMATION","Smart_Search:_Content_Maps":"SMART_SEARCH:_CONTENT_MAPS","Smart_Search:_Indexed_Content":"SMART_SEARCH:_INDEXED_CONTENT","Smart_Search:_New_or_Edit_Filter":"SMART_SEARCH:_NEW_OR_EDIT_FILTER","Smart_Search:_Options":"SMART_SEARCH:_OPTIONS","Smart_Search:_Search_Filters":"SMART_SEARCH:_SEARCH_FILTERS","Smart_Search:_Search_Term_Analysis":"SMART_SEARCH:_SEARCH_TERM_ANALYSIS","Stages_List:_Basic_Workflow":"STAGES_LIST:_BASIC_WORKFLOW","Start_Here":"START_HERE","Tags":"TAGS","Tags:_New_or_Edit":"TAGS:_NEW_OR_EDIT","Tags:_Options":"TAGS:_OPTIONS","Template:_Options":"TEMPLATE:_OPTIONS","Templates:_Customise":"TEMPLATES:_CUSTOMISE","Templates:_Customise_Source":"TEMPLATES:_CUSTOMISE_SOURCE","Templates:_Edit_Style":"TEMPLATES:_EDIT_STYLE","Templates:_Styles":"TEMPLATES:_STYLES","Templates:_Templates":"TEMPLATES:_TEMPLATES","Transitions_List:_Basic_Workflow":"TRANSITIONS_LIST:_BASIC_WORKFLOW","User_Actions_Log":"USER_ACTIONS_LOG","User_Actions_Log:_Options":"USER_ACTIONS_LOG:_OPTIONS","User_Notes":"USER_NOTES","User_Notes:_New_or_Edit":"USER_NOTES:_NEW_OR_EDIT","Users":"USERS","Users:_Edit_Profile":"USERS:_EDIT_PROFILE","Users:_Edit_Viewing_Access_Level":"USERS:_EDIT_VIEWING_ACCESS_LEVEL","Users:_Groups":"USERS:_GROUPS","Users:_New_or_Edit_Group":"USERS:_NEW_OR_EDIT_GROUP","Users:_Options":"USERS:_OPTIONS","Users:_Viewing_Access_Levels":"USERS:_VIEWING_ACCESS_LEVELS","Workflows_List":"WORKFLOWS_LIST"}
diff --git a/administrator/includes/framework.php b/administrator/includes/framework.php
index e24951cdfeae1..48f307125ad40 100644
--- a/administrator/includes/framework.php
+++ b/administrator/includes/framework.php
@@ -9,6 +9,7 @@
 
 \defined('_JEXEC') or die;
 
+use Joomla\CMS\Exception\ExceptionHandler;
 use Joomla\CMS\Version;
 use Joomla\Utilities\IpHelper;
 
@@ -85,7 +86,7 @@
     set_error_handler(null, E_USER_DEPRECATED);
 } else {
     // Make sure handler for E_USER_DEPRECATED is registered
-    set_error_handler(['Joomla\CMS\Exception\ExceptionHandler', 'handleUserDeprecatedErrors'], E_USER_DEPRECATED);
+    set_error_handler([ExceptionHandler::class, 'handleUserDeprecatedErrors'], E_USER_DEPRECATED);
 }
 
 if (JDEBUG || $config->error_reporting === 'maximum') {
diff --git a/administrator/index.php b/administrator/index.php
index 480d1fce34f93..50e10b63f495a 100644
--- a/administrator/index.php
+++ b/administrator/index.php
@@ -10,7 +10,7 @@
 // NOTE: This file should remain compatible with PHP 5.2 to allow us to run our PHP minimum check and show a friendly error message
 
 // Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
-\define('JOOMLA_MINIMUM_PHP', '8.1.0');
+\define('JOOMLA_MINIMUM_PHP', '8.3.0');
 
 if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<')) {
     die(
diff --git a/administrator/language/en-GB/com_actionlogs.ini b/administrator/language/en-GB/com_actionlogs.ini
index d7e71dc5098e8..3abd2f2d8e7fa 100644
--- a/administrator/language/en-GB/com_actionlogs.ini
+++ b/administrator/language/en-GB/com_actionlogs.ini
@@ -58,7 +58,7 @@ COM_ACTIONLOGS_OPTION_RANGE_PAST_YEAR="In the last year"
 COM_ACTIONLOGS_OPTION_RANGE_POST_YEAR="More than a year ago"
 COM_ACTIONLOGS_OPTION_RANGE_TODAY="Today"
 COM_ACTIONLOGS_OPTIONS="Options"
-COM_ACTIONLOGS_POSTINSTALL_BODY="<p>With the release of Joomla 3.9.0 you can now log all administrative actions performed by your users in supported extensions. It is now easy to see who did what and when they did it.</p><p>The logs can be reviewed in Joomla or exported for external use.</p><p>For further information on this new feature read the <a href='https://docs.joomla.org/Special:MyLanguage/J3.x:User_Action_Logs' target='_blank' rel='noopener noreferrer'>User Action Logs documentation.</a></p>"
+COM_ACTIONLOGS_POSTINSTALL_BODY="<p>With the release of Joomla 3.9.0 you can now log all administrative actions performed by your users in supported extensions. It is now easy to see who did what and when they did it.</p><p>The logs can be reviewed in Joomla or exported for external use.</p><p>For further information on this new feature read the <a href='https://guide.joomla.org/user-manual/users/users-user-actions-log' target='_blank' rel='noopener noreferrer'>User Action Logs documentation.</a></p>"
 COM_ACTIONLOGS_POSTINSTALL_TITLE="User Actions Can Now Be Logged"
 COM_ACTIONLOGS_PURGE_CONFIRM="Are you sure want to delete all User Action logs?"
 COM_ACTIONLOGS_PURGE_FAIL="Failed to delete all User Action logs."
diff --git a/administrator/language/en-GB/com_admin.ini b/administrator/language/en-GB/com_admin.ini
index 450ecdeb052ae..7f0247def2b2e 100644
--- a/administrator/language/en-GB/com_admin.ini
+++ b/administrator/language/en-GB/com_admin.ini
@@ -24,6 +24,7 @@ COM_ADMIN_EXTENSIONS="Extensions"
 COM_ADMIN_FILE_UPLOADS="File Uploads"
 COM_ADMIN_GLOSSARY="Glossary"
 COM_ADMIN_HELP="Joomla! Help"
+COM_ADMIN_HELP_ADMIN_MODULES="Administrator Modules"
 COM_ADMIN_HELP_ADMIN_MODULES:_ACTION_LOGS_-_LATEST="Admin Modules: Action Logs - Latest"
 COM_ADMIN_HELP_ADMIN_MODULES:_ADMINISTRATOR_DASHBOARD_MENU="Admin Modules: Administrator Dashboard Menu"
 COM_ADMIN_HELP_ADMIN_MODULES:_ADMINISTRATOR_MENU="Admin Modules: Administrator Menu"
@@ -61,13 +62,16 @@ COM_ADMIN_HELP_BANNERS:_TRACKS="Banners: Tracks"
 COM_ADMIN_HELP_BANNERS="Banners"
 COM_ADMIN_HELP_CACHE:_OPTIONS="Cache: Options"
 COM_ADMIN_HELP_CHECK-IN:_OPTIONS="Check-in: Options"
+COM_ADMIN_HELP_COMPONENTS="Components"
 COM_ADMIN_HELP_CONTACTS:_CATEGORIES="Contacts: Categories"
 COM_ADMIN_HELP_CONTACTS:_EDIT_CATEGORY="Contacts: Categories - New/Edit"
 COM_ADMIN_HELP_CONTACTS:_EDIT="Contacts: New/Edit"
 COM_ADMIN_HELP_CONTACTS:_OPTIONS="Contacts: Options"
 COM_ADMIN_HELP_CONTACTS="Contacts"
+COM_ADMIN_HELP_CONTENT="Content"
 COM_ADMIN_HELP_EDIT_UPDATE_SITE="Edit Update Site"
 COM_ADMIN_HELP_EDITORS="Editors"
+COM_ADMIN_HELP_EXTENSIONS="Extensions"
 COM_ADMIN_HELP_EXTENSIONS:_DISCOVER="Extensions: Discover"
 COM_ADMIN_HELP_EXTENSIONS:_INSTALL="Extensions: Install"
 COM_ADMIN_HELP_EXTENSIONS:_LANGUAGES="Extensions: Install Languages"
@@ -78,6 +82,7 @@ COM_ADMIN_HELP_FIELD_GROUPS:_EDIT="Field Groups: New/Edit"
 COM_ADMIN_HELP_FIELD_GROUPS="Field Groups"
 COM_ADMIN_HELP_FIELDS:_EDIT="Fields: New/Edit"
 COM_ADMIN_HELP_FIELDS="Fields"
+COM_ADMIN_HELP_FRAME_TITLE="Selected Help Page"
 COM_ADMIN_HELP_GLOSSARY="Glossary"
 COM_ADMIN_HELP_GUIDED_TOURS:_NEW_OR_EDIT_STEP="Guided Tours: New/Edit Step"
 COM_ADMIN_HELP_GUIDED_TOURS:_NEW_OR_EDIT_TOUR="Guided Tours: New/Edit Tour"
@@ -85,25 +90,31 @@ COM_ADMIN_HELP_GUIDED_TOURS:_OPTIONS="Guided Tours: Options"
 COM_ADMIN_HELP_GUIDED_TOURS:_STEPS="Guided Tours: Steps"
 COM_ADMIN_HELP_GUIDED_TOURS="Guided Tours"
 COM_ADMIN_HELP_HOME_DASHBOARD="Home Dashboard"
+COM_ADMIN_HELP_INDEX="Index of Help Pages"
+COM_ADMIN_HELP_INFORMATION="Information"
 COM_ADMIN_HELP_INFORMATION:_DATABASE="Extensions: Check Database"
 COM_ADMIN_HELP_INFORMATION:_WARNINGS="Extensions: Warnings"
 COM_ADMIN_HELP_INSTALLER:_OPTIONS="Installer: Options"
 COM_ADMIN_HELP_JOOMLA_UPDATE:_OPTIONS="Joomla Update: Options"
 COM_ADMIN_HELP_JOOMLA_UPDATE="Joomla Update"
+COM_ADMIN_HELP_LANGUAGES="Languages"
 COM_ADMIN_HELP_LANGUAGES:_CONTENT="Languages: Content"
 COM_ADMIN_HELP_LANGUAGES:_EDIT_CONTENT_LANGUAGE="Languages: New/Edit"
 COM_ADMIN_HELP_LANGUAGES:_EDIT_OVERRIDE="Languages: Overrides - New/Edit"
 COM_ADMIN_HELP_LANGUAGES:_INSTALLED="Languages: Installed"
 COM_ADMIN_HELP_LANGUAGES:_OPTIONS="Languages: Options"
 COM_ADMIN_HELP_LANGUAGES:_OVERRIDES="Languages: Overrides"
+COM_ADMIN_HELP_LICENSE="License"
 COM_ADMIN_HELP_MAIL_TEMPLATE:_EDIT="Mail Templates: Edit"
 COM_ADMIN_HELP_MAIL_TEMPLATES:_OPTIONS="Mail Templates: Options"
 COM_ADMIN_HELP_MAIL_TEMPLATES="Mail Templates"
+COM_ADMIN_HELP_MAINTENANCE="Maintenance"
 COM_ADMIN_HELP_MAINTENANCE:_CLEAR_CACHE="Cache: Clear Cache"
 COM_ADMIN_HELP_MAINTENANCE:_GLOBAL_CHECK-IN="Global Check-in"
 COM_ADMIN_HELP_MASS_MAIL_USERS="Mass Mail Users"
 COM_ADMIN_HELP_MEDIA:_OPTIONS="Media: Options"
 COM_ADMIN_HELP_MEDIA="Media"
+COM_ADMIN_HELP_MENU_ITEMS="Menu Items"
 COM_ADMIN_HELP_MENU_ITEM:_ALIAS="Menu Item: Alias"
 COM_ADMIN_HELP_MENU_ITEM:_ARTICLE_ARCHIVED="Menu Item: Article Archived"
 COM_ADMIN_HELP_MENU_ITEM:_COMPACT_LIST_OF_TAGGED_ITEMS="Menu Item: Compact List of Tagged Items"
@@ -142,6 +153,7 @@ COM_ADMIN_HELP_MODULES="Modules"
 COM_ADMIN_HELP_MULTILINGUAL_ASSOCIATIONS:_EDIT="Multilingual Associations: Select"
 COM_ADMIN_HELP_MULTILINGUAL_ASSOCIATIONS:_OPTIONS="Multilingual Associations: Options"
 COM_ADMIN_HELP_MULTILINGUAL_ASSOCIATIONS="Multilingual Associations"
+; Deprecated, will be removed with 7.0
 COM_ADMIN_HELP_MY_PROFILE="My Profile"
 COM_ADMIN_HELP_NEWS_FEEDS:_CATEGORIES="News Feeds: Categories"
 COM_ADMIN_HELP_NEWS_FEEDS:_EDIT_CATEGORY="News Feeds: Categories - New/Edit"
@@ -155,6 +167,7 @@ COM_ADMIN_HELP_PLUGIN:_OPTIONS="Plugin: Options"
 COM_ADMIN_HELP_PLUGINS="Plugins"
 COM_ADMIN_HELP_POST-INSTALLATION_MESSAGES:_OPTIONS="Post-installation Messages: Options"
 COM_ADMIN_HELP_POST-INSTALLATION_MESSAGES_FOR_JOOMLA_CMS="Post-Installation Messages"
+COM_ADMIN_HELP_PRIVACY="Privacy"
 COM_ADMIN_HELP_PRIVACY:_CONSENTS="Privacy: Consents"
 COM_ADMIN_HELP_PRIVACY:_EXTENSION_CAPABILITIES="Privacy: Extension Capabilities"
 COM_ADMIN_HELP_PRIVACY:_INFORMATION_REQUESTS="Privacy: Information Requests"
@@ -165,6 +178,7 @@ COM_ADMIN_HELP_PRIVACY_DASHBOARD="Privacy: Dashboard"
 COM_ADMIN_HELP_PRIVATE_MESSAGES:_READ="Private Messages: Read"
 COM_ADMIN_HELP_PRIVATE_MESSAGES:_WRITE="Private Messages: Write"
 COM_ADMIN_HELP_PRIVATE_MESSAGES="Private Messages: Inbox"
+COM_ADMIN_HELP_REDIRECTS="Redirects"
 COM_ADMIN_HELP_REDIRECTS:_LINKS="Redirect: Links"
 COM_ADMIN_HELP_REDIRECTS:_NEW_OR_EDIT="Redirect: Links - New/Edit"
 COM_ADMIN_HELP_REDIRECT:_OPTIONS="Redirect: Options"
@@ -172,6 +186,7 @@ COM_ADMIN_HELP_SCHEDULED_TASKS="Scheduled Tasks"
 COM_ADMIN_HELP_SCHEDULED_TASKS:_EDIT="Scheduled Tasks: New/Edit"
 COM_ADMIN_HELP_SCHEDULED_TASKS:_OPTIONS="Scheduled Tasks: Options"
 COM_ADMIN_HELP_SITE_GLOBAL_CONFIGURATION="Global Configuration"
+COM_ADMIN_HELP_SITE_MODULES="Site Modules"
 COM_ADMIN_HELP_SITE_MODULES:_ARTICLES="Site Modules: Articles"
 COM_ADMIN_HELP_SITE_MODULES:_ARTICLES_-_ARCHIVED="Site Modules: Articles - Archived"
 COM_ADMIN_HELP_SITE_MODULES:_ARTICLES_-_LATEST="Site Modules: Articles - Latest"
@@ -195,6 +210,7 @@ COM_ADMIN_HELP_SITE_MODULES:_TAGS_-_SIMILAR="Site Modules: Tags - Similar"
 COM_ADMIN_HELP_SITE_MODULES:_WHO_IS_ONLINE="Site Modules: Who's Online"
 COM_ADMIN_HELP_SITE_MODULES:_WRAPPER="Site Modules: Wrapper"
 COM_ADMIN_HELP_SITE_SYSTEM_INFORMATION="System Information"
+COM_ADMIN_HELP_SMART_SEARCH="Smart Search"
 COM_ADMIN_HELP_SMART_SEARCH:_CONTENT_MAPS="Smart Search: Content Maps"
 COM_ADMIN_HELP_SMART_SEARCH:_INDEXED_CONTENT="Smart Search: Indexed Content"
 COM_ADMIN_HELP_SMART_SEARCH:_NEW_OR_EDIT_FILTER="Smart Search: Filters - New/Edit"
@@ -203,16 +219,19 @@ COM_ADMIN_HELP_SMART_SEARCH:_OPTIONS="Smart Search: Options"
 COM_ADMIN_HELP_SMART_SEARCH:_SEARCH_TERM_ANALYSIS="Smart Search: Search Term Analysis"
 COM_ADMIN_HELP_STAGES_LIST:_BASIC_WORKFLOW="Stages List: Basic Workflow"
 COM_ADMIN_HELP_START_HERE="Start Here"
+COM_ADMIN_HELP_SYSTEM="System"
 COM_ADMIN_HELP_TAGS:_NEW_OR_EDIT="Tags: New/Edit"
 COM_ADMIN_HELP_TAGS:_OPTIONS="Tags: Options"
 COM_ADMIN_HELP_TAGS="Tags"
 COM_ADMIN_HELP_TEMPLATE:_OPTIONS="Template: Options"
+COM_ADMIN_HELP_TEMPLATES="Templates"
 COM_ADMIN_HELP_TEMPLATES:_CUSTOMISE_SOURCE="Templates: Source - Edit"
 COM_ADMIN_HELP_TEMPLATES:_CUSTOMISE="Templates: Edit"
 COM_ADMIN_HELP_TEMPLATES:_EDIT_STYLE="Templates: Styles - Edit"
 COM_ADMIN_HELP_TEMPLATES:_STYLES="Templates: Styles"
 COM_ADMIN_HELP_TEMPLATES:_TEMPLATES="Templates"
 COM_ADMIN_HELP_TRANSITIONS_LIST:_BASIC_WORKFLOW="Transitions List: Basic Workflow"
+COM_ADMIN_HELP_USER_ACTIONS="User Actions"
 COM_ADMIN_HELP_USER_ACTIONS_LOG:_OPTIONS="User Actions Log: Options"
 COM_ADMIN_HELP_USER_ACTIONS_LOG="Action Logs"
 COM_ADMIN_HELP_USER_NOTES:_NEW_OR_EDIT="Users: User Notes - New/Edit"
@@ -224,10 +243,10 @@ COM_ADMIN_HELP_USERS:_NEW_OR_EDIT_GROUP="Users: Groups - New/Edit"
 COM_ADMIN_HELP_USERS:_OPTIONS="Users: Options"
 COM_ADMIN_HELP_USERS:_VIEWING_ACCESS_LEVELS="Users: Access Levels"
 COM_ADMIN_HELP_USERS="Users"
+COM_ADMIN_HELP_WORKFLOWS="Workflows"
 COM_ADMIN_HELP_WORKFLOWS_LIST="Workflows List"
 COM_ADMIN_JOOMLA_COMPAT_PLUGIN="Joomla Backward Compatibility Plugin"
 COM_ADMIN_JOOMLA_VERSION="Joomla! Version"
-COM_ADMIN_LICENSE="License"
 COM_ADMIN_LOG_DIRECTORY="(Log folder)"
 COM_ADMIN_MAX_INPUT_VARS="Maximum Input Variables"
 COM_ADMIN_MBSTRING_ENABLED="Multibyte String (mbstring) Enabled"
diff --git a/administrator/language/en-GB/com_config.ini b/administrator/language/en-GB/com_config.ini
index f52762f47327c..a512f603f88d9 100644
--- a/administrator/language/en-GB/com_config.ini
+++ b/administrator/language/en-GB/com_config.ini
@@ -36,6 +36,7 @@ COM_CONFIG_ERROR_SSL_NOT_AVAILABLE_HTTP_CODE="HTTPS version of the site returned
 COM_CONFIG_ERROR_TMP_PATH_NOTWRITABLE="The temp folder is not writable: %s"
 COM_CONFIG_ERROR_UNKNOWN_BEFORE_SAVING="A plugin reported an unknown error before saving the configuration."
 COM_CONFIG_ERROR_WRITE_FAILED="Could not write to the configuration file"
+; Deprecated as never used. To be removed in Joomla 7.0
 COM_CONFIG_FIELD_BODY_LABEL="Body"
 COM_CONFIG_FIELD_CACHE_HANDLER_LABEL="Cache Handler"
 COM_CONFIG_FIELD_CACHE_LABEL="System Cache"
@@ -95,6 +96,7 @@ COM_CONFIG_FIELD_FORCE_SSL_DESC="HTTPS must be enabled on your server or load ba
 COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force HTTPS"
 COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC="Joomla can automatically compress the generated HTML pages with GZip, making them smaller and increasing your site's speed score. Disable it if your server is already doing that for you or if it conflicts with third party extensions."
 COM_CONFIG_FIELD_GZIP_COMPRESSION_LABEL="Gzip Page Compression"
+; Deprecated as never used. To be removed in Joomla 7.0
 COM_CONFIG_FIELD_HTMLBODY_LABEL="HTML Body"
 COM_CONFIG_FIELD_LOADBALANCER_ENABLE_DESC="If your site is behind a load balancer or reverse proxy, enable this setting so that IP addresses and other configurations within Joomla automatically take this into account."
 COM_CONFIG_FIELD_LOADBALANCER_ENABLE_LABEL="Behind Load Balancer"
@@ -160,7 +162,7 @@ COM_CONFIG_FIELD_REDIS_HOST_LABEL="Redis Server Host/Sock"
 COM_CONFIG_FIELD_REDIS_PERSISTENT_LABEL="Persistent Redis"
 COM_CONFIG_FIELD_REDIS_PORT_DESC="Port discarded if connecting to Redis server over Unix sockets."
 COM_CONFIG_FIELD_REDIS_PORT_LABEL="Redis Server Port"
-COM_CONFIG_FIELD_SEF_REWRITE_NOTE="Apache and Litespeed: Rename <code>htaccess.txt</code> to <code>.htaccess</code><br>IIS: Rename <code>web.config.txt</code> to <code>web.config</code><br>NginX: you must <a href=\"https://docs.joomla.org/Nginx\" target=\"_blank\" rel=\"noopener noreferrer\">configure your server</a>.<br>Other servers or if unsure: please consult your hosting company."
+COM_CONFIG_FIELD_SEF_REWRITE_NOTE="Apache and Litespeed: Rename <code>htaccess.txt</code> to <code>.htaccess</code><br>IIS: Rename <code>web.config.txt</code> to <code>web.config</code><br>NginX: you must <a href=\"https://guide.joomla.org/user-manual/hosting-notes/hosting-notes-nginx\" target=\"_blank\" rel=\"noopener noreferrer\">configure your server</a>.<br>Other servers or if unsure: please consult your hosting company."
 COM_CONFIG_FIELD_SEF_REWRITE_DESC="Removes the <code>index.php/</code> part from the URLs."
 COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL Rewriting"
 COM_CONFIG_FIELD_SEF_SUFFIX_DESC="By default, Joomla URLs are \"bare\", without an extension. This options tells Joomla to add an extension such as <code>.html</code>, <code>.feed</code> etc based on the type of content being displayed by the URL."
@@ -181,6 +183,7 @@ COM_CONFIG_FIELD_SITE_DISPLAY_MESSAGE_LABEL="Offline Message"
 COM_CONFIG_FIELD_SITE_NAME_LABEL="Site Name"
 COM_CONFIG_FIELD_SITE_OFFLINE_LABEL="Site Offline"
 COM_CONFIG_FIELD_SITENAME_PAGETITLES_LABEL="Site Name in Page Titles"
+; Deprecated as never used. To be removed in Joomla 7.0
 COM_CONFIG_FIELD_SUBJECT_LABEL="Subject"
 COM_CONFIG_FIELD_TEMP_PATH_DESC="Joomla needs to temporarily store some files to perform actions such as installing / updating extensions or uploading files. Enter the absolute path of a directory that is writable by PHP. <em>Do not</em> use the system–wide temporary folder (e.g. <code>/tmp</code>) for security reasons."
 COM_CONFIG_FIELD_TEMP_PATH_LABEL="Path to Temp Folder"
@@ -212,15 +215,20 @@ COM_CONFIG_FIELD_WEBSERVICES_CORS_OFF_LABEL="Enable CORS"
 COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_HEADERS_DESC="Specifies the header(s) sent back in response to a preflight request. Default: Content-Type,X-Joomla-Token"
 COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_METHODS_DESC="Specifies the Web service method(s) allowed to access on this site, sent back in response to a preflight request. Default: all methods available for the requested route."
 COM_CONFIG_FIELD_WEBSERVICES_CORS_ALLOW_ORIGIN_DESC="Specifies the origin allowed to access Web services on this site, sent back in response to a preflight request. Default: * (=all)."
+; Deprecated as never used. To be removed in Joomla 7.0
 COM_CONFIG_FIELDSET_TAGS_LABEL="Tags"
+; Deprecated as never used. To be removed in Joomla 7.0
 COM_CONFIG_FILTER_OPTION_SELECT_EXTENSION="- Select Extension -"
 COM_CONFIG_FRONTEDITING_DESC="Joomla can show an overlay in the public front–end, visible only to users with edit privileges, to directly modify the configuration of each module and/or menu displayed on the site. Set to \"None\" to disable this feature."
 COM_CONFIG_FRONTEDITING_LABEL="Frontend Editing"
 COM_CONFIG_FRONTEDITING_MENUSANDMODULES="Modules & Menus"
 COM_CONFIG_FRONTEDITING_MODULES="Modules"
 COM_CONFIG_GLOBAL_CONFIGURATION="Global Configuration"
+; Deprecated as never used. To be removed in Joomla 7.0
 COM_CONFIG_HEADING_COMPONENT="Component"
+; Deprecated as never used. To be removed in Joomla 7.0
 COM_CONFIG_HEADING_DESCRIPTION="Description"
+; Deprecated as never used. To be removed in Joomla 7.0
 COM_CONFIG_HEADING_LANUAGES="Languages"
 COM_CONFIG_LOCATION_SETTINGS="Location"
 COM_CONFIG_LOGGING="Logging"
@@ -230,6 +238,7 @@ COM_CONFIG_MAIL_SETTINGS="Mail"
 COM_CONFIG_MAIL_TEST_MAIL_DESC="Sent when you click the &quot;Send Test Mail&quot; button in the Global Configuration. It is sent to the sending mail address that is set in the mail settings."
 COM_CONFIG_MAIL_TEST_MAIL_TITLE="Global Configuration: Test Mail"
 COM_CONFIG_METADATA_SETTINGS="Metadata"
+; Deprecated as never used. To be removed in Joomla 7.0
 COM_CONFIG_PAGE_EDIT_MAIL="Global Configuration: Edit Mail Template"
 COM_CONFIG_PERMISSION_SETTINGS="Permissions"
 COM_CONFIG_PERMISSIONS="Permissions"
diff --git a/administrator/language/en-GB/com_content.ini b/administrator/language/en-GB/com_content.ini
index dc5e50a580ad1..972328dfdf72e 100644
--- a/administrator/language/en-GB/com_content.ini
+++ b/administrator/language/en-GB/com_content.ini
@@ -58,6 +58,8 @@ COM_CONTENT_FEATURED_ORDER="Featured Articles Order"
 COM_CONTENT_FEATURED_TABLE_CAPTION="Featured Articles"
 COM_CONTENT_FEATURED_TITLE="Articles: Featured"
 COM_CONTENT_FIELD_ARTICLETEXT_LABEL="Article Text"
+COM_CONTENT_FIELD_AUTHORFILTERING_LABEL="Author Filtering Type"
+COM_CONTENT_FIELD_AUTHOR_LABEL="Authors"
 COM_CONTENT_FIELD_BROWSER_PAGE_TITLE_LABEL="Browser Page Title"
 COM_CONTENT_FIELD_CAPTCHA_LABEL="Allow Captcha on submit"
 COM_CONTENT_FIELD_CREATED_BY_ALIAS_LABEL="Created by Alias"
@@ -65,14 +67,18 @@ COM_CONTENT_FIELD_CREATED_BY_LABEL="Created By"
 COM_CONTENT_FIELD_CREATED_LABEL="Created Date"
 COM_CONTENT_FIELD_FEATURED_DOWN_LABEL="Finish Featured"
 COM_CONTENT_FIELD_FEATURED_UP_LABEL="Start Featured"
+COM_CONTENT_FIELD_FIGURE_CLASS_DESC="You can add any CSS class for your own styling ideas.<br>For image position use for example float-start and float-end."
+COM_CONTENT_FIELD_FIGURE_CLASS_LABEL="Figure Class"
 COM_CONTENT_FIELD_FULL_LABEL="Full Article Image"
 COM_CONTENT_FIELD_FULLTEXT="Full text"
 COM_CONTENT_FIELD_IMAGE_ALT_EMPTY_DESC="Decorative Image - no description required"
 COM_CONTENT_FIELD_IMAGE_ALT_EMPTY_LABEL="No Description"
 COM_CONTENT_FIELD_IMAGE_ALT_LABEL="Image Description (Alt Text)"
 COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL="Caption"
+; Deprecated, will be removed with 8.0
 COM_CONTENT_FIELD_IMAGE_CLASS_DESC="You can add any CSS class for your own styling ideas.<br>For image position use for example float-start and float-end."
 COM_CONTENT_FIELD_IMAGE_CLASS_LABEL="Image Class"
+COM_CONTENT_FIELD_IMAGEONLY_CLASS_DESC="You can add any CSS class for your own styling ideas.<br>For example img-thumbnail."
 COM_CONTENT_FIELD_IMAGE_OPTIONS="Image Options"
 COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL="Position of Article Info"
 COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL="Article Info Title"
@@ -82,6 +88,8 @@ COM_CONTENT_FIELD_NOTE_LABEL="Note"
 COM_CONTENT_FIELD_OPTION_ABOVE="Above"
 COM_CONTENT_FIELD_OPTION_BELOW="Below"
 COM_CONTENT_FIELD_OPTION_SPLIT="Split"
+COM_CONTENT_FIELD_PREVIEW_TOKEN_EXPIRATION_DESC="Number of minutes before a preview token expires. Preview tokens allow unauthenticated users to view unpublished articles. Default is 15 minutes."
+COM_CONTENT_FIELD_PREVIEW_TOKEN_EXPIRATION_LABEL="Preview Token Expiration (minutes)"
 COM_CONTENT_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
 COM_CONTENT_FIELD_PUBLISH_UP_LABEL="Start Publishing"
 COM_CONTENT_FIELD_SELECT_ARTICLE_LABEL="Select Article"
@@ -121,7 +129,11 @@ COM_CONTENT_HEADING_DATE_MODIFIED="Date Modified"
 COM_CONTENT_HEADING_DATE_PUBLISH_DOWN="Finish Publishing"
 COM_CONTENT_HEADING_DATE_PUBLISH_UP="Start Publishing"
 COM_CONTENT_ID_LABEL="ID"
+COM_CONTENT_FIGURE_FULLTEXT_CLASS_LABEL="Full Text Figure Class"
+COM_CONTENT_FIGURE_INTRO_CLASS_LABEL="Intro Figure Class"
+; Deprecated, will be removed with 8.0
 COM_CONTENT_IMAGE_FULLTEXT_CLASS_LABEL="Full Text Image Class"
+; Deprecated, will be removed with 8.0
 COM_CONTENT_IMAGE_INTRO_CLASS_LABEL="Intro Image Class"
 COM_CONTENT_MODIFIED_ASC="Date Modified ascending"
 COM_CONTENT_MODIFIED_DESC="Date Modified descending"
@@ -152,6 +164,9 @@ COM_CONTENT_NEW_ARTICLE="New Article"
 COM_CONTENT_NO_ARTICLES_LABEL="No Articles Message"
 COM_CONTENT_NO_ITEM_SELECTED="Please first make a selection from the list."
 COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL="# Articles in Category"
+COM_CONTENT_OPTION_EXCLUSIVE_VALUE="Exclude"
+COM_CONTENT_OPTION_INCLUSIVE_VALUE="Include"
+COM_CONTENT_OPTION_ONLYCURRENTUSER_VALUE="Current User"
 COM_CONTENT_OTHER_OPTIONS="Options"
 COM_CONTENT_PAGE_ADD_ARTICLE="Articles: New"
 COM_CONTENT_PAGE_EDIT_ARTICLE="Articles: Edit"
diff --git a/administrator/language/en-GB/com_cpanel.ini b/administrator/language/en-GB/com_cpanel.ini
index 819dc30fd0f70..b9044b2da3b08 100644
--- a/administrator/language/en-GB/com_cpanel.ini
+++ b/administrator/language/en-GB/com_cpanel.ini
@@ -30,6 +30,6 @@ COM_CPANEL_MSG_TEXTFILTER3919_TITLE="Updated Text Filter Recommendations"
 COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel"
 COM_CPANEL_UNPUBLISH_MODULE_ERROR="Error unpublishing the module"
 COM_CPANEL_UNPUBLISH_MODULE_SUCCESS="Module unpublished"
-COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users.</p><ul><li><a href=\"https://docs.joomla.org/Special:MyLanguage/Portal:Beginners\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla! Beginners Guide</a></li><li><a href=\"https://forum.joomla.org/viewforum.php?f=834\" target=\"_blank\" rel=\"noopener noreferrer\">New to Joomla! Forum</a></li></ul>"
+COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users.</p><ul><li><a href=\"https://guide.joomla.org/user-manual/getting-started\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla! Beginners Guide</a></li><li><a href=\"https://forum.joomla.org/viewforum.php?f=860\" target=\"_blank\" rel=\"noopener noreferrer\">New to Joomla! Forum</a></li></ul>"
 COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!"
 COM_CPANEL_XML_DESCRIPTION="Home Dashboard component"
diff --git a/administrator/language/en-GB/com_fields.ini b/administrator/language/en-GB/com_fields.ini
index ca7ab9f4c122c..d262ead0d9af4 100644
--- a/administrator/language/en-GB/com_fields.ini
+++ b/administrator/language/en-GB/com_fields.ini
@@ -21,8 +21,6 @@ COM_FIELDS_FIELD_EDITABLE_IN_BOTH="Both"
 COM_FIELDS_FIELD_EDITABLE_IN_LABEL="Editable In"
 COM_FIELDS_FIELD_EDITABLE_IN_SITE="Site"
 COM_FIELDS_FIELD_FORM_EDIT="Edit Field"
-; The following string is deprecated and will be removed with 6.0
-COM_FIELDS_FIELD_FORM_LAYOUT_LABEL="Layout"
 COM_FIELDS_FIELD_FORM_NEW="New Field"
 COM_FIELDS_FIELD_FORMOPTIONS_HEADING="Form Options"
 COM_FIELDS_FIELD_GROUP_LABEL="Field Group"
diff --git a/administrator/language/en-GB/com_finder.ini b/administrator/language/en-GB/com_finder.ini
index 1623cd4df80b9..bcc3a1d2561ae 100644
--- a/administrator/language/en-GB/com_finder.ini
+++ b/administrator/language/en-GB/com_finder.ini
@@ -19,8 +19,6 @@ COM_FINDER_CONFIG_FILTER_NUMERICS_LABEL="Filter Numeric Terms"
 COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_LABEL="Gather Search Statistics"
 COM_FINDER_CONFIG_HIGHLIGHT_CONTENT_SEARCH_TERMS_DESC="For performance reasons, this will not highlight more than 10 different terms in the search results."
 COM_FINDER_CONFIG_HIGHLIGHT_CONTENT_SEARCH_TERMS_LABEL="Highlight Search Terms"
-; deprecated will be removed in 6.0
-COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_LABEL="Highlight Search Terms"
 COM_FINDER_CONFIG_IMAGE_CLASS_LABEL="Image Class"
 COM_FINDER_CONFIG_LANGUAGE_DEFAULT_DEFAULT_LANGUAGE="Default Site Language"
 COM_FINDER_CONFIG_LANGUAGE_DEFAULT_DESC="Set the language to be used for non-multilingual sites or content marked as \"All\"."
diff --git a/administrator/language/en-GB/com_installer.ini b/administrator/language/en-GB/com_installer.ini
index 842ad7877b733..b01a65f8bec95 100644
--- a/administrator/language/en-GB/com_installer.ini
+++ b/administrator/language/en-GB/com_installer.ini
@@ -222,6 +222,11 @@ COM_INSTALLER_PREFERENCES_DESCRIPTION="Fine-tune how extensions installation and
 COM_INSTALLER_PREFERENCES_LABEL="Preferences"
 COM_INSTALLER_REINSTALL_ARIA="Reinstall %s"
 COM_INSTALLER_REINSTALL_BUTTON="Reinstall"
+COM_INSTALLER_SECURITY_SEVERITY_0="Security release level: None"
+COM_INSTALLER_SECURITY_SEVERITY_1="Security release level: Low"
+COM_INSTALLER_SECURITY_SEVERITY_2="Security release level: Medium"
+COM_INSTALLER_SECURITY_SEVERITY_3="Security release level: High"
+COM_INSTALLER_SECURITY_SEVERITY_4="Security release level: Critical"
 COM_INSTALLER_SUBMENU_WARNINGS="Warnings"
 COM_INSTALLER_TOOLBAR_DATABASE_FIX="Update Structure"
 COM_INSTALLER_TOOLBAR_DISCOVER="Discover"
@@ -255,9 +260,9 @@ COM_INSTALLER_TYPE_TYPE_PLUGIN="plugin"
 COM_INSTALLER_TYPE_TYPE_TEMPLATE="template"
 COM_INSTALLER_UNABLE_TO_FIND_INSTALL_PACKAGE="Unable to find install package."
 COM_INSTALLER_UNABLE_TO_INSTALL_JOOMLA_PACKAGE="The Joomla package cannot be installed through the Extension Manager. Please use the <a href='%s'>Joomla! Update</a> component to update Joomla."
-COM_INSTALLER_UNINSTALL_ERROR="Error uninstalling %s."
+COM_INSTALLER_UNINSTALL_ERROR="Error uninstalling %1$s %2$s."
 COM_INSTALLER_UNINSTALL_ERROR_LOCKED_EXTENSION="The extension \"%1$s\" (ID %2$s) is locked and cannot be uninstalled."
-COM_INSTALLER_UNINSTALL_SUCCESS="Uninstalling the %s was successful."
+COM_INSTALLER_UNINSTALL_SUCCESS="Uninstalling the %1$s %2$s was successful."
 COM_INSTALLER_UNPACK_ERROR="Failed to extract file: %s"
 COM_INSTALLER_UPDATE_ERROR="Error updating: %1$s<br>%2$s<br>%3$s<br>"
 COM_INSTALLER_UPDATE_FILTER_SEARCH_DESC="Search in extension name. Prefix with ID:, UID: or EID: to search for an update ID, update site ID or extension ID."
diff --git a/administrator/language/en-GB/com_joomlaupdate.ini b/administrator/language/en-GB/com_joomlaupdate.ini
index 05ad25d33353d..5122280857f49 100644
--- a/administrator/language/en-GB/com_joomlaupdate.ini
+++ b/administrator/language/en-GB/com_joomlaupdate.ini
@@ -29,8 +29,6 @@ COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_CUSTOM_ERROR="The custom URL field is empty
 COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_DEFAULT="Default"
 COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_LABEL="Update Channel"
 COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT="Joomla Next"
-; Deprecated, will be removed with 6.0
-COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_TESTING="Testing"
 COM_JOOMLAUPDATE_CONFIG_UPDATE_LAST_CHECK_DESC="The last time the automated updates server could reach this site. If this date is too old, something is wrong with the automated updates and you should re-initiate the process by re-saving the configuration."
 COM_JOOMLAUPDATE_CONFIG_UPDATE_LAST_CHECK_LABEL="Last Checked"
 COM_JOOMLAUPDATE_CONFIG_UPDATE_TOKEN_DESC="This is the update token that this site uses to authenticate with the Joomla Automated Updates server. It is used to ensure that only your site can update itself."
@@ -137,11 +135,11 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_DATABASE_STRUCTURE_TITLE="Database Table Structure
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED="Your database type is not supported"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED_DESC="An update to Joomla %1$s was found, but your current database type is not supported by the new version.<br>For further details take a look at <a href=\"https://downloads.joomla.org/technical-requirements\">the minimum requirements for Joomla %1$s</a>."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_BREAK="Extensions marked with <span class='badge bg-danger'>No</span> or <span class='badge bg-secondary'>Missing Compatibility Tag</span> might break your website. Please consult with the developer before updating."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="Extensions marked with <span class='badge bg-secondary'>Missing Compatibility Tag</span> indicate the developer has not included <a href='https://docs.joomla.org/Special:MyLanguage/Deploying_an_Update_Server' target='_blank' rel='noopener noreferrer'>compatibility information.</a>"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_MISSING_TAG="Extensions marked with <span class='badge bg-secondary'>Missing Compatibility Tag</span> indicate the developer has not included <a href='https://manual.joomla.org/docs/building-extensions/install-update/update-server/' target='_blank' rel='noopener noreferrer'>compatibility information.</a>"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION_UPDATE_REQUIRED="Extensions marked with <span class='badge bg-warning'>Yes (X.X.X)</span> might require an update."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DIRECTIVE="Directive"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DOWNLOAD_IN_PROGRESS="Downloading update file. Please wait &hellip;"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_EXPLANATION_AND_LINK_TO_DOCS="The pre-update check provides you with information about the readiness of your server, settings and installed extensions for the update.<br>You can find more information about this page and how to prepare for updating Joomla in the <a class='pre-update-docs' href='https://docs.joomla.org/Special:MyLanguage/Pre-Update_Check' target='_blank' rel='noopener noreferrer'>pre-update check documentation</a>."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_EXPLANATION_AND_LINK_TO_DOCS="The pre-update check provides you with information about the readiness of your server, settings and installed extensions for the update.<br>You can find more information about this page and how to prepare for updating Joomla in the <a class='pre-update-docs' href='https://guide.joomla.org/user-manual/migration/migration-version-update' target='_blank' rel='noopener noreferrer'>pre-update check documentation</a>."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS="Extensions Pre-Update Check"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_DESC="Extensions to check before update."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_EXTENSIONS_NONE="No extensions installed."
@@ -194,7 +192,7 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NEWER_NOT_SUPPORTED_NOTICE="Please che
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NOT_SUPPORTED="Your PHP version is not supported"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PHP_VERSION_NOT_SUPPORTED_DESC="An update to Joomla %1$s was found, but your currently installed PHP version does not match <a href=\"https://downloads.joomla.org/technical-requirements\">the minimum requirements for Joomla %1$s</a>."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_BC_DISABLED_TITLE="The '%s' Plugin Must be Disabled"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_BC_DISABLED_NOTICE="This plugin must be disabled and your site working correctly before updating. <br><span class=\"icon-warning\" aria-hidden=\"true\"></span> Before disabling '%1$s' plugin, read the manual: <a class=\"alert-link\" href=\"https://manual.joomla.org/migrations/54-60/compat-plugin/\" target=\"_blank\" rel=\"noopener noreferrer\">Compatibility Plugin<span class=\"visually-hidden\"> (Opens the Joomla Programmers Documentation site in a new tab or window)</span></a> <br>Go to <a href=\"index.php?option=com_plugins&view=plugins&filter[folder]=%2$s&filter[element]=%3$s\">'System - Manage - Plugins'</a> and disable the plugin."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_BC_DISABLED_NOTICE="This plugin must be disabled and your site working correctly before updating. <br><span class=\"icon-warning\" aria-hidden=\"true\"></span> Before disabling '%1$s' plugin, read the manual: <a class=\"alert-link\" href=\"https://manual.joomla.org/migrations/64-70/compat-plugin/\" target=\"_blank\" rel=\"noopener noreferrer\">Compatibility Plugin<span class=\"visually-hidden\"> (Opens the Joomla Programmers Documentation site in a new tab or window)</span></a> <br>Go to <a href=\"index.php?option=com_plugins&view=plugins&filter[folder]=%2$s&filter[element]=%3$s\">'System - Manage - Plugins'</a> and disable the plugin."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_BC_ENABLED_TITLE="The '%s' Plugin Must be Enabled"
 ; Deprecated, will be removed with 7.0
 COM_JOOMLAUPDATE_VIEW_DEFAULT_PLUGIN_DISABLED_NOTICE="Go to <a href=\"index.php?option=com_plugins&view=plugins&filter[folder]=%1$s&filter[element]=%2$s\">'System - Manage - Plugins'</a> and disable the plugin."
@@ -219,10 +217,8 @@ COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_PRE_UPDATE_CHECK="Pre-Update Check"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_TAB_UPLOAD="Upload & Update"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATEFOUND="A Joomla update was found."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_CUSTOM="You are on the &quot;%s&quot; update channel. This is not an official Joomla update channel."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_DEFAULT="You are on the &quot;%s&quot; update channel. Through this channel you'll receive notifications for all updates of the current Joomla release (5.x)"
-COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_NEXT="You are on the &quot;%s&quot; update channel. Through this channel you will be notified when the future major release (6.x) will be available. Before upgrading to 6.x you'll need to assess its compatibility with your environment. You will not be notified about updates of the current Joomla release (5.x)."
-; Deprecated, will be removed with 6.0
-COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_TESTING="You are on the &quot;%s&quot; update channel. This channel is designed for testing new releases and fixes in Joomla.<br>It is only intended for JBS (Joomla Bug Squad&trade;) members and others within the Joomla community who are testing. Do not use this setting on a production site."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_DEFAULT="You are on the &quot;%s&quot; update channel. Through this channel you'll receive notifications for all updates of the current Joomla release (6.x)"
+COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATES_INFO_NEXT="You are on the &quot;%s&quot; update channel. Through this channel you will be notified when the future major release (7.x) will be available. Before upgrading to 7.x you'll need to assess its compatibility with your environment. You will not be notified about updates of the current Joomla release (6.x)."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATE_NOTICE="Before you update Joomla, ensure that the installed extensions are available for the new Joomla version. <br>You are strongly advised to make a <strong>backup</strong> of your site's files and database before you start updating."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_UPLOAD_INTRO="You can use this feature to update Joomla if your server is behind a firewall or otherwise unable to contact the update servers. First download the Joomla <em><strong>Update Package</strong></em> in ZIP format from <a class='alert-link' href='%s' target='_blank' rel='noopener noreferrer'>the official Joomla download page</a>. Then use the fields below to upload and install it."
 COM_JOOMLAUPDATE_VIEW_UPDATE_BYTESEXTRACTED="Bytes extracted"
@@ -256,11 +252,7 @@ INSTL_EXTENSION_AVAILABLE="%s Available"
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
 INSTL_OUTPUT_BUFFERING="Output Buffering"
 INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support"
 INSTL_PHP_VERSION_NEWER="PHP Version >= %s"
diff --git a/administrator/language/en-GB/com_languages.ini b/administrator/language/en-GB/com_languages.ini
index 296154457c891..c33a4a527bdde 100644
--- a/administrator/language/en-GB/com_languages.ini
+++ b/administrator/language/en-GB/com_languages.ini
@@ -5,6 +5,14 @@
 
 COM_LANGUAGES="Languages"
 COM_LANGUAGES_CONFIGURATION="Languages: Options"
+COM_LANGUAGES_CONFIG_FALLBACK_FIELDSET_DESC="Define which language should be used as a fallback for strings that are missing in a regional language. For example, let de-CH (Swiss German) fall back to de-DE (German) before English. Missing strings are resolved per string; strings present in the regional language are never replaced."
+COM_LANGUAGES_CONFIG_FALLBACK_FIELDSET_LABEL="Language Fallback"
+COM_LANGUAGES_CONFIG_FALLBACK_OVERRIDES_DESC="Each row maps an installed language to the language used as a fallback for its missing strings. This overrides any fallback defined by the language pack. Fallbacks may be chained (for example gsw-CH to de-CH to de-DE)."
+COM_LANGUAGES_CONFIG_FALLBACK_OVERRIDES_LABEL="Fallback Overrides"
+COM_LANGUAGES_CONFIG_FALLBACK_TAG_DESC="The language tag whose missing strings should be resolved through a fallback language, for example de-CH."
+COM_LANGUAGES_CONFIG_FALLBACK_TAG_LABEL="Language"
+COM_LANGUAGES_CONFIG_FALLBACK_TARGET_DESC="The language tag used as a fallback for missing strings, for example de-DE."
+COM_LANGUAGES_CONFIG_FALLBACK_TARGET_LABEL="Fallback Language"
 COM_LANGUAGES_CONTENT_TABLE_CAPTION="Content Languages"
 COM_LANGUAGES_ERR_NO_LANGUAGE_SELECTED="No language selected."
 COM_LANGUAGES_ERR_PUBLISH="Select a language to publish."
@@ -126,9 +134,11 @@ COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE="Languages: New Content Language"
 COM_LANGUAGES_VIEW_LANGUAGES_TITLE="Languages: Content"
 COM_LANGUAGES_VIEW_OVERRIDE_CLIENT_ADMINISTRATOR="Administrator"
 COM_LANGUAGES_VIEW_OVERRIDE_CLIENT_SITE="Site"
+COM_LANGUAGES_VIEW_OVERRIDES_CREATE="Create override in %s"
 COM_LANGUAGES_VIEW_OVERRIDE_EDIT_EDIT_OVERRIDE_LEGEND="Edit this Override"
 COM_LANGUAGES_VIEW_OVERRIDE_EDIT_NEW_OVERRIDE_LEGEND="Create a New Override"
 COM_LANGUAGES_VIEW_OVERRIDE_EDIT_TITLE="Languages: Edit Override"
+COM_LANGUAGES_VIEW_OVERRIDES_EXISTS="Override exists in %s"
 COM_LANGUAGES_VIEW_OVERRIDE_FORM_EDIT="Edit Override"
 COM_LANGUAGES_VIEW_OVERRIDE_FORM_NEW="New Override"
 COM_LANGUAGES_VIEW_OVERRIDE_LANGUAGE="%1$s [%2$s]"
@@ -149,6 +159,8 @@ COM_LANGUAGES_VIEW_OVERRIDES_LANGUAGES_BOX_ITEM="%1$s - %2$s"
 COM_LANGUAGES_VIEW_OVERRIDES_N_ITEMS_DELETED="%d language overrides were deleted."
 COM_LANGUAGES_VIEW_OVERRIDES_N_ITEMS_DELETED_1="Language override was deleted."
 COM_LANGUAGES_VIEW_OVERRIDES_NO_ITEM_SELECTED="You haven't selected any overrides."
+COM_LANGUAGES_VIEW_OVERRIDES_NO_OVERRIDE="No Override"
+COM_LANGUAGES_VIEW_OVERRIDES_OVERRIDE="Override"
 COM_LANGUAGES_VIEW_OVERRIDES_PURGE="Clear Cache"
 COM_LANGUAGES_VIEW_OVERRIDES_PURGE_SUCCESS="Overrider cache table cleared."
 COM_LANGUAGES_VIEW_OVERRIDES_TEXT="Text"
diff --git a/administrator/language/en-GB/com_menus.ini b/administrator/language/en-GB/com_menus.ini
index 05210e29cdcc2..a0e0baed6e4af 100644
--- a/administrator/language/en-GB/com_menus.ini
+++ b/administrator/language/en-GB/com_menus.ini
@@ -176,8 +176,6 @@ COM_MENUS_SELECT_A_MENUITEM="Select a Menu Item"
 COM_MENUS_SELECT_MENU="- Select Menu -"
 COM_MENUS_SELECT_MENU_FILTER="Select Menu"
 COM_MENUS_SELECT_MENU_FILTER_NOT_TRASHED="Filter the list by a state other than trashed or clear the filter."
-; Deprecated, will be removed with 6.0
-COM_MENUS_SELECT_MENU_FIRST="To use batch processing, please first select a Menu in the manager."
 COM_MENUS_SELECT_MENU_FIRST_EXPORT="To use export, please first select a valid Menu in the manager."
 COM_MENUS_SUBMENU_ITEMS="Menu Items"
 COM_MENUS_SUBMENU_MENUS="Menus"
diff --git a/administrator/language/en-GB/com_modules.ini b/administrator/language/en-GB/com_modules.ini
index 339f9fae77b42..fc0e00e55f0e5 100644
--- a/administrator/language/en-GB/com_modules.ini
+++ b/administrator/language/en-GB/com_modules.ini
@@ -25,6 +25,7 @@ COM_MODULES_CONFIGURATION="Module: Options"
 COM_MODULES_CUSTOM_OUTPUT="Custom Output"
 COM_MODULES_CUSTOM_POSITION="Active Positions"
 COM_MODULES_DESELECT="Deselect"
+COM_MODULES_EDIT_MODULE="Edit Module"
 COM_MODULES_EMPTYSTATE_BUTTON_ADD="Add a module"
 COM_MODULES_EMPTYSTATE_CONTENT="Modules are lightweight and flexible extensions used for page rendering. Use them to add small blocks of functionality to your page."
 COM_MODULES_EMPTYSTATE_TITLE_ADMINISTRATOR="No Administrator Modules have been created yet."
@@ -65,6 +66,7 @@ COM_MODULES_GENERAL_FIELDSET_DESC="Configure module edit interface settings."
 COM_MODULES_GLOBAL="Assigning the Module to Menu Items"
 COM_MODULES_GLOBAL_ASSIGN="Assign to Menu Items"
 COM_MODULES_GLOBAL_TREE_EXPAND="Expand the Menu Subtrees"
+COM_MODULES_HEADING_ASSOCIATION="Associations"
 COM_MODULES_HEADING_MODULE="Type"
 COM_MODULES_HEADING_MODULE_ASC="Type ascending"
 COM_MODULES_HEADING_MODULE_DESC="Type descending"
@@ -79,6 +81,7 @@ COM_MODULES_HTML_PUBLISH_DISABLED="Publish module::Extension disabled"
 COM_MODULES_HTML_PUBLISH_ENABLED="Publish module::Extension enabled"
 COM_MODULES_HTML_UNPUBLISH_DISABLED="Unpublish module::Extension disabled"
 COM_MODULES_HTML_UNPUBLISH_ENABLED="Unpublish module::Extension enabled"
+COM_MODULES_ITEM_FIELD_ASSOCIATION_NO_VALUE="Select a Module"
 COM_MODULES_MANAGER_MODULE="Modules: %s"
 COM_MODULES_MANAGER_MODULES_ADMIN="Modules (Administrator)"
 COM_MODULES_MANAGER_MODULES_SITE="Modules (Site)"
@@ -90,6 +93,7 @@ COM_MODULES_MENU_ITEM_URL="URL"
 COM_MODULES_MODULE="Module"
 COM_MODULES_MODULE_ASSIGN="Module Assignment"
 COM_MODULES_MODULE_DESCRIPTION="Module Description"
+COM_MODULES_MODULE_SPRINTF="Module: %s"
 COM_MODULES_MODULE_TEMPLATE_POSITION="%1$s (%2$s)"
 COM_MODULES_MODULES="Modules"
 COM_MODULES_MODULES_FILTER_SEARCH_DESC="Search in module title and note. Prefix with ID: to search for a module ID."
@@ -116,6 +120,7 @@ COM_MODULES_N_QUICKICON_1="Module"
 COM_MODULES_N_QUICKICON_SRONLY="Modules: %d modules are available."
 COM_MODULES_N_QUICKICON_SRONLY_0="Modules: No module is available."
 COM_MODULES_N_QUICKICON_SRONLY_1="Modules: One module is available."
+COM_MODULES_NEW_MODULE="New Module"
 COM_MODULES_NO_ITEM_SELECTED="No modules selected."
 COM_MODULES_NODESCRIPTION="No description available."
 COM_MODULES_NONE=":: None ::"
@@ -185,6 +190,7 @@ COM_MODULES_POSITION_USER7="User 7"
 COM_MODULES_POSITION_USER8="User 8"
 COM_MODULES_SAVE_SUCCESS="Module saved."
 COM_MODULES_SEARCH_MENUITEM="Search for a Menu Item"
+COM_MODULES_SELECT_A_MODULE="Select a module"
 COM_MODULES_SELECT_MODULE="Select module, %s"
 COM_MODULES_SUBITEMS="Sub-items"
 COM_MODULES_TABLE_CAPTION="Modules"
diff --git a/administrator/language/en-GB/com_privacy.ini b/administrator/language/en-GB/com_privacy.ini
index b171f4c6a5bad..94ed11d972982 100644
--- a/administrator/language/en-GB/com_privacy.ini
+++ b/administrator/language/en-GB/com_privacy.ini
@@ -8,15 +8,15 @@ COM_PRIVACY="Privacy"
 COM_PRIVACY_ACTION_DELETE_DATA="Delete Data"
 COM_PRIVACY_ACTION_EMAIL_EXPORT_DATA="Email Data Export"
 COM_PRIVACY_ACTION_EXPORT_DATA="Export Data"
-COM_PRIVACY_ACTION_LOG_ADMIN_COMPLETED_REQUEST="User <a href='{accountlink}'>{username}</a> completed <a href='{itemlink}'>request #{id}</a> for {subjectemail}"
-COM_PRIVACY_ACTION_LOG_ADMIN_CREATED_REQUEST="User <a href='{accountlink}'>{username}</a> created <a href='{itemlink}'>request #{id}</a> for {subjectemail}"
-COM_PRIVACY_ACTION_LOG_ADMIN_INVALIDATED_REQUEST="User <a href='{accountlink}'>{username}</a> invalidated <a href='{itemlink}'>request #{id}</a> for {subjectemail}"
-COM_PRIVACY_ACTION_LOG_CONFIRMED_REQUEST="{subjectemail} has confirmed <a href='{itemlink}'>request #{id}</a>"
-COM_PRIVACY_ACTION_LOG_CREATED_REQUEST="{subjectemail} has submitted <a href='{itemlink}'>request #{id}</a>"
-COM_PRIVACY_ACTION_LOG_EXPORT="User <a href='{accountlink}'>{username}</a> exported the data for <a href='{itemlink}'>request #{id}</a>"
-COM_PRIVACY_ACTION_LOG_EXPORT_EMAILED="User <a href='{accountlink}'>{username}</a> emailed the data export for <a href='{itemlink}'>request #{id}</a> to the recipient"
-COM_PRIVACY_ACTION_LOG_REMOVE="User <a href='{accountlink}'>{username}</a> removed the data for <a href='{itemlink}'>request #{id}</a>"
-COM_PRIVACY_ACTION_LOG_REMOVE_BLOCKED="User <a href='{accountlink}'>{username}</a> attempted to remove the data for <a href='{itemlink}'>request #{id}</a> however this action was blocked"
+COM_PRIVACY_ACTION_LOG_ADMIN_COMPLETED_REQUEST="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> completed <a href='{itemlink}' title='Edit request {id}'>request #{id}</a> for {subjectemail}"
+COM_PRIVACY_ACTION_LOG_ADMIN_CREATED_REQUEST="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> created <a href='{itemlink}' title='Edit request {id}'>request #{id}</a> for {subjectemail}"
+COM_PRIVACY_ACTION_LOG_ADMIN_INVALIDATED_REQUEST="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> invalidated <a href='{itemlink}' title='Edit request {id}'>request #{id}</a> for {subjectemail}"
+COM_PRIVACY_ACTION_LOG_CONFIRMED_REQUEST="{subjectemail} has confirmed <a href='{itemlink}' title='Edit request {id}'>request #{id}</a>"
+COM_PRIVACY_ACTION_LOG_CREATED_REQUEST="{subjectemail} has submitted <a href='{itemlink}' title='Edit request {id}'>request #{id}</a>"
+COM_PRIVACY_ACTION_LOG_EXPORT="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> exported the data for <a href='{itemlink}' title='Edit request {id}'>request #{id}</a>"
+COM_PRIVACY_ACTION_LOG_EXPORT_EMAILED="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> emailed the data export for <a href='{itemlink}' title='Edit request {id}'>request #{id}</a> to the recipient"
+COM_PRIVACY_ACTION_LOG_REMOVE="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> removed the data for <a href='{itemlink}' title='Edit request {id}'>request #{id}</a>"
+COM_PRIVACY_ACTION_LOG_REMOVE_BLOCKED="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> attempted to remove the data for <a href='{itemlink}' title='Edit request {id}'>request #{id}</a> however this action was blocked"
 COM_PRIVACY_ACTION_VIEW="View Request"
 COM_PRIVACY_BADGE_URGENT_REQUEST="Urgent"
 COM_PRIVACY_CONFIGURATION="Privacy: Options"
@@ -131,7 +131,7 @@ COM_PRIVACY_NOTIFY_LABEL="Days To Consider Request Urgent"
 COM_PRIVACY_N_CONSENTS_INVALIDATED="%d consents were invalidated."
 COM_PRIVACY_N_CONSENTS_INVALIDATED_1="The consent was invalidated."
 COM_PRIVACY_OPTION_LABEL="Options"
-COM_PRIVACY_POSTINSTALL_BODY="<p>With the introduction of GDPR for EU citizens and similar regulations elsewhere in the world it may be necessary for you to request consent before storing any <strong>Personal Information</strong> of a user.</p><p>Joomla 3.9 introduces new capabilities to assist you in creating site privacy policies and collecting user consent. In addition a workflow is available to help you manage user information requests such as requests for removing their personal data from your site.</p><p>For further information on this new feature read the <a href='https://docs.joomla.org/Special:MyLanguage/J3.x:Privacy' target='_blank' rel='noopener noreferrer'>Privacy documentation</a>.</p>"
+COM_PRIVACY_POSTINSTALL_BODY="<p>With the introduction of GDPR for EU citizens and similar regulations elsewhere in the world it may be necessary for you to request consent before storing any <strong>Personal Information</strong> of a user.</p><p>Joomla 3.9 introduces new capabilities to assist you in creating site privacy policies and collecting user consent. In addition a workflow is available to help you manage user information requests such as requests for removing their personal data from your site.</p><p>For further information on this new feature read the <a href='https://guide.joomla.org/user-manual/privacy' target='_blank' rel='noopener noreferrer'>Privacy documentation</a>.</p>"
 COM_PRIVACY_POSTINSTALL_TITLE="Increased Management Of Users Privacy"
 COM_PRIVACY_REQUESTS_EMPTYSTATE_BUTTON_ADD="Add your first request"
 COM_PRIVACY_REQUESTS_EMPTYSTATE_CONTENT="This screen displays all Privacy: Information Requests that have been received and their status. You can also create a new request here."
diff --git a/administrator/language/en-GB/com_scheduler.ini b/administrator/language/en-GB/com_scheduler.ini
index 6b37b6c1d272d..23083dd1dd859 100644
--- a/administrator/language/en-GB/com_scheduler.ini
+++ b/administrator/language/en-GB/com_scheduler.ini
@@ -127,7 +127,7 @@ COM_SCHEDULER_OPTION_EXECUTION_MANUAL_LABEL="Manual Execution"
 COM_SCHEDULER_OPTION_ORPHANED_HIDE="Hide Orphaned"
 COM_SCHEDULER_OPTION_ORPHANED_ONLY="Only Orphaned"
 COM_SCHEDULER_OPTION_ORPHANED_SHOW="Show Orphaned"
-COM_SCHEDULER_PERMISSION_TESTRUN="Test task"
+COM_SCHEDULER_PERMISSION_TESTRUN="Run Manually"
 COM_SCHEDULER_ROUTINE_LOG_PREFIX="Task> "
 COM_SCHEDULER_RUNNING_SINCE="Running since %s"
 COM_SCHEDULER_SCHEDULER="Scheduler"
@@ -158,15 +158,15 @@ COM_SCHEDULER_TASK_TIMES_DESC="Times descending"
 COM_SCHEDULER_TASK_TYPE="Task Type"
 COM_SCHEDULER_TASK_TYPE_ASC="Task Type ascending"
 COM_SCHEDULER_TASK_TYPE_DESC="Task Type descending"
-COM_SCHEDULER_TEST_RUN="Run Test"
+COM_SCHEDULER_TEST_RUN="Run Task"
 COM_SCHEDULER_TEST_RUN_DURATION="Duration: %s seconds"
 COM_SCHEDULER_TEST_RUN_OUTPUT="Output:<br>%s"
 COM_SCHEDULER_TEST_RUN_STATUS_COMPLETED="Status: Completed"
 COM_SCHEDULER_TEST_RUN_STATUS_STARTED="Status: Started"
 COM_SCHEDULER_TEST_RUN_STATUS_TERMINATED="Status: Terminated"
 COM_SCHEDULER_TEST_RUN_TASK="Task: \"%s\""
-COM_SCHEDULER_TEST_RUN_TITLE="Test task (ID: %d)"
-COM_SCHEDULER_TEST_TASK="Test Task"
+COM_SCHEDULER_TEST_RUN_TITLE="Run Task (ID: %d)"
+COM_SCHEDULER_TEST_TASK="Run Manually"
 COM_SCHEDULER_TOOLBAR_PURGE="Clear History"
 COM_SCHEDULER_TOOLBAR_PURGE_CONFIRM="Are you sure you want to delete all Execution History?"
 COM_SCHEDULER_TOOLBAR_UNLOCK="Unlock"
diff --git a/administrator/language/en-GB/com_tags.ini b/administrator/language/en-GB/com_tags.ini
index 81e829358f7fe..4a4cf96e1d3fa 100644
--- a/administrator/language/en-GB/com_tags.ini
+++ b/administrator/language/en-GB/com_tags.ini
@@ -9,7 +9,10 @@ COM_TAGS_ALL_TAGS_DESCRIPTION_LABEL="Heading Description"
 COM_TAGS_ALL_TAGS_MEDIA_LABEL="Heading Image File"
 COM_TAGS_ANY="Any"
 COM_TAGS_BASIC_FIELDSET_LABEL="Options"
+COM_TAGS_BATCH_COPY_MOVE_CANNOT_CREATE="You are not allowed to create new tags."
+COM_TAGS_BATCH_COPY_MOVE_CANNOT_EDIT="You are not allowed to edit tags."
 COM_TAGS_BATCH_OPTIONS="Batch process the selected tags"
+COM_TAGS_BATCH_TAG_LABEL="To Move or Copy your selection please select a Tag or parent item."
 COM_TAGS_COMPACT_COLUMNS_LABEL="Number of Columns"
 COM_TAGS_CONFIG_ALL_TAGS_FIELD_LAYOUT_LABEL="Default List All Tags Layout"
 COM_TAGS_CONFIG_ALL_TAGS_SETTINGS_DESC="These settings apply for a List of all Tags unless they are changed for a specific menu item."
diff --git a/administrator/language/en-GB/com_templates.ini b/administrator/language/en-GB/com_templates.ini
index f57bab877d5a4..aadc636762685 100644
--- a/administrator/language/en-GB/com_templates.ini
+++ b/administrator/language/en-GB/com_templates.ini
@@ -11,6 +11,7 @@ COM_TEMPLATES_BUTTON_CHECK="Check Overrides"
 COM_TEMPLATES_BUTTON_CHECK_LIST_ENTRY="Mark Checked"
 COM_TEMPLATES_BUTTON_CLOSE_FILE="Close"
 COM_TEMPLATES_BUTTON_COPY_FILE="Copy File"
+COM_TEMPLATES_BUTTON_COPY_CHILD_TEMPLATE="Copy Child Template"
 COM_TEMPLATES_BUTTON_COPY_TEMPLATE="Copy Template"
 COM_TEMPLATES_BUTTON_CREATE="Create"
 COM_TEMPLATES_BUTTON_CROP="Crop"
@@ -241,6 +242,7 @@ COM_TEMPLATES_TEMPLATE_CHILD_NAME_LABEL="Child Template Name"
 COM_TEMPLATES_TEMPLATE_CHILD_STYLE_LABEL="Additional Template Styles"
 COM_TEMPLATES_TEMPLATE_CLOSE="Close"
 COM_TEMPLATES_TEMPLATE_COPY="Copy Template"
+COM_TEMPLATES_TEMPLATE_COPY_CHILD="Copy Child Template"
 COM_TEMPLATES_TEMPLATE_CORE_FILENAME="Original file &quot;%s&quot;."
 COM_TEMPLATES_TEMPLATE_DESCRIPTION="Template description."
 COM_TEMPLATES_TEMPLATE_DETAILS="%s Details and Files"
diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
index 334cb13e237f5..1cd983eb0de7f 100644
--- a/administrator/language/en-GB/com_users.ini
+++ b/administrator/language/en-GB/com_users.ini
@@ -203,6 +203,7 @@ COM_USERS_LBL_SELECT_INSTRUCTIONS="Please select how you would like to verify yo
 COM_USERS_LEVELS_N_ITEMS_DELETED="%d View Permission Levels deleted."
 COM_USERS_LEVELS_N_ITEMS_DELETED_1="View Permission Level deleted."
 COM_USERS_LEVELS_TABLE_CAPTION="Viewing Access Levels"
+; The following string is deprecated and will be removed with 8.0
 COM_USERS_LEVEL_DETAILS="Level Details"
 COM_USERS_LEVEL_FIELD_TITLE_LABEL="Level Title"
 COM_USERS_LEVEL_FORM_EDIT="Edit Viewing Access Level"
@@ -397,6 +398,8 @@ COM_USERS_USERS_N_ITEMS_DELETED="%d users deleted."
 COM_USERS_USERS_N_ITEMS_DELETED_1="User deleted."
 COM_USERS_USERS_TABLE_CAPTION="Users"
 COM_USERS_USER_ACCOUNT_DETAILS="Account Details"
+COM_USERS_USER_ACTIVATE_AND_MAIL="Activate &amp; Send Email"
+COM_USERS_USER_ACTIVATION_REMINDER="Send Activation Reminder"
 COM_USERS_USER_ALLOWTOURAUTOSTART_LABEL="Allow Auto Starting Tours"
 COM_USERS_USER_BACKUPCODE="Backup Code"
 COM_USERS_USER_BACKUPCODES="Backup Codes"
diff --git a/administrator/language/en-GB/com_workflow.ini b/administrator/language/en-GB/com_workflow.ini
index 6b5d01f1fcfa2..366e3fdb74369 100644
--- a/administrator/language/en-GB/com_workflow.ini
+++ b/administrator/language/en-GB/com_workflow.ini
@@ -46,7 +46,9 @@ COM_WORKFLOW_N_ITEMS_TRASHED="%d workflows trashed."
 COM_WORKFLOW_N_ITEMS_TRASHED_1="Workflow trashed."
 COM_WORKFLOW_N_ITEMS_UNPUBLISHED="%d workflows disabled."
 COM_WORKFLOW_N_ITEMS_UNPUBLISHED_1="Workflow disabled."
+COM_WORKFLOW_PREVIEW="Preview"
 COM_WORKFLOW_PUBLISHED_LABEL="Status"
+COM_WORKFLOW_REDO="Redo"
 COM_WORKFLOW_RULES_TAB="Permissions"
 COM_WORKFLOW_SELECT_FROM_STAGE="- Select Current Stage -"
 COM_WORKFLOW_SELECT_TO_STAGE="- Select Target Stage -"
@@ -97,6 +99,7 @@ COM_WORKFLOW_TRANSITION_EDIT="Edit Transition"
 COM_WORKFLOW_TRANSITION_FORM_EDIT="Edit Transition"
 COM_WORKFLOW_TRANSITION_FORM_NEW="New Transition"
 COM_WORKFLOW_TRANSITION_NOTE="Note"
+COM_WORKFLOW_UNDO="Undo"
 COM_WORKFLOW_UNPUBLISH_DEFAULT_ERROR="The default workflow cannot be disabled."
 COM_WORKFLOW_USE_DEFAULT_WORKFLOW="Use default (%s)"
 COM_WORKFLOW_WORKFLOWS_ADD="Add Workflow"
@@ -106,3 +109,126 @@ COM_WORKFLOW_WORKFLOWS_TABLE_CAPTION="Workflows"
 COM_WORKFLOW_WORKFLOW_NOTE="Note"
 JLIB_HTML_PUBLISH_ITEM="Enable"
 JLIB_HTML_UNPUBLISH_ITEM="Disable"
+
+; Workflow Graph Editor
+COM_WORKFLOW_GRAPH="Graph"
+COM_WORKFLOW_GRAPH_ADD_STAGE="Add Stage"
+COM_WORKFLOW_GRAPH_ADD_STAGE_DIALOG_OPENED="Add stage dialog opened."
+COM_WORKFLOW_GRAPH_ADD_TRANSITION_DIALOG_OPENED="Add transition dialog opened."
+COM_WORKFLOW_GRAPH_ADD_TRANSITION="Add Transition"
+COM_WORKFLOW_GRAPH_API_NOT_SET="Workflow Graph is not initialized correctly."
+COM_WORKFLOW_GRAPH_BACKGROUND="Workflow Graph Background"
+COM_WORKFLOW_GRAPH_CANVAS_DESCRIPTION="Keyboard shortcuts: Alt+N to add stage, Alt+M to add transition, F to fit view, E to edit selected item, Delete to remove selected item."
+COM_WORKFLOW_GRAPH_CANVAS_LABEL="Workflow Graph Canvas"
+COM_WORKFLOW_GRAPH_CANVAS_VIEW_CONTROLS="Workflow Graph Canvas View Controls"
+COM_WORKFLOW_GRAPH_CLEAR_SELECTION="Clear Selection"
+COM_WORKFLOW_GRAPH_CLOSE_ACTIONS_MENU="Close actions menu for %s"
+COM_WORKFLOW_GRAPH_CONTROLS="Workflow Graph Controls"
+COM_WORKFLOW_GRAPH_CREATING_TRANSITION="Creating new transition from stage %s to %s."
+COM_WORKFLOW_GRAPH_DEFAULT="Default"
+COM_WORKFLOW_GRAPH_DISABLED="Disabled"
+COM_WORKFLOW_GRAPH_EDIT_ITEM="Edit Item"
+COM_WORKFLOW_GRAPH_EDIT_STAGE="Edit Stage"
+COM_WORKFLOW_GRAPH_EDIT_TRANSITION="Edit Transition"
+COM_WORKFLOW_GRAPH_ENABLED="Enabled"
+COM_WORKFLOW_GRAPH_ERROR_API_RETURNED_ERROR="API returned an error."
+COM_WORKFLOW_GRAPH_ERROR_CSRF_TOKEN_NOT_SET="Invalid token. Please try again."
+COM_WORKFLOW_GRAPH_ERROR_EXTENSION_NOT_SET="Workflow extension is not set."
+COM_WORKFLOW_GRAPH_ERROR_FAILED_TO_UPDATE_STAGE_POSITIONS="Failed to update stage positions."
+COM_WORKFLOW_GRAPH_ERROR_FETCHING_MODEL="Error loading workflow."
+COM_WORKFLOW_GRAPH_ERROR_INVALID_ID="The workflow is not set correctly."
+COM_WORKFLOW_GRAPH_ERROR_INVALID_POSITION_DATA="Invalid position data for %s."
+COM_WORKFLOW_GRAPH_ERROR_INVALID_STAGE_POSITIONS="Invalid stage positions."
+COM_WORKFLOW_GRAPH_ERROR_NOT_AUTHENTICATED="You are not authenticated."
+COM_WORKFLOW_GRAPH_ERROR_NO_PERMISSION="You do not have permission to access the workflows."
+COM_WORKFLOW_GRAPH_ERROR_REQUEST_FAILED="Request failed with status %s"
+COM_WORKFLOW_GRAPH_ERROR_STAGES_NOT_FOUND="Stages not found."
+COM_WORKFLOW_GRAPH_ERROR_STAGE_DEFAULT_CANT_DELETED="The default stage cannot be deleted."
+COM_WORKFLOW_GRAPH_ERROR_STAGE_HAS_TRANSITIONS="This stage has transitions and cannot be deleted."
+COM_WORKFLOW_GRAPH_ERROR_UNKNOWN="An unknown error occurred."
+COM_WORKFLOW_GRAPH_ERROR_WORKFLOW_ID_NOT_SET="Workflow ID is not set."
+COM_WORKFLOW_GRAPH_ERROR_WORKFLOW_NOT_FOUND="Workflow not found."
+COM_WORKFLOW_GRAPH_FIT_VIEW="Fit View"
+COM_WORKFLOW_GRAPH_FOCUS_TYPE_CHANGE="Change Focus Type"
+COM_WORKFLOW_GRAPH_FROM_ANY="From Any"
+COM_WORKFLOW_GRAPH_FULL="Workflow Graph"
+COM_WORKFLOW_GRAPH_LOADING="Loading..."
+COM_WORKFLOW_GRAPH_MINIMAP_HIDE="Hide Minimap"
+COM_WORKFLOW_GRAPH_MINIMAP_LABEL="Workflow Graph Minimap"
+COM_WORKFLOW_GRAPH_MINIMAP_SHOW="Show Minimap"
+COM_WORKFLOW_GRAPH_MOVE_STAGE="Move Stage"
+COM_WORKFLOW_GRAPH_MOVE_VIEW="Move View"
+COM_WORKFLOW_GRAPH_NAVIGATE_NODES="Navigate Nodes"
+COM_WORKFLOW_GRAPH_N_ITEMS_ARCHIVED="%d items archived."
+COM_WORKFLOW_GRAPH_N_ITEMS_ARCHIVED_1="Item archived."
+COM_WORKFLOW_GRAPH_N_ITEMS_FAILED_PUBLISHING="%d items failed to be published."
+COM_WORKFLOW_GRAPH_N_ITEMS_FAILED_PUBLISHING_1="Item failed to be published."
+COM_WORKFLOW_GRAPH_N_ITEMS_PUBLISHED="%d items published."
+COM_WORKFLOW_GRAPH_N_ITEMS_PUBLISHED_1="Item published."
+COM_WORKFLOW_GRAPH_N_ITEMS_UNPUBLISHED="%d items unpublished."
+COM_WORKFLOW_GRAPH_N_ITEMS_UNPUBLISHED_1="Item unpublished."
+COM_WORKFLOW_GRAPH_OPEN_ACTIONS_MENU="Open actions menu for %s"
+COM_WORKFLOW_GRAPH_SELECTION_CLEARED="Selection cleared."
+COM_WORKFLOW_GRAPH_SELECT_ITEM="Select Item"
+COM_WORKFLOW_GRAPH_SHORTCUTS="Shortcuts"
+COM_WORKFLOW_GRAPH_SHORTCUTS_TITLE="Keyboard Shortcuts"
+COM_WORKFLOW_GRAPH_STAGE="Stage"
+COM_WORKFLOW_GRAPH_STAGES="Stages"
+COM_WORKFLOW_GRAPH_STAGE_ACTIONS="Actions for stage %s."
+COM_WORKFLOW_GRAPH_STAGE_COUNT="Number of Stages"
+COM_WORKFLOW_GRAPH_STAGE_DEFAULT="Default Stage"
+COM_WORKFLOW_GRAPH_STAGE_DESCRIPTION="Description of stage %s."
+COM_WORKFLOW_GRAPH_STAGE_NO_ITEM_SELECTED="No stage selected."
+COM_WORKFLOW_GRAPH_STAGE_N_ITEMS_CHECKED_IN="%d stages checked in."
+COM_WORKFLOW_GRAPH_STAGE_N_ITEMS_CHECKED_IN_1="Stage checked in."
+COM_WORKFLOW_GRAPH_STAGE_N_ITEMS_DELETED="%d stages deleted."
+COM_WORKFLOW_GRAPH_STAGE_N_ITEMS_DELETED_1="Stage deleted."
+COM_WORKFLOW_GRAPH_STAGE_N_ITEMS_FAILED_DELETING="%d stages failed to be deleted."
+COM_WORKFLOW_GRAPH_STAGE_N_ITEMS_FAILED_DELETING_1="Stage failed to be deleted."
+COM_WORKFLOW_GRAPH_STAGE_N_ITEMS_TRASHED="%d stages trashed."
+COM_WORKFLOW_GRAPH_STAGE_N_ITEMS_TRASHED_1="Stage trashed."
+COM_WORKFLOW_GRAPH_STAGE_N_ITEMS_UNPUBLISHED="%d stages unpublished."
+COM_WORKFLOW_GRAPH_STAGE_N_ITEMS_UNPUBLISHED_1="Stage unpublished."
+COM_WORKFLOW_GRAPH_STAGE_POSITIONS_UPDATED="Stage positions updated."
+COM_WORKFLOW_GRAPH_STAGE_REF="Stage: %s"
+COM_WORKFLOW_GRAPH_STAGE_SELECTED="Stage selected: %s"
+COM_WORKFLOW_GRAPH_STAGE_STATUS_ENABLED="Status of stage %s: Enabled."
+COM_WORKFLOW_GRAPH_STAGE_STATUS_DISABLED="Status of stage %s: Disabled."
+COM_WORKFLOW_GRAPH_STATUS="Status"
+COM_WORKFLOW_GRAPH_TRANSITION="Transition"
+COM_WORKFLOW_GRAPH_TRANSITIONS="Transitions"
+COM_WORKFLOW_GRAPH_TRANSITION_ACTIONS="Actions for transition %s."
+COM_WORKFLOW_GRAPH_TRANSITION_COUNT="Number of Transitions"
+COM_WORKFLOW_GRAPH_TRANSITION_DESCRIPTION="Description of transition %s."
+COM_WORKFLOW_GRAPH_TRANSITION_NO_ITEM_SELECTED="No transition selected."
+COM_WORKFLOW_GRAPH_TRANSITION_N_ITEMS_CHECKED_IN="%d transitions checked in."
+COM_WORKFLOW_GRAPH_TRANSITION_N_ITEMS_CHECKED_IN_1="Transition checked in."
+COM_WORKFLOW_GRAPH_TRANSITION_N_ITEMS_DELETED="%d transitions deleted."
+COM_WORKFLOW_GRAPH_TRANSITION_N_ITEMS_DELETED_1="Transition deleted."
+COM_WORKFLOW_GRAPH_TRANSITION_N_ITEMS_FAILED_DELETING="%d transitions failed to be deleted."
+COM_WORKFLOW_GRAPH_TRANSITION_N_ITEMS_FAILED_DELETING_1="Transition failed to be deleted."
+COM_WORKFLOW_GRAPH_TRANSITION_N_ITEMS_PUBLISHED="%d transitions published."
+COM_WORKFLOW_GRAPH_TRANSITION_N_ITEMS_PUBLISHED_1="Transition published."
+COM_WORKFLOW_GRAPH_TRANSITION_N_ITEMS_TRASHED="%d transitions trashed."
+COM_WORKFLOW_GRAPH_TRANSITION_N_ITEMS_TRASHED_1="Transition trashed."
+COM_WORKFLOW_GRAPH_TRANSITION_N_ITEMS_UNPUBLISHED="%d transitions unpublished."
+COM_WORKFLOW_GRAPH_TRANSITION_N_ITEMS_UNPUBLISHED_1="Transition unpublished."
+COM_WORKFLOW_GRAPH_TRANSITION_PATH="Transition path for %s."
+COM_WORKFLOW_GRAPH_TRANSITION_REF="Transition: %s from stage %s to %s."
+COM_WORKFLOW_GRAPH_TRANSITION_SELECTED="Transition selected: %s"
+COM_WORKFLOW_GRAPH_TRANSITION_STATUS_ENABLED="Status of transition %s: Enabled."
+COM_WORKFLOW_GRAPH_TRANSITION_STATUS_DISABLED="Status of transition %s: Disabled."
+COM_WORKFLOW_GRAPH_TRASH_ITEM="Remove Item"
+COM_WORKFLOW_GRAPH_TRASH_STAGE="Remove Stage"
+COM_WORKFLOW_GRAPH_TRASH_STAGE_CONFIRM="Are you sure you want to remove the stage %s?"
+COM_WORKFLOW_GRAPH_TRASH_STAGE_FAILED="Failed to remove stage."
+COM_WORKFLOW_GRAPH_TRASH_TRANSITION="Remove Transition"
+COM_WORKFLOW_GRAPH_TRASH_TRANSITION_CONFIRM="Are you sure you want to remove the transition %s?"
+COM_WORKFLOW_GRAPH_TRASH_TRANSITION_FAILED="Failed to remove transition."
+COM_WORKFLOW_GRAPH_UNSAVED_CHANGES="You have unsaved changes."
+COM_WORKFLOW_GRAPH_UPDATE_STAGE_POSITION_FAILED="Failed to update stage position."
+COM_WORKFLOW_GRAPH_UP_TO_DATE="All changes saved."
+COM_WORKFLOW_GRAPH_VIEW="Graph View"
+COM_WORKFLOW_GRAPH_WORKFLOWS_EDIT="Workflow Editor"
+COM_WORKFLOW_GRAPH_ZOOM_IN="Zoom In"
+COM_WORKFLOW_GRAPH_ZOOM_OUT="Zoom Out"
diff --git a/administrator/language/en-GB/guidedtours.joomla_categories.ini b/administrator/language/en-GB/guidedtours.joomla_categories.ini
index 999c5695cd374..4c96ca08c8ff6 100644
--- a/administrator/language/en-GB/guidedtours.joomla_categories.ini
+++ b/administrator/language/en-GB/guidedtours.joomla_categories.ini
@@ -3,5 +3,5 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-COM_GUIDEDTOURS_TOUR_CATEGORIES_TITLE="How to create categories?"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_DESCRIPTION="This tour will show you how you can create a category."
+COM_GUIDEDTOURS_TOUR_CATEGORIES_TITLE="How to create article categories?"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_DESCRIPTION="This tour will show you how you can create a category for articles."
diff --git a/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_2.ini b/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_2.ini
deleted file mode 100644
index c9f46d656d154..0000000000000
--- a/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_2.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; Joomla! Project
-; (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_DESCRIPTION="<h1 class=\"fw-medium\">Welcome to Joomla 5.2!</h1><div class=\"row align-items-center mb-4 pt-4 border-top border-1\"><div class=\"col-md-6 col-lg-5 text-center text-md-start mb-3 mb-md-0\"><img class=\"img-fluid\" src=\"media/com_guidedtours/images/5_2/enhancedtourheader.png\" alt=\"The first step of the welcome tour, showing the new header look\" width=\"640\" height=\"384\"></div><div class=\"col-md-6 col-lg-7\"><h2 class=\"mb-3\">Guided Tours Updates</h2><h3>Auto-start Tours</h3><p>This feature will allow you to create your own auto-start Guided Tour. The contextual tour can be opted out for one or all users. Tours can be restarted from the Guided Tours menu.</p><h3>Enhancements</h3><ul class=\"mb-3\"><li>For clarity, the <em>Step Counter</em> was positioned first in the tour header.</li><li>The modal window resizes automatically to accommodate larger content and images.</li></ul></div></div><div class=\"row align-items-center border-top border-1 pt-4\"><div class=\"col-md-6 col-lg-7 mb-3\"><h2 class=\"mb-3\">Core Updates</h2><h3>The new all-in-one 'Articles' module</h3><p>Use one module to display latest, most read, specific or archived articles, from select categories - with filters, tags and more...</p><p>From <span class=\"fw-medium\">Content -&gt; Site Modules</span>, create a new module of type 'Articles'.</p><h3>Mail Template Layout</h3><p>Take it a step further by creating an entirely unique layout (including logo) which can be applied to one or all mail templates.</p><p>From <span class=\"fw-medium\">Global Configuration -&gt; Mail Templates</span>, layouts can be defined in HTML.</p><h3>Other Enhancements and Fixes</h3><ul class=\"mb-3\"><li>Nested Subforms - Allows the nesting of Subform inside a Subform Custom Field.</li><li>Total Count - Shows the count and total number of list items in the console.</li></ul></div><div class=\"col-md-6 col-lg-5\"><img class=\"img-fluid\" src=\"media/com_guidedtours/images/5_2/mailtemplate.png\" alt=\"Mail template example, including a header logo and a footer\" width=\"640\" height=\"370\" loading=\"lazy\"></div></div>"
-COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_TITLE="What’s New in Joomla 5.2!"
diff --git a/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_3.ini b/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_3.ini
deleted file mode 100644
index 279928d33f031..0000000000000
--- a/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_3.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; Joomla! Project
-; (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-COM_GUIDEDTOURS_TOUR_WHATSNEW_5_3_DESCRIPTION="<h1 class=\"fw-medium\">Welcome to Joomla 5.3!</h1><div class=\"row align-items-center mb-4 pt-4 border-top border-1\"><div class=\"col-md-6 col-lg-7\"><h2 class=\"mb-3\">Guided Tours Updates</h2><p>Guided Tours now has its own API. <a href=\"https://manual.joomla.org/docs/next/web-services-api/\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla API Documentation</a></p><p>Stay tuned for other new enhancements coming soon!</p></div></div><div class=\"row align-items-center border-top border-1 pt-4\"><div class=\"col-md-6 col-lg-5 text-center text-md-start mb-3 mb-md-0\"><img class=\"img-fluid\" src=\"media/com_guidedtours/images/5_3/filesdirectory.jpg\" alt=\"The first step of the welcome tour, showing the new media files folder\" width=\"521\" height=\"304\"></div><div class=\"col-md-6 col-lg-7 mb-3\"><h2 class=\"mb-3\">Core Updates</h2><h3 class=\"mb-3\">Organize Files in their Own Location</h3><p>Now you can see and select your stored/uploaded documents directly from the Media Manager. Find more information in the <a href=\"https://magazine.joomla.org/all-issues/december-2024/document-uploads-on-your-joomla-website\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla Community Magazine</a>.</p><h3 class=\"mb-3\">View Scheduled Task History</h3><p>You now have the ability to view execution information directly in the backend without having to access log files. Look for the <strong>Execution History</strong> button located in the Scheduled Tasks page.</p><h3>Other Enhancements and Fixes</h3><ul class=\"mb-3\"><li>Template Override Plugin Comparison - adds compare functionality to plugin overrides</li><li>Tag Alias Lookup Fixed - now instead of showing the tag id number in the URL the tag name is shown</li></ul></div></div>"
-COM_GUIDEDTOURS_TOUR_WHATSNEW_5_3_TITLE="What’s New in Joomla 5.3!"
diff --git a/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_3_steps.ini b/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_3_steps.ini
deleted file mode 100644
index fe8788b793d8c..0000000000000
--- a/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_3_steps.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; Joomla! Project
-; (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-COM_GUIDEDTOURS_TOUR_WHATSNEW_5_3_STEP_0_DESCRIPTION="<h3>Joomla 5.3 Full Release Notes</h3><p><a title=\"Full release notes\" href=\"https://www.joomla.org/announcements.html\" target=\"_blank\" rel=\"noopener noreferrer\">View the full release notes on joomla.org</a></p><hr><h3>Help and Information</h3><p>Many resources to help you can be found here together with additional links to more resources, documentation, support and how to become involved in Joomla.</p>"
-COM_GUIDEDTOURS_TOUR_WHATSNEW_5_3_STEP_0_TITLE="More Information and Help"
diff --git a/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4.ini b/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4.ini
deleted file mode 100644
index 423d157601db1..0000000000000
--- a/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; Joomla! Project
-; (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-COM_GUIDEDTOURS_TOUR_WHATSNEW_5_4_DESCRIPTION="<h1 class=\"fw-medium\">Welcome to Joomla 5.4!</h1><div class=\"row align-items-center border-top border-1 pt-4\"><div class=\"col-md-6 col-lg-5 text-center text-md-start mb-3 mb-md-0\"><img class=\"img-fluid\" src=\"media/com_guidedtours/images/5_4/automated-updates.jpg\" alt=\"Display the backend dashboard notification where you can see the new automated updates icon to enable automated updates\" width=\"774\" height=\"281\"></div><div class=\"col-md-6 col-lg-7 mb-3\"><h2 class=\"mb-3\">Automated Updates are here!</h2><p>Joomla! 5.4 now supports automated updates for better security and performance.</p><p><strong>Stay safe and secure!</strong></p></div></div>"
-COM_GUIDEDTOURS_TOUR_WHATSNEW_5_4_TITLE="What’s New in Joomla 5.4!"
diff --git a/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4_steps.ini b/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4_steps.ini
deleted file mode 100644
index 6ee83abbbb253..0000000000000
--- a/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_4_steps.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; Joomla! Project
-; (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-COM_GUIDEDTOURS_TOUR_WHATSNEW_5_4_STEP_0_DESCRIPTION="<h3>Joomla 5.4 Full Release Notes</h3><p><a title=\"Full release notes\" href=\"https://www.joomla.org/announcements.html\" target=\"_blank\" rel=\"noopener noreferrer\">View the full release notes on joomla.org</a></p><hr><h3>Help and Information</h3><p>Many resources to help you can be found here together with additional links to more resources, documentation, support and how to become involved in Joomla.</p>"
-COM_GUIDEDTOURS_TOUR_WHATSNEW_5_4_STEP_0_TITLE="More Information and Help"
diff --git a/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_0.ini b/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_0.ini
new file mode 100644
index 0000000000000..150cd32bfeeb8
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_0.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_DESCRIPTION="<h1 class=\"fw-medium\">Welcome to Joomla 6!</h1><div class=\"row align-items-center border-top border-1 pt-4\"><div class=\"col-md-6 col-lg-6 text-center text-md-start mb-3\"><img class=\"img-fluid shadow\" src=\"media/com_guidedtours/images/6_0/cassiopeiacolors.jpg\" alt=\"Display the child template style customiser\" width=\"640\" height=\"380\"></div><div class=\"col-md-6 col-lg-6 mb-3\"><h2 class=\"mb-3\">Cassiopeia Extended</h2><p>Explore child templates with a new style that demonstrates advanced customisation features like font and colour modifications.</p></div></div><div class=\"row align-items-center border-top border-1 pt-4\"><div class=\"col-md-12 mb-3\"><h2 class=\"mb-3\">Extended Versioning</h2><p>Joomla's versioning system has been enhanced to include custom fields, tags and categories, allowing all content changes to be tracked, compared and restored.</p></div></div>"
+COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_TITLE="What's New in Joomla 6!"
diff --git a/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_0_steps.ini b/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_0_steps.ini
new file mode 100644
index 0000000000000..c2754bee2eef5
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_0_steps.ini
@@ -0,0 +1,9 @@
+; Joomla! Project
+; (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_STEP_0_DESCRIPTION="<div class=\"row align-items-center pt-3\"><div class=\"col-12\"><h2 class=\"mb-3\">More Updates</h2><p>Featured articles are now sharing the Article's Manager view.</p></div></div><div class=\"row align-items-center pt-4\"><div class=\"col-12\"><h3>If you missed it</h3><p>Joomla! 6 supports automated updates with The Update Framework (TUF) for better security and performance.<br>Find automated update settings in the <em>Joomla! Update</em> configuration section.</p></div></div><div class=\"row align-items-center pt-4\"><div class=\"col-12\"><h3>Other Enhancements and Fixes</h3><ul class=\"mb-3\"><li>Notification email on admin registration approval <a href=\"https://github.com/joomla/joomla-cms/pull/45802\" target=\"_blank\" rel=\"noopener noreferrer\">PR#45802</a></li><li>Add custom classes to the class dropdown in the image dialog in TinyMCE <a href=\"https://github.com/joomla/joomla-cms/pull/45676\" target=\"_blank\" rel=\"noopener noreferrer\">PR#45676</a></li><li>Add the possibility to batch remove a tag <a href=\"https://github.com/joomla/joomla-cms/pull/40613\" target=\"_blank\" rel=\"noopener noreferrer\">PR#40613</a></li><li>And many, many under the hood improvements...</li></ul></div></div>"
+COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_STEP_0_TITLE="Other Features"
+COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_STEP_1_DESCRIPTION="<h3>Joomla 6.0 Release Information</h3><p><a title=\"Release information\" href=\"https://6.joomla.org/\" target=\"_blank\" rel=\"noopener noreferrer\">View release information at 6.joomla.org</a></p><hr><h3>Help and Information</h3><p>Many resources to help you can be found here, together with additional links to more resources, documentation, support, and how to become involved in Joomla.</p>"
+COM_GUIDEDTOURS_TOUR_WHATSNEW_6_0_STEP_1_TITLE="More Information and Help"
diff --git a/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_1.ini b/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_1.ini
new file mode 100644
index 0000000000000..40013a99234a8
--- /dev/null
+++ b/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_1.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+COM_GUIDEDTOURS_TOUR_WHATSNEW_6_1_DESCRIPTION="<h1 class=\"fw-medium\">Welcome to Joomla 6.1!</h1><p>Joomla 6.1 introduces key improvements that make site building easier, safer, and more flexible. This tour gives you the essentials at a glance.</p><div class=\"row align-items-center mb-4 pt-4 border-top border-1\"><div class=\"col-md-6 col-lg-7\"><h2 class=\"mb-3\">Spam Protection is BACK with Proof-of-Work CAPTCHA</h2><p>No account or API required, privacy-friendly and accessible, this captcha silently solves math puzzles in the background, invisible to visitors.</p><p>To enable, go to <em>Extensions</em> -&gt; <em>Plugins</em>, search for <strong>captcha</strong>, enable and set as default in Global Configuration.</p></div><div class=\"col-md-6 col-lg-5 text-center text-md-start mb-3\"><img class=\"img-fluid\" src=\"media/com_guidedtours/images/6_1/captcha.jpg\" alt=\"The captcha states verifying and verified\" width=\"600\" height=\"250\"></div></div><div class=\"row align-items-center border-top border-1 pt-4\"><div class=\"col-md-6 col-lg-5 text-center text-md-start mb-3\"><img class=\"img-fluid\" src=\"media/com_guidedtours/images/6_1/workflows.jpg\" alt=\"Graphical representation of the basic workflow\" width=\"600\" height=\"350\"></div><div class=\"col-md-6 col-lg-7 mb-3\"><h2 class=\"mb-3\">Content Pipeline at a Glance with the Visual Workflow Editor</h2><p>Manage your content workflow more easily with the new interactive workflow diagram that allows you to see the entire publication process.</p><p>Enable Workflows in <em>Article Manager</em> -&gt; <em>Workflows</em> and look for the graph button.</p></div></div><div class=\"row align-items-center border-top border-1 pt-4\"><div class=\"col-md-6 col-lg-7 mb-3\"><h2 class=\"mb-3\">Three New Media Custom Field Options: Audio, Video &amp; Documents</h2><p>When creating Custom Fields for your content, you can now let content creators include any type of media, not just images.</p><p>The medias render as HTML5 &lt;audio&gt;, &lt;video&gt;, or document links (PDF, spreadsheets...).</p></div><div class=\"col-md-6 col-lg-5 text-center text-md-start mb-3\"><img class=\"img-fluid\" src=\"media/com_guidedtours/images/6_1/media.jpg\" alt=\"The three media field options audio, video and document\" width=\"600\" height=\"350\"></div></div><div class=\"row align-items-center border-top border-1 pt-4\"><div class=\"col-12 mb-3\"><h2 class=\"mb-3\">Smarter Modules with Versioning and Multilingual Associations</h2><p>Joomla has long had version history for articles. This same capability is now extended to modules.<br>If you run a multilingual website, you can now associate module instances across different languages, the same way you can associate articles across languages.</p><h2>Other Enhancements Worth Noting</h2><ul class=\"mb-3\"><li>Abbreviation <strong>&lt;abbr&gt;</strong> support in TinyMCE rich text editor, semantically correct and improving accessibility (look for the new Abbreviation button in the TinyMCE toolbar when editing content).</li><li>Language override status &amp; quick-create missing overrides UX improvements (status indicator, edit overrides easily).</li></ul></div></div>"
+COM_GUIDEDTOURS_TOUR_WHATSNEW_6_1_TITLE="What’s New in Joomla 6.1!"
diff --git a/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_2_steps.ini b/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_1_steps.ini
similarity index 66%
rename from administrator/language/en-GB/guidedtours.joomla_whatsnew_5_2_steps.ini
rename to administrator/language/en-GB/guidedtours.joomla_whatsnew_6_1_steps.ini
index 6bc9e5ac2d322..eaff1e627d6c6 100644
--- a/administrator/language/en-GB/guidedtours.joomla_whatsnew_5_2_steps.ini
+++ b/administrator/language/en-GB/guidedtours.joomla_whatsnew_6_1_steps.ini
@@ -1,7 +1,7 @@
 ; Joomla! Project
-; (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
+; (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_STEP_0_DESCRIPTION="<h3>Joomla 5.2 Full Release Notes</h3><p><a title=\"Full release notes\" href=\"https://www.joomla.org/announcements.html\" target=\"_blank\" rel=\"noopener noreferrer\">View the full release notes on joomla.org</a></p><hr><h3>Help and Information</h3><p>Many resources to help you can be found here together with additional links to more resources, documentation, support and how to become involved in Joomla.</p>"
-COM_GUIDEDTOURS_TOUR_WHATSNEW_5_2_STEP_0_TITLE="More Information and Help"
+COM_GUIDEDTOURS_TOUR_WHATSNEW_6_1_STEP_0_DESCRIPTION="<h3>Joomla 6.1 Full Release Notes</h3><p><a title=\"Full release notes\" href=\"https://www.joomla.org/announcements.html\" target=\"_blank\" rel=\"noopener noreferrer\">View the full release notes on joomla.org</a></p><hr><h3>Help and Information</h3><p>Many resources to help you can be found here together with additional links to more resources, documentation, support and how to become involved in Joomla.</p>"
+COM_GUIDEDTOURS_TOUR_WHATSNEW_6_1_STEP_0_TITLE="More Information and Help"
diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
index c855da94d9cdf..7abd9e1794e9c 100644
--- a/administrator/language/en-GB/install.xml
+++ b/administrator/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>5.4.8</version>
+	<version>6.2.0</version>
 	<creationDate>2026-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/administrator/language/en-GB/joomla.ini b/administrator/language/en-GB/joomla.ini
index efac7b0fb12aa..7ccabcf0c069a 100644
--- a/administrator/language/en-GB/joomla.ini
+++ b/administrator/language/en-GB/joomla.ini
@@ -221,8 +221,11 @@ JFIELD_COLOR_LABEL_SLIDER_HUE="Hue Slider"
 JFIELD_COLOR_LABEL_SLIDER_INPUT="Selected Colour Value"
 JFIELD_COLOR_LABEL_SLIDER_LIGHT="Light Slider"
 JFIELD_COLOR_LABEL_SLIDER_SATURATION="Saturation Slider"
+; The following string is deprecated and will be removed with 7.0
 JFIELD_COLOR_SELECT="Select a colour"
+; The following string is deprecated and will be removed with 7.0
 JFIELD_COLOR_TRANSPARENT="No colour, transparent"
+; The following string is deprecated and will be removed with 7.0
 JFIELD_COLOR_VALUE="Colour with hexadecimal value of"
 JFIELD_DISPLAY_READONLY_LABEL="Display When Read-Only"
 JFIELD_ENABLED_DESC="The enabled status of this item."
@@ -306,6 +309,7 @@ JFIELD_PLG_SEARCH_SEARCHLIMIT_LABEL="Search Limit"
 JFIELD_PUBLISHED_DESC="Set publication status."
 JFIELD_READMORE_DESC="Add a custom text instead of Read More."
 JFIELD_READMORE_LABEL="Read More Text"
+JFIELD_RULES_LABEL="Group Permissions"
 JFIELD_SPACER_LABEL="<span style=\"width:auto\"><hr></span>"
 JFIELD_TITLE_DESC="Title"
 JFIELD_VERSION_HISTORY_DESC="This button allows you to open a window to view older versions of this item."
@@ -651,6 +655,7 @@ JGLOBAL_SHOW_READMORE_TITLE_DESC="If set to show the title of the Article will b
 JGLOBAL_SHOW_READMORE_TITLE_LABEL="Read More with Title"
 JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC="Show or hide the subcategories descriptions."
 JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL="Subcategories Descriptions"
+JGLOBAL_SHOW_SUBCATEGORIES_IMAGE_LABEL="Subcategories Image"
 JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC="If None, only articles from this category will show. If a number, all articles from the category and the subcategories up to and including that level will show in the blog."
 JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL="Include Subcategories"
 JGLOBAL_SHOW_SUBCATEGORY_HEADING="Subcategories Heading"
@@ -691,8 +696,6 @@ JGLOBAL_VOTES="Votes"
 JGLOBAL_VOTES_ASC="Votes ascending"
 JGLOBAL_VOTES_DESC="Votes descending"
 JGLOBAL_WARNCOOKIES="Warning! Cookies must be enabled to access the Administrator Backend."
-; @deprecated 5.0 will be removed in 6.0
-JGLOBAL_WARNIE="Warning! Internet Explorer should not be used for proper operation of the Administrator Backend."
 JGLOBAL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper operation of the Administrator Backend."
 JGLOBAL_WIDTH="Width"
 
@@ -925,6 +928,7 @@ PHPMAILER_RECIPIENTS_FAILED="SMTP Error! The following recipients failed: "
 PHPMAILER_SIGNING_ERROR="Signing error: "
 PHPMAILER_SMTP_CONNECT_FAILED="SMTP connect failed"
 PHPMAILER_SMTP_ERROR="SMTP server error: "
+; Deprecated, will be removed with 7.0
 PHPMAILER_TLS="Could not start TLS"
 PHPMAILER_VARIABLE_SET="Can't set or reset variable: "
 
diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml
index 7a3b83dfc7a28..da1e1570a326f 100644
--- a/administrator/language/en-GB/langmetadata.xml
+++ b/administrator/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="administrator">
 	<name>English (en-GB)</name>
-	<version>5.4.8</version>
+	<version>6.2.0</version>
 	<creationDate>2026-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini
index f921fdf193c4c..cbb1f370ea2de 100644
--- a/administrator/language/en-GB/lib_joomla.ini
+++ b/administrator/language/en-GB/lib_joomla.ini
@@ -256,6 +256,7 @@ JLIB_FILTER_PARAMS_TEXT="Text"
 
 JLIB_FORM_BUTTON_CLEAR="Clear"
 JLIB_FORM_BUTTON_SELECT="Select"
+JLIB_FORM_CHANGE_FILE="Change File"
 JLIB_FORM_CHANGE_IMAGE="Change Image"
 JLIB_FORM_CHANGE_IMAGE_BUTTON="Change Image Button"
 JLIB_FORM_CHANGE_USER="Select User"
@@ -272,11 +273,20 @@ JLIB_FORM_FIELD_INVALID_MIN_TIME="The time you entered is before the minimum tim
 JLIB_FORM_FIELD_INVALID_TIME_INPUT="Invalid time format. Please use hh:mm."
 JLIB_FORM_FIELD_INVALID_TIME_INPUT_SECONDS="Invalid time format. Please use hh:mm:ss."
 JLIB_FORM_FIELD_INVALID_VALUE="This value is not valid"
-JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_LABEL="Media"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_LABEL="Media (%s)"
 JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_ALT_EMPTY_DESC="Decorative Image - no description required"
 JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_ALT_EMPTY_LABEL="No Description"
 JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_ALT_TEXT_LABEL="Image Description (Alt Text)"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_AUDIO_LABEL="Audio"
 JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_IMAGEFILE_LABEL="Image"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_LINKTEXT_DEFAULT_VALUE="Download {filename}"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_LINKTEXT_DESC="Specify the link text for non-image file."
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_LINKTEXT_LABEL="Link Text"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_MEDIA_TYPE_AUDIOS="Audio"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_MEDIA_TYPE_DOCUMENTS="Document"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_MEDIA_TYPE_IMAGES="Image"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_MEDIA_TYPE_VIDEOS="Video"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_VIDEO_POSTER_LABEL="Video Poster"
 JLIB_FORM_FIELD_PARAM_CALENDAR_FORMAT_DESC="The date format to be used. This is in the format used by PHP to specify date string formats (see below). If no format argument is given, '%Y-%m-%d' is assumed (giving dates like '2008-04-16')."
 JLIB_FORM_FIELD_PARAM_CALENDAR_FORMAT_LABEL="Format"
 JLIB_FORM_FIELD_PARAM_CHECKBOX_MULTIPLE_DESC="Allow multiple values to be selected."
@@ -379,8 +389,11 @@ JLIB_HTML_BATCH_MOVE="Move"
 JLIB_HTML_BATCH_MOVE_QUESTION="Action to Perform"
 JLIB_HTML_BATCH_NO_CATEGORY="- Don't copy or move -"
 JLIB_HTML_BATCH_NOCHANGE="- Keep original Access Levels -"
-JLIB_HTML_BATCH_TAG_LABEL="Add Tag"
+JLIB_HTML_BATCH_TAG_ADD="Add"
+JLIB_HTML_BATCH_TAG_ADDREMOVE_QUESTION="Action to Perform"
+JLIB_HTML_BATCH_TAG_LABEL="Add or Remove Tag"
 JLIB_HTML_BATCH_TAG_NOCHANGE="- Keep original Tags -"
+JLIB_HTML_BATCH_TAG_REMOVE="Remove"
 JLIB_HTML_BATCH_USER_LABEL="Set User."
 JLIB_HTML_BATCH_USER_NOCHANGE="- Keep original User -"
 JLIB_HTML_BATCH_USER_NOUSER="No User."
@@ -625,8 +638,6 @@ JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MANIFEST_NOT_REMOVED="Package Uninstall: Err
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSING_EXTENSION="Package Uninstall: This extension is missing or has already been uninstalled: %s"
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSINGMANIFEST="Package Uninstall: Missing manifest file."
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_NOT_PROPER="Package Uninstall: This extension may have already been uninstalled or might not have been uninstalled properly: %s"
-; The following string is deprecated and will be removed with 6.0
-JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION="Trying to uninstall unknown extension from package. This extension may have already been removed earlier."
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_WARNCOREPACK="Package Uninstall: Trying to uninstall core package."
 JLIB_INSTALLER_ERROR_PLG_DISCOVER_STORE_DETAILS="Plugin Discover install: Failed to store plugin details."
 JLIB_INSTALLER_ERROR_PLG_REFRESH_MANIFEST_CACHE="Plugin Refresh manifest cache: Failed to store plugin details."
@@ -688,6 +699,7 @@ JLIB_JS_AJAX_ERROR_TIMEOUT="A timeout has occurred while fetching the JSON data.
 
 JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METADATA="Could not load %s metadata from %s."
 JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METAFILE="Could not load %s language XML file from %s."
+JLIB_LANGUAGE_ERROR_CANNOT_WRITE_CACHE="Unable to write cache file for %s."
 
 JLIB_LOGIN_AUTHORISATION="Your access has been authorised."
 JLIB_LOGIN_DENIED="Your access has been denied."
@@ -697,6 +709,8 @@ JLIB_MAIL_FUNCTION_DISABLED="The mail() function has been disabled and the mail
 JLIB_MAIL_FUNCTION_OFFLINE="The mail function has been disabled by an administrator."
 JLIB_MAIL_INVALID_EMAIL_SENDER="Invalid email sender: %s"
 
+JLIB_MEDIA_ERROR_SVG_ISSUE="SVG Issue: %s"
+JLIB_MEDIA_ERROR_SVG_UNKNOWN="Unknown SVG error"
 JLIB_MEDIA_ERROR_UPLOAD_INPUT="Unable to upload file."
 JLIB_MEDIA_ERROR_WARNFILENAME="File name must only have alphanumeric characters and no spaces."
 JLIB_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload. You can change the limits for your site in the component options."
diff --git a/administrator/language/en-GB/mod_login.ini b/administrator/language/en-GB/mod_login.ini
index 76515bc51edd6..bf6caadb4b011 100644
--- a/administrator/language/en-GB/mod_login.ini
+++ b/administrator/language/en-GB/mod_login.ini
@@ -5,7 +5,7 @@
 
 MOD_LOGIN="Login Form"
 MOD_LOGIN_CREDENTIALS="Forgot your login details?"
-MOD_LOGIN_CREDENTIALS_LINK="https://docs.joomla.org/Special:MyLanguage/How_do_you_recover_or_reset_your_admin_password%3F"
+MOD_LOGIN_CREDENTIALS_LINK="https://guide.joomla.org/user-manual/users/users-admin-password-recovery"
 MOD_LOGIN_LANGUAGE="Language"
 MOD_LOGIN_LOGIN_TITLE="Administrator Log In"
 MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It should not be unpublished."
diff --git a/administrator/language/en-GB/mod_menu.ini b/administrator/language/en-GB/mod_menu.ini
index 9beaa0eea7aab..303a7c1fc68f5 100644
--- a/administrator/language/en-GB/mod_menu.ini
+++ b/administrator/language/en-GB/mod_menu.ini
@@ -57,7 +57,7 @@ MOD_MENU_HELP_COMMUNITY="Community Portal"
 MOD_MENU_HELP_COMMUNITY_NEWS="Community News"
 MOD_MENU_HELP_COMMUNITY_NEWSLETTER="Community Newsletter"
 MOD_MENU_HELP_DEVELOPER="Developer Resources"
-MOD_MENU_HELP_DOCUMENTATION="Documentation Wiki"
+MOD_MENU_HELP_DOCUMENTATION="Documentation for Joomla! Users"
 MOD_MENU_HELP_EVENTS="Joomla Events"
 MOD_MENU_HELP_EXTENSIONS="Joomla! Extensions"
 MOD_MENU_HELP_GITHUB="Joomla on GitHub"
@@ -141,5 +141,6 @@ MOD_MENU_UPDATE="Update"
 MOD_MENU_UPDATE_EXTENSIONS="Extensions"
 MOD_MENU_UPDATE_JOOMLA="Joomla"
 MOD_MENU_UPDATE_SOURCES="Update Sites"
+; Deprecated, will be removed with 7.0
 MOD_MENU_USER_PROFILE="My Profile"
 MOD_MENU_XML_DESCRIPTION="This module displays an administrator menu module."
diff --git a/administrator/language/en-GB/mod_popular.ini b/administrator/language/en-GB/mod_popular.ini
index 3669bb575d9f5..193680338e523 100644
--- a/administrator/language/en-GB/mod_popular.ini
+++ b/administrator/language/en-GB/mod_popular.ini
@@ -7,11 +7,23 @@ MOD_POPULAR="Popular Articles"
 MOD_POPULAR_CREATED="Created"
 MOD_POPULAR_FIELD_AUTHORS_LABEL="Authors"
 MOD_POPULAR_FIELD_COUNT_LABEL="Items to Display"
+MOD_POPULAR_FIELD_DATEFILTERING_LABEL="Date Filtering"
+MOD_POPULAR_FIELD_DATERANGEFIELD_LABEL="Date Range Field"
+MOD_POPULAR_FIELD_ENDDATE_LABEL="End Date"
+MOD_POPULAR_FIELD_RELATIVEDATE_LABEL="Relative Date"
+MOD_POPULAR_FIELD_STARTDATE_LABEL="Start Date"
 MOD_POPULAR_FIELD_VALUE_ADDED_OR_MODIFIED_BY_ME="Added or modified by me"
 MOD_POPULAR_FIELD_VALUE_ANYONE="Anyone"
 MOD_POPULAR_FIELD_VALUE_NOT_ADDED_OR_MODIFIED_BY_ME="Not added or modified by me"
 MOD_POPULAR_ITEMS="Popular Items"
+; The following string is deprecated and will be removed with 7.0
 MOD_POPULAR_NO_MATCHING_RESULTS="No Matching Results"
+MOD_POPULAR_OPTION_CREATED_VALUE="Created Date"
+MOD_POPULAR_OPTION_DATERANGE_VALUE="Date Range"
+MOD_POPULAR_OPTION_MODIFIED_VALUE="Modified Date"
+MOD_POPULAR_OPTION_OFF_VALUE="Off"
+MOD_POPULAR_OPTION_RELATIVEDAY_VALUE="Relative Date"
+MOD_POPULAR_OPTION_STARTPUBLISHING_VALUE="Start Publishing Date"
 MOD_POPULAR_TITLE="Popular Articles"
 MOD_POPULAR_TITLE_1="Top Popular Article"
 MOD_POPULAR_TITLE_BY_ME="Top Popular Articles By Me"
diff --git a/administrator/language/en-GB/mod_stats_admin.ini b/administrator/language/en-GB/mod_stats_admin.ini
index a3f764172bcac..dd040a39b0d9a 100644
--- a/administrator/language/en-GB/mod_stats_admin.ini
+++ b/administrator/language/en-GB/mod_stats_admin.ini
@@ -12,10 +12,3 @@ MOD_STATS_GZIP="Gzip"
 MOD_STATS_PHP="PHP"
 MOD_STATS_USERS="Users"
 MOD_STATS_XML_DESCRIPTION="The Statistics Module shows information about your server installation together with statistics on the website users and the number of Articles in your database."
-; Deprecated, will be removed with 6.0
-MOD_STATS_ARTICLES_VIEW_HITS="Articles View Hits"
-MOD_STATS_FIELD_COUNTER_LABEL="Hit Counter"
-MOD_STATS_FIELD_INCREASECOUNTER_LABEL="Increase Counter"
-MOD_STATS_OS="OS"
-MOD_STATS_TIME="Time"
-MOD_STATS_WEBLINKS="Web Links"
diff --git a/administrator/language/en-GB/mod_stats_admin.sys.ini b/administrator/language/en-GB/mod_stats_admin.sys.ini
index 38bd731fb2e93..f9941b5d55480 100644
--- a/administrator/language/en-GB/mod_stats_admin.sys.ini
+++ b/administrator/language/en-GB/mod_stats_admin.sys.ini
@@ -6,6 +6,3 @@
 MOD_STATS_ADMIN="Statistics"
 MOD_STATS_ADMIN_LAYOUT_DEFAULT="Default"
 MOD_STATS_XML_DESCRIPTION="The Statistics Module shows information about your server installation together with statistics on the website users and the number of Articles in your database."
-
-; Deprecated, will be removed with 6.0
-MOD_STATS_LAYOUT_DEFAULT="Default"
diff --git a/administrator/language/en-GB/mod_user.ini b/administrator/language/en-GB/mod_user.ini
index adbe9df8f39c7..e7d067241c2de 100644
--- a/administrator/language/en-GB/mod_user.ini
+++ b/administrator/language/en-GB/mod_user.ini
@@ -10,7 +10,3 @@ MOD_USER_LIGHTDARK_MODE="Light/Dark Mode"
 MOD_USER_MENU="User Menu"
 MOD_USER_TITLE="Signed in as %s"
 MOD_USER_XML_DESCRIPTION="This module shows the User Menu and is intended to be displayed in the 'status' position."
-
-; Deprecated, will be removed with 6.0
-MOD_USER_LIGHT_MODE="Light Mode"
-MOD_USER_DARK_MODE="Dark Mode"
diff --git a/administrator/language/en-GB/plg_actionlog_joomla.ini b/administrator/language/en-GB/plg_actionlog_joomla.ini
index dc2d74017868f..58b2f1c3b911d 100644
--- a/administrator/language/en-GB/plg_actionlog_joomla.ini
+++ b/administrator/language/en-GB/plg_actionlog_joomla.ini
@@ -4,7 +4,7 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_ACTIONLOG_JOOMLA="Action Log - Joomla"
-PLG_ACTIONLOG_JOOMLA_API="User <a href='{accountlink}'>{username}</a> performed a {verb} on {url}"
+PLG_ACTIONLOG_JOOMLA_API="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> performed a {verb} on {url}"
 PLG_ACTIONLOG_JOOMLA_APPLICATION_ADMINISTRATOR="admin"
 PLG_ACTIONLOG_JOOMLA_APPLICATION_API="api"
 PLG_ACTIONLOG_JOOMLA_APPLICATION_CLI="cli"
@@ -41,32 +41,32 @@ PLG_ACTIONLOG_JOOMLA_TYPE_USER="user"
 PLG_ACTIONLOG_JOOMLA_TYPE_USER_GROUP="user group"
 PLG_ACTIONLOG_JOOMLA_TYPE_USER_NOTE="user note"
 ; User actions
-PLG_ACTIONLOG_JOOMLA_USER_BLOCK="User <a href='{accountlink}'>{username}</a> blocked user <a href='{itemlink}'>{title}</a>"
-PLG_ACTIONLOG_JOOMLA_USER_CACHE="User <a href='{accountlink}'>{username}</a> deleted cache group {group}"
-PLG_ACTIONLOG_JOOMLA_USER_CHECKIN="User <a href='{accountlink}'>{username}</a> performed a check in to table {table}"
-PLG_ACTIONLOG_JOOMLA_USER_LOG="User <a href='{accountlink}'>{username}</a> purged one or more rows from the action log"
-PLG_ACTIONLOG_JOOMLA_USER_LOGEXPORT="User <a href='{accountlink}'>{username}</a> exported one or more rows from the action log"
-PLG_ACTIONLOG_JOOMLA_USER_LOGGED_IN="User <a href='{accountlink}'>{username}</a> logged in to {app}"
-PLG_ACTIONLOG_JOOMLA_USER_LOGGED_OUT="User <a href='{accountlink}'>{username}</a> logged out from {app}"
-PLG_ACTIONLOG_JOOMLA_USER_LOGIN_FAILED="A failed attempt was made to login as <a href='{accountlink}'>{username}</a> to {app}"
-PLG_ACTIONLOG_JOOMLA_USER_REGISTERED="User <a href='{accountlink}'>{username}</a> registered for an account"
-PLG_ACTIONLOG_JOOMLA_USER_REGISTRATION_ACTIVATE="User <a href='{accountlink}'>{username}</a> activated the account"
-PLG_ACTIONLOG_JOOMLA_USER_REMIND="User <a href='{accountlink}'>{username}</a> requested a username reminder for their account"
-PLG_ACTIONLOG_JOOMLA_USER_RESET_COMPLETE="User <a href='{accountlink}'>{username}</a> completed the password reset for their account"
-PLG_ACTIONLOG_JOOMLA_USER_RESET_REQUEST="User <a href='{accountlink}'>{username}</a> requested a password reset for their account"
-PLG_ACTIONLOG_JOOMLA_USER_UNBLOCK="User <a href='{accountlink}'>{username}</a> unblocked user <a href='{itemlink}'>{title}</a>"
-PLG_ACTIONLOG_JOOMLA_USER_UPDATE="User <a href='{accountlink}'>{username}</a> updated Joomla from {oldversion} to {version}"
+PLG_ACTIONLOG_JOOMLA_USER_BLOCK="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> blocked user <a href='{itemlink}' title='Edit user {title}'>{title}</a>"
+PLG_ACTIONLOG_JOOMLA_USER_CACHE="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> deleted cache group {group}"
+PLG_ACTIONLOG_JOOMLA_USER_CHECKIN="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> performed a check in to table {table}"
+PLG_ACTIONLOG_JOOMLA_USER_LOG="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> purged one or more rows from the action log"
+PLG_ACTIONLOG_JOOMLA_USER_LOGEXPORT="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> exported one or more rows from the action log"
+PLG_ACTIONLOG_JOOMLA_USER_LOGGED_IN="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> logged in to {app}"
+PLG_ACTIONLOG_JOOMLA_USER_LOGGED_OUT="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> logged out from {app}"
+PLG_ACTIONLOG_JOOMLA_USER_LOGIN_FAILED="A failed attempt was made to login as <a href='{accountlink}' title='Edit user {username}'>{username}</a> to {app}"
+PLG_ACTIONLOG_JOOMLA_USER_REGISTERED="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> registered for an account"
+PLG_ACTIONLOG_JOOMLA_USER_REGISTRATION_ACTIVATE="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> activated the account"
+PLG_ACTIONLOG_JOOMLA_USER_REMIND="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> requested a username reminder for their account"
+PLG_ACTIONLOG_JOOMLA_USER_RESET_COMPLETE="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> completed the password reset for their account"
+PLG_ACTIONLOG_JOOMLA_USER_RESET_REQUEST="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> requested a password reset for their account"
+PLG_ACTIONLOG_JOOMLA_USER_UNBLOCK="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> unblocked user <a href='{itemlink}' title='Edit user {title}'>{title}</a>"
+PLG_ACTIONLOG_JOOMLA_USER_UPDATE="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> updated Joomla from {oldversion} to {version}"
 ; Automatic updates
 PLG_ACTIONLOG_JOOMLA_SYSTEM_UPDATE="An automated process updated Joomla from {oldversion} to {version}"
 ; Config
-PLG_ACTIONLOG_JOOMLA_APPLICATION_CONFIG_UPDATED="User <a href='{accountlink}'>{username}</a> changed settings of the application configuration"
-PLG_ACTIONLOG_JOOMLA_COMPONENT_CONFIG_UPDATED="User <a href='{accountlink}'>{username}</a> changed settings of the component {extension_name}"
+PLG_ACTIONLOG_JOOMLA_APPLICATION_CONFIG_UPDATED="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> changed settings of the application configuration"
+PLG_ACTIONLOG_JOOMLA_COMPONENT_CONFIG_UPDATED="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> changed settings of the component {extension_name}"
 ; Extensions
-PLG_ACTIONLOG_JOOMLA_EXTENSION_INSTALLED="User <a href='{accountlink}'>{username}</a> installed the {type} {extension_name}"
-PLG_ACTIONLOG_JOOMLA_EXTENSION_UNINSTALLED="User <a href='{accountlink}'>{username}</a> uninstalled the {type} {extension_name}"
-PLG_ACTIONLOG_JOOMLA_EXTENSION_UPDATED="User <a href='{accountlink}'>{username}</a> updated the {type} {extension_name}"
-PLG_ACTIONLOG_JOOMLA_PLUGIN_INSTALLED="User <a href='{accountlink}'>{username}</a> installed the plugin <a href='index.php?option=com_plugins&task=plugin.edit&extension_id={id}'>{extension_name}</a>"
+PLG_ACTIONLOG_JOOMLA_EXTENSION_INSTALLED="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> installed the {type} {extension_name}"
+PLG_ACTIONLOG_JOOMLA_EXTENSION_UNINSTALLED="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> uninstalled the {type} {extension_name}"
+PLG_ACTIONLOG_JOOMLA_EXTENSION_UPDATED="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> updated the {type} {extension_name}"
+PLG_ACTIONLOG_JOOMLA_PLUGIN_INSTALLED="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> installed the plugin <a href='index.php?option=com_plugins&task=plugin.edit&extension_id={id}' title='Edit plugin {extension_name}'>{extension_name}</a>"
 ; Guided Tours
-PLG_ACTIONLOG_JOOMLA_GUIDEDTOURS_TOURCOMPLETED="User <a href='{accountlink}'>{username}</a> completed the tour '{title}'"
-PLG_ACTIONLOG_JOOMLA_GUIDEDTOURS_TOURDELAYED="User <a href='{accountlink}'>{username}</a> delayed the tour '{title}'"
-PLG_ACTIONLOG_JOOMLA_GUIDEDTOURS_TOURSKIPPED="User <a href='{accountlink}'>{username}</a> skipped the tour '{title}'"
+PLG_ACTIONLOG_JOOMLA_GUIDEDTOURS_TOURCOMPLETED="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> completed the tour '{title}'"
+PLG_ACTIONLOG_JOOMLA_GUIDEDTOURS_TOURDELAYED="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> delayed the tour '{title}'"
+PLG_ACTIONLOG_JOOMLA_GUIDEDTOURS_TOURSKIPPED="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> skipped the tour '{title}'"
diff --git a/administrator/language/en-GB/plg_behaviour_compat.ini b/administrator/language/en-GB/plg_behaviour_compat.ini
deleted file mode 100644
index 3dfab0d6abd68..0000000000000
--- a/administrator/language/en-GB/plg_behaviour_compat.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-; Joomla! Project
-; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-PLG_BEHAVIOUR_COMPAT="Behaviour - Backward Compatibility"
-PLG_COMPAT_FIELD_CLASSES_ALIASES_LABEL="Classes Aliases"
-PLG_COMPAT_FIELD_CLASSES_ALIASES_DESCRIPTION="Add class aliases for classes which have been renamed or moved to a namespace."
-PLG_COMPAT_FIELD_ES5_ASSETS_DESCRIPTION="Activate this option if your extension requires *.es5 assets which has resulted in an exception. The assets provided are empty but prevent the exception."
-PLG_COMPAT_FIELD_ES5_ASSETS_LABEL="ES5 Assets"
-PLG_COMPAT_FIELD_REMOVED_ASSETS_DESCRIPTION="Activate this option if your extension requires removed assets which has resulted in an exception. The assets provided are empty but prevent the exception."
-PLG_COMPAT_FIELD_REMOVED_ASSETS_LABEL="Removed Assets"
-PLG_COMPAT_XML_DESCRIPTION="If you use extensions which are not using the current Joomla Coding standards then this plugin, when enabled, will provide backward compatibility to the prior major version."
diff --git a/administrator/language/en-GB/plg_behaviour_compat.sys.ini b/administrator/language/en-GB/plg_behaviour_compat.sys.ini
deleted file mode 100644
index 405d5a6c97b0d..0000000000000
--- a/administrator/language/en-GB/plg_behaviour_compat.sys.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-; Joomla! Project
-; (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-PLG_BEHAVIOUR_COMPAT="Behaviour - Backward Compatibility"
-PLG_COMPAT_XML_DESCRIPTION="Provides backward compatibility to the prior major version."
diff --git a/administrator/language/en-GB/plg_behaviour_compat6.ini b/administrator/language/en-GB/plg_behaviour_compat6.ini
index d550624dcc1b9..421c8d8d8890a 100644
--- a/administrator/language/en-GB/plg_behaviour_compat6.ini
+++ b/administrator/language/en-GB/plg_behaviour_compat6.ini
@@ -4,4 +4,10 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_BEHAVIOUR_COMPAT6="Behaviour - Backward Compatibility 6"
-PLG_COMPAT6_XML_DESCRIPTION="This plugin should be enabled before updating to Joomla 6."
+PLG_COMPAT6_FIELD_CLASSES_ALIASES_DESCRIPTION="Add class aliases for classes which have been renamed or moved to a namespace."
+PLG_COMPAT6_FIELD_CLASSES_ALIASES_LABEL="Classes Aliases"
+PLG_COMPAT6_FIELD_LEGACY_CLASSES_DESCRIPTION="Activate this option if your extension requires previously deprecated classes removed from the current version of Joomla. These removed classes can be found in the folder /plugins/behavior/compat6/classes/."
+PLG_COMPAT6_FIELD_LEGACY_CLASSES_LABEL="Include Deprecated Classes"
+PLG_COMPAT6_FIELD_REMOVED_ASSETS_DESCRIPTION="Activate this option if your extension requires removed assets which has resulted in an exception. The assets provided are empty but prevent the exception."
+PLG_COMPAT6_FIELD_REMOVED_ASSETS_LABEL="Removed Assets"
+PLG_COMPAT6_XML_DESCRIPTION="If you use extensions which are not using the current Joomla Coding standards then this plugin, when enabled, will provide backward compatibility to the previous major version, Joomla 5."
diff --git a/administrator/language/en-GB/plg_behaviour_compat6.sys.ini b/administrator/language/en-GB/plg_behaviour_compat6.sys.ini
index d550624dcc1b9..e412f703d03f9 100644
--- a/administrator/language/en-GB/plg_behaviour_compat6.sys.ini
+++ b/administrator/language/en-GB/plg_behaviour_compat6.sys.ini
@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_BEHAVIOUR_COMPAT6="Behaviour - Backward Compatibility 6"
-PLG_COMPAT6_XML_DESCRIPTION="This plugin should be enabled before updating to Joomla 6."
+PLG_COMPAT6_XML_DESCRIPTION="If you use extensions which are not using the current Joomla Coding standards then this plugin, when enabled, will provide backward compatibility to the previous major version, Joomla 5."
diff --git a/administrator/language/en-GB/plg_captcha_powcaptcha.ini b/administrator/language/en-GB/plg_captcha_powcaptcha.ini
new file mode 100644
index 0000000000000..04fe2e6410978
--- /dev/null
+++ b/administrator/language/en-GB/plg_captcha_powcaptcha.ini
@@ -0,0 +1,39 @@
+; Joomla! Project
+; (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CAPTCHA_POWCAPTCHA="CAPTCHA - Proof of Work"
+PLG_CAPTCHA_POWCAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin presents a math task to the user's browser that the browser can solve automatically. It's not supposed to prove that the user is human, but to prove that the user is willing to invest the necessary time to solve the task. Currently based on the Altcha (altcha.org) library."
+
+; Admin parameters
+PLG_CAPTCHA_POWCAPTCHA_AUTOSOLVE_DESC="Should the CAPTCHA be solved automatically, without requiring the user to actively interact with the respective box?"
+PLG_CAPTCHA_POWCAPTCHA_AUTOSOLVE_LABEL="Automatic Solution"
+PLG_CAPTCHA_POWCAPTCHA_AUTOSOLVE_OFF="Off"
+PLG_CAPTCHA_POWCAPTCHA_AUTOSOLVE_ONFOCUS="When CAPTCHA field receives focus"
+PLG_CAPTCHA_POWCAPTCHA_AUTOSOLVE_ONLOAD="When page is loaded"
+PLG_CAPTCHA_POWCAPTCHA_AUTOSOLVE_ONSUBMIT="When form is submitted"
+PLG_CAPTCHA_POWCAPTCHA_DIFFICULTY_DESC="The harder the CAPTCHA gets, the more computing time will be required to solve it."
+PLG_CAPTCHA_POWCAPTCHA_DIFFICULTY_LABEL="Difficulty"
+PLG_CAPTCHA_POWCAPTCHA_DIFFICULTY_CUSTOM="Custom"
+PLG_CAPTCHA_POWCAPTCHA_DIFFICULTY_EASY="Easy"
+PLG_CAPTCHA_POWCAPTCHA_DIFFICULTY_HARD="Hard"
+PLG_CAPTCHA_POWCAPTCHA_DIFFICULTY_MODERATE="Moderate"
+PLG_CAPTCHA_POWCAPTCHA_EXPIRATION_DESC="How long should a solution be valid?"
+PLG_CAPTCHA_POWCAPTCHA_EXPIRATION_LABEL="Expiration"
+PLG_CAPTCHA_POWCAPTCHA_EXPIRATION_1MIN="1 minute"
+PLG_CAPTCHA_POWCAPTCHA_EXPIRATION_5MIN="5 minutes"
+PLG_CAPTCHA_POWCAPTCHA_EXPIRATION_10MIN="10 minutes"
+PLG_CAPTCHA_POWCAPTCHA_EXPIRATION_1HOUR="1 hour"
+PLG_CAPTCHA_POWCAPTCHA_MAXNUMBER_DESC="Defines the maximum number that's used in the task that needs to be solved. The higher the number, the harder to solve."
+PLG_CAPTCHA_POWCAPTCHA_MAXNUMBER_LABEL="Maximum Number"
+
+; Client-side interface customisation
+PLG_CAPTCHA_POWCAPTCHA_ARIALINKLABEL="Visit Altcha.org"
+PLG_CAPTCHA_POWCAPTCHA_ERROR="Verification failed. Try again later."
+PLG_CAPTCHA_POWCAPTCHA_EXPIRED="Verification expired. Try again."
+PLG_CAPTCHA_POWCAPTCHA_FOOTER="Protected by <a href=\"https://altcha.org/\" target=\"_blank\" aria-label=\"Visit Altcha.org\" rel=\"noopener noreferrer\">ALTCHA</a>"
+PLG_CAPTCHA_POWCAPTCHA_LABEL="I'm not a robot"
+PLG_CAPTCHA_POWCAPTCHA_VERIFIED="Verified"
+PLG_CAPTCHA_POWCAPTCHA_VERIFYING="Verifying..."
+PLG_CAPTCHA_POWCAPTCHA_WAITALERT="Verifying... please wait."
diff --git a/administrator/language/en-GB/plg_captcha_powcaptcha.sys.ini b/administrator/language/en-GB/plg_captcha_powcaptcha.sys.ini
new file mode 100644
index 0000000000000..59b0c44e46fbb
--- /dev/null
+++ b/administrator/language/en-GB/plg_captcha_powcaptcha.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CAPTCHA_POWCAPTCHA="CAPTCHA - Proof of Work"
+PLG_CAPTCHA_POWCAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin presents a math task to the user's browser that the browser can solve automatically. It's not supposed to prove that the user is human, but to prove that the user is willing to invest the necessary time to solve the task. Currently based on the Altcha (altcha.org) library."
diff --git a/administrator/language/en-GB/plg_content_joomla.ini b/administrator/language/en-GB/plg_content_joomla.ini
index 5b818a07e48e6..6ef078e4cc78c 100644
--- a/administrator/language/en-GB/plg_content_joomla.ini
+++ b/administrator/language/en-GB/plg_content_joomla.ini
@@ -8,6 +8,10 @@ PLG_CONTENT_JOOMLA_FIELD_CHECK_CATEGORIES_DESC="Check that categories are fully
 PLG_CONTENT_JOOMLA_FIELD_CHECK_CATEGORIES_LABEL="Check Category Deletion"
 PLG_CONTENT_JOOMLA_FIELD_EMAIL_NEW_FE_DESC="Email users if 'Send email' is on when there is a new article submitted via the Frontend."
 PLG_CONTENT_JOOMLA_FIELD_EMAIL_NEW_FE_LABEL="Email on New Site Article"
+PLG_CONTENT_JOOMLA_MAIL_NEWARTICLE_DESC="Sent when a new article is submitted via frontend."
+PLG_CONTENT_JOOMLA_MAIL_NEWARTICLE_TITLE="Content: New Article Submitted"
+PLG_CONTENT_JOOMLA_NEW_ARTICLE_BODY="A new Article has been submitted by {NAME} entitled {TITLE}."
+PLG_CONTENT_JOOMLA_NEW_ARTICLE_SUBJECT="[{SITENAME}] - New Article Submitted"
 PLG_CONTENT_JOOMLA_SCHEMA_CONTACT_DESC="When active, generate contact rich snippets from the default data"
 PLG_CONTENT_JOOMLA_SCHEMA_CONTACT_LABEL="Contact Schema"
 PLG_CONTENT_JOOMLA_SCHEMA_CONTENT_DESC="When active, generate content rich snippets from the default data"
diff --git a/administrator/language/en-GB/plg_content_loadmodule.ini b/administrator/language/en-GB/plg_content_loadmodule.ini
index 281917efff08d..fed8665c44efd 100644
--- a/administrator/language/en-GB/plg_content_loadmodule.ini
+++ b/administrator/language/en-GB/plg_content_loadmodule.ini
@@ -9,6 +9,3 @@ PLG_LOADMODULE_FIELD_VALUE_DIVS="Wrapped by Divs"
 PLG_LOADMODULE_FIELD_VALUE_RAW="No wrapping (raw output)"
 PLG_LOADMODULE_FIELD_VALUE_TABLE="Wrapped by table (column)"
 PLG_LOADMODULE_XML_DESCRIPTION="Within content this plugin loads a Module by ID, Syntax: {loadmoduleid 1} or a Module by position, Syntax: {loadposition user1} or a Module by name, Syntax: {loadmodule mod_login}. Optionally can specify module style and for loadmodule a specific module by title, Syntax: {loadmodule mod_login,module title,style}."
-; Deprecated, will be removed with 6.0
-PLG_LOADMODULE_FIELD_VALUE_HORIZONTAL="Wrapped by table (horizontal)"
-PLG_LOADMODULE_FIELD_VALUE_MULTIPLEDIVS="Wrapped by Multiple Divs"
diff --git a/administrator/language/en-GB/plg_editors_codemirror.ini b/administrator/language/en-GB/plg_editors_codemirror.ini
index 7d8715301b6f9..6409f720fc1d0 100644
--- a/administrator/language/en-GB/plg_editors_codemirror.ini
+++ b/administrator/language/en-GB/plg_editors_codemirror.ini
@@ -3,15 +3,16 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
+PLG_CODEMIRROR_FIELD_ACTIVELINE_LABEL="Highlight Active Line"
 PLG_CODEMIRROR_FIELD_AUTOCLOSEBRACKET_LABEL="Bracket Completion"
 PLG_CODEMIRROR_FIELD_CODEFOLDING_LABEL="Code Folding"
 PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_LABEL="Custom Extensions"
 PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_METHOD_DESC="Method name, provided by module for extension initialisation. Or multiple, separated by comma. Eg: bracketMatching (from module @codemirror/language)."
-; deprecated will be removed in 6.0
+; deprecated will be removed in 7.0
 PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_METHOD_DESCR="Method name, provided by module for extension initialisation. Or multiple, separated by comma. Eg: bracketMatching (from module @codemirror/language)."
 PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_METHOD_LABEL="Initialisation Method(s)"
 PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_MODULE_DESC="Relative path to the module file, eg: media/my-assets/js/my-codemirror-module.js. Or module name, eg: @codemirror/language."
-; deprecated will be removed in 6.0
+; deprecated will be removed in 7.0
 PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_MODULE_DESCR="Relative path to the module file, eg: media/my-assets/js/my-codemirror-module.js. Or module name, eg: @codemirror/language."
 PLG_CODEMIRROR_FIELD_CUSTOM_EXTENSIONS_MODULE_LABEL="Module File or Module Name"
 PLG_CODEMIRROR_FIELD_FULLSCREEN_LABEL="Toggle Fullscreen"
@@ -30,26 +31,3 @@ PLG_CODEMIRROR_FIELDSET_TOOLBAR_OPTIONS_LABEL="Toolbar Options"
 PLG_CODEMIRROR_TOGGLE_FULL_SCREEN="Press %s to toggle Full Screen editing."
 PLG_CODEMIRROR_XML_DESCRIPTION="This plugin loads the CodeMirror editor."
 PLG_EDITORS_CODEMIRROR="Editor - CodeMirror"
-
-; Deprecated, will be removed with 6.0
-PLG_CODEMIRROR_FIELDSET_APPEARANCE_OPTIONS_LABEL="Appearance Options"
-PLG_CODEMIRROR_FIELD_ACTIVELINE_COLOR_LABEL="Active Line Colour"
-PLG_CODEMIRROR_FIELD_ACTIVELINE_LABEL="Highlight Active Line"
-PLG_CODEMIRROR_FIELD_AUTOCLOSETAGS_LABEL="Tag Completion"
-PLG_CODEMIRROR_FIELD_FONT_FAMILY_LABEL="Font"
-PLG_CODEMIRROR_FIELD_FONT_SIZE_LABEL="Font Size (px)"
-PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_LABEL="Matching Tag Colour"
-PLG_CODEMIRROR_FIELD_KEYMAP_SUBLIME="Sublime Text"
-PLG_CODEMIRROR_FIELD_KEYMAP_VIM="Vim"
-PLG_CODEMIRROR_FIELD_LINE_HEIGHT_LABEL="Line Height (em)"
-PLG_CODEMIRROR_FIELD_MARKERGUTTER_LABEL="Gutters"
-PLG_CODEMIRROR_FIELD_MATCHBRACKETS_LABEL="Match Brackets"
-PLG_CODEMIRROR_FIELD_MATCHTAGS_LABEL="Match Tags"
-PLG_CODEMIRROR_FIELD_PREVIEW_LABEL="Preview"
-PLG_CODEMIRROR_FIELD_THEME_LABEL="Theme"
-PLG_CODEMIRROR_FIELD_VALUE_FONT_FAMILY_DEFAULT="Browser Default"
-PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_DEFAULT="Default"
-PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_LABEL="Scrollbar Style"
-PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_OVERLAY="Overlay"
-PLG_CODEMIRROR_FIELD_VALUE_SCROLLBARSTYLE_SIMPLE="Simple"
-PLG_CODEMIRROR_FIELD_VIM_KEYBINDING_LABEL="Vim Keybinding"
diff --git a/administrator/language/en-GB/plg_editors_tinymce.ini b/administrator/language/en-GB/plg_editors_tinymce.ini
index 6ea1c2bd444f9..ec8ae0b79e6f2 100644
--- a/administrator/language/en-GB/plg_editors_tinymce.ini
+++ b/administrator/language/en-GB/plg_editors_tinymce.ini
@@ -4,6 +4,12 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_EDITORS_TINYMCE="Editor - TinyMCE"
+PLG_TINY_ABBREVIATION_DESCRIPTION_LABEL="Abbreviation Description"
+PLG_TINY_ABBREVIATION_EDIT="Edit Abbreviation"
+PLG_TINY_ABBREVIATION_INSERT="Insert Abbreviation"
+PLG_TINY_ABBREVIATION_WARNING_NO_DESCRIPTION="Please enter a description for the abbreviation."
+PLG_TINY_ABBREVIATION_WARNING_NO_SELECTION="Please select text or place the cursor inside an abbreviation."
+PLG_TINY_ABBREVIATION_WARNING_REMOVE="Cursor is not inside an abbreviation."
 PLG_TINY_BUILDER="TinyMCE Configuration Builder"
 PLG_TINY_BUTTON_TOGGLE_EDITOR="Toggle Editor"
 PLG_TINY_CONFIG_TEXTFILTER_ACL_DESC="If on, the text filter from the Joomla Global Configuration is applied. If off, the filters as defined here are used."
@@ -41,8 +47,15 @@ PLG_TINY_FIELD_EXTERNALPLUGINS_DESC="Provide a pair made up of a Plugin Name and
 PLG_TINY_FIELD_EXTERNALPLUGINS_LABEL="External Plugin URLs"
 PLG_TINY_FIELD_EXTERNALPLUGINS_NAME_LABEL="Plugin Name"
 PLG_TINY_FIELD_EXTERNALPLUGINS_PATH_LABEL="Path"
+PLG_TINY_FIELD_HTMLHEIGHT_DESC="Set the height of the editor. The default value is 550px. A numeric value can be used or a value with valid CSS units (for example: 50vh or 50rem)."
 PLG_TINY_FIELD_HTMLHEIGHT_LABEL="HTML Height"
+PLG_TINY_FIELD_HTMLWIDTH_DESC="Set the width of the editor. The default value is 100%. A numeric value can be used or a value with valid CSS units (for example: 50vw or 50em)."
 PLG_TINY_FIELD_HTMLWIDTH_LABEL="HTML Width"
+PLG_TINY_FIELD_IMG_CLASS_LIST_LABEL="Class List"
+PLG_TINY_FIELD_IMG_CLASS_NAME_LABEL="Name"
+PLG_TINY_FIELD_IMG_CLASS_NO_CLASS="No Class Selected"
+PLG_TINY_FIELD_IMG_CLASSES_LIST_DESC="Add classes to the image class dropdown in the image dialog."
+PLG_TINY_FIELD_IMG_CLASSES_LIST_LABEL="Image Classes List"
 PLG_TINY_FIELD_LABEL_ADVANCEDPARAMS="Advanced"
 PLG_TINY_FIELD_LANGCODE_LABEL="Language Code"
 PLG_TINY_FIELD_LANGSELECT_LABEL="Automatic Language Selection"
@@ -59,6 +72,9 @@ PLG_TINY_FIELD_PROHIBITED_LABEL="Prohibited Elements"
 PLG_TINY_FIELD_RESIZE_HORIZONTAL_LABEL="Horizontal Resizing"
 PLG_TINY_FIELD_RESIZING_LABEL="Resizing"
 PLG_TINY_FIELD_SANDBOX_IFRAMES_DESC="This is a security feature that restricts what the iframe can do by setting a sandbox attribute for each iframe. It is recommended to enable this feature for security reasons. Only disable if the iframe is not loading and you're sure that the iframed content is safe."
+PLG_TINY_FIELD_SANDBOX_IFRAMES_EXCLUSIONS_LIST_DESC="Additional domain names can be added to be excluded from iframe sandboxing. The current domain and this list of common domains are excluded by default. 'youtube.com', 'youtu.be', 'vimeo.com', 'player.vimeo.com', 'dailymotion.com', 'embed.music.apple.com', 'open.spotify.com', 'giphy.com', 'dai.ly', 'codepen.io'."
+PLG_TINY_FIELD_SANDBOX_IFRAMES_EXCLUSIONS_LIST_LABEL="Sandbox Iframe Exclusions List"
+PLG_TINY_FIELD_SANDBOX_IFRAMES_EXCLUSION_DOMAIN_LABEL="Domain Name"
 PLG_TINY_FIELD_SANDBOX_IFRAMES_LABEL="Sandbox Iframes"
 PLG_TINY_FIELD_SETACCESS_LABEL="Assign this Set to"
 PLG_TINY_FIELD_SKIN_ADMIN_DARK_LABEL="Administrator Skin (Dark Mode)"
@@ -90,6 +106,8 @@ PLG_TINY_FIELD_VALUE_SLIDING="Sliding"
 PLG_TINY_FIELD_VALUE_WRAP="Wrap"
 PLG_TINY_FIELD_WORDCOUNT_LABEL="Word Count"
 PLG_TINY_LEGACY_WARNING="<p>The <a href=\"%s\">TinyMCE Editor Plugin</a> has been updated. Currently it uses your existing configuration. By editing the plugin, you can now assign and customise various layouts to specific user groups.</p><p>Warning: when editing the plugin, you will lose all your previous settings!</p>"
+PLG_TINY_LINK_MEDIA="Media"
+PLG_TINY_LINK_PICKER_TITLE="Insert Link"
 PLG_TINY_MENU_CONTAINER="Container"
 PLG_TINY_SET_PRESET_BUTTON_ADVANCED="Use advanced preset"
 PLG_TINY_SET_PRESET_BUTTON_MEDIUM="Use medium preset"
@@ -98,9 +116,12 @@ PLG_TINY_SET_SOURCE_PANEL_DESCRIPTION="<strong>All available menus and buttons.<
 PLG_TINY_SET_TARGET_PANEL_DESCRIPTION="Use the panel below to customise (drag and drop) TinyMCE for each set."
 PLG_TINY_SET_TARGET_PANEL_TITLE="TinyMCE Sets"
 PLG_TINY_SET_TITLE="Set %d"
+PLG_TINY_TOOLBAR_BUTTON_ABBREVIATION="Insert/Edit Abbreviation"
 PLG_TINY_TOOLBAR_BUTTON_FONTSELECT="Font Select"
 PLG_TINY_TOOLBAR_BUTTON_FONTSIZESELECT="Font Size Select"
 PLG_TINY_TOOLBAR_BUTTON_FORMATSELECT="Format Select"
+PLG_TINY_TOOLBAR_BUTTON_READMORE="Insert Read More"
+PLG_TINY_TOOLBAR_BUTTON_REMOVE_ABBREVIATION="Remove Abbreviation"
 PLG_TINY_TOOLBAR_BUTTON_SEPARATOR="Separator"
 PLG_TINY_TOOLBAR_BUTTON_STYLESELECT="Style Select"
 PLG_TINY_XML_DESCRIPTION="TinyMCE is a platform independent web based JavaScript HTML WYSIWYG Editor. Using <strong>sets</strong> you can configure and customise the editor for every user group."
diff --git a/administrator/language/en-GB/plg_fields_list.ini b/administrator/language/en-GB/plg_fields_list.ini
index 4208cf647e8e3..abd1f80635d64 100644
--- a/administrator/language/en-GB/plg_fields_list.ini
+++ b/administrator/language/en-GB/plg_fields_list.ini
@@ -5,8 +5,6 @@
 
 PLG_FIELDS_LIST="Fields - List"
 PLG_FIELDS_LIST_LABEL="List (%s)"
-; The following string is deprecated and will be removed with 6.0
-PLG_FIELDS_LIST_PARAMS_FORM_LAYOUT_FANCY_SELECT="Enhanced select"
 PLG_FIELDS_LIST_PARAMS_HEADER_DESC="Add a string with no value at the top of the dropdown list eg ' - Select Article - '."
 PLG_FIELDS_LIST_PARAMS_HEADER_LABEL="Header"
 PLG_FIELDS_LIST_PARAMS_MULTIPLE_LABEL="Multiple"
diff --git a/administrator/language/en-GB/plg_fields_media.ini b/administrator/language/en-GB/plg_fields_media.ini
index c53599cd7cb18..de91cccc7f767 100644
--- a/administrator/language/en-GB/plg_fields_media.ini
+++ b/administrator/language/en-GB/plg_fields_media.ini
@@ -4,9 +4,23 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_FIELDS_MEDIA="Fields - Media"
+PLG_FIELDS_MEDIA_AUDIO_LABEL="Audio (%s)"
+PLG_FIELDS_MEDIA_DOCUMENT_LABEL="Document (%s)"
 PLG_FIELDS_MEDIA_LABEL="Media (%s)"
+PLG_FIELDS_MEDIA_PARAMS_AUTOPLAY_LABEL="Autoplay"
+PLG_FIELDS_MEDIA_PARAMS_CONTROLS_LABEL="Show Controls"
+PLG_FIELDS_MEDIA_PARAMS_CSS_CLASS_LABEL="CSS Class"
 PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL="Directory"
 PLG_FIELDS_MEDIA_PARAMS_IMAGE_CLASS_LABEL="Image Class"
+PLG_FIELDS_MEDIA_PARAMS_LOOP_LABEL="Loop Playback"
+PLG_FIELDS_MEDIA_PARAMS_MUTED_LABEL="Muted"
+PLG_FIELDS_MEDIA_PARAMS_PRELOAD_AUTO="Preload Automatically"
+PLG_FIELDS_MEDIA_PARAMS_PRELOAD_LABEL="Preload"
+PLG_FIELDS_MEDIA_PARAMS_PRELOAD_METADATA="Metadata Only"
+PLG_FIELDS_MEDIA_PARAMS_PRELOAD_NONE="None"
 PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE="Inline"
 PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL="Preview"
+PLG_FIELDS_MEDIA_PARAMS_VIDEO_PLAYSINLINE_LABEL="Play Inline"
+PLG_FIELDS_MEDIA_PARAMS_VIDEO_POSTER_LABEL="Poster Image"
+PLG_FIELDS_MEDIA_VIDEO_LABEL="Video (%s)"
 PLG_FIELDS_MEDIA_XML_DESCRIPTION="This plugin lets you create new fields of type 'media' in any extensions where custom fields are supported."
diff --git a/administrator/language/en-GB/plg_fields_note.ini b/administrator/language/en-GB/plg_fields_note.ini
new file mode 100644
index 0000000000000..80296ed76299e
--- /dev/null
+++ b/administrator/language/en-GB/plg_fields_note.ini
@@ -0,0 +1,16 @@
+; Joomla! Project
+; (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_NOTE="Fields - Note"
+PLG_FIELDS_NOTE_LABEL="Note (%s)"
+PLG_FIELDS_NOTE_PARAMS_CLASS_DESC="The class used on the div of the note."
+PLG_FIELDS_NOTE_PARAMS_CLASS_LABEL="Note Class"
+PLG_FIELDS_NOTE_PARAMS_CLOSE_DESC="This field controls the display of an \"x\" to close the note. It takes a value of 'true' (for alerts) or the value for the data-dismiss of the Bootstrap close icon."
+PLG_FIELDS_NOTE_PARAMS_CLOSE_LABEL="Show Close Button"
+PLG_FIELDS_NOTE_PARAMS_DESCRIPTION_LABEL="Note Content"
+PLG_FIELDS_NOTE_PARAMS_DISPLAY_FRONTEND_LABEL="Display In Frontend"
+PLG_FIELDS_NOTE_PARAMS_HEADING_LABEL="Heading Tag"
+PLG_FIELDS_NOTE_PARAMS_LABEL_LABEL="Note Heading"
+PLG_FIELDS_NOTE_XML_DESCRIPTION="This plugin lets you create new fields of type 'note' in any extensions where custom fields are supported."
diff --git a/administrator/language/en-GB/plg_fields_note.sys.ini b/administrator/language/en-GB/plg_fields_note.sys.ini
new file mode 100644
index 0000000000000..8a9a7565e6923
--- /dev/null
+++ b/administrator/language/en-GB/plg_fields_note.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_NOTE="Fields - Note"
+PLG_FIELDS_NOTE_XML_DESCRIPTION="This plugin lets you create new fields of type 'note' in any extensions where custom fields are supported."
diff --git a/administrator/language/en-GB/plg_fields_number.ini b/administrator/language/en-GB/plg_fields_number.ini
new file mode 100644
index 0000000000000..5d8e95d46a19c
--- /dev/null
+++ b/administrator/language/en-GB/plg_fields_number.ini
@@ -0,0 +1,19 @@
+; Joomla! Project
+; (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_NUMBER="Fields - Number"
+PLG_FIELDS_NUMBER_LABEL="Number (%s)"
+PLG_FIELDS_NUMBER_PARAMS_CURRENCY_LABEL="Format as Currency"
+PLG_FIELDS_NUMBER_PARAMS_DECIMALS_LABEL="Number of Decimals"
+PLG_FIELDS_NUMBER_PARAMS_MAX_DESC="Maximum value that can be chosen (only limits the up/down arrows)."
+PLG_FIELDS_NUMBER_PARAMS_MAX_LABEL="Maximum"
+PLG_FIELDS_NUMBER_PARAMS_MIN_DESC="Minimum value that can be chosen (only limits the up/down arrows)."
+PLG_FIELDS_NUMBER_PARAMS_MIN_LABEL="Minimum"
+PLG_FIELDS_NUMBER_PARAMS_POSITION_LABEL="Symbol Position"
+PLG_FIELDS_NUMBER_PARAMS_POSITION_OPTION_AFTER="After"
+PLG_FIELDS_NUMBER_PARAMS_POSITION_OPTION_BEFORE="Before"
+PLG_FIELDS_NUMBER_PARAMS_STEP_LABEL="Step Increment"
+PLG_FIELDS_NUMBER_PARAMS_SYMBOL_LABEL="Currency Symbol"
+PLG_FIELDS_NUMBER_XML_DESCRIPTION="This plugin lets you create new fields of type 'number' in any extensions where custom fields are supported."
diff --git a/administrator/language/en-GB/plg_fields_number.sys.ini b/administrator/language/en-GB/plg_fields_number.sys.ini
new file mode 100644
index 0000000000000..fb94567cd845e
--- /dev/null
+++ b/administrator/language/en-GB/plg_fields_number.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+PLG_FIELDS_NUMBER="Fields - Number"
+PLG_FIELDS_NUMBER_XML_DESCRIPTION="This plugin lets you create new fields of type 'number' in any extensions where custom fields are supported."
diff --git a/administrator/language/en-GB/plg_fields_sql.ini b/administrator/language/en-GB/plg_fields_sql.ini
index 0354e65bde29b..69403cdbc53c5 100644
--- a/administrator/language/en-GB/plg_fields_sql.ini
+++ b/administrator/language/en-GB/plg_fields_sql.ini
@@ -6,8 +6,6 @@
 PLG_FIELDS_SQL="Fields - SQL"
 PLG_FIELDS_SQL_CREATE_NOT_POSSIBLE="Only a Super User can create or edit an SQL field!"
 PLG_FIELDS_SQL_LABEL="SQL (%s)"
-; The following string is deprecated and will be removed with 6.0
-PLG_FIELDS_SQL_PARAMS_FORM_LAYOUT_FANCY_SELECT="Enhanced select"
 PLG_FIELDS_SQL_PARAMS_HEADER_DESC="Add a string with no value at the top of the dropdown list eg ' - Select Article - '."
 PLG_FIELDS_SQL_PARAMS_HEADER_LABEL="Header"
 PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL="Multiple"
diff --git a/administrator/language/en-GB/plg_fields_subform.ini b/administrator/language/en-GB/plg_fields_subform.ini
index e920859e598ea..72d787eeee665 100644
--- a/administrator/language/en-GB/plg_fields_subform.ini
+++ b/administrator/language/en-GB/plg_fields_subform.ini
@@ -7,6 +7,7 @@ PLG_FIELDS_SUBFORM="Fields - Subform"
 PLG_FIELDS_SUBFORM_LABEL="Subform (%s)"
 PLG_FIELDS_SUBFORM_PARAMS_CUSTOMFIELD_LABEL="Field"
 PLG_FIELDS_SUBFORM_PARAMS_EDIT_LAYOUT_OPTION_REPEATABLE_FORM_LABEL="Form"
+PLG_FIELDS_SUBFORM_PARAMS_EDIT_LAYOUT_OPTION_REPEATABLE_GRID_LABEL="Form Grid"
 PLG_FIELDS_SUBFORM_PARAMS_EDIT_LAYOUT_OPTION_REPEATABLE_TABLE_LABEL="Table"
 PLG_FIELDS_SUBFORM_PARAMS_MAX_ROWS_LABEL="Maximum Rows"
 PLG_FIELDS_SUBFORM_PARAMS_OPTIONS_LABEL="Fields"
diff --git a/administrator/language/en-GB/plg_media-action_crop.ini b/administrator/language/en-GB/plg_media-action_crop.ini
index 57c9846ad67a0..9c5c13dd7d82c 100644
--- a/administrator/language/en-GB/plg_media-action_crop.ini
+++ b/administrator/language/en-GB/plg_media-action_crop.ini
@@ -4,6 +4,8 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_MEDIA-ACTION_CROP="Media Action - Crop"
+PLG_MEDIA-ACTION_CROP_ASPECT_RATIOS_DESC="Configure custom aspect ratios for the crop tool. Each ratio needs a label (e.g. '16:9'), a value (e.g. '16/9' or '1'), and optionally a group (landscape/portrait)."
+PLG_MEDIA-ACTION_CROP_ASPECT_RATIOS_LABEL="Aspect Ratios"
 PLG_MEDIA-ACTION_CROP_LABEL="Crop"
 PLG_MEDIA-ACTION_CROP_PARAM_ASPECT="Aspect Ratio"
 PLG_MEDIA-ACTION_CROP_PARAM_DEFAULT_RATIO="Default aspect ratio"
@@ -15,4 +17,11 @@ PLG_MEDIA-ACTION_CROP_PARAM_WIDTH="Width"
 PLG_MEDIA-ACTION_CROP_PARAM_X="X-Axis"
 PLG_MEDIA-ACTION_CROP_PARAM_Y="Y-Axis"
 PLG_MEDIA-ACTION_CROP_QUALITY="Quality"
+PLG_MEDIA-ACTION_CROP_RATIO_GROUP_LABEL="Group"
+PLG_MEDIA-ACTION_CROP_RATIO_GROUP_DESC="Optionally group this ratio under landscape or portrait"
+PLG_MEDIA-ACTION_CROP_RATIO_GROUP_NONE="No group"
+PLG_MEDIA-ACTION_CROP_RATIO_LABEL_LABEL="Label"
+PLG_MEDIA-ACTION_CROP_RATIO_LABEL_DESC="The label to display for this ratio (e.g. '16:9', '4:3', 'thumbnail', etc.)"
+PLG_MEDIA-ACTION_CROP_RATIO_VALUE_LABEL="Value"
+PLG_MEDIA-ACTION_CROP_RATIO_VALUE_DESC="The aspect ratio as numerator/denominator or number (e.g. 16/9, 4/3, 1)."
 PLG_MEDIA-ACTION_CROP_XML_DESCRIPTION="Adds crop functionality for images."
diff --git a/administrator/language/en-GB/plg_media-action_resize.ini b/administrator/language/en-GB/plg_media-action_resize.ini
index d070e2a631360..67a926e1b8e76 100644
--- a/administrator/language/en-GB/plg_media-action_resize.ini
+++ b/administrator/language/en-GB/plg_media-action_resize.ini
@@ -4,7 +4,11 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_MEDIA-ACTION_RESIZE="Media Action - Resize"
+PLG_MEDIA-ACTION_RESIZE_AUTOMATIC_DESC="Settings for automatic processing when images are created or uploaded to the server."
+PLG_MEDIA-ACTION_RESIZE_AUTOMATIC_LABEL="Automatic Processing"
+; The following string is deprecated and will be removed with 8.0
 PLG_MEDIA-ACTION_RESIZE_BATCH_DESC="Settings for server side actions when images are created."
+; The following string is deprecated and will be removed with 8.0
 PLG_MEDIA-ACTION_RESIZE_BATCH_LABEL="Batch Settings"
 PLG_MEDIA-ACTION_RESIZE_BATCH_MAX_HEIGHT_LABEL="Image Max Height"
 PLG_MEDIA-ACTION_RESIZE_BATCH_MAX_WIDTH_LABEL="Image Max Width"
diff --git a/administrator/language/en-GB/plg_quickicon_eos.ini b/administrator/language/en-GB/plg_quickicon_eos.ini
index 64e44bf0bda4a..48de33159f95b 100644
--- a/administrator/language/en-GB/plg_quickicon_eos.ini
+++ b/administrator/language/en-GB/plg_quickicon_eos.ini
@@ -3,11 +3,11 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-PLG_QUICKICON_EOS="Quick Icon - Joomla 5 End Of Support Notification"
-PLG_QUICKICON_EOS_MESSAGE_ERROR_SUPPORT_ENDED="<p>Support has ended for your version of Joomla 5. <a href=\"%2$s\" target=\"_blank\" rel=\"noopener noreferrer\">Upgrade to Joomla 6</a> as soon as possible.</p>"
-PLG_QUICKICON_EOS_MESSAGE_INFO_01="<p>Joomla 6 has arrived! Find out all that Joomla 6 has to offer you. Check the landing page for <a href=\"%2$s\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla 6 features</a> and improvements.</p>"
-PLG_QUICKICON_EOS_MESSAGE_INFO_02="<p>When is the time to upgrade to Joomla 6? Once the extensions your site needs are compatible. Learn <a href=\"%2$s\" target=\"_blank\" rel=\"noopener noreferrer\"> how to use the Pre-Update Checker</a>.</p>"
-PLG_QUICKICON_EOS_MESSAGE_WARNING_SECURITY_ONLY="<p>Joomla 5 has entered security only mode. Support ends %1$s. Start <a href=\"%2$s\" target=\"_blank\" rel=\"noopener noreferrer\">planning to upgrade</a> to Joomla 6 today.</p>"
-PLG_QUICKICON_EOS_MESSAGE_WARNING_SUPPORT_ENDING="<p>Support ends on %1$s for Joomla 5 <a href=\"%2$s\" target=\"_blank\" rel=\"noopener noreferrer\">Upgrade to Joomla 6</a> as soon as possible.</p>"
+PLG_QUICKICON_EOS="Quick Icon - Joomla 6 End Of Support Notification"
+PLG_QUICKICON_EOS_MESSAGE_ERROR_SUPPORT_ENDED="<p>Support has ended for your version of Joomla 6. <a href=\"%2$s\" target=\"_blank\" rel=\"noopener noreferrer\">Upgrade to Joomla 7</a> as soon as possible.</p>"
+PLG_QUICKICON_EOS_MESSAGE_INFO_01="<p>Joomla 7 has arrived! Find out all that Joomla 7 has to offer you. Check the landing page for <a href=\"%2$s\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla 7 features</a> and improvements.</p>"
+PLG_QUICKICON_EOS_MESSAGE_INFO_02="<p>When is the time to upgrade to Joomla 7? Once the extensions your site needs are compatible. Learn <a href=\"%2$s\" target=\"_blank\" rel=\"noopener noreferrer\"> how to use the Pre-Update Checker</a>.</p>"
+PLG_QUICKICON_EOS_MESSAGE_WARNING_SECURITY_ONLY="<p>Joomla 6 has entered security only mode. Support ends %1$s. Start <a href=\"%2$s\" target=\"_blank\" rel=\"noopener noreferrer\">planning to upgrade</a> to Joomla 7 today.</p>"
+PLG_QUICKICON_EOS_MESSAGE_WARNING_SUPPORT_ENDING="<p>Support ends on %1$s for Joomla 6 <a href=\"%2$s\" target=\"_blank\" rel=\"noopener noreferrer\">Upgrade to Joomla 7</a> as soon as possible.</p>"
 PLG_QUICKICON_EOS_SNOOZE_BUTTON="Snooze this message for all users"
-PLG_QUICKICON_EOS_XML_DESCRIPTION="Checks for the end of support status of Joomla 5 and notifies you when visiting the Control Panel page."
+PLG_QUICKICON_EOS_XML_DESCRIPTION="Checks for the end of support status of Joomla 6 and notifies you when visiting the Control Panel page."
diff --git a/administrator/language/en-GB/plg_quickicon_eos.sys.ini b/administrator/language/en-GB/plg_quickicon_eos.sys.ini
index 78cfc1cff5fdb..b2b3febed2225 100644
--- a/administrator/language/en-GB/plg_quickicon_eos.sys.ini
+++ b/administrator/language/en-GB/plg_quickicon_eos.sys.ini
@@ -3,5 +3,5 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-PLG_QUICKICON_EOS="Quick Icon - Joomla 5 End Of Support Notification"
-PLG_QUICKICON_EOS_XML_DESCRIPTION="Checks for the end of support status of Joomla 5 and notifies you when visiting the Control Panel page."
+PLG_QUICKICON_EOS="Quick Icon - Joomla 6 End Of Support Notification"
+PLG_QUICKICON_EOS_XML_DESCRIPTION="Checks for the end of support status of Joomla 6 and notifies you when visiting the Control Panel page."
diff --git a/administrator/language/en-GB/plg_quickicon_extensionupdate.ini b/administrator/language/en-GB/plg_quickicon_extensionupdate.ini
index 84398346ff8aa..4b123d0dba781 100644
--- a/administrator/language/en-GB/plg_quickicon_extensionupdate.ini
+++ b/administrator/language/en-GB/plg_quickicon_extensionupdate.ini
@@ -9,5 +9,6 @@ PLG_QUICKICON_EXTENSIONUPDATE_ERROR="Unknown extensions &hellip;"
 PLG_QUICKICON_EXTENSIONUPDATE_GROUP_DESC="The group of this plugin (this value is compared with the group value used in <strong>Quick Icons</strong> modules to inject icons)."
 PLG_QUICKICON_EXTENSIONUPDATE_GROUP_LABEL="Group"
 PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND="Updates are available! %s"
+PLG_QUICKICON_EXTENSIONUPDATE_SECURITY_UPDATEFOUND="* Security update is available for %s!"
 PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE="Extensions are up to date."
 PLG_QUICKICON_EXTENSIONUPDATE_XML_DESCRIPTION="Checks for updates of your installed third-party extensions and notifies you when you visit the Home Dashboard page."
diff --git a/administrator/language/en-GB/plg_sampledata_blog.ini b/administrator/language/en-GB/plg_sampledata_blog.ini
index f74353b67259c..63e84e2715047 100644
--- a/administrator/language/en-GB/plg_sampledata_blog.ini
+++ b/administrator/language/en-GB/plg_sampledata_blog.ini
@@ -10,7 +10,7 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_FULLTEXT=""
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_INTROTEXT="<p>This tells you a bit about this blog and the person who writes it.</p><p>When you are logged in you will be able to edit this page by selecting the edit icon.</p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_0_TITLE="About"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_FULLTEXT=""
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_INTROTEXT="<p>Here are some basic tips for working on your site.</p><ul><li>Joomla! has a 'front end' that you are looking at now and an 'administrator' or 'back end' which is where you do the more advanced work of creating your site such as setting up the menus and deciding what modules to show. You need to login to the administrator separately using the same user name and password that you used to login to this part of the site.</li><li>One of the first things you will probably want to do is change the site title and tag line and to add a logo. To do this select the Template Settings link in the menu which is visible if you log in. To change your site description, browser title, default email and other items, select Site Settings. More advanced configuration options are available in the administrator.</li><li>To totally change the look of your site you will probably want to install a new template. Go to System, select Install - Extensions from the list and the extension installer will open. There are many free and commercial templates available for Joomla.</li><li>As you have already seen, you can control who can see different parts of you site. When you work with modules and articles, setting the Access level to Registered will mean that only logged in users can see them.</li><li>When you create a new article or other kind of content you also can save it as Published or Unpublished. If it is Unpublished site visitors will not be able to see it but you will.</li><li>You can learn much more about working with Joomla from the <a href=\"https://docs.joomla.org/\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla documentation site</a> and get help from other users at the <a href=\"https://forum.joomla.org/\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla forums</a>. In the administrator there are help buttons on every page that provide detailed information about the functions on that page.</li></ul>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_INTROTEXT="<p>Here are some basic tips for working on your site.</p><ul><li>Joomla! has a 'front end' that you are looking at now and an 'administrator' or 'back end' which is where you do the more advanced work of creating your site such as setting up the menus and deciding what modules to show. You need to login to the administrator separately using the same user name and password that you used to login to this part of the site.</li><li>One of the first things you will probably want to do is change the site title and tag line and to add a logo. To do this select the Template Settings link in the menu which is visible if you log in. To change your site description, browser title, default email and other items, select Site Settings. More advanced configuration options are available in the administrator.</li><li>To totally change the look of your site you will probably want to install a new template. Go to System, select Install - Extensions from the list and the extension installer will open. There are many free and commercial templates available for Joomla.</li><li>As you have already seen, you can control who can see different parts of you site. When you work with modules and articles, setting the Access level to Registered will mean that only logged in users can see them.</li><li>When you create a new article or other kind of content you also can save it as Published or Unpublished. If it is Unpublished site visitors will not be able to see it but you will.</li><li>You can learn much more about working with Joomla from the <a href=\"https://guide.joomla.org/\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla documentation site</a> and get help from other users at the <a href=\"https://forum.joomla.org/\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla forums</a>. In the administrator there are help buttons on every page that provide detailed information about the functions on that page.</li></ul>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_1_TITLE="Working on Your Site"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_10_FULLTEXT=""
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_10_INTROTEXT="<h1>Colour Scheme</h1> <p class=\"d-grid gap-2 d-sm-block\"> <span class=\"btn btn-secondary\">secondary</span>   <span class=\"btn btn-primary\">primary</span>   <span class=\"btn btn-info\">info</span>   <span class=\"btn btn-success\">success</span>   <span class=\"btn btn-warning\">warning</span>   <span class=\"btn btn-danger\">danger</span> </p> <p><span class=\"text text-secondary\">text-secondary</span>  <span class=\"text text-primary\">text-primary</span>  <span class=\"text text-info\">text-info</span>  <span class=\"text text-success\">text-success</span>  <span class=\"text text-warning\">text-warning</span>  <span class=\"text text-danger\">text-danger</span></p><h1>Typography (h1)</h1><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h2>Lorem Ipsum Dolor Sit Amet (h2)</h2><p><strong>Lorem ipsum dolor sit amet, consectetuer adipiscing elit </strong> (strong), sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h3>Lorem Ipsum Dolor Sit Amet (h3)</h3><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h4>Lorem Ipsum Dolor Sit Amet (h4)</h4><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p><h5>Lorem Ipsum Dolor Sit Amet (h5)</h5><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex. (p)</p> <p><a href=\"index.php\"> Lorem ipsum dolor (a)</a></p><h1>Lists</h1> <p>(ol)(li)</p> <ol> <li>Lorem ipsum dolor sit amet consectetur</li> <li>Lorem ipsum dolor sit amet consectetur</li> </ol> <p>(ul)(li)</p> <ul> <li>Lorem ipsum dolor sit amet consectetur</li> <li>Lorem ipsum dolor sit amet consectetur</li> </ul> <h1>Displays</h1><p class=\"display-1\">Lorem (display-1)</p><p class=\"display-2\">Lorem (display-2)</p><p class=\"display-3\">Lorem ipsum (display-3)</p><p class=\"display-4\">Lorem ipsum (display-4)</p><p class=\"lead\">Lorem ipsum arma virumque cano (lead)</p>"
@@ -37,7 +37,7 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_FULLTEXT="<p>Uurnip greens yarr
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_INTROTEXT="<p><strong>We love Joomla to the moon and back!</strong></p><p>Thank you to all volunteers who have contributed!</p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_7_TITLE="Love"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_FULLTEXT="<p>Cupcake ipsum dolor. Sit amet cotton candy ice cream sesame snaps cake marshmallow powder. Ice cream chocolate cake marshmallow halvah bonbon. Dragée carrot cake danish candy muffin brownie. Candy sugar plum ice cream chupa chups macaroon tiramisu soufflé oat cake. Topping cheesecake lollipop gummi bears icing sweet roll donut liquorice. Pie jelly-o candy donut oat cake cotton candy.</p>"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_INTROTEXT="<p><strong>We proudly present Joomla Version 5!</strong></p><p>Learn more about workflows in Joomla.</p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_INTROTEXT="<p><strong>We proudly present Joomla Version 6!</strong></p><p>Learn more about workflows in Joomla.</p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_8_TITLE="Joomla"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_9_FIELD_0="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua."
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_9_FULLTEXT=""
@@ -127,14 +127,14 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_4_TITLE="Latest Posts"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_5_TITLE="Older Posts"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_6_TITLE="Bottom Menu"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_7_TITLE="Search"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_CONTENT="<h1 class=\"display-4 text-thin\">Welcome to Joomla on Cassiopeia!</h1><p class=\"lead\"><strong>You have chosen one of the most powerful CMS Systems in the world.</strong></p><p class=\"lead\">Cassiopeia is the multi-purpose frontend template for Joomla 5.</p><p><a class=\"btn btn-primary btn-lg\" href=\"%s\">Typography »</a></p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_CONTENT="<h1 class=\"display-4 text-thin\">Welcome to Joomla on Cassiopeia!</h1><p class=\"lead\"><strong>You have chosen one of the most powerful CMS Systems in the world.</strong></p><p class=\"lead\">Cassiopeia is the multi-purpose frontend template for Joomla.</p><p><a class=\"btn btn-primary btn-lg\" href=\"%s\">Typography »</a></p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_8_TITLE="Image"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_9_TITLE="Popular Tags"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_NEWSFEEDS_TITLE="My Blog"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_TAG_0_TITLE="Millions"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_TAG_1_TITLE="Worldwide"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_TAG_2_TITLE="Love"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_TAG_3_TITLE="Joomla 5"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_TAG_3_TITLE="Joomla 6"
 PLG_SAMPLEDATA_BLOG_STEP1_SUCCESS="Step 1: Tags, Articles, Fields and Workflow done!"
 PLG_SAMPLEDATA_BLOG_STEP2_SUCCESS="Step 2: Menus done!"
 PLG_SAMPLEDATA_BLOG_STEP3_SUCCESS="Step 3: Modules done!"
diff --git a/administrator/language/en-GB/plg_system_actionlogs.ini b/administrator/language/en-GB/plg_system_actionlogs.ini
index 1f0ec95576f52..44b614c314bf1 100644
--- a/administrator/language/en-GB/plg_system_actionlogs.ini
+++ b/administrator/language/en-GB/plg_system_actionlogs.ini
@@ -13,14 +13,10 @@ PLG_SYSTEM_ACTIONLOGS_NOTIFICATIONS="Email Notifications"
 PLG_SYSTEM_ACTIONLOGS_OPTIONS="User Actions Log Options"
 PLG_SYSTEM_ACTIONLOGS_XML_DESCRIPTION="Records the actions of users on the site so they can be reviewed if required."
 ; Common content type log messages
-PLG_SYSTEM_ACTIONLOGS_CONTENT_ADDED="User <a href=\"{accountlink}\">{username}</a> added new {type} <a href=\"{itemlink}\">{title}</a>"
-PLG_SYSTEM_ACTIONLOGS_CONTENT_ARCHIVED="User <a href=\"{accountlink}\">{username}</a> archived the {type} <a href=\"{itemlink}\">{title}</a>"
-PLG_SYSTEM_ACTIONLOGS_CONTENT_DELETED="User <a href=\"{accountlink}\">{username}</a> deleted the {type} {title}"
-PLG_SYSTEM_ACTIONLOGS_CONTENT_PUBLISHED="User <a href=\"{accountlink}\">{username}</a> published the {type} <a href=\"{itemlink}\">{title}</a>"
-PLG_SYSTEM_ACTIONLOGS_CONTENT_TRASHED="User <a href=\"{accountlink}\">{username}</a> trashed the {type} <a href=\"{itemlink}\">{title}</a>"
-PLG_SYSTEM_ACTIONLOGS_CONTENT_UNPUBLISHED="User <a href=\"{accountlink}\">{username}</a> unpublished the {type} <a href=\"{itemlink}\">{title}</a>"
-PLG_SYSTEM_ACTIONLOGS_CONTENT_UPDATED="User <a href=\"{accountlink}\">{username}</a> updated the {type} <a href=\"{itemlink}\">{title}</a>"
-
-; All the following strings are deprecated and will be removed with 6.0
-PLG_SYSTEM_ACTIONLOGS_LOG_DELETE_PERIOD="Days to delete logs after"
-PLG_SYSTEM_ACTIONLOGS_LOG_DELETE_PERIOD_DESC="Enter 0 if you don't want to delete the logs."
+PLG_SYSTEM_ACTIONLOGS_CONTENT_ADDED="User <a href=\"{accountlink}\" title=\"Edit User {username}\">{username}</a> added new {type} <a href=\"{itemlink}\" title=\"Edit {type} {title}\">{title}</a>"
+PLG_SYSTEM_ACTIONLOGS_CONTENT_ARCHIVED="User <a href=\"{accountlink}\" title=\"Edit User {username}\">{username}</a> archived the {type} <a href=\"{itemlink}\" title=\"Edit {type} {title}\">{title}</a>"
+PLG_SYSTEM_ACTIONLOGS_CONTENT_DELETED="User <a href=\"{accountlink}\" title=\"Edit User {username}\">{username}</a> deleted the {type} {title}"
+PLG_SYSTEM_ACTIONLOGS_CONTENT_PUBLISHED="User <a href=\"{accountlink}\" title=\"Edit User {username}\">{username}</a> published the {type} <a href=\"{itemlink}\" title=\"Edit {type} {title}\">{title}</a>"
+PLG_SYSTEM_ACTIONLOGS_CONTENT_TRASHED="User <a href=\"{accountlink}\" title=\"Edit User {username}\">{username}</a> trashed the {type} <a href=\"{itemlink}\" title=\"Edit {type} {title}\">{title}</a>"
+PLG_SYSTEM_ACTIONLOGS_CONTENT_UNPUBLISHED="User <a href=\"{accountlink}\" title=\"Edit User {username}\">{username}</a> unpublished the {type} <a href=\"{itemlink}\" title=\"Edit {type} {title}\">{title}</a>"
+PLG_SYSTEM_ACTIONLOGS_CONTENT_UPDATED="User <a href=\"{accountlink}\" title=\"Edit User {username}\">{username}</a> updated the {type} <a href=\"{itemlink}\" title=\"Edit {type} {title}\">{title}</a>"
diff --git a/administrator/language/en-GB/plg_system_httpheaders.ini b/administrator/language/en-GB/plg_system_httpheaders.ini
index 3c291db2b175b..45f986259144e 100644
--- a/administrator/language/en-GB/plg_system_httpheaders.ini
+++ b/administrator/language/en-GB/plg_system_httpheaders.ini
@@ -37,7 +37,7 @@ PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD_NOTE_DESC="HSTS means that your domain can n
 PLG_SYSTEM_HTTPHEADERS_HSTS_SUBDOMAINS="Also for subdomains"
 PLG_SYSTEM_HTTPHEADERS_HSTS_SUBDOMAINS_DESC="HSTS should also be enabled <strong>for subdomains</strong> usually the subdomain 'www' is taken into account when creating the SSL certificate. If further subdomains are used, please note that they are also provided with a valid SSL certificate."
 PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION="Enable default security headers"
-PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY="<p>Joomla! comes with a built-in set of tools that help you to handle http security headers. These headers help your browser for example to protect your website from <a href='https://en.wikipedia.org/wiki/Cross-site_scripting' target='_blank' rel='noopener noreferrer'>XSS</a> and <a href='https://en.wikipedia.org/wiki/Clickjacking' target='_blank' rel='noopener noreferrer'>Clickjacking</a> attacks.</p><p>You can find more details in the <a href='https://docs.joomla.org/Special:MyLanguage/J4.x:Http_Header_Management' target='_blank' rel='noopener noreferrer'>HTTP Header Management Tutorial in the Joomla! Documentation.</a></p>"
+PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY="<p>Joomla! comes with a built-in set of tools that help you to handle http security headers. These headers help your browser for example to protect your website from <a href='https://en.wikipedia.org/wiki/Cross-site_scripting' target='_blank' rel='noopener noreferrer'>XSS</a> and <a href='https://en.wikipedia.org/wiki/Clickjacking' target='_blank' rel='noopener noreferrer'>Clickjacking</a> attacks.</p><p>You can find more details in the <a href='https://guide.joomla.org/user-manual/security/security-http-headers' target='_blank' rel='noopener noreferrer'>HTTP Header Management Tutorial in the Joomla! Documentation.</a></p>"
 PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE="HTTP Security Headers"
 PLG_SYSTEM_HTTPHEADERS_REFERRERPOLICY="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy' target='_blank' rel='noopener noreferrer'>Referrer-Policy</a>" ; Do not translate
 PLG_SYSTEM_HTTPHEADERS_XFRAMEOPTIONS="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options' target='_blank' rel='noopener noreferrer'>X-Frame-Options</a>" ; Do not translate
diff --git a/administrator/language/en-GB/plg_system_jooa11y.ini b/administrator/language/en-GB/plg_system_jooa11y.ini
index d4965027c6ed0..bb5aab27ca20e 100644
--- a/administrator/language/en-GB/plg_system_jooa11y.ini
+++ b/administrator/language/en-GB/plg_system_jooa11y.ini
@@ -19,146 +19,3 @@ PLG_SYSTEM_JOOA11Y_FIELD_SHOW_ALWAYS_DESC="Load the accessibility checker on all
 PLG_SYSTEM_JOOA11Y_KEY="Key"
 PLG_SYSTEM_JOOA11Y_VALUE="Value"
 PLG_SYSTEM_JOOA11Y_XML_DESCRIPTION="The Joomla Accessibility Checker visually highlights common accessibility and usability issues. Geared towards content authors, the plugin identifies errors or warnings and provides guidance on how to fix them. Please be aware that this plugin does not offer an exhaustive analysis of your website, nor does it automatically ensure your website's accessibility. It's important to select a template that is inherently accessible to ensure your site meets accessibility standards."
-
-; All the following strings are deprecated and will be removed with 6.0
-PLG_SYSTEM_JOOA11Y_ALERT_CLOSE="Close"
-PLG_SYSTEM_JOOA11Y_ALERT_TEXT="Alert"
-PLG_SYSTEM_JOOA11Y_AVG_WORD_PER_SENTENCE="Average words per sentence:"
-PLG_SYSTEM_JOOA11Y_COMPLEX_WORDS="Complex words:"
-PLG_SYSTEM_JOOA11Y_CONTAINER_LABEL="Accessibility Checker"
-PLG_SYSTEM_JOOA11Y_CONTRAST="Contrast"
-PLG_SYSTEM_JOOA11Y_CONTRAST_ERROR_INPUT_MESSAGE="The text within this input does not have enough contrast with the background. The contrast ratio should be at least 4.5:1 for normal text and 3:1 for large text."
-PLG_SYSTEM_JOOA11Y_CONTRAST_ERROR_INPUT_MESSAGE_INFO="The contrast ratio is <strong>%(cratio)</strong>."
-PLG_SYSTEM_JOOA11Y_CONTRAST_ERROR_MESSAGE="This text does not have enough contrast with the background. The contrast ratio should be at least 4.5:1 for normal text and 3:1 for large text."
-PLG_SYSTEM_JOOA11Y_CONTRAST_ERROR_MESSAGE_INFO="The contrast ratio is <strong>%(cratio)</strong> for the following text: <strong>%(nodetext)</strong>"
-PLG_SYSTEM_JOOA11Y_CONTRAST_WARNING_MESSAGE="The contrast of this text is unknown and needs to be manually reviewed. Ensure the text and the background have strong contrasting colours. The contrast ratio should be at least 4.5:1 for normal text and 3:1 for large text."
-PLG_SYSTEM_JOOA11Y_CONTRAST_WARNING_MESSAGE_INFO="Please review contrast of the following text:<br><strong>%(nodetext)</strong>"
-PLG_SYSTEM_JOOA11Y_DARK_MODE="Dark Mode"
-PLG_SYSTEM_JOOA11Y_DIFFICULT_READABILITY="Difficult"
-PLG_SYSTEM_JOOA11Y_EMBED_AUDIO="Please ensure to provide a <strong>transcript for all podcasts.</strong> Providing transcripts for audio content is a mandatory Level A requirement. Transcripts support people who are D/deaf or hard-of-hearing, but can benefit everyone. Consider placing the transcript below or within an accordion panel."
-PLG_SYSTEM_JOOA11Y_EMBED_GENERAL_WARNING="Unable to check embedded content. Please make sure that images have alt text, videos have captions, text has sufficient contrast, and interactive components are <a href=\"https://webaim.org/techniques/keyboard/\" target=\"_blank\" rel=\"noopener noreferrer\">keyboard accessible.</a>"
-PLG_SYSTEM_JOOA11Y_EMBED_MISSING_TITLE="Embedded content requires an accessible name that describes its contents. Please provide a unique <span class=\"jooa11y-kbd\">title</span> or <span class=\"jooa11y-kbd\">aria-label</span> attribute on the <span class=\"jooa11y-kbd\">iframe</span> element. Learn more about <a href=\"https://dequeuniversity.com/tips/provide-iframe-titles\" target=\"_blank\" rel=\"noopener noreferrer\">iFrames.</a>"
-PLG_SYSTEM_JOOA11Y_EMBED_VIDEO="Please ensure <strong>all videos have closed captioning.</strong> Providing captions for all audio and video content is a mandatory Level A requirement. Captions support people who are D/deaf or hard-of-hearing."
-PLG_SYSTEM_JOOA11Y_ERROR="Error"
-PLG_SYSTEM_JOOA11Y_FAIRLY_DIFFICULT_READABILITY="Fairly difficult"
-PLG_SYSTEM_JOOA11Y_FIELD_ADDITIONAL_CHECKS="Additional Checks Always On"
-PLG_SYSTEM_JOOA11Y_FIELD_ADDITIONAL_CHECKS_DESC="Enabling this option will visually hide the toggle switches for Form Labels, Contrast, Links (Advanced) in the Settings panel."
-PLG_SYSTEM_JOOA11Y_FIELD_COLOUR_FILTER="Colour Filter"
-PLG_SYSTEM_JOOA11Y_FIELD_COLOUR_FILTER_DESC="Show Colour Filter toggle in Settings panel. Colour filters help identify colour combinations that may be difficult for people to distinguish."
-PLG_SYSTEM_JOOA11Y_FIELD_CONTRAST="Contrast"
-PLG_SYSTEM_JOOA11Y_FIELD_CONTRAST_DESC="Show Contrast toggle in Settings panel. Check for WCAG 2.0 Level AA contrast issues between foreground text and background elements."
-PLG_SYSTEM_JOOA11Y_FIELD_FORM_LABELS="Form Labels"
-PLG_SYSTEM_JOOA11Y_FIELD_FORM_LABELS_DESC="Show Form Labels toggle in Settings panel. Check for form inputs missing a corresponding label. Not necessarily a content author issue, and usually not an issue when using a reputable, accessible forms plugin."
-PLG_SYSTEM_JOOA11Y_FIELD_LINKS_ADVANCED="Links (Advanced)"
-PLG_SYSTEM_JOOA11Y_FIELD_LINKS_ADVANCED_DESC="Show Links (Advanced) toggle in Settings panel. Check for additional issues such as: links that open in a new tab without warning, have identical names but different purpose, or points to a PDF and other files without warning."
-PLG_SYSTEM_JOOA11Y_FIELD_WEB_COMPONENTS="Web Components to Check"
-PLG_SYSTEM_JOOA11Y_FIELD_WEB_COMPONENTS_DESC="Provide a list of all known web components or containers with an open shadow DOM."
-PLG_SYSTEM_JOOA11Y_FILE_TYPE_WARNING="Link points to a PDF or downloadable file (e.g. MP3, Zip, Word Doc) without warning. Indicate the file type within the link text. If it is a large file, consider including the file size."
-PLG_SYSTEM_JOOA11Y_FILE_TYPE_WARNING_TIP="<strong>Example:</strong> Executive Report (PDF, 3MB)"
-PLG_SYSTEM_JOOA11Y_FORM_LABELS="Form labels"
-PLG_SYSTEM_JOOA11Y_GOOD="Good"
-PLG_SYSTEM_JOOA11Y_GOOD_READABILITY="Good"
-PLG_SYSTEM_JOOA11Y_HEADING_EMPTY="Empty heading found! To fix, delete this line or change its format from <strong>Heading %(level)</strong> to <strong>Normal</strong> or <strong>Paragraph</strong>."
-PLG_SYSTEM_JOOA11Y_HEADING_EMPTY_WITH_IMAGE="Heading has no text, but contains an image. If this is not a heading, change its format from <strong>Heading %(level)</strong> to <strong>Normal</strong> or <strong>Paragraph</strong>. Otherwise, please add alt text to the image if it is not decorative."
-PLG_SYSTEM_JOOA11Y_HEADING_FIRST="The first heading on a page should usually be a Heading 1 or Heading 2. Heading 1 should be the start of the main content section, and is the main heading that describes the overall purpose of the page. Learn more about <a href=\"https://www.w3.org/WAI/tutorials/page-structure/headings/\" target=\"_blank\" rel=\"noopener noreferrer\">Heading Structure.</a>"
-PLG_SYSTEM_JOOA11Y_HEADING_LONG="Heading is long! Headings should be used to organize content and convey structure. They should be brief, informative, and unique. Please keep headings less than 160 characters (no more than a sentence)."
-PLG_SYSTEM_JOOA11Y_HEADING_LONG_INFO="Character Count: <strong>%(headingLength)</strong>."
-PLG_SYSTEM_JOOA11Y_HEADING_MISSING_ONE="Missing Heading 1. Heading 1 should be the start of the main content area, and is the main heading that describes the overall purpose of the page. Learn more about <a href=\"https://www.w3.org/WAI/tutorials/page-structure/headings/\" target=\"_blank\" rel=\"noopener noreferrer\">Heading Structure.</a>"
-PLG_SYSTEM_JOOA11Y_HEADING_NON_CONSECUTIVE_LEVEL="Non-consecutive heading level used. Headings should never skip levels, or go from <strong>Heading %(prevLevel)</strong> to <strong>Heading %(level)</strong>."
-PLG_SYSTEM_JOOA11Y_HIDE_OUTLINE="Hide Outline"
-PLG_SYSTEM_JOOA11Y_HIDE_SETTINGS="Hide Settings"
-PLG_SYSTEM_JOOA11Y_HYPERLINK_ALT_LENGTH_MESSAGE="Alt text description on a linked image is <strong>too long</strong>. The alt text on linked images should describe where the link takes you, not a literal description of the image. <strong>Consider using the title of the page it links to as the alt text.</strong>"
-PLG_SYSTEM_JOOA11Y_HYPERLINK_ALT_LENGTH_MESSAGE_INFO="The alt text is <strong>%(altLength)</strong> characters: <strong>%(altText)</strong>"
-PLG_SYSTEM_JOOA11Y_IMAGE_FIGURE_DECORATIVE="Image is marked as <strong>decorative</strong> and will be ignored by assistive technology."
-PLG_SYSTEM_JOOA11Y_IMAGE_FIGURE_DECORATIVE_INFO="Although a <strong>caption</strong> was provided, the image should also have alt text in most cases. <ul><li>The alt text should provide a concise description of what is in the image.</li><li>The caption should usually provide context to relate the image back to the surrounding content, or give attention to a particular piece of information.</li></ul> Learn more: <a href=\"https://thoughtbot.com/blog/alt-vs-figcaption#the-figcaption-element\" target=\"_blank\" rel=\"noopener noreferrer\">alt versus figcaption.</a>"
-PLG_SYSTEM_JOOA11Y_IMAGE_FIGURE_DUPLICATE_ALT="Do not use the exact same words for both the alt and caption text. Screen readers will announce the information twice."
-PLG_SYSTEM_JOOA11Y_LABELS_ARIA_LABEL_INPUT_MESSAGE="Input has an accessible name, although please ensure there is a visible label too."
-PLG_SYSTEM_JOOA11Y_LABELS_ARIA_LABEL_INPUT_MESSAGE_INFO="The accessible name for this input is: <strong>%(ariaLabel)</strong>"
-PLG_SYSTEM_JOOA11Y_LABELS_INPUT_RESET_MESSAGE="Reset buttons should <strong>not</strong> be used unless specifically needed because they are easy to activate by mistake."
-PLG_SYSTEM_JOOA11Y_LABELS_INPUT_RESET_MESSAGE_TIP="<strong>Tip!</strong> Learn why <a href=\"https://www.nngroup.com/articles/reset-and-cancel-buttons/\" target=\"_blank\" rel=\"noopener noreferrer\">Reset and Cancel buttons pose usability issues.</a>"
-PLG_SYSTEM_JOOA11Y_LABELS_MISSING_IMAGE_INPUT_MESSAGE="Image button is missing alt text. Please add alt text to provide an accessible name. For example: <em>Search</em> or <em>Submit</em>."
-PLG_SYSTEM_JOOA11Y_LABELS_MISSING_LABEL_MESSAGE="There is no label associated with this input. Please add an <span class=\"jooa11y-kbd\">id</span> to this input, and add a matching <span class=\"jooa11y-kbd\">for</span> attribute to the label."
-PLG_SYSTEM_JOOA11Y_LABELS_NO_FOR_ATTRIBUTE_MESSAGE="There is no label associated with this input. Add a <span class=\"jooa11y-kbd\">for</span> attribute to the label that matches the <span class=\"jooa11y-kbd\">id</span> of this input."
-PLG_SYSTEM_JOOA11Y_LABELS_NO_FOR_ATTRIBUTE_MESSAGE_INFO="The ID for this input is: <strong>id=&#34;%(t)&#34;</strong>"
-PLG_SYSTEM_JOOA11Y_LANG_CODE="en"
-PLG_SYSTEM_JOOA11Y_LINK_ALT_HAS_BAD_WORD_MESSAGE="File extension within the alt text found. If the image conveys a story, mood, or important information - be sure to describe the image."
-PLG_SYSTEM_JOOA11Y_LINK_ALT_HAS_BAD_WORD_MESSAGE_INFO="Remove: <strong>%(error)</strong>.<br>The alt text for this image is: <strong>%(altText)</strong>"
-PLG_SYSTEM_JOOA11Y_LINK_ALT_HAS_SUS_WORD_MESSAGE="Assistive technologies already indicate that this is an image, so &quot;<strong>%(error)</strong>&quot; or &quot;%(error) of&quot; may be redundant."
-PLG_SYSTEM_JOOA11Y_LINK_ALT_HAS_SUS_WORD_MESSAGE_INFO="The alt text for this image is: <strong>%(altText)</strong>"
-PLG_SYSTEM_JOOA11Y_LINK_ALT_PLACEHOLDER_MESSAGE="Non-descript or placeholder alt text found. Replace the following alt text with something more meaningful: <strong>%(altText)</strong>."
-PLG_SYSTEM_JOOA11Y_LINK_ALT_TOO_LONG_MESSAGE="Alt text description is <strong>too long</strong>. Alt text should be concise, yet meaningful like a <em>tweet</em> (around 100 characters). If this is a complex image or a graph, consider putting the long description of the image in the text below or an accordion component."
-PLG_SYSTEM_JOOA11Y_LINK_ALT_TOO_LONG_MESSAGE_INFO="The alt text is <strong>%(altLength)</strong> characters: <strong>%(altText)</strong>"
-PLG_SYSTEM_JOOA11Y_LINK_ANCHOR_LINK_AND_ALT_MESSAGE="Image link contains <strong>both alt text and surrounding link text.</strong> If this image is decorative and is being used as a functional link to another page, consider marking the image as decorative - the surrounding link text should suffice."
-PLG_SYSTEM_JOOA11Y_LINK_ANCHOR_LINK_AND_ALT_MESSAGE_INFO="Alt text: <strong>%(altText)</strong>"
-PLG_SYSTEM_JOOA11Y_LINK_BEST_PRACTICES="Consider replacing the link text: <strong>%(error)</strong>"
-PLG_SYSTEM_JOOA11Y_LINK_BEST_PRACTICES_DETAILS="<ul><li>&quot;Click here&quot; places focus on mouse mechanics, when many people do not use a mouse or may be viewing this website on a mobile device. Consider using a different verb that relates to the task.</li><li>Avoid using HTML symbols as call to actions unless they are hidden to assistive technologies.</li></ul>"
-PLG_SYSTEM_JOOA11Y_LINK_DECORATIVE_MESSAGE="Image is marked as <strong>decorative</strong> and will be ignored by assistive technology. If the image conveys a story, mood or important information - be sure to add alt text."
-PLG_SYSTEM_JOOA11Y_LINK_EMPTY="Remove empty links without any text."
-PLG_SYSTEM_JOOA11Y_LINK_EMPTY_LINK_NO_LABEL="Link does not have discernable text that is visible to screen readers and other assistive technology. To fix:<ul><li>Add some concise text that describes where the link takes you.</li><li>If it is an <a href=\"https://a11y-101.com/development/icons-and-links\" target=\"_blank\" rel=\"noopener noreferrer\">icon link or SVG</a> it is likely missing a descriptive label.</li><li>If you think this link is an error due to a copy/paste bug, consider deleting it.</li></ul>"
-PLG_SYSTEM_JOOA11Y_LINK_HYPERLINKED_IMAGE_ARIA_HIDDEN="Link around image has <span class=\"jooa11y-kbd\">aria-hidden=&quot;true&quot;</span> but is still keyboard focusable. If you are intending to hide a redundant or duplicate link, add <span class=\"jooa11y-kbd\">tabindex=&quot;-1&quot;</span> as well."
-PLG_SYSTEM_JOOA11Y_LINK_IDENTICAL_NAME="Link has identical text as another link, although it points to a different page. Multiple links with the same text may cause confusion for people who use screen readers."
-PLG_SYSTEM_JOOA11Y_LINK_IDENTICAL_NAME_TIP="Consider making the following link more descriptive to help distinguish it from other links: <strong>%(linkText)</strong>"
-PLG_SYSTEM_JOOA11Y_LINK_IMAGE_BAD_ALT_MESSAGE="File extension within the alt text found. Ensure the alt text describes the destination of the link, not a literal description of the image. Remove: <strong>%(error)</strong>."
-PLG_SYSTEM_JOOA11Y_LINK_IMAGE_BAD_ALT_MESSAGE_INFO="The alt text for this image is: <strong>%(altText)</strong>"
-PLG_SYSTEM_JOOA11Y_LINK_IMAGE_LINK_ALT_TEXT_MESSAGE="Image link contains alt text, although please ensure alt text describes the destination page. <strong>Consider using the title of the page it links to as the alt text.</strong> Does the alt text describe where the link takes you?"
-PLG_SYSTEM_JOOA11Y_LINK_IMAGE_LINK_ALT_TEXT_MESSAGE_INFO="Alt text: <strong>%(altText)</strong>"
-PLG_SYSTEM_JOOA11Y_LINK_IMAGE_LINK_NULL_ALT_NO_TEXT_MESSAGE="Image within link is marked as decorative and there is no link text. Please add alt text to the image that describes the destination of the link."
-PLG_SYSTEM_JOOA11Y_LINK_IMAGE_PLACEHOLDER_ALT_MESSAGE="Non-descript or placeholder alt text within a linked image found. Ensure the alt text describes the destination of the link, not a literal description of the image. Replace the following alt text: <strong>%(altText)</strong>."
-PLG_SYSTEM_JOOA11Y_LINK_IMAGE_SUS_ALT_MESSAGE="Assistive technologies already indicate that this is an image, so &quot;<strong>%(error)</strong>&quot; or &quot;%(error) of&quot; may be redundant. Ensure the alt text describes the destination of the link, not a literal description of the image."
-PLG_SYSTEM_JOOA11Y_LINK_IMAGE_SUS_ALT_MESSAGE_INFO="The alt text for this image is: <strong>%(altText)</strong>."
-PLG_SYSTEM_JOOA11Y_LINK_LABEL="The descriptive label for this link is: <strong>%(linkText)</strong>"
-PLG_SYSTEM_JOOA11Y_LINK_LINK_HAS_ALT_MESSAGE="Image is marked as decorative, although the link is using the surrounding text as a descriptive label."
-PLG_SYSTEM_JOOA11Y_LINK_PASS_ALT="The alt text for this image is: <strong>%(altText)</strong>"
-PLG_SYSTEM_JOOA11Y_LINK_STOPWORD="Link text may not be descriptive enough out of context: <strong>%(error)</strong>"
-PLG_SYSTEM_JOOA11Y_LINK_STOPWORD_TIP="<strong>Tip!</strong> Link text should always be clear, unique, and meaningful. Avoid common words like \"click here\"; or \"learn more\"."
-PLG_SYSTEM_JOOA11Y_LINK_URL="Longer, less intelligible URLs used as link text might be difficult to listen to with assistive technology. In most cases, it is better to use human-readable text instead of the URL. Short URLs (such as a site's homepage) are okay."
-PLG_SYSTEM_JOOA11Y_LINK_URL_TIP="<strong>Tip!</strong> Link text should always be clear, unique, and meaningful so it could be understood out of context."
-PLG_SYSTEM_JOOA11Y_LINKS_ADVANCED="Links (Advanced)"
-PLG_SYSTEM_JOOA11Y_MAIN_TOGGLE_LABEL="Check Accessibility"
-PLG_SYSTEM_JOOA11Y_MISSING_ALT_LINK_BUT_HAS_TEXT_MESSAGE="Image is being used as a link with surrounding text, although the alt attribute should be marked as decorative."
-PLG_SYSTEM_JOOA11Y_MISSING_ALT_LINK_MESSAGE="Image is being used as a link but is missing alt text! Please ensure alt text describes where the link takes you."
-PLG_SYSTEM_JOOA11Y_MISSING_ALT_MESSAGE="Missing alt text! If the image conveys a story, mood, or important information - be sure to describe the image."
-PLG_SYSTEM_JOOA11Y_NEW_TAB_WARNING="Link opens in a new tab or window without warning. Doing so can be disorienting, especially for people who have difficulty perceiving visual content. Secondly, it is not always a good practice to control someone's experience or make decisions for them. Indicate that the link opens in a new window within the link text."
-PLG_SYSTEM_JOOA11Y_NEW_TAB_WARNING_TIP="<strong>Tip!</strong> Learn best practices: <a href=\"https://www.nngroup.com/articles/new-browser-windows-and-tabs/\" target=\"_blank\" rel=\"noopener noreferrer\">opening links in new browser windows and tabs.</a>"
-PLG_SYSTEM_JOOA11Y_OFF="Off"
-PLG_SYSTEM_JOOA11Y_ON="On"
-PLG_SYSTEM_JOOA11Y_PAGE_OUTLINE="Page Outline"
-PLG_SYSTEM_JOOA11Y_PANEL_HEADING_MISSING_ONE="Missing Heading 1!"
-PLG_SYSTEM_JOOA11Y_PANEL_STATUS_BOTH="Accessibility Errors: %(errorCount). Accessibility Warnings: %(warningCount)."
-PLG_SYSTEM_JOOA11Y_PANEL_STATUS_ERRORS="Accessibility Errors: %(errorCount)."
-PLG_SYSTEM_JOOA11Y_PANEL_STATUS_HIDDEN="The item you are trying to view is not visible; it may be hidden or inside of an accordion or tab component. Here's a preview: "
-PLG_SYSTEM_JOOA11Y_PANEL_STATUS_ICON="<span class=\"jooa11y-visually-hidden\">Total issues found: </span>%(totalCount)"
-PLG_SYSTEM_JOOA11Y_PANEL_STATUS_NONE="No accessibility errors found."
-PLG_SYSTEM_JOOA11Y_PANEL_STATUS_WARNINGS="Accessibility Warnings: %(warningCount)."
-PLG_SYSTEM_JOOA11Y_QA_BAD_ITALICS="Bold and italic tags have semantic meaning, and should <strong>not</strong> be used to highlight entire paragraphs. Bolded text should be used to provide strong <strong>emphasis</strong> on a word or phrase. Italics should be used to highlight proper names (i.e. book and article titles), foreign words, quotes. Long quotes should be formatted as a blockquote."
-PLG_SYSTEM_JOOA11Y_QA_BAD_LINK="Bad link found. Link appears to point to a development environment. This link points to: <strong>%(el)</strong>"
-PLG_SYSTEM_JOOA11Y_QA_BLOCKQUOTE_MESSAGE="Is this a heading? <strong>%(bqHeadingText)</strong>"
-PLG_SYSTEM_JOOA11Y_QA_BLOCKQUOTE_MESSAGE_TIP="Blockquotes should be used for quotes only. If this is intended to be a heading, change this blockquote to a semantic heading (e.g. Heading 2 or Heading 3)."
-PLG_SYSTEM_JOOA11Y_QA_DUPLICATE_ID="Found <strong>duplicate ID</strong>. Duplicate ID errors are known to cause problems for assistive technologies when they are trying to interact with content."
-PLG_SYSTEM_JOOA11Y_QA_DUPLICATE_ID_TIP="Please remove or change the following ID: <strong>%(id)</strong>"
-PLG_SYSTEM_JOOA11Y_QA_FAKE_HEADING="Is this a heading? <strong>%(boldtext)</strong>"
-PLG_SYSTEM_JOOA11Y_QA_FAKE_HEADING_INFO="A line of bold text might look like a heading, but someone using a screen reader cannot tell that it is important or jump to its content. Bolded text should never replace semantic headings (Heading 2 to Heading 6)."
-PLG_SYSTEM_JOOA11Y_QA_PAGE_LANGUAGE_MESSAGE="Page language not declared! Please <a href=\"https://www.w3.org/International/questions/qa-html-language-declarations\" target=\"_blank\" rel=\"noopener noreferrer\">declare language on HTML tag.</a>"
-PLG_SYSTEM_JOOA11Y_QA_PDF_COUNT="PDFs are considered web content and must be made accessible as well. PDFs often contain issues for people who use screen readers (missing structural tags or missing form field labels) and people who have low vision (text does not reflow when enlarged). <ul><li>If this is a form, consider using an accessible HTML form as an alternative.</li><li>If this is a document, consider converting it into a web page.</li></ul><br>Otherwise, please check <strong>%(pdfCount)</strong> <a href=\"https://www.adobe.com/accessibility/products/acrobat/using-acrobat-pro-accessibility-checker.html\" target=\"_blank\" rel=\"noopener noreferrer\">PDF(s) for accessibility in Acrobat DC.</a>"
-PLG_SYSTEM_JOOA11Y_QA_SHOULD_BE_LIST="Are you trying to create a list? Possible list item found: <strong>%(firstPrefix)</strong>"
-PLG_SYSTEM_JOOA11Y_QA_SHOULD_BE_LIST_TIP="Make sure to use semantic lists by using the bullet or number formatting buttons instead. When using a semantic list, assistive technologies are able to convey information such as the total number of items and the relative position of each item in the list. Learn more about <a href=\"https://www.w3.org/WAI/tutorials/page-structure/content/#lists\" target=\"_blank\" rel=\"noopener noreferrer\">semantic lists.</a>"
-PLG_SYSTEM_JOOA11Y_QA_UPPERCASE_WARNING="Found all caps. Some screen readers may interpret all caps text as an acronym and will read each letter individually. Additionally, some people find all caps more difficult to read and it may give the appearance of SHOUTING."
-PLG_SYSTEM_JOOA11Y_READABILITY="Readability:"
-PLG_SYSTEM_JOOA11Y_READABILITY_NO_P_OR_LI_MESSAGE="Unable to calculate readability score. No paragraph <span class=\"jooa11y-badge\">&lt;p&gt;</span> or list content <span class=\"jooa11y-badge\">&lt;li&gt;</span> found."
-PLG_SYSTEM_JOOA11Y_READABILITY_NOT_ENOUGH_CONTENT_MESSAGE="Not enough content to calculate readability score."
-PLG_SYSTEM_JOOA11Y_SETTINGS="Settings"
-PLG_SYSTEM_JOOA11Y_SHORTCUT_SR="Skip to issue. Keyboard shortcut: Alt period"
-PLG_SYSTEM_JOOA11Y_SHORTCUT_TOOLTIP="Skip to issue"
-PLG_SYSTEM_JOOA11Y_SHOW_OUTLINE="Show Outline"
-PLG_SYSTEM_JOOA11Y_SHOW_SETTINGS="Show Settings"
-PLG_SYSTEM_JOOA11Y_TABLES_EMPTY_HEADING="Empty table header found! Table headers should <em>never</em> be empty. It is important to designate row and/or column headers to convey their relationship. This information provides context to people who use assistive technology. Please keep in mind that tables should be used for tabular data only."
-PLG_SYSTEM_JOOA11Y_TABLES_EMPTY_HEADING_INFO="Learn more about <a href=\"https://www.w3.org/WAI/tutorials/tables/\" target=\"_blank\" rel=\"noopener noreferrer\">accessible tables.</a>"
-PLG_SYSTEM_JOOA11Y_TABLES_MISSING_HEADINGS="Missing table headers! Accessible tables need HTML markup that indicates header cells and data cells which defines their relationship. This information provides context to people who use assistive technology. Tables should be used for tabular data only."
-PLG_SYSTEM_JOOA11Y_TABLES_MISSING_HEADINGS_INFO="Learn more about <a href=\"https://www.w3.org/WAI/tutorials/tables/\" target=\"_blank\" rel=\"noopener noreferrer\">accessible tables.</a>"
-PLG_SYSTEM_JOOA11Y_TABLES_SEMANTIC_HEADING="Semantic headings such as Heading 2 or Heading 3 should only be used for sections of content; <strong>not</strong> in HTML tables. Indicate table headings using the <strong>th</strong> element instead."
-PLG_SYSTEM_JOOA11Y_TABLES_SEMANTIC_HEADING_INFO="Learn more about <a href=\"https://www.w3.org/WAI/tutorials/tables/\" target=\"_blank\" rel=\"noopener noreferrer\">accessible tables.</a>"
-PLG_SYSTEM_JOOA11Y_TEXT_UNDERLINE_WARNING="Underlined text can be confused with links."
-PLG_SYSTEM_JOOA11Y_TEXT_UNDERLINE_WARNING_TIP="Consider using a different style such as &lt;em&gt;<em>emphasis</em>&lt;/em&gt;."
-PLG_SYSTEM_JOOA11Y_TOTAL_WORDS="Words:"
-PLG_SYSTEM_JOOA11Y_VERY_DIFFICULT_READABILITY="Very difficult"
-PLG_SYSTEM_JOOA11Y_WARNING="Warning"
diff --git a/administrator/language/en-GB/plg_system_privacyconsent.ini b/administrator/language/en-GB/plg_system_privacyconsent.ini
index f15388b120217..8585c2a58710a 100644
--- a/administrator/language/en-GB/plg_system_privacyconsent.ini
+++ b/administrator/language/en-GB/plg_system_privacyconsent.ini
@@ -5,7 +5,7 @@
 
 PLG_SYSTEM_PRIVACYCONSENT="System - Privacy Consent"
 PLG_SYSTEM_PRIVACYCONSENT_BODY="<p>The user consented to storing their user information using the IP address <strong>%s</strong></p><p>The user agent string of the user's browser was:<br>%s</p><p>This information was automatically recorded when the user submitted their details on the website and checked the confirm box.</p>"
-PLG_SYSTEM_PRIVACYCONSENT_CONSENT="User <a href='{accountlink}'>{username}</a> consented to the privacy policy."
+PLG_SYSTEM_PRIVACYCONSENT_CONSENT="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> consented to the privacy policy."
 PLG_SYSTEM_PRIVACYCONSENT_FIELD_ARTICLE_DESC="Select the article from the list or create a new one."
 PLG_SYSTEM_PRIVACYCONSENT_FIELD_ARTICLE_LABEL="Privacy Article"
 PLG_SYSTEM_PRIVACYCONSENT_FIELD_ERROR="Agreement to the site's Privacy Policy is required."
@@ -25,20 +25,3 @@ PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_DESC="Custom message to be displayed
 PLG_SYSTEM_PRIVACYCONSENT_REDIRECT_MESSAGE_LABEL="Redirect Message"
 PLG_SYSTEM_PRIVACYCONSENT_SUBJECT="Privacy Policy"
 PLG_SYSTEM_PRIVACYCONSENT_XML_DESCRIPTION="Basic plugin to request user's consent to the site's privacy policy. Existing users who have not consented yet will be redirected on login to update their profile."
-
-; All the following strings are deprecated and will be removed with 6.0
-PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_DESC="How often the check is performed."
-PLG_SYSTEM_PRIVACYCONSENT_CACHETIMEOUT_LABEL="Periodic check (days)"
-PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_DESC="Number of days after which the privacy consent shall expire."
-PLG_SYSTEM_PRIVACYCONSENT_CONSENTEXPIRATION_LABEL="Expiration"
-PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_BODY="Your Privacy Consent given at {URL} will expire in few days, you can renew the privacy consent for this website.\n\nIn order to do this, you can complete one of the following tasks:\n\n1. Visit the following URL: {TOKENURL}\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: {FORMURL}\nToken: {TOKEN}\n\nPlease note that this token is only valid for this account."
-PLG_SYSTEM_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT="Privacy Consent at {SITENAME}"
-PLG_SYSTEM_PRIVACYCONSENT_EXPIRATION_FIELDSET_LABEL="Expiration"
-PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_DESC="When enabled it performs checks for consent expiration."
-PLG_SYSTEM_PRIVACYCONSENT_FIELD_ENABLED_LABEL="Enable"
-PLG_SYSTEM_PRIVACYCONSENT_MAIL_REQUEST_REMINDER_DESC="Reminder to renew the privacy consent for this website."
-PLG_SYSTEM_PRIVACYCONSENT_MAIL_REQUEST_REMINDER_TITLE="System - Privacy Consent: Renew Consent"
-PLG_SYSTEM_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_MESSAGE="Privacy consent has expired for %1$s."
-PLG_SYSTEM_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_SUBJECT="Privacy Consent Expired"
-PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_DESC="Number of days to send a reminder before the expiration of the privacy consent."
-PLG_SYSTEM_PRIVACYCONSENT_REMINDBEFORE_LABEL="Remind"
diff --git a/administrator/language/en-GB/plg_system_schemaorg.ini b/administrator/language/en-GB/plg_system_schemaorg.ini
index 617dedbfd5251..4e13d9795cd1a 100644
--- a/administrator/language/en-GB/plg_system_schemaorg.ini
+++ b/administrator/language/en-GB/plg_system_schemaorg.ini
@@ -9,9 +9,6 @@ PLG_SYSTEM_SCHEMAORG_BASETYPE_LABEL="Base Type"
 PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_ORGANIZATION="Organization"
 PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_PERSON="Person"
 PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION="Structured data is a standardised format for organising and representing information on the web. It provides a way to describe the content and meaning of data in a structured manner, making it easier for search engines and other applications to understand and process the information. <a href=\"https://schema.org\" target=\"_blank\" rel=\"noopener noreferrer\">More information on schema.org</a>."
-; The following two strings are deprecated and will be removed with 6.0
-PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED="To use the schema.org functionality, you have to configure the plugin first. Please contact an administrator of the page to get it configured."
-PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED_ADMIN="To use the schema.org functionality, you have to configure the plugin first. Please select <a href=\"index.php?option=com_plugins&amp;task=plugin.edit&amp;extension_id=%s\" target=\"_blank\">this link to open the plugin</a>, configure and save."
 PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURED="To use the schema.org functionality, you have to configure the plugin first. Please contact an administrator of the page to get it configured."
 PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURED_ADMIN="To use the schema.org functionality, you have to configure the plugin first. Please select <a href=\"index.php?option=com_plugins&amp;task=plugin.edit&amp;extension_id=%s\" target=\"_blank\">this link to open the plugin</a>, configure and save."
 PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_EXTEND_JED_DESC="<strong>Need more Schema types?</strong> Extend with <a href=\"https://extensions.joomla.org/category/core-enhancements/schema-plugins\" target=\"_blank\" rel=\"noopener noreferrer\">Schema Plugins from Joomla! Extension Directory</a>."
diff --git a/administrator/language/en-GB/plg_system_webauthn.ini b/administrator/language/en-GB/plg_system_webauthn.ini
index ceb3d0ed9242b..682b694af8054 100644
--- a/administrator/language/en-GB/plg_system_webauthn.ini
+++ b/administrator/language/en-GB/plg_system_webauthn.ini
@@ -27,7 +27,7 @@ PLG_SYSTEM_WEBAUTHN_ERR_USER_REMOVED="The user for this passkey seems to no long
 PLG_SYSTEM_WEBAUTHN_ERR_XHR_INITCREATE="Cannot get the passkey registration information from your site."
 PLG_SYSTEM_WEBAUTHN_FIELD_ATTESTATION_SUPPORT_DESC="Only allow passkeys with verifiable cryptographic signatures to be used for passkey logins. Strongly recommended for high security environments. Requires the system temporary directory being writable by PHP, and the OpenSSL extension. May prevent some cheaper, non-certified passkeys from working at all. Disabling it also prevents Joomla from identifying the make and model of the passkey you are using (no icon will be displayed next to the passkey Name)."
 PLG_SYSTEM_WEBAUTHN_FIELD_ATTESTATION_SUPPORT_LABEL="Attestation Support"
-PLG_SYSTEM_WEBAUTHN_FIELD_DESC="Lets you manage passwordless login methods using passkeys. You need a supported browser and passkey (eg Google Chrome or Firefox with a FIDO2 certified security key).<br><br><strong>MacOS/iOS/watchOS:</strong> Touch/Face ID.<br><strong>Windows:</strong> Hello (Fingerprint / Facial Recognition / PIN).<br><strong>Android:</strong> Biometric screen lock.<br><br>You can find more details in the <a href=\"https://docs.joomla.org/Special:MyLanguage/WebAuthn_Passwordless_Login\" target=\"_blank\" rel=\"noopener noreferrer\">Passkey Passwordless Login documentation</a>."
+PLG_SYSTEM_WEBAUTHN_FIELD_DESC="Lets you manage passwordless login methods using passkeys. You need a supported browser and passkey (eg Google Chrome or Firefox with a FIDO2 certified security key).<br><br><strong>MacOS/iOS/watchOS:</strong> Touch/Face ID.<br><strong>Windows:</strong> Hello (Fingerprint / Facial Recognition / PIN).<br><strong>Android:</strong> Biometric screen lock.<br><br>You can find more details in the <a href=\"https://guide.joomla.org/user-manual/users/users-webauthn-passwordless-login\" target=\"_blank\" rel=\"noopener noreferrer\">Passkey Passwordless Login documentation</a>."
 PLG_SYSTEM_WEBAUTHN_FIELD_LABEL="Passkey Login"
 PLG_SYSTEM_WEBAUTHN_FIELD_N_AUTHENTICATORS_REGISTERED="%d passkeys already set up: %s"
 PLG_SYSTEM_WEBAUTHN_FIELD_N_AUTHENTICATORS_REGISTERED_0="No passkey has been set up yet"
diff --git a/administrator/language/en-GB/plg_task_deleteactionlogs.ini b/administrator/language/en-GB/plg_task_deleteactionlogs.ini
index bc1c00ebed271..f17d1b1eb78ba 100644
--- a/administrator/language/en-GB/plg_task_deleteactionlogs.ini
+++ b/administrator/language/en-GB/plg_task_deleteactionlogs.ini
@@ -6,5 +6,7 @@
 PLG_TASK_DELETEACTIONLOGS="Task - Delete Action Logs"
 PLG_TASK_DELETEACTIONLOGS_DELETE_DESC="Delete Action logs after specified days."
 PLG_TASK_DELETEACTIONLOGS_DELETE_TITLE="Delete ActionLogs"
+PLG_TASK_DELETEACTIONLOGS_LOG_DELETE_AFTER="Delete Logs after %d days"
+PLG_TASK_DELETEACTIONLOGS_LOG_DELETE_END="Delete Logs end"
 PLG_TASK_DELETEACTIONLOGS_LOG_DELETE_PERIOD="Days to delete action logs after"
 PLG_TASK_DELETEACTIONLOGS_XML_DESCRIPTION="This plugin for schedule Action Logs delete Tasks."
diff --git a/administrator/language/en-GB/plg_task_privacyconsent.ini b/administrator/language/en-GB/plg_task_privacyconsent.ini
index 4cd98a977c0d4..87d524b3b2107 100644
--- a/administrator/language/en-GB/plg_task_privacyconsent.ini
+++ b/administrator/language/en-GB/plg_task_privacyconsent.ini
@@ -10,6 +10,7 @@ PLG_TASK_PRIVACYCONSENT_INVALIDATE_TITLE="Expiration of privacy consents"
 PLG_TASK_PRIVACYCONSENT_INVALIDATE_DESC="Manage the expiration of privacy consents"
 PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_BODY="Your Privacy Consent given at {URL} will expire in few days, you can renew the privacy consent for this website.\n\nIn order to do this, you can complete one of the following tasks:\n\n1. Visit the following URL: {TOKENURL}\n\n2. Copy your token from this email, visit the referenced URL, and paste your token into the form.\nURL: {FORMURL}\nToken: {TOKEN}\n\nPlease note that this token is only valid for this account."
 PLG_TASK_PRIVACYCONSENT_EMAIL_REMIND_SUBJECT="Privacy Consent at {SITENAME}"
+PLG_TASK_PRIVACYCONSENT_LOG_REMIND_END="Remind End"
 PLG_TASK_PRIVACYCONSENT_MAIL_REQUEST_REMINDER_DESC="Reminder to renew the privacy consent for this website."
 PLG_TASK_PRIVACYCONSENT_MAIL_REQUEST_REMINDER_TITLE="Task - Privacy Consent: Renew Consent"
 PLG_TASK_PRIVACYCONSENT_NOTIFICATION_USER_PRIVACY_EXPIRED_MESSAGE="Privacy consent has expired for %1$s."
diff --git a/administrator/language/en-GB/plg_task_requests.ini b/administrator/language/en-GB/plg_task_requests.ini
index 8b47db87f5543..89f8e02d5171f 100644
--- a/administrator/language/en-GB/plg_task_requests.ini
+++ b/administrator/language/en-GB/plg_task_requests.ini
@@ -9,6 +9,9 @@ PLG_TASK_REQUESTS_JOOMLA_TOKEN="X-Joomla-Token"
 PLG_TASK_REQUESTS_LABEL_AUTH="Authorization"
 PLG_TASK_REQUESTS_LABEL_AUTH_HEADER="Authorization Header"
 PLG_TASK_REQUESTS_LABEL_AUTH_KEY="Authorization Key"
+PLG_TASK_REQUESTS_LABEL_CUSTOM_HEADERS="Custom Headers"
+PLG_TASK_REQUESTS_LABEL_CUSTOM_HEADER_NAME="Header Name"
+PLG_TASK_REQUESTS_LABEL_CUSTOM_HEADER_VALUE="Header Value"
 PLG_TASK_REQUESTS_LABEL_REQUEST_TIMEOUT="Request Timeout"
 PLG_TASK_REQUESTS_LABEL_REQUEST_URL="Request URL"
 PLG_TASK_REQUESTS_TASK_GET_REQUEST_DESC="Make GET requests to a server. Supports a custom timeout and authorization headers."
diff --git a/administrator/language/en-GB/plg_task_updatenotification.ini b/administrator/language/en-GB/plg_task_updatenotification.ini
index 141df42dbb937..b5a556df49df1 100644
--- a/administrator/language/en-GB/plg_task_updatenotification.ini
+++ b/administrator/language/en-GB/plg_task_updatenotification.ini
@@ -4,6 +4,7 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_TASK_UPDATENOTIFICATION="Task - Joomla! Update Notification"
+PLG_TASK_UPDATENOTIFICATION_END="Update Notification end"
 PLG_TASK_UPDATENOTIFICATION_EMAIL_DESC="A comma separated list of the email addresses which will receive the update notification emails. The addresses in the list MUST belong to existing users of your site who have the Super User privilege. If none of the listed emails belongs to Super Users, or if it's left blank, all Super Users of this site will receive the update notification email."
 PLG_TASK_UPDATENOTIFICATION_EMAIL_LBL="Super User Emails"
 PLG_TASK_UPDATENOTIFICATION_SEND_TITLE="Joomla! Update Notification"
diff --git a/administrator/language/en-GB/plg_user_terms.ini b/administrator/language/en-GB/plg_user_terms.ini
index 389ef20109358..6c9fceb44c023 100644
--- a/administrator/language/en-GB/plg_user_terms.ini
+++ b/administrator/language/en-GB/plg_user_terms.ini
@@ -9,7 +9,7 @@ PLG_USER_TERMS_FIELD_ARTICLE_LABEL="Terms & Conditions Article"
 PLG_USER_TERMS_FIELD_ERROR="Agreement to the site's Terms & Conditions is required."
 PLG_USER_TERMS_FIELD_LABEL="Terms & Conditions"
 PLG_USER_TERMS_LABEL="Terms & Conditions"
-PLG_USER_TERMS_LOGGING_CONSENT_TO_TERMS="User <a href='{accountlink}'>{username}</a> consented to the terms and conditions during registration."
+PLG_USER_TERMS_LOGGING_CONSENT_TO_TERMS="User <a href='{accountlink}' title='Edit user {username}'>{username}</a> consented to the terms and conditions during registration."
 PLG_USER_TERMS_NOTE_FIELD_DEFAULT="By signing up to this website you accept the Terms & Conditions."
 PLG_USER_TERMS_NOTE_FIELD_DESC="A summary of the site's terms & conditions. If left blank then the default message will be used."
 PLG_USER_TERMS_NOTE_FIELD_LABEL="Short Terms & Conditions"
diff --git a/administrator/language/en-GB/tpl_atum.ini b/administrator/language/en-GB/tpl_atum.ini
index 13d9f6ca31423..0486957b489ad 100644
--- a/administrator/language/en-GB/tpl_atum.ini
+++ b/administrator/language/en-GB/tpl_atum.ini
@@ -21,13 +21,17 @@ TPL_ATUM_COLORS_SETTINGS_TEXT_DARK_LABEL="Dark Text"
 TPL_ATUM_COLORS_SETTINGS_TEXT_LIGHT_LABEL="Light Text"
 TPL_ATUM_IMAGE_LABEL="Image"
 TPL_ATUM_IMAGE_SETTINGS_LABEL="Image Settings"
+TPL_ATUM_LOGIN_LOGO_DESCRIPTION="The recommended size is 70px x 70px"
 TPL_ATUM_LOGIN_LOGO_LABEL="Login Logo"
+TPL_ATUM_LOGIN_SIDEBAR_HEADING="Help and support"
 TPL_ATUM_LOGIN_SIDEBAR_VIEW_WEBSITE="View website"
 TPL_ATUM_LOGO_ALT_EMPTY_DESC="Decorative Image - no description required"
 TPL_ATUM_LOGO_ALT_EMPTY_LABEL="No Description"
 TPL_ATUM_LOGO_ALT_LABEL="Image Description (Alt Text)"
 TPL_ATUM_MORE_ELEMENTS="More Elements"
+TPL_ATUM_SITE_LOGO_DESCRIPTION="The recommended size is 150px x 30px"
 TPL_ATUM_SITE_LOGO_LABEL="Brand Large"
+TPL_ATUM_SITE_LOGO_SMALL_DESCRIPTION="The recommended size is 20px x 20px"
 TPL_ATUM_SITE_LOGO_SMALL_LABEL="Brand Small"
 TPL_ATUM_TOOLBAR="Toolbar"
-TPL_ATUM_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5, Hathor from 1.6, Isis from 3.0), Atum is the name of the Joomla 4 and Joomla 5 administrator template."
+TPL_ATUM_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5, Hathor from 1.6, Isis from 3.0), Atum is the name of the Joomla administrator template."
diff --git a/administrator/language/en-GB/tpl_atum.sys.ini b/administrator/language/en-GB/tpl_atum.sys.ini
index 50eb38f0c5918..9388cdad5d1d6 100644
--- a/administrator/language/en-GB/tpl_atum.sys.ini
+++ b/administrator/language/en-GB/tpl_atum.sys.ini
@@ -16,4 +16,4 @@ TPL_ATUM_POSITION_STATUS="Status"
 TPL_ATUM_POSITION_TITLE="Title"
 TPL_ATUM_POSITION_TOOLBAR="Toolbar"
 TPL_ATUM_POSITION_TOP="Top"
-TPL_ATUM_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5, Hathor from 1.6, Isis from 3.0), Atum is the name of the Joomla 4 and Joomla 5 administrator template."
+TPL_ATUM_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5, Hathor from 1.6, Isis from 3.0), Atum is the name of the Joomla administrator template."
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 25c1db0739c93..4573e1c025501 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>5.4.8-rc3-dev</version>
+	<version>6.2.0-beta2-dev</version>
 	<creationDate>2026-08</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
index 977b3f624f65f..3e0746076cd9b 100644
--- a/administrator/manifests/packages/pkg_en-GB.xml
+++ b/administrator/manifests/packages/pkg_en-GB.xml
@@ -2,7 +2,7 @@
 <extension type="package" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>5.4.8.1</version>
+	<version>6.2.0.1</version>
 	<creationDate>2026-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
@@ -21,7 +21,7 @@
 	</files>
 	<updateservers>
 		<server type="collection" priority="1" name="Accredited Joomla! Translations">
-			https://update.joomla.org/language/translationlist_5.xml
+			https://update.joomla.org/language/translationlist_6.xml
 		</server>
 	</updateservers>
 </extension>
diff --git a/administrator/modules/mod_logged/src/Helper/LoggedHelper.php b/administrator/modules/mod_logged/src/Helper/LoggedHelper.php
index bcefae12b6e81..e7cf40b87333a 100644
--- a/administrator/modules/mod_logged/src/Helper/LoggedHelper.php
+++ b/administrator/modules/mod_logged/src/Helper/LoggedHelper.php
@@ -44,11 +44,12 @@ class LoggedHelper
     public function getUsers(Registry $params, CMSApplication $app, DatabaseInterface $db): mixed
     {
         $user  = $app->getIdentity();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('s.time, s.client_id, u.id, u.name, u.username')
             ->from('#__session AS s')
             ->join('RIGHT', '#__users AS u ON s.userid = u.id')
             ->where('s.guest = 0')
+            ->order('s.time DESC')
             ->setLimit($params->get('count', 5), 0);
 
         $db->setQuery($query);
diff --git a/administrator/modules/mod_menu/mod_menu.xml b/administrator/modules/mod_menu/mod_menu.xml
index f78fbb68da710..1019bf57c4fc0 100644
--- a/administrator/modules/mod_menu/mod_menu.xml
+++ b/administrator/modules/mod_menu/mod_menu.xml
@@ -88,7 +88,7 @@
 					description="MOD_MENU_FIELD_FORUMURL_DESC"
 					filter="url"
 					default=""
-					showon="menutype:*"
+					showon="preset:alternate"
 					validate="url"
 				/>
 			</fieldset>
diff --git a/administrator/modules/mod_menu/tmpl/default_submenu.php b/administrator/modules/mod_menu/tmpl/default_submenu.php
index 8dc08f0d446fb..efca38b33a5c8 100644
--- a/administrator/modules/mod_menu/tmpl/default_submenu.php
+++ b/administrator/modules/mod_menu/tmpl/default_submenu.php
@@ -38,13 +38,7 @@
     }
 }
 
-if ($current->level == 1) {
-    $class .= ' item-level-1';
-} elseif ($current->level == 2) {
-    $class .= ' item-level-2';
-} elseif ($current->level == 3) {
-    $class .= ' item-level-3';
-}
+$class .= ' item-level-' . (int) $current->level;
 
 // Set the correct aria role and print the item
 if ($current->type == 'separator') {
@@ -55,17 +49,12 @@
 
 // Print a link if it exists
 $linkClass  = [];
-$dataToggle = '';
 $iconClass  = '';
 $itemIconClass = '';
 $itemImage  = '';
 
 if ($current->hasChildren()) {
     $linkClass[] = 'has-arrow';
-
-    if ($current->level > 2) {
-        $dataToggle  = ' data-bs-toggle="dropdown"';
-    }
 } else {
     $linkClass[] = 'no-dropdown';
 
@@ -119,15 +108,15 @@
 }
 
 if ($link != '' && $current->target != '') {
-    echo '<a' . $linkClass . $dataToggle . $ariaCurrent . ' href="' . $link . '" target="' . $current->target . '">'
+    echo '<a' . $linkClass . $ariaCurrent . ' href="' . $link . '" target="' . $current->target . '">'
         . $iconClass
         . '<span class="sidebar-item-title">' . $itemImage . Text::_($current->title) . '</span>' . $ajax . '</a>';
 } elseif ($link != '' && $current->type !== 'separator') {
-    echo '<a' . $linkClass . $dataToggle . $ariaCurrent . ' href="' . $link . '" aria-label="' . Text::_($current->title) . '">'
+    echo '<a' . $linkClass . $ariaCurrent . ' href="' . $link . '" aria-label="' . Text::_($current->title) . '">'
         . $iconClass
         . '<span class="sidebar-item-title">' . $itemImage . Text::_($current->title) . '</span>' . $iconImage . '</a>';
 } elseif ($current->title != '' && $current->type !== 'separator') {
-    echo '<a' . $linkClass . $dataToggle . $ariaCurrent . ' href="#">'
+    echo '<a' . $linkClass . $ariaCurrent . ' href="#">'
         . $iconClass
         . '<span class="sidebar-item-title">' . $itemImage . Text::_($current->title) . '</span>' . $ajax . '</a>';
 } elseif ($current->title != '' && $current->type === 'separator') {
diff --git a/administrator/modules/mod_popular/mod_popular.php b/administrator/modules/mod_popular/mod_popular.php
deleted file mode 100644
index 1896c3d58aff5..0000000000000
--- a/administrator/modules/mod_popular/mod_popular.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Administrator
- * @subpackage  mod_popular
- *
- * @copyright   (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-\defined('_JEXEC') or die;
-
-use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Helper\ModuleHelper;
-use Joomla\CMS\Layout\LayoutHelper;
-use Joomla\Module\Popular\Administrator\Helper\PopularHelper;
-
-$model = $app->bootComponent('com_content')->getMVCFactory()->createModel('Articles', 'Administrator', ['ignore_request' => true]);
-$list  = PopularHelper::getList($params, $model);
-
-// Get module data.
-if ($params->get('automatic_title', 0)) {
-    $module->title = PopularHelper::getTitle($params);
-}
-
-// If recording of hits is disabled.
-if (!ComponentHelper::getParams('com_content')->get('record_hits', 1)) {
-    echo LayoutHelper::render('joomla.content.emptystate_module', [
-        'title' => 'JGLOBAL_RECORD_HITS_DISABLED',
-        'icon'  => 'icon-minus-circle',
-        ]);
-
-    return;
-}
-
-// If there are some articles to display.
-if (\count($list)) {
-    require ModuleHelper::getLayoutPath('mod_popular', $params->get('layout', 'default'));
-
-    return;
-}
-
-// If there are no articles to display, show empty state.
-$app->getLanguage()->load('com_content');
-
-echo LayoutHelper::render('joomla.content.emptystate_module', [
-        'textPrefix' => 'COM_CONTENT',
-        'icon'       => 'icon-copy',
-    ]);
diff --git a/administrator/modules/mod_popular/mod_popular.xml b/administrator/modules/mod_popular/mod_popular.xml
index 5d1c3e00fcb65..c4ccf1e0e550c 100644
--- a/administrator/modules/mod_popular/mod_popular.xml
+++ b/administrator/modules/mod_popular/mod_popular.xml
@@ -11,7 +11,7 @@
 	<description>MOD_POPULAR_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Module\Popular</namespace>
 	<files>
-		<filename module="mod_popular">mod_popular.php</filename>
+		<folder module="mod_popular">services</folder>
 		<folder>src</folder>
 		<folder>tmpl</folder>
 	</files>
@@ -55,6 +55,66 @@
 					<option value="by_me">MOD_POPULAR_FIELD_VALUE_ADDED_OR_MODIFIED_BY_ME</option>
 					<option value="not_me">MOD_POPULAR_FIELD_VALUE_NOT_ADDED_OR_MODIFIED_BY_ME</option>
 				</field>
+
+				<field
+					name="filteringspacer1"
+					type="spacer"
+					hr="true"
+				/>
+
+				<field
+					name="date_filtering"
+					type="list"
+					label="MOD_POPULAR_FIELD_DATEFILTERING_LABEL"
+					default="off"
+					validate="options"
+					>
+					<option value="off">MOD_POPULAR_OPTION_OFF_VALUE</option>
+					<option value="range">MOD_POPULAR_OPTION_DATERANGE_VALUE</option>
+					<option value="relative">MOD_POPULAR_OPTION_RELATIVEDAY_VALUE</option>
+				</field>
+
+				<field
+					name="date_field"
+					type="list"
+					label="MOD_POPULAR_FIELD_DATERANGEFIELD_LABEL"
+					default="a.created"
+					showon="date_filtering!:off"
+					validate="options"
+					>
+					<option value="a.created">MOD_POPULAR_OPTION_CREATED_VALUE</option>
+					<option value="a.modified">MOD_POPULAR_OPTION_MODIFIED_VALUE</option>
+					<option value="a.publish_up">MOD_POPULAR_OPTION_STARTPUBLISHING_VALUE</option>
+				</field>
+
+				<field
+					name="start_date_range"
+					type="calendar"
+					label="MOD_POPULAR_FIELD_STARTDATE_LABEL"
+					translateformat="true"
+					showtime="true"
+					filter="user_utc"
+					showon="date_filtering:range"
+				/>
+
+				<field
+					name="end_date_range"
+					type="calendar"
+					label="MOD_POPULAR_FIELD_ENDDATE_LABEL"
+					translateformat="true"
+					showtime="true"
+					filter="user_utc"
+					showon="date_filtering:range"
+				/>
+
+				<field
+					name="relative_date"
+					type="number"
+					label="MOD_POPULAR_FIELD_RELATIVEDATE_LABEL"
+					default="30"
+					filter="integer"
+					showon="date_filtering:relative"
+				/>
 			</fieldset>
 
 			<fieldset name="advanced">
diff --git a/administrator/modules/mod_popular/services/provider.php b/administrator/modules/mod_popular/services/provider.php
new file mode 100644
index 0000000000000..67f2c33aef3cc
--- /dev/null
+++ b/administrator/modules/mod_popular/services/provider.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_popular
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+\defined('_JEXEC') or die;
+
+use Joomla\CMS\Extension\Service\Provider\HelperFactory;
+use Joomla\CMS\Extension\Service\Provider\Module;
+use Joomla\CMS\Extension\Service\Provider\ModuleDispatcherFactory;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+/**
+ * The latest articles module service provider.
+ *
+ * @since  6.0.0
+ */
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->registerServiceProvider(new ModuleDispatcherFactory('\\Joomla\\Module\\Popular'));
+        $container->registerServiceProvider(new HelperFactory('\\Joomla\\Module\\Popular\\Administrator\\Helper'));
+
+        $container->registerServiceProvider(new Module());
+    }
+};
diff --git a/administrator/modules/mod_popular/src/Dispatcher/Dispatcher.php b/administrator/modules/mod_popular/src/Dispatcher/Dispatcher.php
new file mode 100644
index 0000000000000..498b0dd42bd94
--- /dev/null
+++ b/administrator/modules/mod_popular/src/Dispatcher/Dispatcher.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  mod_popular
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Module\Popular\Administrator\Dispatcher;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Dispatcher\AbstractModuleDispatcher;
+use Joomla\CMS\Helper\HelperFactoryAwareInterface;
+use Joomla\CMS\Helper\HelperFactoryAwareTrait;
+use Joomla\Module\Popular\Administrator\Helper\PopularHelper;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Dispatcher class for mod_popular
+ *
+ * @since  6.0.0
+ */
+class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareInterface
+{
+    use HelperFactoryAwareTrait;
+
+    /**
+     * Returns the layout data.
+     *
+     * @return  array
+     *
+     * @since   6.0.0
+     */
+    protected function getLayoutData()
+    {
+        $data = parent::getLayoutData();
+        /** @var PopularHelper $helper */
+        $helper       = $this->getHelperFactory()->getHelper('PopularHelper', $data);
+        $articleModel = $this
+            ->getApplication()
+            ->bootComponent('com_content')
+            ->getMVCFactory()
+            ->createModel('Articles', 'Administrator', ['ignore_request' => true]);
+
+        if ($data['params']->get('automatic_title', 0)) {
+            $data['module']->title = $helper->getModuleTitle($data['params']);
+        }
+
+        $data['list']        = $helper->getArticles($data['params'], $articleModel);
+        $data['record_hits'] = (int) ComponentHelper::getParams('com_content')->get('record_hits', 1);
+
+        return $data;
+    }
+}
diff --git a/administrator/modules/mod_popular/src/Helper/PopularHelper.php b/administrator/modules/mod_popular/src/Helper/PopularHelper.php
index 926196117773e..cab46309e19f6 100644
--- a/administrator/modules/mod_popular/src/Helper/PopularHelper.php
+++ b/administrator/modules/mod_popular/src/Helper/PopularHelper.php
@@ -10,8 +10,7 @@
 
 namespace Joomla\Module\Popular\Administrator\Helper;
 
-use Joomla\CMS\Categories\Categories;
-use Joomla\CMS\Factory;
+use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Content\Administrator\Model\ArticlesModel;
@@ -26,8 +25,35 @@
  *
  * @since  1.6
  */
-abstract class PopularHelper
+class PopularHelper
 {
+    /**
+     * @var CMSApplicationInterface
+     *
+     * @since   6.0.0
+     */
+    protected $app;
+
+    /**
+     * @var Registry
+     *
+     * @since   6.0.0
+     */
+    protected $params;
+
+    /**
+     * Helper class constructor
+     *
+     * @param   array  $config  Parameters we are using
+     *
+     * @since   6.0.0
+     */
+    public function __construct($config)
+    {
+        $this->app    = $config['app'];
+        $this->params = $config['params'];
+    }
+
     /**
      * Get a list of the most popular articles.
      *
@@ -37,14 +63,16 @@ abstract class PopularHelper
      * @return  mixed  An array of articles, or false on error.
      *
      * @throws  \Exception
+     *
+     * @since   6.0.0
      */
-    public static function getList(Registry $params, ArticlesModel $model)
+    public function getArticles(Registry $params, ArticlesModel $model): mixed
     {
-        $user = Factory::getUser();
+        $user = $this->app->getIdentity();
 
         // Set List SELECT
         $model->setState('list.select', 'a.id, a.title, a.checked_out, a.checked_out_time, ' .
-            ' a.created_by, a.publish_up, a.hits');
+            ' a.created, a.modified, a.publish_up, a.created_by, a.hits');
 
         // Set Ordering filter
         $model->setState('list.ordering', 'a.hits');
@@ -75,6 +103,21 @@ public static function getList(Registry $params, ArticlesModel $model)
         $model->setState('list.start', 0);
         $model->setState('list.limit', $params->get('count', 5));
 
+        // Set date filtering using ArticlesModel's built-in filter
+        $dateFiltering = $params->get('date_filtering', 'off');
+
+        if ($dateFiltering !== 'off') {
+            $model->setState('filter.date_filtering', $dateFiltering);
+            $model->setState('filter.date_field', $params->get('date_field', 'a.created'));
+
+            if ($dateFiltering === 'range') {
+                $model->setState('filter.start_date_range', $params->get('start_date_range', '1000-01-01 00:00:00'));
+                $model->setState('filter.end_date_range', $params->get('end_date_range', '9999-12-31 23:59:59'));
+            } elseif ($dateFiltering === 'relative') {
+                $model->setState('filter.relative_date', (int) $params->get('relative_date', 30));
+            }
+        }
+
         $items = $model->getItems();
 
         if ($error = $model->getError()) {
@@ -102,15 +145,17 @@ public static function getList(Registry $params, ArticlesModel $model)
      * @param   Registry  $params  The module parameters.
      *
      * @return  string  The alternate title for the module.
+     *
+     * @since   6.0.0
      */
-    public static function getTitle($params)
+    public function getModuleTitle(Registry $params): string
     {
         $who   = $params->get('user_id', 0);
         $catid = (int) $params->get('catid', null);
         $title = '';
 
         if ($catid) {
-            $category = Categories::getInstance('Content')->get($catid);
+            $category = $this->app->bootComponent('com_content')->getCategory()->get($catid);
             $title    = Text::_('MOD_POPULAR_UNEXISTING');
 
             if ($category) {
diff --git a/administrator/modules/mod_popular/tmpl/default.php b/administrator/modules/mod_popular/tmpl/default.php
index 4949093a8177e..bbec31bf7f940 100644
--- a/administrator/modules/mod_popular/tmpl/default.php
+++ b/administrator/modules/mod_popular/tmpl/default.php
@@ -12,52 +12,66 @@
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
 
 $moduleId = str_replace(' ', '', $module->title) . $module->id;
 
 ?>
-<table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
-    <caption class="visually-hidden"><?php echo $module->title; ?></caption>
-    <thead>
-        <tr>
-            <th scope="col" class="w-60"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
-            <th scope="col" class="w-20"><?php echo Text::_('JGLOBAL_HITS'); ?></th>
-            <th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
-        </tr>
-    </thead>
-    <tbody>
-    <?php if (count($list)) : ?>
-        <?php foreach ($list as $i => $item) : ?>
-            <?php // Calculate popular items ?>
-            <?php $hits = (int) $item->hits; ?>
-            <?php $hits_class = ($hits >= 10000 ? 'danger' : ($hits >= 1000 ? 'warning' : ($hits >= 100 ? 'info' : 'secondary'))); ?>
-            <tr>
-                <th scope="row">
-                    <?php if ($item->checked_out) : ?>
-                        <?php echo HTMLHelper::_('jgrid.checkedout', $moduleId . $i, $item->editor, $item->checked_out_time); ?>
-                    <?php endif; ?>
-                    <?php if ($item->link) : ?>
-                        <a href="<?php echo $item->link; ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
-                            <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
-                        </a>
-                    <?php else : ?>
-                        <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
-                    <?php endif; ?>
-                </th>
-                <td>
-                    <span class="badge bg-<?php echo $hits_class; ?>"><?php echo $item->hits; ?></span>
-                </td>
-                <td>
-                    <?php echo HTMLHelper::_('date', $item->publish_up, Text::_('DATE_FORMAT_LC4')); ?>
-                </td>
-            </tr>
-        <?php endforeach; ?>
+<?php if ($record_hits === 0) : ?>
+    <?php echo LayoutHelper::render('joomla.content.emptystate_module', [
+    'title' => 'JGLOBAL_RECORD_HITS_DISABLED',
+    'icon'  => 'icon-minus-circle',
+    ]); ?>
+<?php else : ?>
+    <?php if (\count($list)) : ?>
+        <table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
+            <caption class="visually-hidden"><?php echo $module->title; ?></caption>
+            <thead>
+                <tr>
+                    <th scope="col" class="w-60"><?php echo Text::_('JGLOBAL_TITLE'); ?></th>
+                    <th scope="col" class="w-20"><?php echo Text::_('JGLOBAL_HITS'); ?></th>
+                    <th scope="col" class="w-20"><?php echo Text::_('JDATE'); ?></th>
+                </tr>
+            </thead>
+            <tbody>
+                <?php foreach ($list as $i => $item) : ?>
+                    <?php // Calculate popular items ?>
+                    <?php $hits = (int) $item->hits; ?>
+                    <?php $hits_class = ($hits >= 10000 ? 'danger' : ($hits >= 1000 ? 'warning' : ($hits >= 100 ? 'info' : 'secondary'))); ?>
+                    <tr>
+                        <th scope="row">
+                            <?php if ($item->checked_out) : ?>
+                                <?php echo HTMLHelper::_('jgrid.checkedout', $moduleId . $i, $item->editor, $item->checked_out_time); ?>
+                            <?php endif; ?>
+                            <?php if ($item->link) : ?>
+                                <a href="<?php echo $item->link; ?>" title="<?php echo Text::_('JACTION_EDIT'); ?> <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
+                                    <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
+                                </a>
+                            <?php else : ?>
+                                <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
+                            <?php endif; ?>
+                        </th>
+                        <td>
+                            <span class="badge bg-<?php echo $hits_class; ?>"><?php echo $item->hits; ?></span>
+                        </td>
+                        <td>
+                            <?php echo HTMLHelper::_('date', $item->publish_up, Text::_('DATE_FORMAT_LC4')); ?>
+                        </td>
+                    </tr>
+                <?php endforeach; ?>
+            </tbody>
+        </table>
+
     <?php else : ?>
-        <tr>
-            <td colspan="3">
-                <?php echo Text::_('MOD_POPULAR_NO_MATCHING_RESULTS'); ?>
-            </td>
-        </tr>
+        <?php
+        // If there are no articles to display, show empty state.
+        $app->getLanguage()->load('com_content');
+
+        echo LayoutHelper::render('joomla.content.emptystate_module', [
+        'textPrefix' => 'COM_CONTENT',
+        'icon'       => 'icon-copy',
+        ]);
+        ?>
+
     <?php endif; ?>
-    </tbody>
-</table>
+<?php endif; ?>
diff --git a/administrator/modules/mod_privacy_dashboard/src/Helper/PrivacyDashboardHelper.php b/administrator/modules/mod_privacy_dashboard/src/Helper/PrivacyDashboardHelper.php
index 2d8e5d2f08ab5..121455ad14658 100644
--- a/administrator/modules/mod_privacy_dashboard/src/Helper/PrivacyDashboardHelper.php
+++ b/administrator/modules/mod_privacy_dashboard/src/Helper/PrivacyDashboardHelper.php
@@ -38,7 +38,7 @@ class PrivacyDashboardHelper implements DatabaseAwareInterface
     public function getPrivacyRequests(): array
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     'COUNT(*) AS count',
diff --git a/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php b/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php
index 75195a0828775..2d0e75331100b 100644
--- a/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php
+++ b/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php
@@ -86,7 +86,7 @@ public function getRequestFormMenuStatus(CMSApplicationInterface $app)
         $lang = '';
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id'),
@@ -129,7 +129,7 @@ public function getRequestFormMenuStatus(CMSApplicationInterface $app)
                 $params              = ComponentHelper::getParams('com_languages');
                 $defaultSiteLanguage = $params->get('site');
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('id'))
                     ->from($db->quoteName('#__menu'))
                     ->where(
@@ -173,7 +173,7 @@ public function getNumberOfUrgentRequests()
         $period = '-' . $notify;
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select('COUNT(*)')
             ->from($db->quoteName('#__privacy_requests'))
             ->where(
diff --git a/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php b/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php
index caad7839758ea..0bc6b9beb8a0b 100644
--- a/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php
+++ b/administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php
@@ -15,6 +15,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Module\Quickicon\Administrator\Event\QuickIconsEvent;
 use Joomla\Registry\Registry;
 
@@ -258,14 +259,14 @@ public function getButtons(Registry $params, ?CMSApplication $application = null
             if ($params->get('show_featured')) {
                 $tmp = [
                     'image'  => 'icon-star featured',
-                    'link'   => Route::_('index.php?option=com_content&view=featured'),
+                    'link'   => Route::_('index.php?option=com_content&view=articles&filter[featured]=1'),
                     'name'   => 'MOD_QUICKICON_FEATURED_MANAGER',
                     'access' => ['core.manage', 'com_content'],
                     'group'  => 'MOD_QUICKICON_SITE',
                 ];
 
                 if ($params->get('show_featured') == 2) {
-                    $tmp['ajaxurl'] = 'index.php?option=com_content&amp;task=featured.getQuickiconContent&amp;format=json';
+                    $tmp['ajaxurl'] = 'index.php?option=com_content&amp;task=articles.getQuickiconFeatured&amp;format=json';
                 }
 
                 $this->buttons[$key][] = $tmp;
@@ -382,10 +383,12 @@ public function getButtons(Registry $params, ?CMSApplication $application = null
             }
             PluginHelper::importPlugin('quickicon');
 
-            $arrays = (array) $application->triggerEvent(
-                'onGetIcons',
-                new QuickIconsEvent('onGetIcons', ['context' => $context])
-            );
+            $arrays = (array) Factory::getContainer()
+                ->get(DispatcherInterface::class)
+                ->dispatch(
+                    'onGetIcons',
+                    new QuickIconsEvent('onGetIcons', ['context' => $context])
+                )->getArgument('result', []);
 
             foreach ($arrays as $response) {
                 if (!\is_array($response)) {
diff --git a/administrator/modules/mod_stats_admin/src/Helper/StatsAdminHelper.php b/administrator/modules/mod_stats_admin/src/Helper/StatsAdminHelper.php
index 4ee2df3276851..3df2cc3f1585c 100644
--- a/administrator/modules/mod_stats_admin/src/Helper/StatsAdminHelper.php
+++ b/administrator/modules/mod_stats_admin/src/Helper/StatsAdminHelper.php
@@ -44,7 +44,7 @@ public function getStatsData(Registry $params, CMSApplication $app, DatabaseInte
         $user = $app->getIdentity();
 
         $rows  = [];
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $serverinfo = $params->get('serverinfo', 0);
         $siteinfo   = $params->get('siteinfo', 0);
diff --git a/administrator/templates/atum/error.php b/administrator/templates/atum/error.php
index eb209be779fdb..926066ea25b68 100644
--- a/administrator/templates/atum/error.php
+++ b/administrator/templates/atum/error.php
@@ -15,7 +15,7 @@
 /** @var \Joomla\CMS\Document\ErrorDocument $this */
 
 // Authenticated versus guest have different displays
-$user = Factory::getUser();
+$user = Factory::getApplication()->getIdentity();
 
 if ($user->guest) {
     require __DIR__ . '/error_login.php';
diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php
index 58bffd8ebf139..a12d685347116 100644
--- a/administrator/templates/atum/error_login.php
+++ b/administrator/templates/atum/error_login.php
@@ -177,9 +177,10 @@
             </section>
         </div>
 
-        <div id="sidebar-wrapper" class="sidebar-wrapper">
+        <aside id="sidebar-wrapper" class="sidebar-wrapper" aria-labelledby="sidebar-section-heading">
+            <h2 id="sidebar-section-heading" class="visually-hidden"><?php echo Text::_('TPL_ATUM_LOGIN_SIDEBAR_HEADING'); ?></h2>
             <div id="main-brand" class="main-brand">
-                <h1><?php echo $app->get('sitename'); ?></h1>
+                <p class="h1"><?php echo $app->get('sitename'); ?></p>
                 <a href="<?php echo Uri::root(); ?>"><?php echo Text::_('TPL_ATUM_LOGIN_SIDEBAR_VIEW_WEBSITE'); ?></a>
             </div>
             <div id="sidebar">
@@ -187,7 +188,7 @@
                     <jdoc:include type="modules" name="sidebar" style="body" />
                 <?php endif; ?>
             </div>
-        </div>
+        </aside>
     </div>
     <?php if ($renderModules) : ?>
         <jdoc:include type="modules" name="debug" style="none" />
diff --git a/administrator/templates/atum/joomla.asset.json b/administrator/templates/atum/joomla.asset.json
index acd22c1bf3dfc..edb2c2bd05943 100644
--- a/administrator/templates/atum/joomla.asset.json
+++ b/administrator/templates/atum/joomla.asset.json
@@ -2,7 +2,7 @@
   "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
   "name": "atum",
   "version": "4.0.0",
-  "description": "This file contains details of the assets used by Atum, the default Joomla 4 administrator template.",
+  "description": "This file contains details of the assets used by Atum, the default Joomla administrator template.",
   "license": "GPL-2.0-or-later",
   "assets": [
     {
diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
index 8e3700d8885b2..9f7be79a5a541 100644
--- a/administrator/templates/atum/login.php
+++ b/administrator/templates/atum/login.php
@@ -134,29 +134,31 @@
     <div id="wrapper" class="wrapper flex-grow-1">
         <div class="container-fluid container-main">
             <section id="content" class="content h-100">
-                <div class="login_message">
-                    <jdoc:include type="message" />
-                </div>
-                <main class="d-flex justify-content-center align-items-center h-100">
+                <main class="d-flex flex-column justify-content-center align-items-center h-100">
+                    <div class="login_message w-100">
+                        <jdoc:include type="message" />
+                    </div>
                     <div class="login">
                         <div class="main-brand logo text-center">
                             <?php echo HTMLHelper::_('image', $loginLogo, $loginLogoAlt, ['loading' => 'eager', 'decoding' => 'async'], false, 0); ?>
                         </div>
+                        <h1 class="visually-hidden"><?php echo Text::_('TPL_ATUM_BACKEND_LOGIN'); ?></h1>
                         <jdoc:include type="component" />
                     </div>
                 </main>
             </section>
         </div>
 
-        <div id="sidebar-wrapper" class="sidebar-wrapper px-3 pb-3">
+        <aside id="sidebar-wrapper" class="sidebar-wrapper px-3 pb-3" aria-labelledby="sidebar-section-heading">
+            <h2 id="sidebar-section-heading" class="visually-hidden"><?php echo Text::_('TPL_ATUM_LOGIN_SIDEBAR_HEADING'); ?></h2>
             <div id="main-brand" class="main-brand">
-                <h1><?php echo $app->get('sitename'); ?></h1>
-                <h2><?php echo Text::_('TPL_ATUM_BACKEND_LOGIN'); ?></h2>
+                <p class="h1"><?php echo $app->get('sitename'); ?></p>
+                <p class="h2"><?php echo Text::_('TPL_ATUM_BACKEND_LOGIN'); ?></p>
             </div>
             <div id="sidebar">
                 <jdoc:include type="modules" name="sidebar" style="body" />
             </div>
-        </div>
+        </aside>
     </div>
     <jdoc:include type="modules" name="debug" style="none" />
 </body>
diff --git a/administrator/templates/atum/templateDetails.xml b/administrator/templates/atum/templateDetails.xml
index d4ec535fdf700..ab3df8c85f27e 100644
--- a/administrator/templates/atum/templateDetails.xml
+++ b/administrator/templates/atum/templateDetails.xml
@@ -126,7 +126,10 @@
 			</fieldset>
 
 			<fieldset name="images" label="TPL_ATUM_IMAGE_SETTINGS_LABEL">
-				<fieldset name="loginLogo" label="TPL_ATUM_LOGIN_LOGO_LABEL">
+				<fieldset
+					name="loginLogo"
+					label="TPL_ATUM_LOGIN_LOGO_LABEL"
+					description="TPL_ATUM_LOGIN_LOGO_DESCRIPTION">
 					<field
 						name="loginLogo"
 						type="media"
@@ -147,7 +150,10 @@
 						description="TPL_ATUM_LOGO_ALT_EMPTY_DESC"
 					/>
 				</fieldset>
-				<fieldset name="logoBrandLarge" label="TPL_ATUM_SITE_LOGO_LABEL">
+				<fieldset
+					name="logoBrandLarge"
+					label="TPL_ATUM_SITE_LOGO_LABEL"
+					description="TPL_ATUM_SITE_LOGO_DESCRIPTION">
 					<field
 						name="logoBrandLarge"
 						type="media"
@@ -168,7 +174,10 @@
 						description="TPL_ATUM_LOGO_ALT_EMPTY_DESC"
 					/>
 				</fieldset>
-				<fieldset name="logoBrandSmall" label="TPL_ATUM_SITE_LOGO_SMALL_LABEL">
+				<fieldset
+					name="logoBrandSmall"
+					label="TPL_ATUM_SITE_LOGO_SMALL_LABEL"
+					description="TPL_ATUM_SITE_LOGO_SMALL_DESCRIPTION">
 					<field
 						name="logoBrandSmall"
 						type="media"
diff --git a/api/components/com_banners/src/Controller/BannersController.php b/api/components/com_banners/src/Controller/BannersController.php
index 4fb7c9d5fbfae..27c29eb914275 100644
--- a/api/components/com_banners/src/Controller/BannersController.php
+++ b/api/components/com_banners/src/Controller/BannersController.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Banners\Api\Controller;
 
+use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\MVC\Controller\ApiController;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -38,4 +39,23 @@ class BannersController extends ApiController
      * @since  3.0
      */
     protected $default_view = 'banners';
+
+    /**
+     * Banner list view amended to add filtering of data
+     *
+     * @return  static  A BaseController object to support chaining.
+     *
+     * @since   6.1.0
+     */
+    public function displayList()
+    {
+        $apiFilterInfo = $this->input->get('filter', [], 'array');
+        $filter        = InputFilter::getInstance();
+
+        if (\array_key_exists('state', $apiFilterInfo)) {
+            $this->modelState->set('filter.published', $filter->clean($apiFilterInfo['state'], 'INT'));
+        }
+
+        return parent::displayList();
+    }
 }
diff --git a/api/components/com_categories/src/Controller/CategoriesController.php b/api/components/com_categories/src/Controller/CategoriesController.php
index fe44d00fa4416..6b11683d191c7 100644
--- a/api/components/com_categories/src/Controller/CategoriesController.php
+++ b/api/components/com_categories/src/Controller/CategoriesController.php
@@ -132,6 +132,10 @@ public function displayList()
             $this->modelState->set('filter.search', $filter->clean($apiFilterInfo['search'], 'STRING'));
         }
 
+        if (\array_key_exists('state', $apiFilterInfo)) {
+            $this->modelState->set('filter.published', $filter->clean($apiFilterInfo['state'], 'INT'));
+        }
+
         $this->modelState->set('filter.extension', $this->getExtensionFromInput());
 
         return parent::displayList();
@@ -149,4 +153,92 @@ private function getExtensionFromInput()
         return $this->input->exists('extension') ?
             $this->input->get('extension') : $this->input->post->get('extension');
     }
+
+    /**
+     * Method to check if you can add a new record.
+     *
+     * @param   array  $data  An array of input data.
+     *
+     * @return  boolean
+     *
+     * @since   6.1.3
+     */
+    protected function allowAdd($data = [])
+    {
+        $user      = $this->app->getIdentity();
+        $extension = $this->getExtensionFromInput();
+
+        // Require generic management permissions for the component
+        if (!$user->authorise('core.manage', $extension)) {
+            return false;
+        }
+
+        return $user->authorise('core.create', $extension) || \count($user->getAuthorisedCategories($extension, 'core.create'));
+    }
+
+
+    /**
+     * Method to check if you can edit a record.
+     *
+     * @param   array  $data  An array of input data.
+     *
+     * @return  boolean
+     *
+     * @since   6.1.3
+     */
+    protected function allowEdit($data = [], $key = 'id')
+    {
+        $recordId  = isset($data[$key]) ? (int) $data[$key] : 0;
+        $user      = $this->app->getIdentity();
+        $extension = $this->getExtensionFromInput();
+
+        // Require generic management permissions for the component
+        if (!$user->authorise('core.manage', $extension)) {
+            return false;
+        }
+
+        // Need to do a lookup from the model to get the owner
+        $record = $this->getModel('Category')->getItem($recordId);
+
+        if (empty($record) || $record->extension !== $extension) {
+            return false;
+        }
+
+        // Check "edit" permission on record asset (explicit or inherited)
+        if ($user->authorise('core.edit', $extension . '.category.' . $recordId)) {
+            return true;
+        }
+
+        // Check "edit own" permission on record asset (explicit or inherited)
+        if ($user->authorise('core.edit.own', $extension . '.category.' . $recordId)) {
+            $ownerId = $record->created_user_id;
+
+            // If the owner matches 'me' then do the test.
+            if ($ownerId == $user->id) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to check if it's allowed to delete a record
+     *
+     * @return  boolean
+     *
+     * @since   6.1.3
+     */
+    protected function allowDelete(): bool
+    {
+        $extension = $this->getExtensionFromInput();
+        $user      = $this->app->getIdentity();
+
+        // Require generic management permissions for the component
+        if (!$user->authorise('core.manage', $extension)) {
+            return false;
+        }
+
+        return $user->authorise('core.delete', $extension);
+    }
 }
diff --git a/api/components/com_config/src/Controller/ComponentController.php b/api/components/com_config/src/Controller/ComponentController.php
index 15809e9a093a3..0992ed165b5a0 100644
--- a/api/components/com_config/src/Controller/ComponentController.php
+++ b/api/components/com_config/src/Controller/ComponentController.php
@@ -172,6 +172,7 @@ public function edit()
      * @return  boolean
      *
      * @since   5.4.6
+     * @since   6.1.1
      */
     protected function allowEdit($data = [], $key = 'id')
     {
diff --git a/api/components/com_contact/src/Controller/ContactController.php b/api/components/com_contact/src/Controller/ContactController.php
index 5bbe70b31e375..e9f77ec0a790c 100644
--- a/api/components/com_contact/src/Controller/ContactController.php
+++ b/api/components/com_contact/src/Controller/ContactController.php
@@ -10,14 +10,19 @@
 
 namespace Joomla\Component\Contact\Api\Controller;
 
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Event\Contact\SubmitContactEvent;
 use Joomla\CMS\Event\Contact\ValidateContactEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Controller\ApiController;
 use Joomla\CMS\MVC\Controller\Exception\SendEmail;
@@ -29,7 +34,6 @@
 use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 use Joomla\Registry\Registry;
-use Joomla\String\Inflector;
 use PHPMailer\PHPMailer\Exception as phpMailerException;
 use Tobscure\JsonApi\Exception\InvalidParameterException;
 
@@ -42,9 +46,11 @@
  *
  * @since  4.0.0
  */
-class ContactController extends ApiController implements UserFactoryAwareInterface
+class ContactController extends ApiController implements UserFactoryAwareInterface, MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * The content type of the item.
@@ -99,7 +105,8 @@ public function submitForm($id = null)
             $id = $this->input->post->get('id', 0, 'int');
         }
 
-        $modelName = Inflector::singularize($this->contentType);
+        $inflector = InflectorFactory::create()->build();
+        $modelName = $inflector->singularize($this->contentType);
 
         /** @var  \Joomla\Component\Contact\Site\Model\ContactModel $model */
         $model = $this->getModel($modelName, 'Site');
@@ -231,7 +238,12 @@ private function _sendEmail($data, $contact, $emailCopyToSender)
         }
 
         try {
-            $mailer = new MailTemplate('com_contact.mail', $app->getLanguage()->getTag());
+            $mailer = new MailTemplate(
+                'com_contact.mail',
+                $app->getLanguage()->getTag(),
+                $this->getMailerFactory()->createMailer(),
+                $this->getLanguageFactory()
+            );
             $mailer->addRecipient($contact->email_to);
             $mailer->setReplyTo($templateData['email'], $templateData['name']);
             $mailer->addTemplateData($templateData);
@@ -239,7 +251,12 @@ private function _sendEmail($data, $contact, $emailCopyToSender)
 
             // If we are supposed to copy the sender, do so.
             if ($emailCopyToSender && !empty($data['contact_email_copy'])) {
-                $mailer = new MailTemplate('com_contact.mail.copy', $app->getLanguage()->getTag());
+                $mailer = new MailTemplate(
+                    'com_contact.mail.copy',
+                    $app->getLanguage()->getTag(),
+                    $this->getMailerFactory()->createMailer(),
+                    $this->getLanguageFactory()
+                );
                 $mailer->addRecipient($templateData['email']);
                 $mailer->setReplyTo($templateData['email'], $templateData['name']);
                 $mailer->addTemplateData($templateData);
diff --git a/api/components/com_contact/src/View/Contacts/JsonapiView.php b/api/components/com_contact/src/View/Contacts/JsonapiView.php
index 4036a77638264..00d8dfa5e24ed 100644
--- a/api/components/com_contact/src/View/Contacts/JsonapiView.php
+++ b/api/components/com_contact/src/View/Contacts/JsonapiView.php
@@ -10,8 +10,11 @@
 
 namespace Joomla\Component\Contact\Api\View\Contacts;
 
+use Joomla\CMS\Event\Model\PrepareDataEvent;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\MVC\View\JsonApiView as BaseApiView;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Component\Contact\Api\Serializer\ContactSerializer;
 use Joomla\Component\Content\Api\Helper\ContentHelper;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
@@ -71,6 +74,7 @@ class JsonapiView extends BaseApiView
         'sortname1',
         'sortname2',
         'sortname3',
+        'schemaorg',
     ];
 
     /**
@@ -92,6 +96,7 @@ class JsonapiView extends BaseApiView
         'image',
         'tags',
         'user_id',
+        'schemaorg',
     ];
 
     /**
@@ -209,6 +214,37 @@ protected function prepareItem($item)
             $item->image = ContentHelper::resolve($item->image);
         }
 
+        // Add schema.org data using existing plugin system
+        if (PluginHelper::isEnabled('system', 'schemaorg')) {
+            $item->schemaorg = $this->getSchemaOrg($item);
+        }
+
         return parent::prepareItem($item);
     }
+
+    /**
+     * Get schema.org structured data for a contact using the plugin system
+     *
+     * @param   object  $item  The contact item
+     *
+     * @return  array|null
+     *
+     * @since   6.1.0
+     */
+    protected function getSchemaOrg($item)
+    {
+        $context = 'com_contact.contact';
+
+        $event = new PrepareDataEvent('onContentPrepareData', ['context' => $context, 'data' => $item]);
+
+        PluginHelper::importPlugin('system', 'schemaorg');
+        Factory::getApplication()->getDispatcher()->dispatch('onContentPrepareData', $event);
+
+        if (isset($item->schema) && !empty($item->schema['schemaType'])) {
+            $schemaType = $item->schema['schemaType'];
+            return $item->schema[$schemaType] ?? null;
+        }
+
+        return null;
+    }
 }
diff --git a/api/components/com_content/src/Controller/ArticlesController.php b/api/components/com_content/src/Controller/ArticlesController.php
index e8873c291aade..8c972f9431168 100644
--- a/api/components/com_content/src/Controller/ArticlesController.php
+++ b/api/components/com_content/src/Controller/ArticlesController.php
@@ -82,10 +82,22 @@ public function displayList()
             $this->modelState->set('filter.language', $filter->clean($apiFilterInfo['language'], 'STRING'));
         }
 
+        if (\array_key_exists('modified_start', $apiFilterInfo)) {
+            $this->modelState->set('filter.modified_start', $filter->clean($apiFilterInfo['modified_start'], 'STRING'));
+        }
+
+        if (\array_key_exists('modified_end', $apiFilterInfo)) {
+            $this->modelState->set('filter.modified_end', $filter->clean($apiFilterInfo['modified_end'], 'STRING'));
+        }
+
         if (\array_key_exists('checked_out', $apiFilterInfo)) {
             $this->modelState->set('filter.checked_out', $filter->clean($apiFilterInfo['checked_out'], 'INT'));
         }
 
+        if (\array_key_exists('stage', $apiFilterInfo)) {
+            $this->modelState->set('filter.stage', $filter->clean($apiFilterInfo['stage'], 'INT'));
+        }
+
         $apiListInfo = $this->input->get('list', [], 'array');
 
         if (\array_key_exists('ordering', $apiListInfo)) {
diff --git a/api/components/com_content/src/View/Articles/JsonapiView.php b/api/components/com_content/src/View/Articles/JsonapiView.php
index 57274e0b6bac7..af8a96a5b32ae 100644
--- a/api/components/com_content/src/View/Articles/JsonapiView.php
+++ b/api/components/com_content/src/View/Articles/JsonapiView.php
@@ -10,7 +10,8 @@
 
 namespace Joomla\Component\Content\Api\View\Articles;
 
-use Joomla\CMS\Factory;
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
+use Joomla\CMS\Event\Model\PrepareDataEvent;
 use Joomla\CMS\Helper\TagsHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\MVC\View\JsonApiView as BaseApiView;
@@ -42,7 +43,13 @@ class JsonapiView extends BaseApiView
         'typeAlias',
         'asset_id',
         'title',
+    /**
+     * @deprecated  6.2.0 will be removed in 8.0
+     *              Will be removed without replacement.
+     */
         'text',
+        'introtext',
+        'fulltext',
         'tags',
         'language',
         'state',
@@ -67,6 +74,7 @@ class JsonapiView extends BaseApiView
         'version',
         'featured_up',
         'featured_down',
+        'schemaorg',
     ];
 
     /**
@@ -80,7 +88,13 @@ class JsonapiView extends BaseApiView
         'typeAlias',
         'asset_id',
         'title',
+    /**
+     * @deprecated  6.2.0 will be removed in 8.0
+     *              Will be removed without replacement.
+     */
         'text',
+        'introtext',
+        'fulltext',
         'tags',
         'language',
         'state',
@@ -104,6 +118,7 @@ class JsonapiView extends BaseApiView
         'version',
         'featured_up',
         'featured_down',
+        'schemaorg',
     ];
 
     /**
@@ -193,11 +208,24 @@ protected function prepareItem($item)
             return $item;
         }
 
+        /**
+         * @deprecated  6.2.0 will be removed in 8.0
+         *              Will be removed without replacement.
+         */
         $item->text = $item->introtext . ' ' . $item->fulltext;
 
+        $params = new Registry($item->params ?? '{}');
+
         // Process the content plugins.
-        PluginHelper::importPlugin('content');
-        Factory::getApplication()->triggerEvent('onContentPrepare', ['com_content.article', &$item, &$item->params]);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
+        $dispatcher->dispatch(
+            'onContentPrepare',
+            new ContentPrepareEvent(
+                'onContentPrepare',
+                ['context' => 'com_content.article', 'subject' => $item, 'params' => $params, 'page' => 0]
+            )
+        );
 
         foreach (FieldsHelper::getFields('com_content.article', $item, true) as $field) {
             $item->{$field->name} = $field->apivalue ?? $field->rawvalue;
@@ -245,6 +273,37 @@ protected function prepareItem($item)
             }
         }
 
+        // Add schema.org data using existing plugin system
+        if (PluginHelper::isEnabled('system', 'schemaorg')) {
+            $item->schemaorg = $this->getSchemaOrg($item);
+        }
+
         return parent::prepareItem($item);
     }
+
+    /**
+     * Get schema.org structured data for an article using the plugin system
+     *
+     * @param   object  $item  The article item
+     *
+     * @return  array|null
+     *
+     * @since   6.1.0
+     */
+    protected function getSchemaOrg($item)
+    {
+        $context = 'com_content.article';
+        $event   = new PrepareDataEvent('onContentPrepareData', ['context' => $context, 'data' => $item]);
+
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('system', 'schemaorg', true, $dispatcher);
+        $dispatcher->dispatch('onContentPrepareData', $event);
+
+        if (isset($item->schema) && !empty($item->schema['schemaType'])) {
+            $schemaType = $item->schema['schemaType'];
+            return $item->schema[$schemaType] ?? null;
+        }
+
+        return null;
+    }
 }
diff --git a/api/components/com_fields/src/Controller/FieldsController.php b/api/components/com_fields/src/Controller/FieldsController.php
index f98abb8eef2c2..da1fe66357dca 100644
--- a/api/components/com_fields/src/Controller/FieldsController.php
+++ b/api/components/com_fields/src/Controller/FieldsController.php
@@ -10,7 +10,7 @@
 
 namespace Joomla\Component\Fields\Api\Controller;
 
-use Joomla\CMS\Access\Exception\NotAllowed;
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\MVC\Controller\ApiController;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -92,13 +92,19 @@ private function getContextFromInput()
      *
      * @return  boolean
      *
-     * @since   5.4.7
+     * @since   6.1.2
      */
     protected function allowAdd($data = [])
     {
+        $user     = $this->app->getIdentity();
         [$option] = explode('.', $this->getContextFromInput());
 
-        return $this->app->getIdentity()->authorise('core.create', $option);
+        // Require generic management permissions for the component
+        if (!$user->authorise('core.manage', $option)) {
+            return false;
+        }
+
+        return $user->authorise('core.create', $option);
     }
 
     /**
@@ -111,7 +117,7 @@ protected function allowAdd($data = [])
      *
      * @return  boolean
      *
-     * @since   5.4.7
+     * @since   6.1.2
      */
     protected function allowEdit($data = [], $key = 'id')
     {
@@ -119,11 +125,31 @@ protected function allowEdit($data = [], $key = 'id')
         $user     = $this->app->getIdentity();
         [$option] = explode('.', $this->getContextFromInput());
 
+        // Require generic management permissions for the component
+        if (!$user->authorise('core.manage', $option)) {
+            return false;
+        }
+
         // Zero record (id:0), return component edit permission by calling parent controller method
         if (!$recordId) {
             return $user->authorise('core.edit', $option);
         }
 
+        // Get existing record
+        $inflector = InflectorFactory::create()->build();
+        $record    = $this->getModel($inflector->singularize($this->contentType))->getItem($recordId);
+
+        if (empty($record)) {
+            return false;
+        }
+
+        [$recordOption] = explode('.', $record->context);
+
+        // Validate request context and field context match
+        if ($recordOption !== $option) {
+            return false;
+        }
+
         // Check edit on the record asset (explicit or inherited)
         if ($user->authorise('core.edit', $option . '.field.' . $recordId)) {
             return true;
@@ -131,13 +157,6 @@ protected function allowEdit($data = [], $key = 'id')
 
         // Check edit own on the record asset (explicit or inherited)
         if ($user->authorise('core.edit.own', $option . '.field.' . $recordId)) {
-            // Existing record already has an owner, get it
-            $record = $this->getModel()->getItem($recordId);
-
-            if (empty($record)) {
-                return false;
-            }
-
             // Grant if current user is owner of the record
             return $user->id == $record->created_user_id;
         }
@@ -146,22 +165,22 @@ protected function allowEdit($data = [], $key = 'id')
     }
 
     /**
-     * Removes an item.
-     *
-     * @param   integer  $id  The primary key to delete item.
+     * Method to check if it's allowed to delete a record
      *
-     * @return  void
+     * @return  boolean
      *
-     * @since   5.4.7
+     * @since   6.1.3
      */
-    public function delete($id = null)
+    protected function allowDelete(): bool
     {
         [$option] = explode('.', $this->getContextFromInput());
+        $user     = $this->app->getIdentity();
 
-        if (!$this->app->getIdentity()->authorise('core.delete', $option)) {
-            throw new NotAllowed('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED', 403);
+        // Require generic management permissions for the component
+        if (!$user->authorise('core.manage', $option)) {
+            return false;
         }
 
-        parent::delete($id);
+        return $user->authorise('core.delete', $option);
     }
 }
diff --git a/api/components/com_fields/src/Controller/GroupsController.php b/api/components/com_fields/src/Controller/GroupsController.php
index aafe4b64625f4..d70b58872db27 100644
--- a/api/components/com_fields/src/Controller/GroupsController.php
+++ b/api/components/com_fields/src/Controller/GroupsController.php
@@ -10,7 +10,7 @@
 
 namespace Joomla\Component\Fields\Api\Controller;
 
-use Joomla\CMS\Access\Exception\NotAllowed;
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\MVC\Controller\ApiController;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -92,13 +92,18 @@ private function getContextFromInput()
      *
      * @return  boolean
      *
-     * @since   5.4.7
+     * @since   6.1.2
      */
     protected function allowAdd($data = [])
     {
+        $user     = $this->app->getIdentity();
         [$option] = explode('.', $this->getContextFromInput());
 
-        return $this->app->getIdentity()->authorise('core.create', $option);
+        if (!$user->authorise('core.manage', $option)) {
+            return false;
+        }
+
+        return $user->authorise('core.create', $option);
     }
 
     /**
@@ -111,7 +116,7 @@ protected function allowAdd($data = [])
      *
      * @return  boolean
      *
-     * @since   5.4.7
+     * @since   6.1.2
      */
     protected function allowEdit($data = [], $key = 'parent_id')
     {
@@ -119,11 +124,31 @@ protected function allowEdit($data = [], $key = 'parent_id')
         $user     = $this->app->getIdentity();
         [$option] = explode('.', $this->getContextFromInput());
 
+        // Require generic management permissions for the component
+        if (!$user->authorise('core.manage', $option)) {
+            return false;
+        }
+
         // Zero record (id:0), return component edit permission by calling parent controller method
         if (!$recordId) {
             return $user->authorise('core.edit', $option);
         }
 
+        // Get existing record
+        $inflector = InflectorFactory::create()->build();
+        $record    = $this->getModel($inflector->singularize($this->contentType))->getItem($recordId);
+
+        if (empty($record)) {
+            return false;
+        }
+
+        [$recordOption] = explode('.', $record->context);
+
+        // Validate request context and field context match
+        if ($recordOption !== $option) {
+            return false;
+        }
+
         // Check edit on the record asset (explicit or inherited)
         if ($user->authorise('core.edit', $option . '.fieldgroup.' . $recordId)) {
             return true;
@@ -146,22 +171,22 @@ protected function allowEdit($data = [], $key = 'parent_id')
     }
 
     /**
-     * Removes an item.
+     * Method to check if it's allowed to delete a record
      *
-     * @param   integer  $id  The primary key to delete item.
-     *
-     * @return  void
+     * @return  boolean
      *
-     * @since   5.4.7
+     * @since   6.1.3
      */
-    public function delete($id = null)
+    protected function allowDelete(): bool
     {
         [$option] = explode('.', $this->getContextFromInput());
+        $user     = $this->app->getIdentity();
 
-        if (!$this->app->getIdentity()->authorise('core.delete', $option)) {
-            throw new NotAllowed('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED', 403);
+        // Require generic management permissions for the component
+        if (!$user->authorise('core.manage', $option)) {
+            return false;
         }
 
-        parent::delete($id);
+        return $user->authorise('core.delete', $option);
     }
 }
diff --git a/api/components/com_joomlaupdate/src/Controller/BaseController.php b/api/components/com_joomlaupdate/src/Controller/BaseController.php
index 01921242d5726..4c2125a00266d 100644
--- a/api/components/com_joomlaupdate/src/Controller/BaseController.php
+++ b/api/components/com_joomlaupdate/src/Controller/BaseController.php
@@ -22,7 +22,7 @@ abstract class BaseController extends ApiController
      *
      * @return void
      *
-     * @since 5.4.0
+     * @since 6.0.0
      *
      * @throws \Exception
      */
diff --git a/api/components/com_joomlaupdate/src/Controller/HealthcheckController.php b/api/components/com_joomlaupdate/src/Controller/HealthcheckController.php
index 044949636d224..57998b47f40c8 100644
--- a/api/components/com_joomlaupdate/src/Controller/HealthcheckController.php
+++ b/api/components/com_joomlaupdate/src/Controller/HealthcheckController.php
@@ -20,7 +20,7 @@
 /**
  * The healthcheck controller
  *
- * @since  5.4.0
+ * @since  6.0.0
  */
 class HealthcheckController extends BaseController
 {
@@ -28,7 +28,7 @@ class HealthcheckController extends BaseController
      * The content type of the item.
      *
      * @var    string
-     * @since  5.4.0
+     * @since  6.0.0
      */
     protected $contentType = 'healthcheck';
 
@@ -36,7 +36,7 @@ class HealthcheckController extends BaseController
      * The default view for the display method.
      *
      * @var    string
-     * @since  5.4.0
+     * @since  6.0.0
      */
     protected $default_view = 'healthcheck';
 
@@ -45,7 +45,7 @@ class HealthcheckController extends BaseController
      *
      * @return HealthcheckController
      *
-     * @since 5.4.0
+     * @since 6.0.0
      */
     public function show()
     {
@@ -94,7 +94,7 @@ public function show()
      *
      * @return  static  A \JControllerLegacy object to support chaining.
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     public function displayItem($id = null)
     {
@@ -106,7 +106,7 @@ public function displayItem($id = null)
      *
      * @return  static  A BaseController object to support chaining.
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     public function displayList()
     {
@@ -120,7 +120,7 @@ public function displayList()
      *
      * @return  void
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     public function delete($id = null)
     {
@@ -137,7 +137,7 @@ public function delete($id = null)
      *
      * @return  boolean
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     protected function allowEdit($data = [], $key = 'id')
     {
@@ -153,7 +153,7 @@ protected function allowEdit($data = [], $key = 'id')
      *
      * @return  boolean
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     protected function allowAdd($data = [])
     {
diff --git a/api/components/com_joomlaupdate/src/Controller/NotificationController.php b/api/components/com_joomlaupdate/src/Controller/NotificationController.php
index da52aa37fc63b..359004d8ab0c8 100644
--- a/api/components/com_joomlaupdate/src/Controller/NotificationController.php
+++ b/api/components/com_joomlaupdate/src/Controller/NotificationController.php
@@ -21,7 +21,7 @@
 /**
  * The updates controller
  *
- * @since  5.4.0
+ * @since  6.0.0
  */
 class NotificationController extends BaseController
 {
@@ -29,7 +29,7 @@ class NotificationController extends BaseController
      * The content type of the item.
      *
      * @var    string
-     * @since  5.4.0
+     * @since  6.0.0
      */
     protected $contentType = 'notification';
 
@@ -37,7 +37,7 @@ class NotificationController extends BaseController
      * The default view for the display method.
      *
      * @var string
-     * @since  5.4.0
+     * @since  6.0.0
      */
     protected $default_view = 'notification';
 
@@ -65,7 +65,7 @@ public function failed()
      *
      * @return NotificationController
      *
-     * @since  5.4.0
+     * @since  6.0.0
      */
     public function success()
     {
@@ -126,7 +126,7 @@ protected function prepareView()
      *
      * @return  static  A \JControllerLegacy object to support chaining.
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     public function displayItem($id = null)
     {
@@ -138,7 +138,7 @@ public function displayItem($id = null)
      *
      * @return  static  A BaseController object to support chaining.
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     public function displayList()
     {
@@ -152,7 +152,7 @@ public function displayList()
      *
      * @return  void
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     public function delete($id = null)
     {
@@ -169,7 +169,7 @@ public function delete($id = null)
      *
      * @return  boolean
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     protected function allowEdit($data = [], $key = 'id')
     {
@@ -185,7 +185,7 @@ protected function allowEdit($data = [], $key = 'id')
      *
      * @return  boolean
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     protected function allowAdd($data = [])
     {
diff --git a/api/components/com_joomlaupdate/src/Controller/UpdatesController.php b/api/components/com_joomlaupdate/src/Controller/UpdatesController.php
index 957906812dde0..439ca63955943 100644
--- a/api/components/com_joomlaupdate/src/Controller/UpdatesController.php
+++ b/api/components/com_joomlaupdate/src/Controller/UpdatesController.php
@@ -20,7 +20,7 @@
 /**
  * The updates controller
  *
- * @since  5.4.0
+ * @since  6.0.0
  */
 class UpdatesController extends BaseController
 {
@@ -28,7 +28,7 @@ class UpdatesController extends BaseController
      * The content type of the item.
      *
      * @var    string
-     * @since  5.4.0
+     * @since  6.0.0
      */
     protected $contentType = 'updates';
 
@@ -36,7 +36,7 @@ class UpdatesController extends BaseController
      * The default view for the display method.
      *
      * @var string
-     * @since  5.4.0
+     * @since  6.0.0
      */
     protected $default_view = 'updates';
 
@@ -61,7 +61,7 @@ public function getUpdate()
      *
      * @return UpdatesController
      *
-     * @since  5.4.0
+     * @since  6.0.0
      */
     public function prepareUpdate()
     {
@@ -154,7 +154,7 @@ protected function prepareView()
      *
      * @return  static  A \JControllerLegacy object to support chaining.
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     public function displayItem($id = null)
     {
@@ -166,7 +166,7 @@ public function displayItem($id = null)
      *
      * @return  static  A BaseController object to support chaining.
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     public function displayList()
     {
@@ -180,7 +180,7 @@ public function displayList()
      *
      * @return  void
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     public function delete($id = null)
     {
@@ -197,7 +197,7 @@ public function delete($id = null)
      *
      * @return  boolean
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     protected function allowEdit($data = [], $key = 'id')
     {
@@ -213,7 +213,7 @@ protected function allowEdit($data = [], $key = 'id')
      *
      * @return  boolean
      *
-     * @since   5.4.0
+     * @since   6.0.0
      */
     protected function allowAdd($data = [])
     {
diff --git a/api/components/com_languages/src/Controller/OverridesController.php b/api/components/com_languages/src/Controller/OverridesController.php
index 3bc20ec0ef9e8..1eb8e3528e378 100644
--- a/api/components/com_languages/src/Controller/OverridesController.php
+++ b/api/components/com_languages/src/Controller/OverridesController.php
@@ -10,11 +10,11 @@
 
 namespace Joomla\Component\Languages\Api\Controller;
 
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\ApiController;
 use Joomla\CMS\MVC\Controller\Exception;
-use Joomla\String\Inflector;
 use Tobscure\JsonApi\Exception\InvalidParameterException;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -87,8 +87,11 @@ public function displayList()
      */
     protected function save($recordKey = null)
     {
+        $inflector = InflectorFactory::create()->build();
+        $modelName = $inflector->singularize($this->contentType);
+
         /** @var \Joomla\CMS\MVC\Model\AdminModel $model */
-        $model = $this->getModel(Inflector::singularize($this->contentType));
+        $model = $this->getModel($modelName);
 
         if (!$model) {
             throw new \RuntimeException(Text::_('JLIB_APPLICATION_ERROR_MODEL_CREATE'));
diff --git a/api/components/com_media/src/Controller/MediaController.php b/api/components/com_media/src/Controller/MediaController.php
index eb53e194a85d6..3dd34e09488c4 100644
--- a/api/components/com_media/src/Controller/MediaController.php
+++ b/api/components/com_media/src/Controller/MediaController.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Media\Api\Controller;
 
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\Access\Exception\NotAllowed;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Filter\InputFilter;
@@ -19,7 +20,6 @@
 use Joomla\Component\Media\Administrator\Exception\InvalidPathException;
 use Joomla\Component\Media\Administrator\Provider\ProviderManagerHelperTrait;
 use Joomla\Component\Media\Api\Model\MediumModel;
-use Joomla\String\Inflector;
 use Tobscure\JsonApi\Exception\InvalidParameterException;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -243,6 +243,11 @@ protected function allowAdd($data = []): bool
     {
         $user = $this->app->getIdentity();
 
+        // Require generic management permissions for the component
+        if (!$user->authorise('core.manage', 'com_media')) {
+            return false;
+        }
+
         // In the override mode, adding a file will override and therefore edit an existing file
         if ($this->input->json->get('override', false)) {
             return $user->authorise('core.edit', 'com_media');
@@ -303,6 +308,11 @@ protected function allowEdit($data = [], $key = 'id'): bool
     {
         $user = $this->app->getIdentity();
 
+        // Require generic management permissions for the component
+        if (!$user->authorise('core.manage', 'com_media')) {
+            return false;
+        }
+
         // com_media's access rules contains no specific update rule.
         return $user->authorise('core.edit', 'com_media');
     }
@@ -319,7 +329,8 @@ protected function allowEdit($data = [], $key = 'id'): bool
     protected function save($recordKey = null)
     {
         // Explicitly get the single item model name.
-        $modelName = $this->input->get('model', Inflector::singularize($this->contentType));
+        $inflector = InflectorFactory::create()->build();
+        $modelName = $this->input->get('model', $inflector->singularize($this->contentType));
 
         /** @var MediumModel $model */
         $model = $this->getModel($modelName, '', ['ignore_request' => true, 'state' => $this->modelState]);
@@ -382,7 +393,8 @@ public function delete($id = null): void
 
         $this->modelState->set('path', $this->input->get('path', '', 'STRING'));
 
-        $modelName = $this->input->get('model', Inflector::singularize($this->contentType));
+        $inflector = InflectorFactory::create()->build();
+        $modelName = $this->input->get('model', $inflector->singularize($this->contentType));
         $model     = $this->getModel($modelName, '', ['ignore_request' => true, 'state' => $this->modelState]);
 
         $model->delete();
@@ -401,6 +413,11 @@ protected function allowDelete(): bool
     {
         $user = $this->app->getIdentity();
 
+        // Require generic management permissions for the component
+        if (!$user->authorise('core.manage', 'com_media')) {
+            return false;
+        }
+
         return $user->authorise('core.delete', 'com_media');
     }
 }
diff --git a/api/components/com_plugins/src/Controller/PluginsController.php b/api/components/com_plugins/src/Controller/PluginsController.php
index a402d46dd2a11..f487cf0d53e07 100644
--- a/api/components/com_plugins/src/Controller/PluginsController.php
+++ b/api/components/com_plugins/src/Controller/PluginsController.php
@@ -10,12 +10,12 @@
 
 namespace Joomla\Component\Plugins\Api\Controller;
 
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Controller\ApiController;
 use Joomla\CMS\MVC\Controller\Exception;
 use Joomla\CMS\Router\Exception\RouteNotFoundException;
-use Joomla\String\Inflector;
 use Tobscure\JsonApi\Exception\InvalidParameterException;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -70,7 +70,8 @@ public function edit()
         }
 
         /** @var \Joomla\Component\Plugins\Administrator\Model\PluginModel $model */
-        $model = $this->getModel(Inflector::singularize($this->contentType), '', ['ignore_request' => true]);
+        $inflector = InflectorFactory::create()->build();
+        $model     = $this->getModel($inflector->singularize($this->contentType), '', ['ignore_request' => true]);
 
         if (!$model) {
             throw new \RuntimeException(Text::_('JLIB_APPLICATION_ERROR_MODEL_CREATE'));
diff --git a/api/components/com_privacy/src/Controller/ConsentsController.php b/api/components/com_privacy/src/Controller/ConsentsController.php
index 770a2e26491f9..950bcdd4b83f7 100644
--- a/api/components/com_privacy/src/Controller/ConsentsController.php
+++ b/api/components/com_privacy/src/Controller/ConsentsController.php
@@ -69,7 +69,7 @@ public function displayItem($id = null)
      *
      * @return  static  A \JControllerLegacy object to support chaining.
      *
-     * @since   5.4.7
+     * @since   6.1.2
      */
     public function displayList()
     {
diff --git a/api/components/com_privacy/src/Controller/RequestsController.php b/api/components/com_privacy/src/Controller/RequestsController.php
index a301a318bb473..eddfde719cafc 100644
--- a/api/components/com_privacy/src/Controller/RequestsController.php
+++ b/api/components/com_privacy/src/Controller/RequestsController.php
@@ -48,7 +48,7 @@ class RequestsController extends ApiController
      *
      * @return  static  A \JControllerLegacy object to support chaining.
      *
-     * @since   5.4.7
+     * @since   6.1.2
      */
     public function displayItem($id = null)
     {
@@ -64,7 +64,7 @@ public function displayItem($id = null)
      *
      * @return  static  A \JControllerLegacy object to support chaining.
      *
-     * @since   5.4.7
+     * @since   6.1.2
      */
     public function displayList()
     {
diff --git a/api/components/com_templates/src/Controller/StylesController.php b/api/components/com_templates/src/Controller/StylesController.php
index e973c2bfb50fc..319a3ed77dc46 100644
--- a/api/components/com_templates/src/Controller/StylesController.php
+++ b/api/components/com_templates/src/Controller/StylesController.php
@@ -10,8 +10,8 @@
 
 namespace Joomla\Component\Templates\Api\Controller;
 
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\MVC\Controller\ApiController;
-use Joomla\String\Inflector;
 use Tobscure\JsonApi\Exception\InvalidParameterException;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -91,7 +91,8 @@ protected function preprocessSaveData(array $data): array
                 unset($data['template']);
             }
 
-            $model            = $this->getModel(Inflector::singularize($this->contentType), '', ['ignore_request' => true]);
+            $inflector        = InflectorFactory::create()->build();
+            $model            = $this->getModel($inflector->singularize($this->contentType), '', ['ignore_request' => true]);
             $data['template'] = $model->getItem($this->input->getInt('id'))->template;
         }
 
diff --git a/api/components/com_users/src/Controller/GroupsController.php b/api/components/com_users/src/Controller/GroupsController.php
index beb644d7b606d..4d55cd5b3827c 100644
--- a/api/components/com_users/src/Controller/GroupsController.php
+++ b/api/components/com_users/src/Controller/GroupsController.php
@@ -48,6 +48,7 @@ class GroupsController extends ApiController
      * @return  void
      *
      * @since   5.4.6
+     * @since   6.1.1
      */
     public function delete($id = null)
     {
@@ -65,7 +66,7 @@ public function delete($id = null)
      *
      * @return  boolean
      *
-     * @since   5.4.6
+     * @since   6.1.1
      */
     public function allowAdd($data = [])
     {
@@ -81,7 +82,7 @@ public function allowAdd($data = [])
      *
      * @return  boolean
      *
-     * @since   5.4.6
+     * @since   6.1.1
      */
     public function allowEdit($data = [], $key = 'id')
     {
diff --git a/api/components/com_users/src/Controller/LevelsController.php b/api/components/com_users/src/Controller/LevelsController.php
index f9ba6fbaeb965..65ffeac9c231c 100644
--- a/api/components/com_users/src/Controller/LevelsController.php
+++ b/api/components/com_users/src/Controller/LevelsController.php
@@ -46,7 +46,7 @@ class LevelsController extends ApiController
      *
      * @return  array
      *
-     * @since   5.4.7
+     * @since   6.2.0
      */
     protected function preprocessSaveData(array $data): array
     {
diff --git a/api/index.php b/api/index.php
index 39b7bd8adceda..1c5503555e75d 100644
--- a/api/index.php
+++ b/api/index.php
@@ -10,7 +10,7 @@
 // NOTE: This file should remain compatible with PHP 5.2 to allow us to run our PHP minimum check and show a friendly error message
 
 // Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
-\define('JOOMLA_MINIMUM_PHP', '8.1.0');
+\define('JOOMLA_MINIMUM_PHP', '8.3.0');
 
 if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<')) {
     header('HTTP/1.1 500 Internal Server Error');
diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml
index 5140dd502989d..893b7100a260d 100644
--- a/api/language/en-GB/install.xml
+++ b/api/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension client="api" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>5.4.8</version>
+	<version>6.2.0</version>
 	<creationDate>2026-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini
index 3ec784a0409df..18fde5672d4c2 100644
--- a/api/language/en-GB/joomla.ini
+++ b/api/language/en-GB/joomla.ini
@@ -219,8 +219,11 @@ JFIELD_COLOR_LABEL_SLIDER_HUE="Hue Slider"
 JFIELD_COLOR_LABEL_SLIDER_INPUT="Selected Colour Value"
 JFIELD_COLOR_LABEL_SLIDER_LIGHT="Light Slider"
 JFIELD_COLOR_LABEL_SLIDER_SATURATION="Saturation Slider"
+; The following string is deprecated and will be removed with 7.0
 JFIELD_COLOR_SELECT="Select a colour"
+; The following string is deprecated and will be removed with 7.0
 JFIELD_COLOR_TRANSPARENT="No colour, transparent"
+; The following string is deprecated and will be removed with 7.0
 JFIELD_COLOR_VALUE="Colour with hexadecimal value of"
 JFIELD_DISPLAY_READONLY_LABEL="Display When Read-Only"
 JFIELD_ENABLED_DESC="The enabled status of this item."
@@ -643,6 +646,7 @@ JGLOBAL_SHOW_READMORE_TITLE_DESC="If set to show the title of the Article will b
 JGLOBAL_SHOW_READMORE_TITLE_LABEL="Read More with Title"
 JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC="Show or hide the subcategories descriptions."
 JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL="Subcategories Descriptions"
+JGLOBAL_SHOW_SUBCATEGORIES_IMAGE_LABEL="Subcategories Image"
 JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC="If None, only articles from this category will show. If a number, all articles from the category and the subcategories up to and including that level will show in the blog."
 JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL="Include Subcategories"
 JGLOBAL_SHOW_SUBCATEGORY_HEADING="Subcategories Heading"
@@ -683,8 +687,6 @@ JGLOBAL_VOTES="Votes"
 JGLOBAL_VOTES_ASC="Votes ascending"
 JGLOBAL_VOTES_DESC="Votes descending"
 JGLOBAL_WARNCOOKIES="Warning! Cookies must be enabled to access the Administrator Backend."
-; @deprecated 5.0 will be removed in 6.0
-JGLOBAL_WARNIE="Warning! Internet Explorer should not be used for proper operation of the Administrator Backend."
 JGLOBAL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper operation of the Administrator Backend."
 JGLOBAL_WIDTH="Width"
 
@@ -915,6 +917,7 @@ PHPMAILER_RECIPIENTS_FAILED="SMTP Error! The following recipients failed: "
 PHPMAILER_SIGNING_ERROR="Signing error: "
 PHPMAILER_SMTP_CONNECT_FAILED="SMTP connect failed"
 PHPMAILER_SMTP_ERROR="SMTP server error: "
+; Deprecated, will be removed with 7.0
 PHPMAILER_TLS="Could not start TLS"
 PHPMAILER_VARIABLE_SET="Can't set or reset variable: "
 
diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml
index eb2060e268897..b4225492b0423 100644
--- a/api/language/en-GB/langmetadata.xml
+++ b/api/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="api">
 	<name>English (en-GB)</name>
-	<version>5.4.8</version>
+	<version>6.2.0</version>
 	<creationDate>2026-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 494ad4fd69769..0000000000000
--- a/build.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="joomla" default="build" basedir=".">
-	<property name="source" value="." />
-	<property name="joomlasource" value="administrator,cli,components,includes,installation,language/en-GB,libraries/src,modules,plugins,templates" />
-
-	<target name="clean" description="Clean up and create artifact directories">
-		<delete dir="${basedir}/build/api" />
-		<delete dir="${basedir}/build/coverage" />
-		<delete dir="${basedir}/build/logs" />
-		<delete dir="${basedir}/build/pdepend" />
-
-		<mkdir dir="${basedir}/build/api" />
-		<mkdir dir="${basedir}/build/coverage" />
-		<mkdir dir="${basedir}/build/logs" />
-		<mkdir dir="${basedir}/build/pdepend" />
-	</target>
-
-	<target name="phpunit" description="Run unit tests using PHPUnit and generates junit.xml and clover.xml">
-		<exec executable="${basedir}/libraries/vendor/bin/phpunit">
-			<arg value="-d" />
-			<arg value="zend.enable_gc=0" />
-		</exec>
-	</target>
-
-	<target name="parallelTasks" description="Run the pdepend, phpmd and phpcs tasks in parallel using a maximum of 2 threads.">
-		<parallel threadCount="2">
-			<sequential>
-				<antcall target="pdepend" />
-				<antcall target="phpmd" />
-			</sequential>
-			<antcall target="phpcs" />
-		</parallel>
-	</target>
-
-	<target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer">
-		<exec executable="phpcs">
-			<arg value="--report=checkstyle" />
-			<arg value="--extensions=php" />
-			<arg value="--encoding=utf-8" />
-			<arg value="-p" />
-			<arg value="--report-file=${basedir}/build/logs/checkstyle.xml" />
-			<arg value="--standard=${basedir}/libraries/vendor/joomla/cms-coding-standards/lib/Joomla-CMS" />
-			<arg path="${source}" />
-		</exec>
-	</target>
-
-	<target name="pdepend" description="Generate jdepend.xml and software metrics charts using PHP_Depend">
-		<exec executable="pdepend">
-			<arg value="--jdepend-xml=${basedir}/build/logs/jdepend.xml" />
-			<arg value="--jdepend-chart=${basedir}/build/pdepend/dependencies.svg" />
-			<arg value="--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg" />
-			<arg value="--ignore=build,tests" />
-			<arg path="${source}" />
-		</exec>
-	</target>
-
-	<target name="installdep" description="Install build dependencies using composer">
-		<exec executable="composer">
-			<arg value="update" />
-			<arg value="--no-dev" />
-		</exec>
-	</target>
-
-	<target name="phpmd" description="Generate pmd.xml using PHPMD">
-		<exec executable="phpmd">
-			<arg path="${joomlasource}" />
-			<arg value="xml" />
-			<arg value="${basedir}/build/phpmd.xml" />
-			<arg value="--reportfile" />
-			<arg value="${basedir}/build/logs/pmd.xml" />
-		</exec>
-	</target>
-
-	<target name="phpdoc" description="Generate API documentation using phpDocumentor">
-		<exec executable="phpdoc">
-			<arg value="-i" />
-			<arg path="${basedir}/libraries/vendor/joomla/*/Tests/,${basedir}/libraries/vendor/joomla/string/src/phputf8/,${basedir}/libraries/vendor/composer/,${basedir}/libraries/vendor/joomla/event/vendor/,${basedir}/libraries/vendor/joomla/session/Joomla/Session/_Tests/,${basedir}/libraries/vendor/joomla/session/Joomla/Session/Tests/,${basedir}/libraries/idna_convert/" />
-			<arg value="-d" />
-			<arg path="${basedir}/libraries/src/,${basedir}/libraries/vendor/joomla/" />
-			<arg value="-f" />
-			<arg path="${basedir}/libraries/loader.php" />
-			<arg value="-t" />
-			<arg path="${basedir}/build/api/" />
-			<arg value="--template" />
-			<arg value="joomla" />
-			<arg value="--title" />
-			<arg value="Joomla! CMS 5.4 API" />
-		</exec>
-	</target>
-
-	<target name="lint" description="Perform syntax check of source code files">
-		<apply executable="php" failonerror="true">
-			<arg value="-l" />
-
-			<fileset dir="${basedir}/administrator">
-				<include name="**/*.php" />
-				<modified />
-			</fileset>
-
-			<fileset dir="${basedir}/cli">
-				<include name="**/*.php" />
-				<modified />
-			</fileset>
-
-			<fileset dir="${basedir}/components">
-				<include name="**/*.php" />
-				<modified />
-			</fileset>
-
-			<fileset dir="${basedir}/installation">
-				<include name="**/*.php" />
-				<modified />
-			</fileset>
-
-			<fileset dir="${basedir}/includes">
-				<include name="**/*.php" />
-				<modified />
-			</fileset>
-
-			<fileset dir="${basedir}/language/en-GB">
-				<include name="**/*.php" />
-				<modified />
-			</fileset>
-
-			<fileset dir="${basedir}/libraries">
-				<include name="**/*.php" />
-				<modified />
-			</fileset>
-
-			<fileset dir="${basedir}/modules">
-				<include name="**/*.php" />
-				<modified />
-			</fileset>
-
-			<fileset dir="${basedir}/templates">
-				<include name="**/*.php" />
-				<modified />
-			</fileset>
-		</apply>
-	</target>
-
-	<target name="make-updatecomponent" description="Create an installable package from the com_joomlaupdate component" >
-		<delete dir="${basedir}/build/com_joomlaupdate-pkg" includeemptydirs="true" failonerror="false" />
-		<mkdir dir="${basedir}/build/com_joomlaupdate-pkg" />
-		<echo message="Create com_joomlaupdate package" />
-		<mkdir dir="${basedir}/build/com_joomlaupdate-pkg/staging" />
-		<mkdir dir="${basedir}/build/com_joomlaupdate-pkg/staging/admin" />
-		<copy todir="${basedir}/build/com_joomlaupdate-pkg/staging/admin">
-			<fileset dir="${basedir}/administrator/components/com_joomlaupdate" />
-		</copy>
-		<move file="${basedir}/build/com_joomlaupdate-pkg/staging/admin/joomlaupdate.xml" todir="${basedir}/build/com_joomlaupdate-pkg/staging" />
-		<echo message="Copy the media folder" />
-		<copy todir="${basedir}/build/com_joomlaupdate-pkg/staging/media/js">
-			<fileset dir="${basedir}/media/com_joomlaupdate/js" />
-		</copy>
-		<echo message="Copy language files" />
-		<mkdir dir="${basedir}/build/com_joomlaupdate-pkg/staging/admin/language" />
-		<copyfile src="${basedir}/administrator/language/en-GB/com_joomlaupdate.ini" dest="${basedir}/build/com_joomlaupdate-pkg/staging/admin/language/en-GB/com_joomlaupdate.ini"/>
-		<copyfile src="${basedir}/administrator/language/en-GB/com_joomlaupdate.sys.ini" dest="${basedir}/build/com_joomlaupdate-pkg/staging/admin/language/en-GB/com_joomlaupdate.sys.ini"/>
-		<echo message="Archiving package" />
-		<mkdir dir="${basedir}/build/com_joomlaupdate-pkg/packages" />
-		<zip destfile="${basedir}/build/com_joomlaupdate-pkg/packages/com_joomlaupdate.zip" basedir="${basedir}/build/com_joomlaupdate-pkg/staging" />
-	</target>
-
-	<target name="build" depends="clean,phpunit,parallelTasks" />
-</project>
diff --git a/build/README.md b/build/README.md
index d9509e73624da..fd7d2899f6d2b 100644
--- a/build/README.md
+++ b/build/README.md
@@ -6,65 +6,34 @@ Joomla provides a set of tools for managing static assets and dependencies based
 The responsibilities of these tools are:
 - To copy files from the `node-modules` folder to the `media` folder.
 - Do any transformations on the copied files.
-- Update the version numbers on the XML files of the TinyMCE and CodeMirror editors.
-- Copy files from the `build/media_source` folder to the `media` folder.
+- Copy files from the `media_source/` folder to the `media` folder.
 - Transform any modern JS to ES2017 and transpile it to ES5.
 - Transform any SCSS file to the respective CSS file.
 
 For some of these operations, conventions were established to simplify and speed up the process.
 
-## Javascript
-There are three options here:
-- Modern Javascript files must have an extension `.es6.js`.
-  This allows ESLint to check the code style, Joomla is using the Airbnb preset https://github.com/airbnb/javascript.
-  It also instructs Rollup to do the transforms for ES2017. This step creates both normal and minified files.
-  Production code WILL NOT have the `.es6` part for ES2017+ files.
+Read more at [CMS Media source](../media_source/README.md).
 
-- Web Component Javascript files must have an extension `.w-c.es6.js`.
-  This allows ESLint to check the code style and instructs Rollup to do the transforms for ES2017. This step creates normal and minified files. The difference with the `.es6` files is that the tools will automate the minification of the CSS (assuming that the appropriate SCSS file exists), which is then injected into the JS file in place of the placeholder `{{CSS_CONTENTS_PLACEHOLDER}}` (ie: `build/media_source/system/js/joomla-core-loader.w-c.es6.js`)
-  Production code WILL NOT have the `.w-c.es6` part for ES2017+.
 
-- Legacy Javascript files must have an extension `.es5.js`.
-  This instructs ESLint to skip checking this file.
-  Also, it instructs the tools to create a minified version (production code WILL NOT have the `.es5` part)
-
-- Javascript files with only an extension `.js`.
-  These files will be ignored by the build tools.
-
-## SCSS
-- SCSS files starting with `_` will not become entry points for SCSS.
-  SCSS files will be transformed to CSS, both normal and minified versions.
-
-## CSS
-- CSS files will only get minified.
+## NPM Commands
 
+- `npm run builders-list` Show list of available builders in order of execution.
+- `npm run build` Build assets with production env. Extra arguments are required. Check [CMS Media source](../media_source/README.md#building-assets).
+- `npm run build:dev` Build assets with development env. Extra arguments are required. Check [CMS Media source](../media_source/README.md#building-assets).
+- `npm run watch` Start files watcher for specified asset with production env\
+Example `npm run watch -- -n com_content` for `com_content` assets.\
+Example `npm run watch -- --all` for all assets.
+- `npm run watch:dev` Start files watcher for specified asset with development env.
+- `npm run lint:js` Checks the code style for the JavaScript/Vue files
+- `npm run lint:testjs` Checks the code style for the JavaScript/Vue files under `tests/System` used for testing.
+- `npm run lint:css` Checks the code style for all SCSS files.
+- `npm run gzip` Creates `.gz` files for all the `.min.js` and `.min.css`.
 
-## NPM Commands
-- `npm run build:js`: compiles ALL the JS (excluding Bootstrap and Media Manager).
-- `npm run build:js -- build/media_source/com_actionlogs`: compiles ALL the JS ONLY in the folder `build/media_source/com_actionlogs`.
-- `npm run build:css`: compiles ALL the SCSS.
-- `npm run build:css -- templates/cassiopeia`: compiles ALL the SCSS ONLY in the folder `templates/cassiopeia`.
-- `npm run build:bs5`: Builds the Bootstrap Javascript components.
-- `npm run build:com_media`: Builds the Media Manager Vue Application.
-- `npm run build:com_media:dev`: Builds the Media Manager Vue Application but in DEV mode, (no minification, no es5 and all flags for the vue devtools)
-- `npm run lint:js`: Checks the code style for all the Javascript/Vue files.
-- `npm run lint:js -- --fix`: Checks and fixes the code style for all the Javascript/Vue files (might not fix everything).
-- `npm run lint:css`: Checks the code style for all SCSS files.
-- `npm run lint:css -- --fix`: Checks and fixes the code style for all SCSS files (might not fix everything).
-- `npm run gzip`: Creates `.gz` files for all the `.min.js` and `.min.css`.
-- `npm run versioning`: Creates the correct version hash for all the assets inside the joomla.asset.json files (excluding templates).
 
 ## Working Efficiently with the Joomla Build Tools
 
 Usually, the scope of a single contribution to the project should be limited. For example: fixing a CSS bug, a Javascript bug, some Markup, or a bug that involves changes in all these areas. The build tools were created so that you spend less time on compiling assets than testing a possible solution.
 
-*Embrace the watchers*
-Let the computer help you succeed faster and safer. There are 2 watchers at the moment: one for the Media Manager (client app based on VueJS) and another one that handles templates and the source (build) folder.
-
-Assuming that you are working on the Media Manager, you can run in your terminal (already in the root folder of the Joomla repo) `npm run watch:com_media`. This watcher will automatically recompile the app on every save (there is a debounce of 0.3s, so if you have autosave it will be a clever way to minimise the wait).
-
-Assuming that you are working on the Web Authentication JavaScript, you can run in your terminal (already in the root folder of the Joomla repo) `npm run watch -- build/media_source/plg_system_webauthn`. This watcher will automatically recompile any JavaScript file inside the folder `build/media_source/plg_system_webauthn/js` on every save. But there's more! Since you asked the watcher to check the parent folder (eg `build/media_source/plg_system_webauthn`), you can also edit the SCSS files in the `build/media_source/plg_system_webauthn/scss` or the CSS files in `build/media_source/plg_system_webauthn/css`. The same example for editing some SCSS in the Cassiopeia template would require a command like: `npm run watch -- templates/cassiopeia/scss`.
-
 Once you get your code doing what it is meant to do, make sure that you check you are not breaking any of the Code Style rules by running `npm run lint:css -- --fix` and `npm run lint:js -- --fix` (the `-- --fix` will try to fix anything that's not trivial).
 
 Happy coding
diff --git a/build/build-modules-js/builder/builder-factory.mjs b/build/build-modules-js/builder/builder-factory.mjs
new file mode 100644
index 0000000000000..c3a41f485883c
--- /dev/null
+++ b/build/build-modules-js/builder/builder-factory.mjs
@@ -0,0 +1,83 @@
+/**
+ * Builder factory class
+ */
+import { pathToFileURL } from 'node:url';
+import path from 'node:path';
+import fs from 'node:fs';
+import DefaultModuleBuilder from './default-module-builder.mjs';
+
+export class BuilderFactory {
+  constructor(basePath = '', targetPath = '', cmdOptions = {}) {
+    this.basePath = basePath;
+    this.targetPath = targetPath;
+    this.cmdOptions = cmdOptions;
+  }
+
+  async createBuilder(name) {
+    // Module path
+    let modulePath = path.join(this.basePath, name, 'builder.mjs');
+
+    // Check if we have the builder module
+    if (!fs.existsSync(modulePath)) {
+      // Use default module
+      return new DefaultModuleBuilder(name, this.basePath, this.targetPath, this.cmdOptions);
+    }
+    let resolvedPath = path.resolve(modulePath);
+    resolvedPath = resolvedPath.replace(/\\/g, '/');
+    const fileURL = pathToFileURL(resolvedPath).href;
+
+    return import(fileURL).then((module) => {
+      return new module.default(name, this.basePath, this.targetPath, this.cmdOptions);
+    });
+  }
+}
+
+/**
+ * Create and run the builder
+ *
+ * @param { Command } program
+ * @param { String } name
+ * @param { BuilderFactory } factory
+ * @param { string[] } tasksToRun
+ * @param { boolean } skipUndefinedTask
+ * @return { Promise }
+ */
+export const createAndRunBuilder = async (program, name, factory, tasksToRun = [], skipUndefinedTask = false) => {
+  return factory.createBuilder(name)
+    .then((builder) => {
+      if (!builder.getBuildTasks) {
+        program.error(`Builder module for "${name}" should provide "getBuildTasks()" method. This is used to determine which task can be run for the builder.`);
+      }
+      console.log(`Initialize build [${name}]`);
+
+      // Run tasks for given builder
+      const allTasks = builder.getAllTasks ? builder.getAllTasks() : builder.getBuildTasks();
+      let lastPromise = Promise.resolve();
+      (tasksToRun.length ? tasksToRun : builder.getBuildTasks()).forEach((taskName) => {
+        // Check whether the task is allowed for active builder
+        if (!allTasks.includes(taskName)) {
+          // Show error when the builder and the task was specified, and it is not applicable for active builder.
+          if (!skipUndefinedTask) {
+            program.error(`Task "${taskName}" is not applicable for "${name}" builder.`);
+          }
+          return;
+        }
+
+        // Execute the task sequentially, this is needed because task may depend on each other
+        lastPromise = lastPromise.then(() => {
+          console.log(`Start task [${name}::${taskName}]`);
+
+          return builder[taskName]().then(async () => {
+            console.log('\x1b[32m%s\x1b[0m', `Completed task [${name}::${taskName}]`);
+          }).catch((error) => {
+            console.log('\x1b[31m%s\x1b[0m', `Failed Task [${name}::${taskName}]`);
+            console.trace(error);
+            program.error(error.message);
+          });
+        });
+      });
+      return lastPromise;
+    }).then(() => {
+      console.log('\x1b[32m%s\x1b[0m', `Completed build [${name}]`);
+    });
+};
diff --git a/build/build-modules-js/builder/default-module-builder.mjs b/build/build-modules-js/builder/default-module-builder.mjs
new file mode 100644
index 0000000000000..2fbcefa18ef0d
--- /dev/null
+++ b/build/build-modules-js/builder/default-module-builder.mjs
@@ -0,0 +1,304 @@
+/**
+ * Default Assets Builder
+ */
+
+import fs from 'node:fs';
+import fsp from 'node:fs/promises';
+import path, { sep } from 'node:path';
+import chokidar from 'chokidar';
+import { handleCSSFile } from '../stylesheets/css-handler.mjs';
+import { handleSCSSFile } from '../stylesheets/scss-handler.mjs';
+import { handleMJSFile, handleJSFile } from '../javascript/js-handle.mjs';
+import { compressFileAndSave } from '../utils/compressFile.mjs';
+
+export default class DefaultModuleBuilder {
+  /**
+   * List of tasks to be executed by default for the build process.
+   * Basically list all of the class methods that are allowed to be called from CLI.
+   *
+   * @type {string[]}
+   */
+  tasksBuild = ['clear', 'copy', 'css', 'js'];
+
+  /**
+   * List of extra tasks that the builder can run, but which are not executed during the build process.
+   *
+   * @type {string[]}
+   */
+  tasksExtras = ['gzip'];
+
+  /**
+   * Class constructor.
+   *
+   * @param { string } name        The folder (builder) name. Relative to media/.
+   * @param { string } basePath    Base path to the media source, without builder name.
+   * @param { string } targetPath  Path to the media target, without builder name.
+   * @param { object } options     Options object, from cmd or etc.
+   */
+  constructor(name = '', basePath = '', targetPath = '', options = {}) {
+    if (!name) {
+      throw new Error('Argument "name" is required for ModuleBuilder.');
+    }
+
+    if (!basePath || !targetPath) {
+      throw new Error(`Arguments "basePath" and "targetPath"  is required for "${name}" ModuleBuilder.`);
+    }
+
+    this.name = name;
+    this.basePath = path.join(basePath, name);
+    this.targetPath = path.join(targetPath, name);
+    this.options = options;
+  }
+
+  getAllTasks() {
+    return [...this.tasksBuild, ...this.tasksExtras];
+  }
+
+  getBuildTasks() {
+    return this.tasksBuild;
+  }
+
+  /**
+   * Remove files on target location
+   * @returns { Promise }
+   */
+  async clear() {
+    if (!fs.existsSync(this.targetPath)) {
+      return;
+    }
+
+    return fsp.rm(this.targetPath, { recursive: true });
+  }
+
+  /**
+   * Copy files to target location.
+   * Skip:
+   *  - css and js files
+   *  - build.mjs and src/ and folders contain builder.mjs or .buildignore
+   *
+   * @returns { Promise }
+   */
+  async copy() {
+    const ignoreName = {
+      'builder.mjs': true,
+      src: true,
+      '.buildignore': true,
+    };
+    const ignoreExt = {
+      '.js': true,
+      '.css': true,
+    };
+
+    const filterFunc = (src, dest) => {
+      if (dest === this.targetPath) {
+        return true;
+      }
+
+      const baseName = path.basename(src);
+      const fileStat = fs.statSync(src);
+
+      // Skip ignored files/folders
+      if (ignoreName[baseName]) {
+        return false;
+      }
+
+      // Skip files with extensions
+      if (fileStat.isFile() && ignoreExt[path.extname(baseName)]) {
+        return false;
+      }
+
+      // Skip folders for child modules or explicitly ignored
+      if (fs.existsSync(path.join(src, 'builder.mjs')) || fs.existsSync(path.join(src, '.buildignore'))) {
+        return false;
+      }
+
+      return true;
+    };
+
+    return fsp.cp(this.basePath, this.targetPath, { filter: filterFunc, recursive: true });
+  }
+
+  /**
+   * Process CSS files
+   * @returns { Promise }
+   */
+  async css() {
+    // Collect files
+    const cssFiles = [];
+    const scssFiles = [];
+
+    return fsp.readdir(this.basePath, { recursive: true, withFileTypes: true })
+      .then((files) => {
+        // Filter and handle the files
+        files.forEach((file) => {
+          if (!file.isFile()) return;
+
+          const baseName = file.name;
+          const ext = path.extname(baseName);
+          const fullSrcPath = path.join(file.parentPath, file.name);
+          const relativePath = fullSrcPath.replace(this.basePath, '');
+
+          // Ignore paths from src/ those requiring custom builder
+          if (relativePath.includes(`${sep}src${sep}`)) return;
+
+          if (ext === '.css' && !baseName.endsWith('.min.css')) {
+            // Handle the CSS file
+            cssFiles.push(handleCSSFile(
+              fullSrcPath,
+              path.join(this.targetPath, relativePath)),
+            );
+          } else if (ext === '.scss' && baseName[0] !== '_') {
+            // Handle the SCSS file
+            scssFiles.push(handleSCSSFile(
+              fullSrcPath,
+              path.join(this.targetPath, relativePath.replace(`${sep}scss${sep}`, `${sep}css${sep}`).replace('.scss', '.css')),
+              this.options.sassSilent,
+            ));
+          }
+        });
+
+        return Promise.all([...cssFiles, ...scssFiles]);
+      });
+  }
+
+  /**
+   * Process JavaScript files and Modules
+   * @returns { Promise }
+   */
+  async js() {
+    // Collect files
+    const jsFiles = [];
+    const mjsFiles = [];
+
+    return fsp.readdir(this.basePath, { recursive: true, withFileTypes: true })
+      .then((files) => {
+        // Filter and handle the files
+        files.forEach((file) => {
+          if (!file.isFile()) return;
+
+          const baseName = file.name;
+          const ext = path.extname(baseName);
+          const fullSrcPath = path.join(file.parentPath, file.name);
+          const relativePath = fullSrcPath.replace(this.basePath, '');
+
+          // Ignore paths from src/ those requiring custom builder
+          if (relativePath.includes(`${sep}src${sep}`)) return;
+
+          // Pick only js files
+          if ((ext !== '.js' && ext !== '.mjs') || baseName.endsWith('.min.js')) return;
+
+          if (baseName === 'builder.mjs') {
+            // Ignore builders of active asset, which is in the root of the asset folder
+            if (relativePath.replace('/', '').replace('\\', '') === 'builder.mjs') {
+              return;
+            }
+
+            // This should never happen
+            throw new Error(`Trying to build script from another builder "${fullSrcPath}". Make sure that each builder is separated.`);
+          }
+
+          if ((ext === '.mjs' || baseName.endsWith('.es6.js') || baseName.endsWith('.w-c.es6.js')) && !baseName.startsWith('_')) {
+            mjsFiles.push(handleMJSFile(
+              fullSrcPath,
+              path.join(this.targetPath, relativePath.replace(/\.w-c\.es6\.js$/, '.js').replace(/\.es6\.js$/, '.js')),
+            ));
+          } else {
+            jsFiles.push(handleJSFile(
+              fullSrcPath,
+              path.join(this.targetPath, relativePath.replace(/\.es5\.js$/, '.js')),
+            ));
+          }
+        });
+
+        return Promise.all([...jsFiles, ...mjsFiles]);
+      });
+  }
+
+  /**
+   * Create compressed (gzip) .css/.js files
+   * @returns { Promise }
+   */
+  async gzip() {
+    return fsp.readdir(this.targetPath, { recursive: true, withFileTypes: true }).then((files) => {
+      const promises = [];
+
+      files.forEach((file) => {
+        if (!file.isFile()) return;
+
+        const fullSrcPath = path.join(file.parentPath, file.name);
+
+        // Compress only minified
+        if (!file.name.endsWith('.min.js') && !file.name.endsWith('.min.css')) return;
+
+        promises.push(compressFileAndSave(fullSrcPath));
+      });
+
+      return Promise.all(promises);
+    });
+  }
+
+  /**
+   * Watch handler
+   * @returns { Promise }
+   */
+  async watch() {
+    const watcher = chokidar.watch(this.basePath, {
+      ignored: /(^|[/\\])\../, // ignore dotfiles
+      persistent: true,
+      ignoreInitial: true,
+    });
+
+    // Rebuild everything
+    const rebuild = () => {
+      console.log(`Watcher rebuild everything in [${this.name}]...`);
+
+      const buildTasks = this.getBuildTasks();
+      const nextTask = () => {
+        if (!buildTasks.length) return;
+        const task = buildTasks.shift();
+
+        return this[task]().then(() => nextTask());
+      };
+      return nextTask();
+    };
+    // Wait for initial rebuild
+    await rebuild();
+
+    // File type checker
+    let lastPromise = Promise.resolve();
+    const checkFile = (file) => {
+      const ext = path.extname(file);
+
+      switch (ext) {
+        case '.css':
+        case '.scss':
+          console.log(`Watcher updating css/scss for [${this.name}]...`);
+          lastPromise = lastPromise.then(() => this.css().catch((error) => {
+            console.error(`Watcher for [${this.name}] got an error:`);
+            console.error(error);
+          }));
+          break;
+
+        case '.js':
+        case '.vue':
+          console.log(`Watcher updating js for [${this.name}]...`);
+          lastPromise = lastPromise.then(() => this.js().catch((error) => {
+            console.error(`Watcher for [${this.name}] got an error:`);
+            console.error(error);
+          }));
+          break;
+
+        default:
+          console.log(`Watcher updating static files for [${this.name}]...`);
+          lastPromise = lastPromise.then(() => this.copy());
+          break;
+      }
+    };
+
+    // Go and watch
+    watcher
+      .on('add', checkFile)
+      .on('change', checkFile)
+      .on('unlink', rebuild);
+  }
+}
diff --git a/build/build-modules-js/builders-registry.mjs b/build/build-modules-js/builders-registry.mjs
new file mode 100644
index 0000000000000..2df2aa2339f7c
--- /dev/null
+++ b/build/build-modules-js/builders-registry.mjs
@@ -0,0 +1,107 @@
+/**
+ * Builders registry for Media resources
+ */
+
+// List of media resources. A folder (extension) name under media_source/
+// By default, is used DefaultModuleBuilder class.
+// However, each resource may have own builder.mjs script, for this it should be placed in root of its folder.
+export const builders = [
+  // Libraries
+  'vendor', // Many extensions depending on it, should be run first
+  'system',
+  'vendor/bootstrap', // Customised bootstrap
+  'vendor/jquery', // jQuery extras
+  'vendor/short-and-sweet', // Customised short-and-sweet
+  'layouts',
+  'legacy',
+  'mailto',
+
+  // Components
+  'cache',
+  'com_actionlogs',
+  'com_admin',
+  'com_associations',
+  'com_banners',
+  'com_cache',
+  'com_categories',
+  'com_config',
+  'com_contact',
+  'com_content',
+  'com_contenthistory',
+  'com_cpanel',
+  'com_fields',
+  'com_finder',
+  'com_guidedtours',
+  'com_installer',
+  'com_joomlaupdate',
+  'com_languages',
+  'com_mails',
+  'com_media',
+  'com_menus',
+  'com_modules',
+  'com_scheduler',
+  'com_tags',
+  'com_templates',
+  'com_users',
+  'com_workflow',
+  'com_wrapper',
+
+  // Modules
+  'mod_articles',
+  'mod_articles_news',
+  'mod_languages',
+  'mod_login',
+  'mod_menu',
+  'mod_quickicon',
+  'mod_sampledata',
+
+  // Plugins
+  'plg_behaviour_compat6',
+  'plg_content_vote',
+  'plg_editors-xtd_image',
+  'plg_editors_codemirror',
+  'plg_editors_none',
+  'plg_editors_tinymce',
+  'plg_installer_folderinstaller',
+  'plg_installer_packageinstaller',
+  'plg_installer_urlinstaller',
+  'plg_installer_webinstaller',
+  'plg_media-action_crop',
+  'plg_media-action_resize',
+  'plg_media-action_rotate',
+  'plg_multifactorauth_email',
+  'plg_multifactorauth_fixed',
+  'plg_multifactorauth_totp',
+  'plg_multifactorauth_webauthn',
+  'plg_multifactorauth_yubikey',
+  'plg_quickicon_autoupdate',
+  'plg_quickicon_eos',
+  'plg_quickicon_extensionupdate',
+  'plg_quickicon_joomlaupdate',
+  'plg_quickicon_overridecheck',
+  'plg_quickicon_privacycheck',
+  'plg_system_debug',
+  'plg_system_guidedtours',
+  'plg_system_jooa11y',
+  'plg_system_schedulerunner',
+  'plg_system_shortcut',
+  'plg_system_stats',
+  'plg_system_webauthn',
+  'plg_user_token',
+
+  // Templates
+  'templates/administrator/atum',
+  'templates/site/cassiopeia',
+  'templates/site/cassiopeia_extended',
+  'installation/template',
+
+  // Additional builders, which are not distributed under media/
+  'error-pages',
+];
+
+// Builders which should be completed before any following builder starts.
+// Used for mass-execution to prevent collisions.
+export const blockingBuilders = [
+  'vendor', // Blocking many extensions depending on it
+  'system', // Blocking because 'error-pages' writes in to the same folder, so 'system' should be completed before that
+];
diff --git a/build/build-modules-js/command/build-command.mjs b/build/build-modules-js/command/build-command.mjs
new file mode 100644
index 0000000000000..cbf1bc4a828f3
--- /dev/null
+++ b/build/build-modules-js/command/build-command.mjs
@@ -0,0 +1,88 @@
+/**
+ * Build command module
+ */
+
+import path from 'node:path';
+import { BuilderFactory, createAndRunBuilder } from '../builder/builder-factory.mjs';
+
+/**
+ * Build command:
+ *  build -a
+ *  build -n builder1,builder2
+ *  build -t css,js
+ *  build -n builder1,builder2 -t css,js
+ *
+ * @param { Command } program        CMD program instance
+ * @param { Object } cmdOptions      Command options and arguments
+ * @param { Array } builders         List of builder names
+ * @param { Array } blockingBuilders List of blocking builder names
+ *
+ * @return { Promise }
+ */
+export default async function buildCommand(program, cmdOptions = {}, builders = [], blockingBuilders = []) {
+  // Get list of builders to run
+  let buildersToRun = [];
+  let runAll = false;
+  if (cmdOptions.all) {
+    runAll = true;
+    buildersToRun = builders;
+  } else if (cmdOptions.name) {
+    cmdOptions.name.split(',').forEach((name) => {
+      // Check if builder exists
+      if (!builders.includes(name)) {
+        program.error(`Builder "${name}" does not exists.`);
+      }
+      buildersToRun.push(name);
+    });
+  }
+
+  // Get list of tasks to run
+  let tasksToRun = [];
+  if (cmdOptions.task) {
+    cmdOptions.task.split(',').forEach((name) => {
+      tasksToRun.push(name);
+    });
+  }
+
+  if (!buildersToRun.length) {
+    console.log('Nothing to run. Please specify the builder name or use -a to run all builders.');
+    return;
+  }
+
+  const factory = new BuilderFactory(
+    path.resolve('./media_source'),
+    path.resolve('./media'),
+    cmdOptions,
+  );
+
+  // Create builder queue
+  const queue = [];
+  buildersToRun.forEach((name) => {
+    queue.push([
+      name,
+      blockingBuilders.includes(name),
+    ]);
+  });
+
+  // Go through queue and execute each builder.
+  // The blocking builder will halt Queue lookup.
+  const danglingPromises = [];
+  const checkQueue = async () => {
+    if (!queue.length) return;
+    const [name, isBlocking] = queue.shift();
+
+    if (isBlocking) {
+      // Halt Queue lookup until the builder completes
+      return createAndRunBuilder(program, name, factory, tasksToRun, runAll).then(() => checkQueue());
+    }
+
+    // Collect dangling promises to be sure all are resolved in the end
+    danglingPromises.push(createAndRunBuilder(program, name, factory, tasksToRun, runAll));
+
+    return checkQueue();
+  };
+
+  return checkQueue().then(() => {
+    return Promise.all(danglingPromises);
+  });
+};
diff --git a/build/build-modules-js/command/watch-command.mjs b/build/build-modules-js/command/watch-command.mjs
new file mode 100644
index 0000000000000..6ecdbdce83ae5
--- /dev/null
+++ b/build/build-modules-js/command/watch-command.mjs
@@ -0,0 +1,92 @@
+/**
+ * Watch command module
+ */
+import path from 'node:path';
+import { BuilderFactory } from '../builder/builder-factory.mjs';
+
+const isWatchNotImplementedError = (error) => error?.message?.startsWith('Watch is not implemented for [');
+
+export default async function watchCommand(program, cmdOptions = {}, builders = []) {
+  let buildersToWatch = [];
+  const unsupportedBuilders = [];
+  const getUnsupportedWatchSummary = (names) => `Skipped builders (watch not supported): ${names.join(', ')}`;
+  const addUnsupportedBuilder = (name) => {
+    if (!unsupportedBuilders.includes(name)) {
+      unsupportedBuilders.push(name);
+    }
+  };
+  const handleUnsupportedBuilder = (name) => {
+    addUnsupportedBuilder(name);
+
+    if (!cmdOptions.all) {
+      program.error(`Builder "${name}" does not support watch mode.`);
+    }
+  };
+  const logUnsupportedBuilders = () => {
+    if (!unsupportedBuilders.length) {
+      return;
+    }
+
+    console.log(
+      '\x1b[33m%s\x1b[0m',
+      getUnsupportedWatchSummary(unsupportedBuilders),
+    );
+  };
+
+  if (cmdOptions.all) {
+    buildersToWatch = builders;
+  } else if (cmdOptions.name) {
+    cmdOptions.name.split(',').map((name) => name.trim()).filter(Boolean).forEach((name) => {
+      // Check if builder exists
+      if (!builders.includes(name)) {
+        program.error(`Builder "${name}" does not exists.`);
+      }
+
+      buildersToWatch.push(name);
+    });
+  }
+
+  if (!buildersToWatch.length) {
+    logUnsupportedBuilders();
+    console.log('Nothing to watch. Please specify the builder name to watch.');
+    return;
+  }
+
+  const factory = new BuilderFactory(
+    path.resolve('./media_source'),
+    path.resolve('./media'),
+    cmdOptions,
+  );
+
+  const watchers = [];
+  buildersToWatch.forEach((name) => {
+    const watcher = factory.createBuilder(name)
+      .then(async (builder) => {
+        if (!builder.watch || typeof builder.watch !== 'function') {
+          handleUnsupportedBuilder(name);
+          return;
+        }
+
+        console.log(`Initialize watch [${name}]`);
+
+        return builder.watch();
+      })
+      .catch((error) => {
+        if (isWatchNotImplementedError(error)) {
+          handleUnsupportedBuilder(name);
+          return;
+        }
+
+        console.log('\x1b[31m%s\x1b[0m', `Failed Watch [${name}]`);
+        console.trace(error);
+        program.error(error.message);
+      });
+    watchers.push(watcher);
+  });
+
+  return Promise.all(watchers).then((result) => {
+    logUnsupportedBuilders();
+
+    return result;
+  });
+};
diff --git a/build/build-modules-js/compilecss.mjs b/build/build-modules-js/compilecss.mjs
deleted file mode 100644
index f1caa3758c80a..0000000000000
--- a/build/build-modules-js/compilecss.mjs
+++ /dev/null
@@ -1,88 +0,0 @@
-import { sep } from 'node:path';
-
-import recursive from 'recursive-readdir';
-import pkg from 'fs-extra';
-
-import { handleScssFile } from './stylesheets/handle-scss.mjs';
-import { handleCssFile } from './stylesheets/handle-css.mjs';
-
-const { stat } = pkg;
-const RootPath = process.cwd();
-
-/**
- * Method that will crawl the media_source folder
- * and compile any scss files to css and .min.css
- * copy any css files to the appropriate destination and
- * minify them in place
- *
- * Expects scss files to have ext: .scss
- *         css files to have ext: .css
- * Ignores scss files that their filename starts with `_`
- *
- * @param {object} options  The options
- * @param {string} path     The folder that needs to be compiled, optional
- */
-export const stylesheets = async (options, path) => {
-  const files = [];
-  let folders = [];
-
-  if (path) {
-    const stats = await stat(`${RootPath}/${path}`);
-
-    if (stats.isDirectory()) {
-      folders.push(`${RootPath}/${path}`);
-    } else if (stats.isFile()) {
-      files.push(`${RootPath}/${path}`);
-    } else {
-      console.error(`Unknown path ${path}`);
-      process.exitCode = 1;
-    }
-  } else {
-    folders = [
-      `${RootPath}/build/media_source`,
-      `${RootPath}/templates`,
-      `${RootPath}/administrator/templates`,
-      `${RootPath}/installation/template`,
-      `${RootPath}/media/vendor/debugbar`,
-    ];
-  }
-
-  const folderPromises = [];
-
-  // Loop to get the files that should be compiled via parameter
-  for (const folder of folders) {
-    folderPromises.push(recursive(folder, ['!*.+(scss|css)']));
-  }
-
-  const computedFiles = await Promise.all(folderPromises);
-
-  const cssFilesPromises = [];
-  const scssFilesPromises = [];
-
-  // Loop to get the files that should be compiled via parameter
-  [].concat(...computedFiles).forEach((file) => {
-    if (file.endsWith('.css') && !file.endsWith('.min.css')) {
-      cssFilesPromises.push(handleCssFile(file));
-    }
-
-    // Don't take files with "_" but "file" has the full path, so check via match
-    if (file.endsWith('.scss') && !file.match(/(\/|\\)_[^/\\]+$/)) {
-      // Bail out for non Joomla convention folders, eg: scss
-      if (!(file.match(/\/scss\//) || file.match(/\\scss\\/))) {
-        return;
-      }
-
-      files.push(file);
-    }
-  });
-
-  for (const file of files) {
-    const outputFile = file.replace(`${sep}scss${sep}`, `${sep}css${sep}`)
-      .replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`)
-      .replace('.scss', '.css');
-
-    scssFilesPromises.push(handleScssFile(file, outputFile));
-  }
-
-  return Promise.all([...cssFilesPromises, ...scssFilesPromises]);
-};
diff --git a/build/build-modules-js/compilejs.mjs b/build/build-modules-js/compilejs.mjs
deleted file mode 100644
index e8c4c2644ec9b..0000000000000
--- a/build/build-modules-js/compilejs.mjs
+++ /dev/null
@@ -1,74 +0,0 @@
-import { stat } from 'node:fs/promises';
-import { sep } from 'node:path';
-
-import recursive from 'recursive-readdir';
-
-import { handleES5File } from './javascript/handle-es5.mjs';
-import { handleESMFile } from './javascript/compile-to-es2017.mjs';
-
-const RootPath = process.cwd();
-
-/**
- * Method that will crawl the media_source folder and
- * compile ES6 to ES5 and ES6
- * copy any ES5 files to the appropriate destination and
- * minify them in place
- * compile any custom elements/webcomponents
- *
- * Expects ES6 files to have ext: .es6.js
- *         ES5 files to have ext: .es5.js
- *         WC/CE files to have ext: .w-c.es6.js
- *
- * @param { object } options The options from settings.json
- * @param { string } path    The folder that needs to be compiled, optional
- * @param { string } mode    esm for ES2017, es5 for ES5, both for both
- */
-export const scripts = async (options, path) => {
-  const files = [];
-  let folders = [];
-
-  if (path) {
-    const stats = await stat(`${RootPath}/${path}`);
-
-    if (stats.isDirectory()) {
-      folders.push(`${RootPath}/${path}`);
-    } else if (stats.isFile()) {
-      files.push(`${RootPath}/${path}`);
-    } else {
-      console.error(`Unknown path ${path}`);
-      process.exitCode = 1;
-    }
-  } else {
-    folders = [
-      `${RootPath}/build/media_source`,
-      `${RootPath}/templates/cassiopeia`,
-    ];
-  }
-
-  const folderPromises = [];
-
-  // Loop to get the files that should be compiled via parameter
-  for (const folder of folders) {
-    folderPromises.push(recursive(folder, ['!*.+(m|js)']));
-  }
-
-  const computedFiles = await Promise.all(folderPromises);
-  const computedFilesFlat = [].concat(...computedFiles);
-  const jsFilesPromises = [];
-  const esmFilesPromises = [];
-
-  // Loop to get the files that should be compiled via parameter
-  computedFilesFlat.forEach((file) => {
-    if (file.includes(`build${sep}media_source${sep}vendor${sep}bootstrap${sep}js`)) {
-      return;
-    }
-
-    if (file.endsWith('.es5.js')) {
-      jsFilesPromises.push(handleES5File(file));
-    } else if ((file.endsWith('.es6.js') || file.endsWith('.w-c.es6.js')) && !file.startsWith('_')) {
-      esmFilesPromises.push(handleESMFile(file));
-    }
-  });
-
-  Promise.all([...jsFilesPromises, ...esmFilesPromises]);
-};
diff --git a/build/build-modules-js/compress.mjs b/build/build-modules-js/compress.mjs
deleted file mode 100644
index a7ba3b91640f3..0000000000000
--- a/build/build-modules-js/compress.mjs
+++ /dev/null
@@ -1,39 +0,0 @@
-import { readdir } from 'node:fs/promises';
-import { extname } from 'node:path';
-
-import { compressFile } from './utils/compressFile.mjs';
-import { Timer } from './utils/timer.mjs';
-
-/**
- * Get files recursively
- *
- * @param {string} path The path
- */
-async function getFiles(path) {
-  // Get files within the current directory
-  return (await readdir(path, { withFileTypes: true, recursive: true }))
-    .filter((file) => !file.isDirectory() && ['.js', '.css'].includes(extname(file.name)))
-    .map((file) => `${file.parentPath}/${file.name}`);
-}
-
-/**
- * Method that will pre compress (gzip) all .css/.js files
- * in the templates and in the media folder
- */
-export const compressFiles = async (enableBrotli = false) => {
-  const bench = new Timer('Gzip');
-  const paths = [
-    `${process.cwd()}/media`,
-    `${process.cwd()}/installation/template`,
-    `${process.cwd()}/templates`,
-    `${process.cwd()}/administrator/templates`,
-  ];
-
-  const compressTasks = [];
-  const files = await Promise.all(paths.map((path) => getFiles(`${path}`)));
-  [].concat(...files).map((file) => compressTasks.push(compressFile(file, enableBrotli)));
-
-  await Promise.all(compressTasks);
-  console.log('✅ Done 👍');
-  bench.stop();
-};
diff --git a/build/build-modules-js/error-pages.mjs b/build/build-modules-js/error-pages.mjs
deleted file mode 100644
index 544bab2c6f8cc..0000000000000
--- a/build/build-modules-js/error-pages.mjs
+++ /dev/null
@@ -1,164 +0,0 @@
-import {
-  access, mkdir, readFile, writeFile,
-} from 'node:fs/promises';
-import { dirname } from 'node:path';
-
-import Ini from 'ini';
-import Recurs from 'recursive-readdir';
-import { transform } from 'esbuild';
-import { transform as transformCss } from 'lightningcss';
-
-const RootPath = process.cwd();
-const dir = `${RootPath}/installation/language`;
-const srcPath = `${RootPath}/build/warning_page`;
-
-/**
- * Will produce as many .html files as defined in settings.json
- * Expects three files:
- *     build/warning_page/template.css
- *     build/warning_page/template.html
- *     build/warning_page/template.js
- *
- * And also specific strings in the languages in the installation folder!
- * Also the base strings are held in build/build-modules-js/settings.json
- */
-export const createErrorPages = async (options) => {
-  const iniFilesProcess = [];
-  const processPages = [];
-  global.incompleteObj = {};
-  global.unsupportedObj = {};
-  global.fatalObj = {};
-  global.noxmlObj = {};
-
-  const initTemplate = await readFile(`${srcPath}/template.html`, { encoding: 'utf8' });
-  let cssContent = await readFile(`${srcPath}/template.css`, { encoding: 'utf8' });
-  let jsContent = await readFile(`${srcPath}/template.js`, { encoding: 'utf8' });
-
-  const { code } = transformCss({
-    code: Buffer.from(cssContent),
-    minify: true,
-  });
-
-  cssContent = code;
-  jsContent = await transform(jsContent, { minify: true });
-
-  const processIni = async (file) => {
-    const languageStrings = Ini.parse(await readFile(file, { encoding: 'utf8' }));
-
-    // Build the variables into json for the unsupported page
-    if (languageStrings.BUILD_MIN_PHP_ERROR_LANGUAGE) {
-      const name = dirname(file).replace(/.+\//, '').replace(/.+\\/, '');
-      global.unsupportedObj = {
-        ...global.unsupportedObj,
-        [name]: {
-          language: Ini.unsafe(languageStrings.BUILD_MIN_PHP_ERROR_LANGUAGE),
-          header: languageStrings.BUILD_MIN_PHP_ERROR_HEADER,
-          text1: languageStrings.BUILD_MIN_PHP_ERROR_TEXT,
-          'help-url-text': languageStrings.BUILD_MIN_PHP_ERROR_URL_TEXT,
-        },
-      };
-    }
-
-    // Build the variables into json for the build incomplete page
-    if (languageStrings.BUILD_INCOMPLETE_LANGUAGE) {
-      const name = dirname(file).replace(/.+\//, '').replace(/.+\\/, '');
-      global.incompleteObj = {
-        ...global.incompleteObj,
-        [name]: {
-          language: Ini.unsafe(languageStrings.BUILD_INCOMPLETE_LANGUAGE),
-          header: languageStrings.BUILD_INCOMPLETE_HEADER,
-          text1: languageStrings.BUILD_INCOMPLETE_TEXT,
-          'help-url-text': languageStrings.BUILD_INCOMPLETE_URL_TEXT,
-        },
-      };
-    }
-
-    // Build the variables into json for the fatal error page
-    if (languageStrings.BUILD_FATAL_LANGUAGE) {
-      const name = dirname(file).replace(/.+\//, '').replace(/.+\\/, '');
-      global.fatalObj = {
-        ...global.fatalObj,
-        [name]: {
-          language: Ini.unsafe(languageStrings.BUILD_FATAL_LANGUAGE),
-          header: languageStrings.BUILD_FATAL_HEADER,
-          text1: languageStrings.BUILD_FATAL_TEXT,
-          'help-url-text': languageStrings.BUILD_FATAL_URL_TEXT,
-        },
-      };
-    }
-
-    // Build the variables into json for the missing XML error page
-    if (languageStrings.BUILD_NOXML_LANGUAGE) {
-      const name = dirname(file).replace(/.+\//, '').replace(/.+\\/, '');
-      global.noxmlObj = {
-        ...global.noxmlObj,
-        [name]: {
-          language: Ini.unsafe(languageStrings.BUILD_NOXML_LANGUAGE),
-          header: languageStrings.BUILD_NOXML_HEADER,
-          text1: languageStrings.BUILD_NOXML_TEXT,
-          'help-url-text': languageStrings.BUILD_NOXML_URL_TEXT,
-        },
-      };
-    }
-  };
-
-  const files = await Recurs(dir);
-  files.sort().forEach((file) => {
-    if (file.endsWith('langmetadata.xml')) {
-      return;
-    }
-    iniFilesProcess.push(processIni(file));
-  });
-
-  await Promise.all(iniFilesProcess).catch((err) => {
-    console.error(err);
-    process.exitCode = -1;
-  });
-
-  const processPage = async (name) => {
-    const sortedJson = Object.fromEntries(Object.entries(global[`${name}Obj`]).sort());
-    const jsonContent = `window.errorLocale=${JSON.stringify(sortedJson)};`;
-
-    let template = initTemplate;
-
-    template = template.replace('{{jsonContents}}', jsonContent);
-    template = template.replace('{{Title}}', options.settings.errorPages[name].title);
-    template = template.replace('{{Header}}', options.settings.errorPages[name].header);
-    template = template.replace('{{Description}}', options.settings.errorPages[name].text);
-    template = template.replace('{{Link}}', options.settings.errorPages[name].link);
-    template = template.replace('{{LinkText}}', options.settings.errorPages[name].linkText);
-
-    if (cssContent) {
-      template = template.replace('{{cssContents}}', cssContent);
-    }
-
-    if (jsContent) {
-      template = template.replace('{{jsContents}}', jsContent.code);
-    }
-
-    options.settings.errorPages[name].destFile.forEach(async (folder) => {
-      let mediaExists = false;
-      try {
-        await access(dirname(`${RootPath}${folder}`));
-        mediaExists = true;
-      } catch (err) {
-        // Do nothing
-      }
-
-      if (!mediaExists) {
-        await mkdir(dirname(`${RootPath}${folder}`), { recursive: true, mode: 0o755 });
-      }
-
-      await writeFile(`${RootPath}${folder}`, template, { encoding: 'utf8', mode: 0o644 });
-
-      console.error(`✅ Created the file: ${folder}`);
-    });
-  };
-
-  Object.keys(options.settings.errorPages).forEach((name) => processPages.push(processPage(name)));
-
-  return Promise.all(processPages).catch((err) => {
-    console.error(err);
-    process.exitCode = -1;
-  });
-};
diff --git a/build/build-modules-js/init/cleanup-media.mjs b/build/build-modules-js/init/cleanup-media.mjs
deleted file mode 100644
index 184ae41ab0c1d..0000000000000
--- a/build/build-modules-js/init/cleanup-media.mjs
+++ /dev/null
@@ -1,43 +0,0 @@
-import { join } from 'node:path';
-
-import pkg from 'fs-extra';
-
-const RootPath = process.cwd();
-const {
-  stat, mkdir, copy, remove,
-} = pkg;
-
-/**
- * Method that will erase the media/vendor folder
- * and populate the debugbar assets
- *
- * @returns {Promise}
- */
-export const cleanVendors = async () => {
-  if (process.env.SKIP_COMPOSER_CHECK === 'YES') {
-    await mkdir('media/vendor/debugbar', { recursive: true, mode: 0o755 });
-    console.log('Skipping the DebugBar assets...');
-    return;
-  }
-
-  console.log('Cleanup the Vendor ');
-
-  const mediaFolder = await stat(join(RootPath, 'libraries/vendor/php-debugbar/php-debugbar/src/DebugBar/Resources'));
-
-  if (await mediaFolder.isDirectory()) {
-    // Remove the vendor folder
-    // await remove(join(RootPath, 'media'));
-    // console.error('/media has been removed.');
-
-    // Recreate the media folder
-    await mkdir(join(RootPath, 'media/vendor/debugbar'), { recursive: true, mode: 0o755 });
-
-    // Copy some assets from a PHP package
-    await copy(join(RootPath, 'libraries/vendor/php-debugbar/php-debugbar/src/DebugBar/Resources'), join(RootPath, 'media/vendor/debugbar'), { preserveTimestamps: true });
-    await remove(join(RootPath, 'media/vendor/debugbar/vendor/font-awesome'));
-    await remove(join(RootPath, 'media/vendor/debugbar/vendor/jquery'));
-  } else {
-    console.error("You need to run `npm install` AFTER the command `composer install`!!!. The debug plugin HASN'T installed all its front end assets");
-    process.exitCode = 1;
-  }
-};
diff --git a/build/build-modules-js/init/common/concat-files.mjs b/build/build-modules-js/init/common/concat-files.mjs
deleted file mode 100644
index a611ed92a10d6..0000000000000
--- a/build/build-modules-js/init/common/concat-files.mjs
+++ /dev/null
@@ -1,25 +0,0 @@
-import { readFile, writeFile, existsSync } from 'fs-extra';
-
-const RootPath = process.cwd();
-
-/**
- * Method to concatenate some files
- *
- * @param {array}  files   the array of files to be be concatenated
- * @param {string} output  the name of the output file
- *
- * @returns {void}
- */
-export const concatFiles = async (files, output) => {
-  const promises = [];
-
-  for (const file of files) {
-    if (existsSync(`${RootPath}/${file}`)) {
-      promises.push(readFile(`${RootPath}/${file}`, { encoding: 'utf8' }));
-    }
-  }
-
-  const res = await Promise.all(promises);
-
-  await writeFile(`${RootPath}/${output}`, res.join(' '), { encoding: 'utf8', mode: 0o644 });
-};
diff --git a/build/build-modules-js/init/common/copy-all-files.mjs b/build/build-modules-js/init/common/copy-all-files.mjs
deleted file mode 100644
index 3037ec32d5cc7..0000000000000
--- a/build/build-modules-js/init/common/copy-all-files.mjs
+++ /dev/null
@@ -1,25 +0,0 @@
-import { join } from 'node:path';
-
-import { copy } from 'fs-extra';
-
-const RootPath = process.cwd();
-
-/**
- * Copies all the files from a directory
- *
- * @param {string} dirName the name of the source folder
- * @param {string} name    the name of the destination folder
- * @param {string} type    the type of the folder, eg: js, css, fonts, images
- *
- * @returns { void }
- */
-export const copyAllFiles = async (dirName, name, type) => {
-  const folderName = dirName === '/' ? '/' : `/${dirName}`;
-  await copy(
-    join(RootPath, `node_modules/${name}/${folderName}`),
-    join(RootPath, `media/vendor/${name.replace(/.+\//, '')}/${type}`),
-    {
-      preserveTimestamps: true,
-    },
-  );
-};
diff --git a/build/build-modules-js/init/common/resolve-package.cjs b/build/build-modules-js/init/common/resolve-package.cjs
deleted file mode 100644
index 9a2159acd5da4..0000000000000
--- a/build/build-modules-js/init/common/resolve-package.cjs
+++ /dev/null
@@ -1,49 +0,0 @@
-const { existsSync, readdirSync } = require('node:fs');
-
-/**
- * Find full path for package file.
- * Replacement for require.resolve(), as it is broken for packages with "exports" property.
- *
- * @param {string} relativePath Relative path to the file to resolve, in format packageName/file-name.js
- * @returns {string|boolean}
- */
-module.exports.resolvePackageFile = (relativePath) => {
-  for (let i = 0, l = module.paths.length; i < l; i += 1) {
-    const path = module.paths[i];
-    const fullPath = `${path}/${relativePath}`;
-    if (existsSync(fullPath)) {
-      return fullPath;
-    }
-  }
-
-  return false;
-};
-
-/**
- * Find a list of modules under given scope,
- * eg: @foobar will look for all submodules @foobar/foo, @foobar/bar
- *
- * @param scope
- * @returns {[]}
- */
-module.exports.getPackagesUnderScope = (scope) => {
-  const cmModules = new Set();
-
-  // Get the scope roots
-  const roots = [];
-  module.paths.forEach((path) => {
-    const fullPath = `${path}/${scope}`;
-    if (existsSync(fullPath)) {
-      roots.push(fullPath);
-    }
-  });
-
-  // List of modules
-  roots.forEach((rootPath) => {
-    readdirSync(rootPath).forEach((subModule) => {
-      cmModules.add(`${scope}/${subModule}`);
-    });
-  });
-
-  return [...cmModules];
-};
diff --git a/build/build-modules-js/init/exemptions/tinymce.mjs b/build/build-modules-js/init/exemptions/tinymce.mjs
deleted file mode 100644
index c4b9fb7005b26..0000000000000
--- a/build/build-modules-js/init/exemptions/tinymce.mjs
+++ /dev/null
@@ -1,80 +0,0 @@
-import { existsSync } from 'node:fs';
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
-
-import pkg from 'fs-extra';
-
-import { copyAllFiles } from '../common/copy-all-files.mjs';
-
-const { copy, removeSync } = pkg;
-const RootPath = process.cwd();
-const xmlVersionStr = /(<version>)(.+)(<\/version>)/;
-
-/**
- * Copies an array of files from a directory
- *
- * @param {string} dirName the name of the source folder
- * @param {array}  files   the array of files to be be copied
- * @param {string} name    the name of the destination folder
- * @param {string} type    the type of the folder, eg: js, css, fonts, images
- *
- * @returns { void }
- */
-const copyArrayFiles = async (dirName, files, name, type) => {
-  const promises = [];
-  for (const file of files) {
-    const folderName = dirName === '/' ? '/' : `/${dirName}/`;
-
-    if (existsSync(`node_modules/${name}${folderName}${file}`)) {
-      promises.push(copy(`node_modules/${name}${folderName}${file}`, `media/vendor/${name.replace(/.+\//, '')}${type ? `/${type}` : ''}/${file}`, { preserveTimestamps: true }));
-    }
-  }
-
-  await Promise.all(promises);
-};
-
-/**
- * tinyMCE needs special treatment
- */
-export const tinyMCE = async (packageName, version) => {
-  const itemvendorPath = join(RootPath, `media/vendor/${packageName}`);
-
-  if (!(await existsSync(itemvendorPath))) {
-    await mkdir(itemvendorPath, { mode: 0o755 });
-    await mkdir(join(itemvendorPath, 'icons'), { mode: 0o755 });
-    await mkdir(join(itemvendorPath, 'plugins'), { mode: 0o755 });
-    await mkdir(join(itemvendorPath, 'langs'), { mode: 0o755 });
-    await mkdir(join(itemvendorPath, 'skins'), { mode: 0o755 });
-    await mkdir(join(itemvendorPath, 'themes'), { mode: 0o755 });
-    await mkdir(join(itemvendorPath, 'templates'), { mode: 0o755 });
-    await mkdir(join(itemvendorPath, 'models'), { mode: 0o755 });
-  }
-
-  await copyAllFiles('icons', 'tinymce', 'icons');
-  await copyAllFiles('plugins', 'tinymce', 'plugins');
-  await copyAllFiles('skins', 'tinymce', 'skins');
-  await copyAllFiles('themes', 'tinymce', 'themes');
-  await copyAllFiles('models', 'tinymce', 'models');
-
-  await copyArrayFiles('', ['tinymce.js', 'tinymce.min.js', 'changelog.txt', 'license.txt'], 'tinymce', '');
-
-  // Update the XML file for tinyMCE
-  let tinyXml = await readFile(`${RootPath}/plugins/editors/tinymce/tinymce.xml`, { encoding: 'utf8' });
-  tinyXml = tinyXml.replace(xmlVersionStr, `$1${version}$3`);
-  await writeFile(`${RootPath}/plugins/editors/tinymce/tinymce.xml`, tinyXml, { encoding: 'utf8', mode: 0o644 });
-
-  // Remove that sourcemap...
-  let tinyWrongMap = await readFile(`${RootPath}/media/vendor/tinymce/skins/ui/oxide/skin.min.css`, { encoding: 'utf8' });
-  tinyWrongMap = tinyWrongMap.replace(
-    '/*# sourceMappingURL=skin.min.css.map */',
-    '',
-  );
-  await writeFile(`${RootPath}/media/vendor/tinymce/skins/ui/oxide/skin.min.css`, tinyWrongMap, { encoding: 'utf8', mode: 0o644 });
-
-  // Restore our code on the vendor folders
-  await copy(join(RootPath, 'build/media_source/vendor/tinymce/templates'), join(RootPath, 'media/vendor/tinymce/templates'), { preserveTimestamps: true });
-  // Drop the template plugin
-  if (existsSync(join(RootPath, 'media/vendor/tinymce/plugins/template'))) {
-    removeSync(join(RootPath, 'media/vendor/tinymce/plugins/template'));
-  }
-};
diff --git a/build/build-modules-js/init/localise-packages.mjs b/build/build-modules-js/init/localise-packages.mjs
deleted file mode 100644
index e155761405ba6..0000000000000
--- a/build/build-modules-js/init/localise-packages.mjs
+++ /dev/null
@@ -1,144 +0,0 @@
-import { dirname, join } from 'node:path';
-import { createRequire } from 'node:module';
-import { existsSync } from 'node:fs';
-
-import pkg from 'fs-extra';
-
-import { tinyMCE } from './exemptions/tinymce.mjs';
-import { resolvePackageFile } from './common/resolve-package.cjs';
-
-const require = createRequire(import.meta.url);
-const {
-  copy, mkdirs, mkdir, ensureDir, writeFile,
-} = pkg;
-
-const RootPath = process.cwd();
-
-/**
- *
- * @param {object} files    the object of files map, eg {"src.js": "js/src.js"}
- * @param {string} srcDir   the name of the package root dir
- * @param {string} destDir  the name of the Vendor destination dir
- *
- * @returns {Promise}
- */
-const copyFilesTo = async (files, srcDir, destDir) => {
-  const copyPromises = [];
-
-  async function doTheCopy(source, dest) {
-    await ensureDir(dirname(dest));
-    await copy(source, dest, { preserveTimestamps: true });
-  }
-
-  // Copy each file
-  for (const srcFile in files) {
-    copyPromises.push(doTheCopy(join(srcDir, srcFile), join(destDir, files[srcFile])));
-  }
-
-  return Promise.all(copyPromises);
-};
-
-/**
- * Main method that will resolve each vendor package
- *
- * @returns {Promise}
- */
-const resolvePackage = async (vendor, packageName, mediaVendorPath, options, registry) => {
-  const vendorName = vendor.name || packageName;
-  const modulePathJson = resolvePackageFile(`${packageName}/package.json`);
-  const modulePathRoot = dirname(modulePathJson);
-  const moduleOptions = require(modulePathJson);
-
-  const promises = [];
-
-  if (packageName === 'tinymce') {
-    promises.push(tinyMCE(packageName, moduleOptions.version));
-  } else {
-    await mkdirs(join(mediaVendorPath, vendorName));
-
-    ['js', 'css', 'filesExtra'].forEach((type) => {
-      if (!vendor[type]) return;
-
-      promises.push(copyFilesTo(vendor[type], modulePathRoot, join(mediaVendorPath, vendorName), type));
-    });
-  }
-
-  // Copy the license if existsSync
-  if (options.settings.vendors[packageName].licenseFilename
-    && (await existsSync(`${join(RootPath, `node_modules/${packageName}`)}/${options.settings.vendors[packageName].licenseFilename}`))) {
-    const dest = join(mediaVendorPath, vendorName);
-    await copy(
-      `${join(RootPath, `node_modules/${packageName}`)}/${options.settings.vendors[packageName].licenseFilename}`,
-      `${dest}/${options.settings.vendors[packageName].licenseFilename}`,
-      { preserveTimestamps: true },
-    );
-  }
-
-  await Promise.all(promises);
-
-  // Add provided Assets to a registry, if any
-  if (vendor.provideAssets && vendor.provideAssets.length) {
-    vendor.provideAssets.forEach((assetInfo) => {
-      const registryItemBase = {
-        package: packageName,
-        name: assetInfo.name || vendorName,
-        version: moduleOptions.version,
-        type: assetInfo.type,
-      };
-
-      const registryItem = Object.assign(assetInfo, registryItemBase);
-
-      // Update path to file
-      if (assetInfo.uri && (assetInfo.type === 'script' || assetInfo.type === 'style' || assetInfo.type === 'webcomponent')) {
-        let itemPath = assetInfo.uri;
-
-        // Check for external path
-        if (itemPath.indexOf('http://') !== 0 && itemPath.indexOf('https://') !== 0 && itemPath.indexOf('//') !== 0) {
-          itemPath = `vendor/${vendorName}/${itemPath}`;
-        }
-
-        registryItem.uri = itemPath;
-      }
-
-      registry.assets.push(registryItem);
-    });
-  }
-
-  console.log(`${packageName} was updated.`);
-};
-
-/**
- * Main method that will copy all vendor files according to Joomla's specs
- *
- * @param options The options from setting.json
- *
- * @returns {Promise}
- */
-export const localisePackages = async (options) => {
-  const mediaVendorPath = join(RootPath, 'media/vendor');
-  const registry = {
-    $schema: 'https://developer.joomla.org/schemas/json-schema/web_assets.json',
-    name: options.name,
-    version: options.version,
-    description: options.description,
-    license: options.license,
-    assets: [],
-  };
-  const promises = [];
-
-  if (!(await existsSync(mediaVendorPath))) {
-    await mkdir(mediaVendorPath, { recursive: true, mode: 0o755 });
-  }
-
-  // Loop to get some text for the package.json
-  for (const packageName in options.settings.vendors) {
-    const vendor = options.settings.vendors[packageName];
-
-    promises.push(resolvePackage(vendor, packageName, mediaVendorPath, options, registry));
-  }
-
-  await Promise.all(promises);
-
-  // Write assets registry
-  await writeFile(join(mediaVendorPath, 'joomla.asset.json'), JSON.stringify(registry, null, 2), { encoding: 'utf8', mode: 0o644 });
-};
diff --git a/build/build-modules-js/init/minify-vendor.mjs b/build/build-modules-js/init/minify-vendor.mjs
deleted file mode 100644
index 78c45c84800bc..0000000000000
--- a/build/build-modules-js/init/minify-vendor.mjs
+++ /dev/null
@@ -1,92 +0,0 @@
-import { sep, basename } from 'node:path';
-import { lstat, readFile, writeFile } from 'node:fs/promises';
-
-import recursive from 'recursive-readdir';
-import { transform } from 'esbuild';
-
-const RootPath = process.cwd();
-
-const folders = [
-  'media/vendor/accessibility/js',
-  'media/vendor/chosen/js',
-  'media/vendor/debugbar',
-  'media/vendor/diff/js',
-  'media/vendor/es-module-shims/js',
-  'media/vendor/qrcode/js',
-  'media/vendor/webcomponentsjs/js',
-];
-
-let allFiles = [];
-
-const noMinified = ['accessibility.min.js'];
-
-const alreadyMinified = [
-  'media/vendor/webcomponentsjs/js/webcomponents-bundle.js',
-  'media/vendor/debugbar/vendor/highlightjs/highlight.pack.js',
-];
-
-/**
- * Check if a file exists
- *
- * @param file
- * @returns {Promise<boolean>}
- */
-const minifiedExists = async (file) => {
-  try {
-    return (await lstat(file)).isFile();
-  } catch (e) {
-    return false;
-  }
-};
-
-/**
- *
- * @param {string} file
- *
- * @returns {Promise}
- */
-const minifyJS = async (file) => {
-  const needsDotJS = noMinified.includes(basename(file));
-  if (file.endsWith('.min.js') && !needsDotJS) {
-    return;
-  }
-
-  console.log(`Processing Vendor file: ${file}`);
-
-  let minified;
-  const fileExists = await minifiedExists(file);
-  if (!fileExists) {
-    return;
-  }
-
-  const content = await readFile(file, { encoding: 'utf8' });
-  const isMinified = alreadyMinified.includes(file.replace(`${RootPath}${sep}`, ''));
-
-  if (isMinified || needsDotJS) {
-    minified = content;
-  } else {
-    minified = (await transform(content, { minify: true })).code;
-  }
-
-  const newFile = needsDotJS ? file.replace('.min.js', '.js') : file.replace('.js', '.min.js');
-  // Write the file
-  await writeFile(newFile, minified, { encoding: 'utf8', mode: 0o644 });
-};
-
-/**
- * Method that will minify a set of vendor javascript files
- *
- * @returns {Promise}
- */
-export const minifyVendor = async () => {
-  const folderPromises = [];
-  const filesPromises = [];
-
-  folders.map((folder) => folderPromises.push(recursive(folder, ['!*.+(js)'])));
-
-  const computedFiles = await Promise.all(folderPromises);
-  allFiles = [...allFiles, ...[].concat(...computedFiles)];
-  allFiles.map((file) => filesPromises.push(minifyJS(file)));
-
-  return Promise.all(filesPromises);
-};
diff --git a/build/build-modules-js/init/patches.mjs b/build/build-modules-js/init/patches.mjs
deleted file mode 100644
index 1a20efff1c513..0000000000000
--- a/build/build-modules-js/init/patches.mjs
+++ /dev/null
@@ -1,35 +0,0 @@
-import { join } from 'node:path';
-import { readFile, writeFile } from 'node:fs/promises';
-
-const RootPath = process.cwd();
-
-/**
- * Main method that will patch files...
- *
- * @param options The options from setting.json
- *
- * @returns {Promise}
- */
-export const patchPackages = async (options) => {
-  const mediaVendorPath = join(RootPath, 'media/vendor');
-
-  // Joomla's hack to expose the chosen base classes so we can extend it ourselves
-  // (it was better than the many hacks we had before. But I'm still ashamed of myself).
-  const dest = join(mediaVendorPath, 'chosen');
-  const chosenPath = `${dest}/${options.settings.vendors['chosen-js'].js['chosen.jquery.js']}`;
-  let ChosenJs = await readFile(chosenPath, { encoding: 'utf8' });
-  ChosenJs = ChosenJs.replace(
-    '}).call(this);',
-    `  document.AbstractChosen = AbstractChosen;
-  document.Chosen = Chosen;
-}).call(this);`,
-  );
-  await writeFile(chosenPath, ChosenJs, { encoding: 'utf8', mode: 0o644 });
-
-  // Include the v5 shim for Font Awesome
-  const faPath = join(mediaVendorPath, 'fontawesome-free/scss/fontawesome.scss');
-  const newScss = (await readFile(faPath, { encoding: 'utf8' })).concat(`
-@import 'shims';
-`);
-  await writeFile(faPath, newScss, { encoding: 'utf8', mode: 0o644 });
-};
diff --git a/build/build-modules-js/init/recreate-media.mjs b/build/build-modules-js/init/recreate-media.mjs
deleted file mode 100644
index e30a66220a416..0000000000000
--- a/build/build-modules-js/init/recreate-media.mjs
+++ /dev/null
@@ -1,85 +0,0 @@
-import {
-  stat, readFile, writeFile, readdir,
-} from 'node:fs/promises';
-import { join, extname } from 'node:path';
-
-import pkg from 'fs-extra';
-import recursive from 'recursive-readdir';
-
-const { copy, existsSync, emptyDirSync } = pkg;
-const RootPath = process.cwd();
-const knownDirs = [
-  'templates/site/cassiopeia',
-  'templates/administrator/atum',
-];
-
-/**
- * Will scan all the installed extensions and rebuild the cleanUpFolders registry.
- */
-const updateSettings = async (options) => {
-  const extensionsScanned = await readdir(`${RootPath}/build/media_source`, { withFileTypes: true });
-  const extensions = [...extensionsScanned]
-    .filter((x) => !['.DS_Store', 'templates', 'vendor', 'cache'].includes(x.name) && x.isDirectory())
-    .map((x) => x.name);
-
-  options.settings.cleanUpFolders = [...extensions, ...knownDirs];
-};
-
-/**
- * Method to recreate the basic media folder structure
- * After execution the media folder is populated with empty js and css subdirectories
- * images subfolders with their relative files and any other files except .js, .css
- *
- * @returns {Promise}
- */
-export const recreateMediaFolder = async (options) => {
-  await updateSettings(options);
-  const installedVendors = Object.keys(options.settings.vendors).map((vendor) => {
-    if (vendor === 'choices.js') {
-      return 'vendor/choicesjs';
-    }
-    if (vendor === '@fortawesome/fontawesome-free') {
-      return 'vendor/fontawesome-free';
-    }
-    if (vendor === '@claviska/jquery-minicolors') {
-      return 'vendor/minicolors';
-    }
-    if (vendor === '@webcomponents/webcomponentsjs') {
-      return 'vendor/webcomponentsjs';
-    }
-    if (vendor === 'joomla-ui-custom-elements') {
-      return 'vendor/joomla-custom-elements';
-    }
-    return `vendor/${vendor}`;
-  });
-
-  // Clean up existing folders
-  [...options.settings.cleanUpFolders, ...installedVendors].forEach((folder) => {
-    const folderPath = join(`${RootPath}/media`, folder);
-    if (existsSync(folderPath)) {
-      emptyDirSync(folderPath);
-    }
-  });
-
-  console.log('Recreating the media folder...');
-
-  const filterFunc = async (src) => {
-    const fileStat = await stat(src);
-    if (fileStat.isFile() && (extname(src) === '.js' || extname(src) === '.css')) {
-      return false;
-    }
-
-    return true;
-  };
-
-  await copy(join(RootPath, 'build/media_source'), join(RootPath, 'media'), { filter: filterFunc, preserveTimestamps: true });
-
-  const SCSSMediafolders = await recursive(join(RootPath, 'media/templates'), ['!*.+(scss)']);
-
-  // Patch the scss files
-  Object.keys(SCSSMediafolders).forEach(async (file) => {
-    const contents = await readFile(SCSSMediafolders[file], 'utf8');
-    // Transform this `../../../../../../media/` to `../../../../`
-    await writeFile(SCSSMediafolders[file], contents.replace(/\.\.\/\.\.\/\.\.\/\.\.\/\.\.\/\.\.\/media\//g, '../../../../'));
-  });
-};
diff --git a/build/build-modules-js/javascript/build-bootstrap-js.mjs b/build/build-modules-js/javascript/build-bootstrap-js.mjs
deleted file mode 100644
index 7c4e75063595a..0000000000000
--- a/build/build-modules-js/javascript/build-bootstrap-js.mjs
+++ /dev/null
@@ -1,118 +0,0 @@
-import {
-  readdir, readFile, writeFile, unlink,
-} from 'node:fs/promises';
-import { resolve } from 'node:path';
-import { transform } from 'esbuild';
-import { rimrafSync } from 'rimraf';
-import { rollup } from 'rollup';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import replace from '@rollup/plugin-replace';
-import { babel } from '@rollup/plugin-babel';
-import { createRequire } from 'node:module';
-
-const require = createRequire(import.meta.url);
-const opts = require('../../../package.json');
-
-const bsVersion = opts.dependencies.bootstrap.replace(/^\^|~/, '');
-const tasks = [];
-const inputFolder = 'build/media_source/vendor/bootstrap/js';
-const outputFolder = 'media/vendor/bootstrap/js';
-
-const createMinified = async (file) => {
-  const initial = await readFile(resolve(outputFolder, file), {
-    encoding: 'utf8',
-  });
-  const mini = await transform(
-    initial.replace('./popper.js', `./popper.min.js?${bsVersion}`).replace('./dom.js', `./dom.min.js?${bsVersion}`),
-    { minify: true },
-  );
-  await writeFile(
-    resolve(outputFolder, file),
-    initial.replace('./popper.js', `./popper.js?${bsVersion}`).replace('./dom.js', `./dom.js?${bsVersion}`),
-    { encoding: 'utf8', mode: 0o644 },
-  );
-  await writeFile(resolve(outputFolder, file.replace('.js', '.min.js')), mini.code, { encoding: 'utf8', mode: 0o644 });
-};
-
-const build = async () => {
-  console.log('Building ES6 Components...');
-
-  const domImports = await readdir(resolve('node_modules/bootstrap', 'js/src/dom'));
-  const utilImports = await readdir(resolve('node_modules/bootstrap', 'js/src/util'));
-
-  const bundle = await rollup({
-    input: resolve(inputFolder, 'index.es6.js'),
-    plugins: [
-      nodeResolve(),
-      replace({
-        preventAssignment: true,
-        'process.env.NODE_ENV': "'production'",
-      }),
-      babel({
-        exclude: 'node_modules/core-js/**',
-        babelHelpers: 'bundled',
-        babelrc: false,
-        presets: [
-          [
-            '@babel/preset-env',
-            {
-              targets: {
-                browsers: ['> 1%', 'not op_mini all'],
-              },
-            },
-          ],
-        ],
-      }),
-    ],
-  });
-
-  await bundle.write({
-    format: 'es',
-    sourcemap: false,
-    dir: outputFolder,
-    chunkFileNames: '[name].js',
-    manualChunks: {
-      alert: ['build/media_source/vendor/bootstrap/js/alert.es6.js'],
-      button: ['build/media_source/vendor/bootstrap/js/button.es6.js'],
-      carousel: ['build/media_source/vendor/bootstrap/js/carousel.es6.js'],
-      collapse: ['build/media_source/vendor/bootstrap/js/collapse.es6.js'],
-      dropdown: ['build/media_source/vendor/bootstrap/js/dropdown.es6.js'],
-      modal: ['build/media_source/vendor/bootstrap/js/modal.es6.js'],
-      offcanvas: ['build/media_source/vendor/bootstrap/js/offcanvas.es6.js'],
-      popover: ['build/media_source/vendor/bootstrap/js/popover.es6.js'],
-      scrollspy: ['build/media_source/vendor/bootstrap/js/scrollspy.es6.js'],
-      tab: ['build/media_source/vendor/bootstrap/js/tab.es6.js'],
-      toast: ['build/media_source/vendor/bootstrap/js/toast.es6.js'],
-      popper: ['@popperjs/core'],
-      dom: [
-        'node_modules/bootstrap/js/src/base-component.js',
-        ...domImports.map((file) => `node_modules/bootstrap/js/src/dom/${file}`),
-        ...utilImports.map((file) => `node_modules/bootstrap/js/src/util/${file}`),
-      ],
-    },
-  });
-
-  // closes the bundle
-  await bundle.close();
-};
-
-export const bootstrapJs = async () => {
-  rimrafSync(resolve(outputFolder));
-
-  try {
-    await build(resolve(inputFolder, 'index.es6.js'));
-    await unlink(resolve(outputFolder, 'index.es6.js'));
-  } catch (error) {
-    console.error(error);
-    process.exitCode = 1;
-  }
-
-  (await readdir(outputFolder)).forEach((file) => {
-    tasks.push(createMinified(file));
-  });
-
-  return Promise.all(tasks).catch((er) => {
-    console.log(er);
-    process.exitCode = 1;
-  });
-};
diff --git a/build/build-modules-js/javascript/build-codemirror.mjs b/build/build-modules-js/javascript/build-codemirror.mjs
deleted file mode 100644
index 0801efeaef2d1..0000000000000
--- a/build/build-modules-js/javascript/build-codemirror.mjs
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Build codemirror modules
- */
-import { readFileSync } from 'node:fs';
-import { writeFile } from 'node:fs/promises';
-import { createRequire } from 'node:module';
-
-import cliProgress from 'cli-progress';
-import { rollup } from 'rollup';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import replace from '@rollup/plugin-replace';
-import { transform } from 'esbuild';
-
-const require = createRequire(import.meta.url);
-
-const {
-  resolvePackageFile,
-  getPackagesUnderScope,
-} = require('../init/common/resolve-package.cjs');
-
-// Build the module
-const buildModule = async (module, externalModules, destFile) => {
-  const build = await rollup({
-    input: module,
-    external: externalModules || [],
-    plugins: [
-      nodeResolve(),
-      replace({ preventAssignment: true, 'process.env.NODE_ENV': '"production"' }),
-    ],
-  });
-
-  await build.write({
-    format: 'es',
-    sourcemap: false,
-    file: destFile,
-  });
-  await build.close();
-};
-
-// Minify a js file
-const createMinified = async (filePath) => {
-  const destFile = filePath.replace('.js', '.min.js');
-  // Read source
-  const src = readFileSync(filePath, { encoding: 'utf8' });
-  // Minify
-  const min = await transform(src, { minify: true });
-  // Save result
-  await writeFile(destFile, min.code, { encoding: 'utf8', mode: 0o644 });
-};
-
-// Update joomla.asset.json for codemirror
-const updateAssetRegistry = async (modules, externalModules) => {
-  const srcPath = 'build/media_source/plg_editors_codemirror/joomla.asset.json';
-  const destPath = 'media/plg_editors_codemirror/joomla.asset.json';
-
-  // Get base JSON and update
-  const registry = JSON.parse(readFileSync(srcPath, { encoding: 'utf8' }));
-
-  // Add dependencies to base codemirror asset
-  registry.assets.forEach((asset) => {
-    if (asset.name === 'codemirror' && asset.type === 'script') {
-      asset.dependencies = externalModules;
-    }
-  });
-
-  // Create asset for each module
-  modules.forEach((module) => {
-    const packageName = module.package;
-    const modulePathJson = resolvePackageFile(`${packageName}/package.json`);
-    const moduleOptions = require(modulePathJson);
-    const asset = {
-      type: 'script',
-      name: module.package,
-      uri: module.uri.replace('.js', '.min.js'),
-      importmap: true,
-      version: moduleOptions.version,
-    };
-
-    registry.assets.push(asset);
-  });
-
-  // Write assets registry
-  await writeFile(destPath, JSON.stringify(registry, null, 2), { encoding: 'utf8', mode: 0o644 });
-};
-
-export const compileCodemirror = async () => {
-  console.log('Building Codemirror Components...');
-
-  const cmModules = getPackagesUnderScope('@codemirror');
-  const lModules = getPackagesUnderScope('@lezer');
-  const externalModules = [...cmModules, ...lModules];
-  const destBasePath = 'media/vendor/codemirror/js';
-  const assets = [];
-  const tasks = [];
-
-  const progressBar = new cliProgress.SingleBar({
-    stopOnComplete: true,
-    format: '{bar} {percentage}% | {value}/{total} files done',
-  }, cliProgress.Presets.shades_classic);
-  const totalSteps = (cmModules.length + lModules.length) * 2;
-  progressBar.start(totalSteps, 0);
-
-  // Prepare @codemirror modules
-  cmModules.forEach((module) => {
-    const destFile = `${module.replace('@codemirror/', 'codemirror-')}.js`;
-    const destPath = `${destBasePath}/${destFile}`;
-    assets.push({ package: module, uri: destPath });
-
-    const task = buildModule(module, externalModules, destPath).then(() => {
-      progressBar.increment();
-      return createMinified(destPath).then(() => {
-        progressBar.increment();
-      });
-    });
-    tasks.push(task);
-  });
-
-  // Prepare @lezer modules which @codemirror depends on
-  lModules.forEach((module) => {
-    const destFile = `${module.replace('@lezer/', 'lezer-')}.js`;
-    const destPath = `${destBasePath}/${destFile}`;
-    assets.push({ package: module, uri: destPath });
-
-    const task2 = buildModule(module, externalModules, destPath).then(() => {
-      progressBar.increment();
-      return createMinified(destPath).then(() => {
-        progressBar.increment();
-      });
-    });
-    tasks.push(task2);
-  });
-
-  return Promise.all(tasks).then(() => {
-    progressBar.stop();
-    return updateAssetRegistry(assets, externalModules);
-  });
-};
diff --git a/build/build-modules-js/javascript/build-com_media-js.mjs b/build/build-modules-js/javascript/build-com_media-js.mjs
deleted file mode 100644
index 0d0af95307008..0000000000000
--- a/build/build-modules-js/javascript/build-com_media-js.mjs
+++ /dev/null
@@ -1,161 +0,0 @@
-import { writeFile, copyFile } from 'node:fs/promises';
-import { resolve } from 'node:path';
-
-import { rollup, watch } from 'rollup';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import replace from '@rollup/plugin-replace';
-import { babel } from '@rollup/plugin-babel';
-import VuePlugin from 'rollup-plugin-vue';
-import commonjs from '@rollup/plugin-commonjs';
-import dotenv from 'dotenv';
-
-import { minifyCode } from './minify.mjs';
-
-dotenv.config();
-
-const inputJS = 'administrator/components/com_media/resources/scripts/mediamanager.es6.js';
-const isProduction = process.env.NODE_ENV !== 'DEVELOPMENT';
-
-export const mediaManager = async () => {
-  console.log('Building Media Manager ES Module...');
-
-  const bundle = await rollup({
-    input: resolve(inputJS),
-    plugins: [
-      VuePlugin({
-        target: 'browser',
-        css: false,
-        compileTemplate: true,
-        template: {
-          isProduction,
-        },
-      }),
-      nodeResolve(),
-      commonjs(),
-      replace({
-        'process.env.NODE_ENV': JSON.stringify((process.env.NODE_ENV && process.env.NODE_ENV.toLocaleLowerCase()) || 'production'),
-        __VUE_OPTIONS_API__: true,
-        __VUE_PROD_DEVTOOLS__: !isProduction,
-        preventAssignment: true,
-      }),
-      babel({
-        exclude: 'node_modules/core-js/**',
-        babelHelpers: 'bundled',
-        babelrc: false,
-        presets: [
-          [
-            '@babel/preset-env',
-            {
-              targets: {
-                browsers: [
-                  '> 1%',
-                  'not op_mini all',
-                  /** https://caniuse.com/es6-module */
-                  'chrome >= 61',
-                  'safari >= 11',
-                  'edge >= 16',
-                  'Firefox >= 60',
-                ],
-              },
-              loose: true,
-              bugfixes: false,
-              ignoreBrowserslistConfig: true,
-            },
-          ],
-        ],
-      }),
-    ],
-  });
-
-  bundle
-    .write({
-      format: 'es',
-      sourcemap: !isProduction ? 'inline' : false,
-      file: 'media/com_media/js/media-manager.js',
-    })
-    .then((value) => (isProduction ? minifyCode(value.output[0].code) : value.output[0]))
-    .then((content) => {
-      if (isProduction) {
-        console.log('✅ ES2017 Media Manager ready');
-        return writeFile(resolve('media/com_media/js/media-manager.min.js'), content.code, { encoding: 'utf8', mode: 0o644 });
-      }
-      console.log('✅ ES2017 Media Manager ready');
-      return copyFile(resolve('media/com_media/js/media-manager.js'), resolve('media/com_media/js/media-manager.min.js'));
-    })
-    .catch((error) => {
-      console.error(error);
-    });
-
-  // closes the bundle
-  await bundle.close();
-};
-
-export const watchMediaManager = async () => {
-  console.log('Watching Media Manager js+vue files...');
-  console.log('=========');
-  const watcher = watch({
-    input: resolve(inputJS),
-    plugins: [
-      VuePlugin({
-        target: 'browser',
-        css: false,
-        compileTemplate: true,
-        template: {
-          isProduction: true,
-        },
-      }),
-      nodeResolve(),
-      commonjs(),
-      replace({
-        'process.env.NODE_ENV': JSON.stringify('development'),
-        __VUE_OPTIONS_API__: true,
-        __VUE_PROD_DEVTOOLS__: true,
-        preventAssignment: true,
-      }),
-      babel({
-        exclude: 'node_modules/core-js/**',
-        babelHelpers: 'bundled',
-        babelrc: false,
-        presets: [
-          [
-            '@babel/preset-env',
-            {
-              targets: {
-                browsers: [
-                  '> 1%',
-                  'not op_mini all',
-                  /** https://caniuse.com/es6-module */
-                  'chrome 61',
-                  'safari 11',
-                  'edge 16',
-                  'Firefox 60',
-                ],
-              },
-              loose: true,
-              bugfixes: false,
-              ignoreBrowserslistConfig: true,
-            },
-          ],
-        ],
-      }),
-    ],
-    output: [
-      {
-        format: 'es',
-        sourcemap: 'inline',
-        file: 'media/com_media/js/media-manager.js',
-      },
-      {
-        format: 'es',
-        sourcemap: 'inline',
-        file: 'media/com_media/js/media-manager.min.js',
-      },
-    ],
-  });
-
-  watcher.on('event', ({ code, result, error }) => {
-    if (result) result.close();
-    if (error) console.log(error);
-    if (code === 'BUNDLE_END') console.log('Files updated ✅');
-  });
-};
diff --git a/build/build-modules-js/javascript/compile-to-es2017.mjs b/build/build-modules-js/javascript/compile-to-es2017.mjs
deleted file mode 100644
index af1cf740cf747..0000000000000
--- a/build/build-modules-js/javascript/compile-to-es2017.mjs
+++ /dev/null
@@ -1,101 +0,0 @@
-import { writeFile } from 'node:fs/promises';
-import { basename, sep, resolve } from 'node:path';
-
-import { rollup } from 'rollup';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import { babel } from '@rollup/plugin-babel';
-
-import { minifyCode } from './minify.mjs';
-import { getPackagesUnderScope } from '../init/common/resolve-package.cjs';
-
-// List of external modules that should not be resolved by rollup
-const externalModules = [];
-const collectExternals = () => {
-  if (externalModules.length) {
-    return;
-  }
-
-  // Joomla and Vendor modules
-  externalModules.push(
-    'cropper-module',
-    'codemirror',
-    'joomla.dialog',
-    'editor-api',
-    'editor-decorator',
-    'sa11y',
-    'sa11y-lang',
-  );
-
-  // Codemirror modules
-  const cmModules = getPackagesUnderScope('@codemirror');
-  if (cmModules) {
-    externalModules.push(...cmModules);
-  }
-  const lezerModules = getPackagesUnderScope('@lezer');
-  if (lezerModules) {
-    externalModules.push(...lezerModules);
-  }
-};
-
-/**
- * Compiles es6 files to es5.
- *
- * @param file the full path to the file + filename + extension
- */
-export const handleESMFile = async (file) => {
-  const newPath = file.replace(/\.w-c\.es6\.js$/, '').replace(/\.es6\.js$/, '').replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`);
-
-  // Make sure externals are collected
-  collectExternals();
-
-  const bundle = await rollup({
-    input: resolve(file),
-    plugins: [
-      nodeResolve({ preferBuiltins: false }),
-      babel({
-        exclude: 'node_modules/core-js/**',
-        babelHelpers: 'bundled',
-        babelrc: false,
-        presets: [
-          [
-            '@babel/preset-env',
-            {
-              targets: {
-                browsers: [
-                  '> 1%',
-                  'not op_mini all',
-                  /** https://caniuse.com/es6-module */
-                  'chrome >= 61',
-                  'safari >= 11',
-                  'edge >= 16',
-                  'Firefox >= 60',
-                ],
-              },
-              bugfixes: true,
-              loose: true,
-            },
-          ],
-        ],
-      }),
-    ],
-    external: externalModules,
-  });
-
-  bundle.write({
-    format: file.endsWith('core.es6.js') ? 'iife' : 'es',
-    sourcemap: false,
-    file: resolve(`${newPath}.js`),
-  })
-    .then((value) => minifyCode(value.output[0].code))
-    .then((content) => {
-      console.log(`✅ ES2017 file: ${basename(file).replace('.es6.js', '.js')}: transpiled`);
-
-      return writeFile(resolve(`${newPath}.min.js`), content.code, { encoding: 'utf8', mode: 0o644 });
-    })
-    .catch((error) => {
-      console.error(error);
-    });
-
-  // closes the bundle
-  await bundle.close();
-};
diff --git a/build/build-modules-js/javascript/handle-es5.mjs b/build/build-modules-js/javascript/handle-es5.mjs
deleted file mode 100644
index a7eae972d7b09..0000000000000
--- a/build/build-modules-js/javascript/handle-es5.mjs
+++ /dev/null
@@ -1,20 +0,0 @@
-import { basename, dirname, sep } from 'node:path';
-
-import FsExtra from 'fs-extra';
-import { minifyFile } from './minify.mjs';
-
-export const handleES5File = async (file) => {
-  if (file.endsWith('.js')) {
-    // ES5 file, we will copy the file and then minify it in place
-    // Ensure that the directories exist or create them
-    await FsExtra.ensureDir(dirname(file).replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`));
-    await FsExtra.copy(
-      file,
-      file.replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`).replace('.es5.js', '.js'),
-      { preserveTimestamps: true },
-    );
-    console.log(`✅ Legacy js file: ${basename(file)}: copied`);
-
-    minifyFile(file.replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`).replace('.es5.js', '.js'));
-  }
-};
diff --git a/build/build-modules-js/javascript/js-handle.mjs b/build/build-modules-js/javascript/js-handle.mjs
new file mode 100644
index 0000000000000..35c8f76b6edad
--- /dev/null
+++ b/build/build-modules-js/javascript/js-handle.mjs
@@ -0,0 +1,159 @@
+/**
+ * JS handler
+ */
+
+import fsp from 'node:fs/promises';
+import path from 'node:path';
+import fs from 'node:fs';
+
+import { transform } from 'esbuild';
+import { rollup } from 'rollup';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import { babel } from '@rollup/plugin-babel';
+import { getPackagesUnderScope } from '../utils/resolve-package.mjs';
+
+// List of external modules that should not be resolved by rollup
+// @TODO: Make it configurable somehow?
+const externalModules = [];
+const getExternalModules = async () => {
+  if (externalModules.length) {
+    return externalModules;
+  }
+
+  // Joomla and Vendor modules
+  externalModules.push(
+    'cropper-module',
+    'codemirror',
+    'joomla.dialog',
+    'editor-api',
+    'editor-decorator',
+    'sa11y',
+    'sa11y-lang',
+  );
+
+  // Codemirror modules
+  const cmModules = getPackagesUnderScope('@codemirror');
+  if (cmModules) {
+    externalModules.push(...cmModules);
+  }
+  const lezerModules = getPackagesUnderScope('@lezer');
+  if (lezerModules) {
+    externalModules.push(...lezerModules);
+  }
+
+  return externalModules;
+};
+
+/**
+ * Minify JS content
+ *
+ * @param   { String } content
+ * @returns { Promise<String> }
+ */
+export const minifyJSContent = async (content = '') => transform(content, { minify: true })
+  .then((result) => result.code);
+
+/**
+ * Handle JS file without extra processing. Just minification.
+ *
+ * @param { String } srcPath
+ * @param { String } targetPath
+ * @returns { Promise }
+ */
+export const handleJSFile = async (srcPath, targetPath) => {
+  const targetFolder = path.dirname(targetPath);
+
+  if (!fs.existsSync(targetFolder)) {
+    fs.mkdirSync(targetFolder, { mode: 0o755, recursive: true });
+  }
+
+  return fsp.readFile(srcPath, { encoding: 'utf8' }).then((content) => {
+    return minifyJSContent(content).then((jsMin) => {
+      // Copy source
+      const saveCopy = (srcPath !== targetPath) ? fsp.copyFile(srcPath, targetPath) : Promise.resolve();
+
+      // Store minified version
+      const saveMin = fsp.writeFile(
+        targetPath.replace('.js', '.min.js'),
+        jsMin,
+        { encoding: 'utf8', mode: 0o644 },
+      );
+
+      return Promise.all([saveCopy, saveMin]);
+    });
+  }).catch((error) => {
+    throw new Error(`Processing failed for "${srcPath}".`, { cause: error });
+  });
+};
+
+/**
+ * Handle JS file which requires extra processing.
+ *
+ * @param { String } srcPath
+ * @param { String } targetPath
+ * @param { string[] } externalModulesList
+ * @returns { Promise }
+ */
+export const handleMJSFile = async (srcPath, targetPath, externalModulesList = []) => {
+  const externalModules = externalModulesList && externalModulesList.length ? externalModulesList : await getExternalModules();
+  const targetFolder = path.dirname(targetPath);
+
+  if (!fs.existsSync(targetFolder)) {
+    fs.mkdirSync(targetFolder, { mode: 0o755, recursive: true });
+  }
+
+  return rollup({
+    input: srcPath,
+    plugins: [
+      nodeResolve({ preferBuiltins: false }),
+      babel({
+        exclude: 'node_modules/core-js/**',
+        babelHelpers: 'bundled',
+        babelrc: false,
+        presets: [
+          [
+            '@babel/preset-env',
+            {
+              targets: {
+                browsers: [
+                  '> 1%',
+                  'not op_mini all',
+                  /** https://caniuse.com/es6-module */
+                  'chrome >= 61',
+                  'safari >= 11',
+                  'edge >= 16',
+                  'Firefox >= 60',
+                ],
+              },
+              bugfixes: true,
+              loose: true,
+            },
+          ],
+        ],
+      }),
+    ],
+    external: externalModules,
+  }).then((bundle) => {
+    // Process and store source file
+    const result = bundle.write({
+      format: targetPath.endsWith('core.js') ? 'iife' : 'es',
+      sourcemap: false,
+      file: targetPath,
+    });
+
+    // Minify the code and store
+    const saveMin = result
+      .then((value) => minifyJSContent(value.output[0].code))
+      .then((jsMin) => {
+        return fsp.writeFile(
+          targetPath.replace('.js', '.min.js'),
+          jsMin,
+          { encoding: 'utf8', mode: 0o644 },
+        );
+      });
+
+    return saveMin.then(() => bundle.close());
+  }).catch((error) => {
+    throw new Error(`Processing failed for "${srcPath}".`, { cause: error });
+  });
+};
diff --git a/build/build-modules-js/javascript/minify.mjs b/build/build-modules-js/javascript/minify.mjs
deleted file mode 100644
index a01b7b6b0faeb..0000000000000
--- a/build/build-modules-js/javascript/minify.mjs
+++ /dev/null
@@ -1,25 +0,0 @@
-import { basename } from 'node:path';
-import { readFile, writeFile } from 'node:fs/promises';
-
-import { transform } from 'esbuild';
-
-/**
- * Minify a js file using esbuild
- *
- * @param file
- * @returns {Promise<void>}
- */
-export const minifyFile = async (file) => {
-  const fileContent = await readFile(file, { encoding: 'utf8' });
-  const content = await transform(fileContent, { minify: true });
-  await writeFile(file.replace('.js', '.min.js'), content.code, { encoding: 'utf8', mode: 0o644 });
-  console.log(`✅ Legacy js file: ${basename(file)}: minified`);
-};
-
-/**
- * Minify a chunk of js using esbuild
- *
- * @param code
- * @returns {Promise<void>}
- */
-export const minifyCode = async (code) => transform(code, { minify: true });
diff --git a/build/build-modules-js/settings.json b/build/build-modules-js/settings.json
index 2d781c7a2ef72..6351505685411 100644
--- a/build/build-modules-js/settings.json
+++ b/build/build-modules-js/settings.json
@@ -1,6 +1,43 @@
 {
   "settings": {
     "vendors": {
+      "altcha": {
+        "name": "altcha",
+        "js": {
+          "dist_external/altcha.js": "js/altcha.js",
+          "dist_external/worker.js": "js/worker.js"
+        },
+        "css": {
+          "dist_external/altcha.css": "css/altcha.css"
+        },
+        "provideAssets": [
+          {
+            "name": "altcha",
+            "type": "script",
+            "uri": "altcha.js",
+            "attributes": {
+              "defer": true,
+              "async": true,
+              "type": "module"
+            }
+          },
+          {
+            "name": "altcha",
+            "type": "style",
+            "uri": "altcha.css"
+          },
+          {
+            "name": "altcha",
+            "type": "preset",
+            "dependencies": [
+              "altcha#script",
+              "altcha#style"
+            ]
+          }
+        ],
+        "dependencies": [],
+        "licenseFilename": "LICENSE.txt"
+      },
       "awesomplete": {
         "name": "awesomplete",
         "js": {
@@ -383,8 +420,8 @@
       "@fortawesome/fontawesome-free": {
         "name": "fontawesome-free",
         "css": {
-          "css/fontawesome.css": "css/fontawesome.css",
-          "css/fontawesome.min.css": "css/fontawesome.min.css"
+          "css/all.css": "css/fontawesome.css",
+          "css/all.min.css": "css/fontawesome.min.css"
         },
         "filesExtra": {
           "scss": "scss",
@@ -432,6 +469,11 @@
             "name": "jquery",
             "type": "script",
             "uri": "jquery.min.js"
+          },
+          {
+            "name": "jquery-noconflict",
+            "type": "script",
+            "uri": "jquery-noconflict.min.js"
           }
         ],
         "dependencies": [],
@@ -487,7 +529,7 @@
               "defer": true
             },
             "dependencies": [
-              "wcpolyfill"
+              "core"
             ]
           },
           {
@@ -498,7 +540,7 @@
               "type": "module"
             },
             "dependencies": [
-              "wcpolyfill"
+              "core"
             ]
           },
           {
@@ -515,7 +557,7 @@
               "defer": true
             },
             "dependencies": [
-              "wcpolyfill"
+              "core"
             ]
           },
           {
@@ -526,7 +568,7 @@
               "type": "module"
             },
             "dependencies": [
-              "wcpolyfill"
+              "core"
             ]
           }
         ],
@@ -602,63 +644,7 @@
       },
       "tinymce": {
         "name": "tinymce",
-        "licenseFilename": "license.txt"
-      },
-      "@webcomponents/webcomponentsjs": {
-        "name": "webcomponentsjs",
-        "js": {
-          "webcomponents-bundle.js": "js/webcomponents-bundle.js"
-        },
-        "dependencies": [],
-        "licenseFilename": "LICENSE.md",
-        "provideAssets": [
-          {
-            "name": "wcpolyfill",
-            "type": "script",
-            "uri": "webcomponents-bundle.js",
-            "attributes": {
-              "nomodule": true,
-              "defer": true
-            },
-            "dependencies": [
-              "core"
-            ]
-          }
-        ]
-      },
-      "chosen-js": {
-        "name": "chosen",
-        "js": {
-          "chosen.jquery.js": "js/chosen.jquery.js"
-        },
-        "css": {
-          "chosen.css": "css/chosen.css",
-          "chosen-sprite.png": "css/chosen-sprite.png",
-          "chosen-sprite@2x.png": "css/chosen-sprite@2x.png"
-        },
-        "provideAssets": [
-          {
-            "name": "chosen",
-            "type": "style",
-            "uri": "chosen.css"
-          },
-          {
-            "name": "chosen",
-            "type": "script",
-            "uri": "chosen.jquery.js",
-            "dependencies": [
-              "jquery"
-            ]
-          },
-          {
-            "name": "chosen",
-            "type": "preset",
-            "dependencies": [
-              "chosen#style",
-              "chosen#script"
-            ]
-          }
-        ]
+        "licenseFilename": "license.md"
       },
       "accessibility": {
         "name": "accessibility",
@@ -797,9 +783,9 @@
       "qrcode-generator": {
         "name": "qrcode",
         "js": {
-          "qrcode.js": "js/qrcode.js",
-          "qrcode_SJIS.js": "js/qrcode_SJIS.js",
-          "qrcode_UTF8.js": "js/qrcode_UTF8.js"
+          "dist/qrcode.js": "js/qrcode.js",
+          "dist/qrcode_SJIS.js": "js/qrcode_SJIS.js",
+          "dist/qrcode_UTF8.js": "js/qrcode_UTF8.js"
         },
         "provideAssets": [
           {
diff --git a/build/build-modules-js/stylesheets/css-handler.mjs b/build/build-modules-js/stylesheets/css-handler.mjs
new file mode 100644
index 0000000000000..49b6c9c66e7fe
--- /dev/null
+++ b/build/build-modules-js/stylesheets/css-handler.mjs
@@ -0,0 +1,109 @@
+/**
+ * CSS handler
+ */
+
+import rtlcss from 'rtlcss';
+import path from 'node:path';
+import fsp from 'node:fs/promises';
+import fs from 'node:fs';
+
+import { composeVisitors, transform as transformCss } from 'lightningcss';
+import { urlVersioning2 } from './css-versioning.mjs';
+import { createHash } from 'node:crypto';
+
+/**
+ * Preprocess Css content
+ *
+ * @param { String } content
+ * @returns { Promise<string> }
+ */
+export const preprocessCSS = async (content = '') => {
+  // Remove @charset "UTF-8" at beginning to preserve the license
+  // Because the license comment needs to start at the beginning of the file to be saved
+  content = content.startsWith('@charset "UTF-8";\n') ? content.replace('@charset "UTF-8";\n', '') : content;
+
+  // Check the header comments and make sure it starts with /*!
+  // This need to force lightningcss to keep the license comments
+  if (content.substring(0, 50).includes('/**')) {
+    content = content.replace('/**', '/*!');
+  }
+
+  // Run url() versioning for the source
+  const hash = createHash('md5');
+  hash.update(content);
+  const hashStr = hash.digest('hex').substring(0, 6);
+
+  const { code: css } = transformCss({
+    code: Buffer.from(content),
+    minify: false,
+    visitor: composeVisitors([urlVersioning2(hashStr)]), // Adds a hash to the url() parts of the static css
+  });
+
+  return css.toString();
+};
+
+/**
+ * Minify Css content
+ * @param { String } content
+ * @returns { Promise<string> }
+ */
+export const minifyCSS = async (content = '') => {
+  const { code: cssMin } = transformCss({
+    code: Buffer.from(content),
+    minify: true,
+  });
+
+  return cssMin.toString();
+};
+
+/**
+ * Handle CSS content and store it at the destination.
+ * Store source and minified version.
+ *
+ * @param { String } targetPath
+ * @param { String } content
+ * @returns { Promise }
+ */
+export const handleAndStoreCSSContent = async (targetPath, content = '') => {
+  if (targetPath.endsWith('-rtl.css')) {
+    content = rtlcss.process(content);
+  }
+
+  const css = await preprocessCSS(content);
+  const cssMin = await minifyCSS(css);
+  const targetFolder = path.dirname(targetPath);
+
+  if (!fs.existsSync(targetFolder)) {
+    fs.mkdirSync(targetFolder, { mode: 0o755, recursive: true });
+  }
+
+  const save = fsp.writeFile(
+    targetPath,
+    `@charset "UTF-8";\n${css}`, // Force "UTF-8" for all, also it is removed by preprocessCSS
+    { encoding: 'utf8', mode: 0o644 },
+  );
+
+  // Save minified css file
+  const saveMin = fsp.writeFile(
+    targetPath.replace('.css', '.min.css'),
+    `@charset "UTF-8";${cssMin}`,
+    { encoding: 'utf8', mode: 0o644 },
+  );
+
+  return Promise.all([save, saveMin]);
+};
+
+/**
+ * Read source CSS, handle its content and store it at the destination.
+ *
+ * @param { String } srcPath
+ * @param { String } targetPath
+ * @returns { Promise }
+ */
+export const handleCSSFile = async (srcPath, targetPath) => {
+  return fsp.readFile(srcPath, { encoding: 'utf8' }).then((content) => {
+    return handleAndStoreCSSContent(targetPath, content);
+  }).catch((error) => {
+    throw new Error(`Processing failed for "${srcPath}".`, { cause: error });
+  });
+};
diff --git a/build/build-modules-js/stylesheets/css-versioning.mjs b/build/build-modules-js/stylesheets/css-versioning.mjs
index 19ade2f165a2c..7c5ad8e444c17 100644
--- a/build/build-modules-js/stylesheets/css-versioning.mjs
+++ b/build/build-modules-js/stylesheets/css-versioning.mjs
@@ -1,15 +1,11 @@
 import { createHash } from 'node:crypto';
-import { readdir, readFile, writeFile } from 'node:fs/promises';
 import { existsSync, readFileSync } from 'node:fs';
-import { dirname, extname, resolve } from 'node:path';
-import { transform, composeVisitors } from 'lightningcss';
-import { Timer } from '../utils/timer.mjs';
+import { dirname, resolve } from 'node:path';
 
-const RootPath = process.cwd();
 const skipExternal = true;
 const variable = 'v';
 
-function version(urlString, fromFile) {
+function version(urlString, fromFile, withHash) {
   // Skip external URLs
   if (skipExternal && (urlString.startsWith('http') || urlString.startsWith('//'))) {
     return `${urlString}`;
@@ -27,6 +23,10 @@ function version(urlString, fromFile) {
     return `${urlString}`;
   }
 
+  if (withHash) {
+    return `${urlString}?${variable}=${withHash}`;
+  }
+
   if (fromFile && existsSync(resolve(`${dirname(fromFile)}/${urlString}`))) {
     const hash = createHash('md5');
     hash.update(readFileSync(resolve(`${dirname(fromFile)}/${urlString}`)));
@@ -50,58 +50,15 @@ const urlVersioning = (fromFile) => ({
 });
 
 /**
- * Adds a hash to the url() parts of the static css
- *
- * @param file
- * @returns {Promise<void>}
- */
-const fixVersion = async (file) => {
-  try {
-    let content = await readFile(file, { encoding: 'utf8' });
-    // To preserve the licence the comment needs to start at the beginning of the file
-    const replaceUTF8String = file.endsWith('.min.css') ? '@charset "UTF-8";' : '@charset "UTF-8";\n';
-    content = content.startsWith(replaceUTF8String) ? content.replace(replaceUTF8String, '') : content;
-
-    // Preserve a leading license comment (/** ... */)
-    const firstLine = content.split(/\r?\n/)[0] || '';
-    if (firstLine.includes('/*') && !firstLine.includes('/*!')) {
-      const endCommentIdx = content.indexOf('*/');
-      if (endCommentIdx !== -1
-          && (content.substring(0, endCommentIdx).includes('license')
-          || content.substring(0, endCommentIdx).includes('copyright'))
-      ) {
-        content = firstLine.includes('/**') ? content.replace('/**', '/*!') : content.replace('/*', '/*!');
-      }
-    }
-
-    const { code } = transform({
-      code: Buffer.from(content),
-      minify: file.endsWith('.min.css'),
-      visitor: composeVisitors([urlVersioning(file)]),
-    });
-    await writeFile(file, `@charset "UTF-8";${file.endsWith('.min.css') ? '' : '\n'}${code}`, {
-      encoding: 'utf8',
-      mode: 0o644,
-    });
-  } catch (error) {
-    throw new Error(error);
-  }
-};
-
-/**
- * Loop the media folder and add version to all url() entries in all the css files
- *
- * @returns {Promise<void>}
+ * @param {withHash: String} - the filepath for the css file
+ * @returns {import('lightningcss').Visitor} - A visitor that replaces the url
  */
-const cssVersioningVendor = async () => {
-  const bench = new Timer('Versioning');
-
-  const cssFiles = (await readdir(`${RootPath}/media/vendor`, { withFileTypes: true, recursive: true }))
-    .filter((file) => (!file.isDirectory() && extname(file.name) === '.css'))
-    .map((file) => `${file.parentPath}/${file.name}`);
-
-  Promise.all(cssFiles.map((file) => fixVersion(file)))
-    .then(() => bench.stop());
-};
+const urlVersioning2 = (withHash) => ({
+  /**
+   * @param {import('lightningcss').Url} url - The url object to transform
+   * @returns {import('lightningcss').Url} - The transformed url object
+   */
+  Url: (url) => ({ ...url, url: version(url.url, false, withHash) }),
+});
 
-export { urlVersioning, cssVersioningVendor };
+export { urlVersioning, urlVersioning2 };
diff --git a/build/build-modules-js/stylesheets/handle-css.mjs b/build/build-modules-js/stylesheets/handle-css.mjs
deleted file mode 100644
index e4609a8e84673..0000000000000
--- a/build/build-modules-js/stylesheets/handle-css.mjs
+++ /dev/null
@@ -1,55 +0,0 @@
-import { dirname, sep } from 'node:path';
-
-import pkg from 'fs-extra';
-import { transform as transformCss, composeVisitors } from 'lightningcss';
-import { urlVersioning } from './css-versioning.mjs';
-
-const {
-  readFile, writeFile, ensureDir,
-} = pkg;
-
-export const handleCssFile = async (file) => {
-  const outputFile = file.replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`);
-  try {
-    // CSS file, we will process the file and then minify it in place
-    // Ensure that the directories exist or create them
-    await ensureDir(dirname(outputFile), { recursive: true, mode: 0o755 });
-
-    let content = await readFile(file, { encoding: 'utf8' });
-
-    // To preserve the licence the comment needs to start at the beginning of the file
-    content = content.startsWith('@charset "UTF-8";\n') ? content.replace('@charset "UTF-8";\n', '') : content;
-
-    if (file !== outputFile) {
-      const { code: css } = transformCss({
-        code: Buffer.from(content),
-        minify: false,
-        visitor: composeVisitors([urlVersioning(file)]), // Adds a hash to the url() parts of the static css
-      });
-
-      // Save optimized css file
-      await writeFile(
-        outputFile,
-        content.startsWith('@charset "UTF-8";')
-          ? css
-          : `@charset "UTF-8";
-${css}`,
-        { encoding: 'utf8', mode: 0o644 },
-      );
-    }
-
-    // Process the file and minify it in place
-    const { code: cssMin } = transformCss({
-      code: Buffer.from(content),
-      minify: true,
-      visitor: composeVisitors([urlVersioning(outputFile)]), // Adds a hash to the url() parts of the static css
-    });
-
-    // Save minified css file
-    await writeFile(outputFile.replace('.css', '.min.css'), `@charset "UTF-8";${cssMin}`, { encoding: 'utf8', mode: 0o644 });
-
-    console.log(`✅ CSS file copied/minified: ${file}`);
-  } catch (err) {
-    console.log(err);
-  }
-};
diff --git a/build/build-modules-js/stylesheets/handle-scss.mjs b/build/build-modules-js/stylesheets/handle-scss.mjs
deleted file mode 100644
index ee7a598167eff..0000000000000
--- a/build/build-modules-js/stylesheets/handle-scss.mjs
+++ /dev/null
@@ -1,66 +0,0 @@
-import { writeFile } from 'node:fs/promises';
-import { dirname, sep } from 'node:path';
-
-import rtlcss from 'rtlcss';
-import { ensureDir } from 'fs-extra';
-import { transform as transformCss, Features, composeVisitors } from 'lightningcss';
-import { compileAsync } from 'sass-embedded';
-import { urlVersioning } from './css-versioning.mjs';
-
-const getOutputFile = (file) => file.replace(`${sep}scss${sep}`, `${sep}css${sep}`).replace('.scss', '.css').replace(`${sep}build${sep}media_source${sep}`, `${sep}media${sep}`);
-
-export const handleScssFile = async (file) => {
-  let contents;
-  const cssFile = getOutputFile(file);
-
-  try {
-    const { css } = await compileAsync(file);
-    contents = css.toString();
-  } catch (error) {
-    throw new Error(error.formatted);
-  }
-
-  if (cssFile.endsWith('-rtl.css')) {
-    contents = rtlcss.process(contents);
-  }
-
-  // To preserve the licence the comment needs to start at the beginning of the file
-  contents = contents.startsWith('@charset "UTF-8";\n') ? contents.replace('@charset "UTF-8";\n', '') : contents;
-
-  // Ensure the folder exists or create it
-  await ensureDir(dirname(cssFile), {});
-
-  const { code: css } = transformCss({
-    code: Buffer.from(contents),
-    minify: false,
-    exclude: Features.VendorPrefixes,
-    visitor: composeVisitors([urlVersioning(file)]), // Adds a hash to the url() parts of the static css
-  });
-
-  // Save optimized css file
-  await writeFile(
-    cssFile,
-    contents.startsWith('@charset "UTF-8";')
-      ? css
-      : `@charset "UTF-8";
-${css}`,
-    { encoding: 'utf8', mode: 0o644 },
-  );
-
-  const { code: cssMin } = transformCss({
-    code: Buffer.from(contents),
-    minify: true,
-    exclude: Features.VendorPrefixes,
-    visitor: composeVisitors([urlVersioning(cssFile)]), // Adds a hash to the url() parts of the static css
-  });
-
-  // Ensure the folder exists or create it
-  await ensureDir(dirname(cssFile.replace('.css', '.min.css')), {});
-  await writeFile(
-    cssFile.replace('.css', '.min.css'),
-    `@charset "UTF-8";${cssMin}`,
-    { encoding: 'utf8', mode: 0o644 },
-  );
-
-  console.log(`✅ SCSS File compiled: ${cssFile}`);
-};
diff --git a/build/build-modules-js/stylesheets/scss-handler.mjs b/build/build-modules-js/stylesheets/scss-handler.mjs
new file mode 100644
index 0000000000000..61d44b14a484d
--- /dev/null
+++ b/build/build-modules-js/stylesheets/scss-handler.mjs
@@ -0,0 +1,25 @@
+/**
+ * SCSS handler
+ */
+import { compileAsync } from 'sass-embedded';
+import { handleAndStoreCSSContent } from './css-handler.mjs';
+
+/**
+ * Read source SCSS, compile it to CSS and store it at the destination.
+ *
+ * @param { String } srcPath
+ * @param { String } targetPath
+ * @param { boolean } silent
+ * @returns { Promise }
+ */
+export const handleSCSSFile = async (srcPath, targetPath, silent = false) => {
+  return compileAsync(srcPath, {
+    quietDeps: true,
+    silenceDeprecations: silent ? ['if-function', 'import', 'global-builtin', 'color-functions'] : [],
+  })
+    .then(({ css: content }) => {
+      return handleAndStoreCSSContent(targetPath, content);
+    }).catch((error) => {
+      throw new Error(`Processing failed for "${srcPath}".`, { cause: error });
+    });
+};
diff --git a/build/build-modules-js/utils/compressFile.mjs b/build/build-modules-js/utils/compressFile.mjs
index c03dbe864c919..fe033f861f54f 100644
--- a/build/build-modules-js/utils/compressFile.mjs
+++ b/build/build-modules-js/utils/compressFile.mjs
@@ -19,17 +19,23 @@ const gzipEncode = (data) => gzipPromise(data, gzipOpts);
 const brotliPromise = promisify(brotliCompress);
 const brotliEncode = (data) => brotliPromise(data, brotliOpts);
 
-export const compressFile = async (file, enableBrotli) => {
-  if (file.endsWith('.min.js') || file.endsWith('.min.css')) {
-    try {
-      const data = await readFile(file);
-      await writeFile(`${file}.gz`, await gzipEncode(data));
-      if (enableBrotli) {
-        await writeFile(`${file}.br`, await brotliEncode(data));
-      }
-      console.log(file);
-    } catch (err) {
-      console.info(`Error on ${file}: ${err.code}`);
-    }
-  }
+/**
+ * Compress and store the result aside original file.
+ * @param { String } file
+ * @param { boolean } enableBrotli
+ * @return {Promise<void>}
+ */
+export const compressFileAndSave = async (file, enableBrotli = false) => {
+  return readFile(file).then((content) => {
+    const gzipRun = gzipEncode(content).then((data) => {
+      return writeFile(`${file}.gz`, data);
+    });
+    const brotliRun = !enableBrotli
+      ? Promise.resolve()
+      : brotliEncode(content).then(() => {
+          return writeFile(`${file}.br`, data);
+        });
+
+    return Promise.all([gzipRun, brotliRun]);
+  });
 };
diff --git a/build/build-modules-js/utils/resolve-package.mjs b/build/build-modules-js/utils/resolve-package.mjs
new file mode 100644
index 0000000000000..7b8201885eb29
--- /dev/null
+++ b/build/build-modules-js/utils/resolve-package.mjs
@@ -0,0 +1,63 @@
+/**
+ * Resolve Package Helper
+ */
+import path from 'node:path';
+import { existsSync, readdirSync } from 'node:fs';
+import { createRequire } from 'node:module';
+
+/**
+ * Find full path for package file.
+ * Replacement for require.resolve(), as it is broken for packages with "exports" property.
+ *
+ * @param {string} relativePath Relative path to the file to resolve, in format packageName/file-name.js
+ * @returns {string|boolean}
+ */
+export const resolvePackageFile = (relativePath) => {
+  // Get list of node.js include paths
+  const paths = createRequire(import.meta.url).resolve.paths('node');
+
+  for (let i = 0, l = paths.length; i < l; i += 1) {
+    const fullPath = path.join(paths[i], relativePath);
+
+    if (existsSync(fullPath)) {
+      return fullPath;
+    }
+  }
+
+  return false;
+};
+
+/**
+ * Find a list of modules under given scope,
+ * eg: @foobar will look for all submodules @foobar/foo, @foobar/bar
+ *
+ * @param scope
+ * @returns {[]}
+ */
+export const getPackagesUnderScope = (scope) => {
+  const cmModules = new Set();
+
+  // Get list of node.js include paths
+  const paths = createRequire(import.meta.url).resolve.paths('node');
+
+  // Get the scope roots
+  const roots = [];
+  paths.forEach((pathBase) => {
+    const fullPath = path.join(pathBase, scope);
+    if (existsSync(fullPath)) {
+      roots.push(fullPath);
+    }
+  });
+
+  // List of modules
+  // Use forward slashes for module names (package specifiers always use forward slashes,
+  // even on Windows; using path.join() here would produce backslashes on Windows and
+  // break Rollup's external module matching).
+  roots.forEach((rootPath) => {
+    readdirSync(rootPath).forEach((subModule) => {
+      cmModules.add(`${scope}/${subModule}`);
+    });
+  });
+
+  return [...cmModules];
+};
diff --git a/build/build-modules-js/versioning.mjs b/build/build-modules-js/versioning.mjs
deleted file mode 100644
index 3eb985a6abbf5..0000000000000
--- a/build/build-modules-js/versioning.mjs
+++ /dev/null
@@ -1,128 +0,0 @@
-import {
-  lstat, readdir, readFile, writeFile,
-} from 'node:fs/promises';
-import {
-  basename, dirname, resolve, sep,
-} from 'node:path';
-
-import { createHashFromFile } from './utils/hashfromfile.mjs';
-import { Timer } from './utils/timer.mjs';
-
-const RootPath = process.cwd();
-const exclusion = [
-  // We will skip these:
-  '.DS_Store',
-  'index.html',
-  'cache',
-  'vendors',
-];
-const final = {};
-
-/**
- * Update a given joomla.assets.json entry
- *
- * @param asset
- * @param directory
- * @returns {Promise<{type}|*>}
- */
-const updateAsset = async (asset, directory) => {
-  const currentDir = `${RootPath}${sep}media${sep}${directory}`;
-  if (!asset.type) {
-    final[directory].push(asset);
-    return;
-  }
-  let subDir;
-  if (asset.type === 'script') {
-    subDir = 'js';
-  }
-  if (asset.type === 'style') {
-    subDir = 'css';
-  }
-  if (!subDir) {
-    final[directory].push(asset);
-    return;
-  }
-
-  let path = `${currentDir}${sep}${subDir}${sep}${basename(asset.uri)}`;
-  if (`${directory}/${basename(asset.uri)}` !== asset.uri) {
-    if (dirname(asset.uri) === 'system/fields') {
-      path = `${currentDir}${sep}${subDir}${sep}fields${sep}${basename(asset.uri)}`;
-    } else {
-      final[directory].push(asset);
-      return;
-    }
-  }
-
-  const jAssetFile = await lstat(path);
-
-  if (!jAssetFile.isFile()) {
-    final[directory].push(asset);
-    return;
-  }
-
-  const hash = await createHashFromFile(path);
-
-  asset.version = hash.substring(0, 6);
-  final[directory].push(asset);
-};
-
-/**
- * Read the joomla.assets.json and loop the assets
- *
- * @param directory
- * @returns {Promise<void>}
- */
-const fixVersion = async (directory) => {
-  let jAssetFile;
-  try {
-    jAssetFile = await lstat(`${RootPath}${sep}media${sep}${directory}${sep}joomla.asset.json`);
-  } catch (err) {
-    return;
-  }
-
-  if (!jAssetFile.isFile()) {
-    return;
-  }
-
-  const jAssetFileContent = await readFile(`${RootPath}${sep}media${sep}${directory}${sep}joomla.asset.json`, { encoding: 'utf8' });
-  let jsonData;
-  try {
-    jsonData = JSON.parse(jAssetFileContent);
-  } catch (err) {
-    throw new Error(`media\\${directory}\\joomla.asset.json is not a valid JSON file!!!`);
-  }
-
-  if (!jsonData || !jsonData.assets.length) {
-    return;
-  }
-
-  const processes = [];
-  jsonData.assets.map((asset) => processes.push(updateAsset(asset, directory)));
-
-  await Promise.all(processes);
-
-  jsonData.assets = final[directory];
-  await writeFile(`${RootPath}${sep}media${sep}${directory}${sep}joomla.asset.json`, JSON.stringify(jsonData, '', 2), { encoding: 'utf8', mode: 0o644 });
-};
-
-/**
- * Loop the media folder and add version to all .js/.css entries in all
- * the joomla.assets.json files
- *
- * @returns {Promise<void>}
- */
-export const versioning = async () => {
-  const bench = new Timer('Versioning');
-  const tasks = [];
-  let mediaDirectories = await readdir(resolve(RootPath, 'media'));
-  mediaDirectories = mediaDirectories.filter((dir) => !exclusion.includes(dir));
-
-  mediaDirectories.forEach((directory) => {
-    final[directory] = [];
-    tasks.push(fixVersion(directory));
-  });
-
-  await Promise.all(tasks);
-
-  bench.stop();
-};
diff --git a/build/build-modules-js/watch.mjs b/build/build-modules-js/watch.mjs
deleted file mode 100644
index 648dc468a82a8..0000000000000
--- a/build/build-modules-js/watch.mjs
+++ /dev/null
@@ -1,44 +0,0 @@
-import {
-  join, extname, basename, dirname,
-} from 'node:path';
-import chokidar from 'chokidar';
-
-import { handleESMFile } from './javascript/compile-to-es2017.mjs';
-import { handleES5File } from './javascript/handle-es5.mjs';
-import { handleScssFile } from './stylesheets/handle-scss.mjs';
-import { handleCssFile } from './stylesheets/handle-css.mjs';
-import { debounce } from './utils/debounce.mjs';
-
-const RootPath = process.cwd();
-
-const processFile = (file) => {
-  if (extname(file) === '.js' && !dirname(file).startsWith(join(RootPath, 'build/media_source/vendor/bootstrap/js'))) {
-    if ((file.endsWith('.w-c.es6.js') || file.endsWith('.es6.js')) && !file.startsWith('_')) {
-      debounce(handleESMFile(file), 300);
-    }
-    if (file.endsWith('.es5..js')) {
-      debounce(handleES5File(file), 300);
-    }
-  }
-
-  if (extname(file) === '.scss' && !basename(file).startsWith('_')) {
-    debounce(handleScssFile(file), 300);
-  }
-  if (extname(file) === '.css') {
-    debounce(handleCssFile(file), 300);
-  }
-};
-
-export const watching = (path) => {
-  const watchingPath = path ? join(RootPath, path) : join(RootPath, 'build/media_source');
-  const watcher = chokidar.watch(watchingPath, {
-    ignored: /(^|[/\\])\../, // ignore dotfiles
-    persistent: true,
-  });
-
-  watcher
-    .on('add', (file) => processFile(file))
-    .on('change', (file) => processFile(file));
-  // @todo Handle this case as well
-  // .on('unlink', path => log(`File ${path} has been removed`));
-};
diff --git a/build/build.mjs b/build/build.mjs
index a82f28620594d..a53f31c131727 100644
--- a/build/build.mjs
+++ b/build/build.mjs
@@ -1,202 +1,61 @@
 /**
- * Command line helper
- *
- * To get the complete functional media folder please run:
- * npm ci
- *
- * For dedicated tasks, please run:
- * node build.mjs --build-pages      will create the error pages (for incomplete repo build PHP+NPM)
- * node build.mjs --copy-assets      will clean the media/vendor folder and then will populate the folder from node_modules
- * node build.mjs --compile-js       will transpile ES6 files and also uglify the ES6,ES5 files
- * node build.mjs --compile-css      will compile all the scss defined files and also create a minified version of the css
- * node build.mjs --compile-bs       will compile all the Bootstrap javascript components
- * node build.mjs --com-media        will compile the media manager Vue application
- * node build.mjs --watch-com-media  will watch and compile the media manager Vue application
- * node build.mjs --gzip             will create gzip files for all the minified stylesheets and scripts.
- * node build.mjs --versioning       will update all the joomla.assets.json files providing accurate versions for stylesheets and scripts.
+ * Script used to build Joomla Web Assets content
  */
 
-import { createRequire } from 'node:module';
 import { Command } from 'commander';
 import semver from 'semver';
-
-// Joomla Build modules
-import { createErrorPages } from './build-modules-js/error-pages.mjs';
-import { stylesheets } from './build-modules-js/compilecss.mjs';
-import { scripts } from './build-modules-js/compilejs.mjs';
-import { bootstrapJs } from './build-modules-js/javascript/build-bootstrap-js.mjs';
-import { localisePackages } from './build-modules-js/init/localise-packages.mjs';
-import { minifyVendor } from './build-modules-js/init/minify-vendor.mjs';
-import { patchPackages } from './build-modules-js/init/patches.mjs';
-import { cleanVendors } from './build-modules-js/init/cleanup-media.mjs';
-import { recreateMediaFolder } from './build-modules-js/init/recreate-media.mjs';
-import { watching } from './build-modules-js/watch.mjs';
-import { mediaManager, watchMediaManager } from './build-modules-js/javascript/build-com_media-js.mjs';
-import { compressFiles } from './build-modules-js/compress.mjs';
-import { versioning } from './build-modules-js/versioning.mjs';
 import { Timer } from './build-modules-js/utils/timer.mjs';
-import { compileCodemirror } from './build-modules-js/javascript/build-codemirror.mjs';
-import { cssVersioningVendor } from './build-modules-js/stylesheets/css-versioning.mjs';
-
-const require = createRequire(import.meta.url);
-
-// The settings
-const options = require('../package.json');
-const settings = require('./build-modules-js/settings.json');
+import buildCommand from './build-modules-js/command/build-command.mjs';
+import watchCommand from './build-modules-js/command/watch-command.mjs';
+import pkgOptions from '../package.json' with { type: 'json' };
+import { builders, blockingBuilders } from './build-modules-js/builders-registry.mjs';
 
-const handleError = (err, terminateCode) => {
-  console.error(err);
-  process.exitCode = terminateCode;
-};
-
-if (semver.gte(semver.minVersion(options.engines.node), semver.clean(process.version))) {
-  handleError(
-    `Node version ${semver.clean(process.version)} is not supported, please upgrade to Node version ${semver.clean(options.engines.node)}`,
-    1,
-  );
+// Check minimum Node version
+if (semver.gte(semver.minVersion(pkgOptions.engines.node), semver.clean(process.version))) {
+  throw new Error(`Node version ${semver.clean(process.version)} is not supported, please upgrade to Node version ${semver.clean(pkgOptions.engines.node)}`);
 }
 
-// The command line
-const Program = new Command();
-
-// Merge Joomla's specific settings to the main package.json object
-if ('settings' in settings) {
-  options.settings = settings.settings;
-}
-
-const allowedVersion = () => {
-  if (!semver.satisfies(process.version.substring(1), options.engines.node)) {
-    handleError(
-      `Command line tools require Node Version ${options.engines.node} but found ${process.version}`,
-      -1,
-    );
-  }
-};
-
-// Initialize the CLI
-Program.allowUnknownOption()
-  .version(options.version)
-  .option('--copy-assets', 'Moving files from node_modules to media folder')
-  .option(
-    '--build-pages',
-    'Creates the error pages for unsupported PHP version & incomplete environment',
-  )
-  .option(
-    '--compile-js, --compile-js path',
-    'Handles ES6, ES5 and web component scripts',
-  )
-  .option(
-    '--compile-css, --compile-css path',
-    'Compiles all the scss files to css',
-  )
-  .option('--compile-bs', 'Compiles all the Bootstrap component scripts.')
-  .option('--compile-codemirror', 'Compiles all the codemirror modules.')
-  .option(
-    '--watch',
-    'Watch file changes and re-compile (ATM only works for the js in the media_source).',
-  )
-  .option('--com-media', 'Compile the Media Manager client side App.')
-  .option(
-    '--watch-com-media',
-    'Watch and Compile the Media Manager client side App.',
-  )
-  .option('--gzip', 'Compress all the minified stylesheets and scripts.')
-  .option('--prepare', 'Run all the needed tasks to initialise the repo')
-  .option(
-    '--versioning',
-    'Update all the .js/.css versions on their relative joomla.assets.json',
-  )
+// The command line, initialize
+const program = new Command();
 
+program
+  // Show correct command hint in the Help
+  .name('node build/build.mjs')
+  .version(pkgOptions.version)
   .addHelpText(
     'after',
     `
-Version: ${options.version}
+Version: ${pkgOptions.version}
 `,
   );
 
-Program.parse(process.argv);
-
-const cliOptions = Program.opts();
-
-// Update the vendor folder
-if (cliOptions.copyAssets) {
-  allowedVersion();
-  recreateMediaFolder(options)
-    .then(() => cleanVendors())
-    .then(() => localisePackages(options))
-    .then(() => patchPackages(options))
-    .then(() => cssVersioningVendor())
-    .then(() => minifyVendor())
-    .catch((error) => handleError(error, 1));
-}
-
-// Creates the error pages for unsupported PHP version & incomplete environment
-if (cliOptions.buildPages) {
-  createErrorPages(options).catch((err) => handleError(err, 1));
-}
-
-// Convert scss to css
-if (cliOptions.compileCss) {
-  stylesheets(options, Program.args[0]).catch((err) => handleError(err, 1));
-}
-
-// Compress/transpile the javascript files
-if (cliOptions.compileJs) {
-  scripts(options, Program.args[0]).catch((err) => handleError(err, 1));
-}
-
-// Watch & Compile the javascript files in the media_source folder
-if (cliOptions.watch) {
-  watching(Program.args[0]);
-}
-
-// Compile the Bootstrap javascript components
-if (cliOptions.compileBs) {
-  bootstrapJs();
-}
-
-// Compile codemirror
-if (cliOptions.compileCodemirror) {
-  compileCodemirror();
-}
-
-// Gzip js/css files
-if (cliOptions.gzip) {
-  compressFiles();
-}
-
-// Compile the media manager
-if (cliOptions.comMedia) {
-  // false indicates "no watch"
-  mediaManager(false);
-}
-
-// Watch & Compile the media manager
-if (cliOptions.watchComMedia) {
-  watchMediaManager(true);
-}
-
-// Update the .js/.css versions
-if (cliOptions.versioning) {
-  versioning().catch((err) => handleError(err, 1));
-}
-
-// Prepare the repo for dev work
-if (cliOptions.prepare) {
-  const bench = new Timer('Build');
-  allowedVersion();
-  recreateMediaFolder(options)
-    .then(() => cleanVendors())
-    .then(() => localisePackages(options))
-    .then(() => patchPackages(options))
-    .then(() => minifyVendor())
-    .then(() => createErrorPages(options))
-    .then(() => stylesheets(options, Program.args[0]))
-    .then(() => cssVersioningVendor())
-    .then(() => scripts(options, Program.args[0]))
-    .then(() => mediaManager())
-    .then(() => bootstrapJs())
-    .then(() => compileCodemirror())
-    .then(() => bench.stop('Build'))
-    .catch((err) => handleError(err, -1));
-}
+program
+  .command('builders-list')
+  .description('Show list of builders')
+  .action(() => {
+    console.log(builders.join('\n'));
+  });
+
+program
+  .command('build')
+  .description('Build all or only specified asset')
+  .option('-a,--all', 'build all assets')
+  .option('-n,--name <resource_name,resource_name>', 'build specific resource(s)')
+  .option('-t,--task <builder_task,builder_task>', 'task(s) to run for specified resource(s)')
+  .option('--sass-silent', 'hide SASS deprecations and warnings')
+  .action((options) => {
+    const bench = new Timer('Build command');
+    buildCommand(program, options, builders, blockingBuilders)
+      .then(() => bench.stop('Build command'));
+  });
+
+program
+  .command('watch')
+  .description('Watch specified asset and rebuild on changes')
+  .option('-a,--all', 'watch all assets')
+  .option('-n,--name <builder_name,builder_name>', 'builder(s) to watch')
+  .action((options) => {
+    watchCommand(program, options, builders);
+  });
+
+program.parse(process.argv);
diff --git a/build/build.php b/build/build.php
index 573a06db27dd6..a8408f2c12e64 100644
--- a/build/build.php
+++ b/build/build.php
@@ -86,6 +86,8 @@ function clean_checkout(string $dir)
     run_and_check('find libraries/vendor -name CODE_OF_CONDUCT.md | xargs rm -rf -');
     run_and_check('find libraries/vendor -name CONDUCT.md | xargs rm -rf -');
     run_and_check('find libraries/vendor -name docker-compose.yml | xargs rm -rf -');
+    run_and_check('find libraries/vendor -name Dockerfile | xargs rm -rf -');
+    run_and_check('find libraries/vendor -name compose.yml | xargs rm -rf -');
     run_and_check('find libraries/vendor -name phpunit.xml | xargs rm -rf -');
     run_and_check('find libraries/vendor -name README.md | xargs rm -rf -');
     run_and_check('find libraries/vendor -name readme.md | xargs rm -rf -');
@@ -112,7 +114,6 @@ function clean_checkout(string $dir)
     run_and_check('find libraries/vendor -name .php_cs.dist | xargs rm -rf -');
     run_and_check('find libraries/vendor -name phpcs.xsd | xargs rm -rf -');
     run_and_check('find libraries/vendor -name phpcs.xml | xargs rm -rf -');
-    run_and_check('find libraries/vendor -name build.xml | xargs rm -rf -');
     run_and_check('find libraries/vendor -name infection.json.dist | xargs rm -rf -');
     run_and_check('find libraries/vendor -name phpbench.json | xargs rm -rf -');
     run_and_check('find libraries/vendor -name phpstan.neon.dist | xargs rm -rf -');
@@ -358,9 +359,6 @@ function capture_or_fail(string $command): string
 // Create gzipped version of the static assets
 run_and_check('npm run gzip');
 
-// Create version entries of the static assets in their respective joomla.asset.json
-run_and_check('npm run versioning');
-
 // Clean the checkout of extra resources
 if (!$debugBuild) {
     clean_checkout($fullpath);
@@ -446,15 +444,13 @@ function capture_or_fail(string $command): string
     '.gitignore',
     '.php-cs-fixer.dist.php',
     'acceptance.suite.yml',
-    // Media Manager Node Assets
-    'administrator/components/com_media/resources',
     'build',
-    'build.xml',
     'CODE_OF_CONDUCT.md',
     'composer.json',
     'composer.lock',
     'crowdin.yml',
     'cypress.config.dist.mjs',
+    'media_source',
     'package-lock.json',
     'package.json',
     'phpstan-baseline.neon',
diff --git a/build/bump.php b/build/bump.php
index 5f266acc00c02..44c77a6144642 100644
--- a/build/bump.php
+++ b/build/bump.php
@@ -57,8 +57,6 @@ function usage($command)
 
 $languagePackXmlFile = '/administrator/manifests/packages/pkg_en-GB.xml';
 
-$antJobFile = '/build.xml';
-
 $packageJsonFiles = [
     '/package.json',
     '/package-lock.json',
@@ -162,7 +160,7 @@ function usage($command)
     'build'      => '',
     'reldate'    => $date->format('j-F-Y'),
     'reltime'    => $date->format('H:i'),
-    'reltz'      => 'GMT',
+    'reltz'      => 'UTC',
     'credate'    => $date->format('Y-m'),
 ];
 
@@ -243,13 +241,6 @@ function usage($command)
     file_put_contents($rootPath . $languagePackXmlFile, $fileContents);
 }
 
-// Updates the version for the `phpdoc` task in the Ant job file.
-if (file_exists($rootPath . $antJobFile)) {
-    $fileContents = file_get_contents($rootPath . $antJobFile);
-    $fileContents = preg_replace('#<arg value="Joomla! CMS [^ ]* API" />#', '<arg value="Joomla! CMS ' . $version['main'] . ' API" />', $fileContents);
-    file_put_contents($rootPath . $antJobFile, $fileContents);
-}
-
 // Updates the version in the package.json file.
 foreach ($packageJsonFiles as $packageJsonFile) {
     if (file_exists($rootPath . $packageJsonFile)) {
diff --git a/build/deleted_file_check.php b/build/deleted_file_check.php
index c2d14e69f7583..b18fd3971cb2f 100644
--- a/build/deleted_file_check.php
+++ b/build/deleted_file_check.php
@@ -59,29 +59,14 @@ function usage($command)
     exit(1);
 }
 
-// Directories to skip for the check (needs to include anything from J3 we want to keep)
+// Directories to skip for the check (needs to include anything from previous versions which we want to keep)
 $previousReleaseExclude = [
-    $options['from'] . '/administrator/components/com_search',
-    $options['from'] . '/components/com_search',
     $options['from'] . '/images/sampledata',
     $options['from'] . '/installation',
-    $options['from'] . '/media/com_cpanel/js',
-    $options['from'] . '/media/com_modules/js',
-    $options['from'] . '/media/legacy/js',
-    $options['from'] . '/media/mod_multilangstatus',
-    $options['from'] . '/media/plg_quickicon_eos310',
-    $options['from'] . '/media/system/images',
-    $options['from'] . '/modules/mod_search',
-    $options['from'] . '/plugins/captcha/recaptcha',
-    $options['from'] . '/plugins/captcha/recaptcha_invisible',
-    $options['from'] . '/plugins/fields/repeatable',
-    $options['from'] . '/plugins/quickicon/eos310',
-    $options['from'] . '/plugins/search',
-    $options['from'] . '/plugins/system/compat',
-    $options['from'] . '/plugins/system/logrotation',
-    $options['from'] . '/plugins/system/sessiongc',
-    $options['from'] . '/plugins/system/updatenotification',
-    $options['from'] . '/plugins/task/demotasks',
+    $options['from'] . '/media/plg_captcha_recaptcha',
+    $options['from'] . '/media/plg_captcha_recaptcha_invisible',
+    $options['from'] . '/media/plg_behaviour_compat',
+    $options['from'] . '/plugins/behaviour/compat',
 ];
 
 /**
@@ -159,50 +144,14 @@ function usage($command)
 
 // Specific files (e.g. language files) that we want to keep on upgrade
 $filesToKeep = [
-    "'/administrator/language/en-GB/en-GB.com_search.ini',",
-    "'/administrator/language/en-GB/en-GB.com_search.sys.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_editors-xtd_weblink.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_editors-xtd_weblink.sys.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_fields_repeatable.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_fields_repeatable.sys.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_quickicon_eos310.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_quickicon_eos310.sys.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_search_categories.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_search_contacts.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_search_content.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_search_content.sys.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_search_tags.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_search_weblinks.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_system_weblinks.ini',",
-    "'/administrator/language/en-GB/en-GB.plg_system_weblinks.sys.ini',",
-    "'/administrator/language/en-GB/plg_captcha_recaptcha.ini',",
-    "'/administrator/language/en-GB/plg_captcha_recaptcha.sys.ini',",
-    "'/administrator/language/en-GB/plg_captcha_recaptcha_invisible.ini',",
-    "'/administrator/language/en-GB/plg_captcha_recaptcha_invisible.sys.ini',",
-    "'/administrator/language/en-GB/plg_system_compat.ini',",
-    "'/administrator/language/en-GB/plg_system_compat.sys.ini',",
-    "'/administrator/language/en-GB/plg_system_logrotation.ini',",
-    "'/administrator/language/en-GB/plg_system_logrotation.sys.ini',",
-    "'/administrator/language/en-GB/plg_system_sessiongc.ini',",
-    "'/administrator/language/en-GB/plg_system_sessiongc.sys.ini',",
-    "'/administrator/language/en-GB/plg_system_updatenotification.ini',",
-    "'/administrator/language/en-GB/plg_system_updatenotification.sys.ini',",
-    "'/administrator/language/en-GB/plg_task_demotasks.ini',",
-    "'/administrator/language/en-GB/plg_task_demotasks.sys.ini',",
-    "'/language/en-GB/en-GB.com_search.ini',",
-    "'/language/en-GB/en-GB.mod_search.ini',",
-    "'/language/en-GB/en-GB.mod_search.sys.ini',",
+    // Example: "'/administrator/language/en-GB/en-GB.com_search.ini',",
+    "'/administrator/language/en-GB/plg_behaviour_compat.ini',",
+    "'/administrator/language/en-GB/plg_behaviour_compat.sys.ini',",
 ];
 
 // Specific folders that we want to keep on upgrade
 $foldersToKeep = [
-    "'/bin',",
+    // Example: "'/bin',",
 ];
 
 // Remove folders from the results which we want to keep on upgrade
diff --git a/build/eslint-tests.mjs b/build/eslint-tests.mjs
index 9a022681c132a..326f02027135e 100644
--- a/build/eslint-tests.mjs
+++ b/build/eslint-tests.mjs
@@ -1,12 +1,20 @@
 import { defineConfig } from 'eslint/config';
+import cypressPlugin from 'eslint-plugin-cypress';
+import stylistic from '@stylistic/eslint-plugin';
 
 export default defineConfig([
+  stylistic.configs.customize({
+    arrowParens: true,
+    braceStyle: '1tbs',
+    quoteProps: 'as-needed',
+    quotes: 'single',
+    semi: true,
+  }),
+  cypressPlugin.configs.recommended,
   {
-    files: [
-      'tests/**/*.js',
-      'tests/**/*.mjs',
-      'tests/**/*.es6',
-      'tests/**/*.vue',
-    ],
+    rules: {
+      '@stylistic/quotes': ['error', 'single', { avoidEscape: true }],
+      'cypress/unsafe-to-chain-command': 'off',
+    },
   },
 ]);
diff --git a/build/eslint.config.mjs b/build/eslint.config.mjs
index 94662bece8587..a948ebc6c23eb 100644
--- a/build/eslint.config.mjs
+++ b/build/eslint.config.mjs
@@ -1,14 +1,25 @@
 import { defineConfig } from 'eslint/config';
+import stylistic from '@stylistic/eslint-plugin';
 import vue from 'eslint-plugin-vue';
 
 export default defineConfig([
+  stylistic.configs.customize({
+    arrowParens: true,
+    braceStyle: '1tbs',
+    quoteProps: 'as-needed',
+    quotes: 'single',
+    semi: true,
+  }),
   ...vue.configs['flat/recommended'],
   {
-    files: [
-      'build/**/*.js',
-      'build/**/*.mjs',
-      'build/**/*.es6',
-      'build/**/*.vue',
+    ignores: [
+      '**/*.es5.js',
     ],
   },
+  {
+    rules: {
+      '@stylistic/quotes': ['error', 'single', { avoidEscape: true }],
+      '@stylistic/max-statements-per-line': 'off',
+    },
+  },
 ]);
diff --git a/build/helpTOC.php b/build/helpTOC.php
deleted file mode 100644
index ad8915276a86a..0000000000000
--- a/build/helpTOC.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-
-/**
- * @package    Joomla.Build
- *
- * @copyright  (C) 2013 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-// We are a valid entry point.
-const _JEXEC = 1;
-
-// Import namespaced classes
-use Joomla\CMS\Factory;
-use Joomla\CMS\Http\HttpFactory;
-use Joomla\CMS\Version;
-use Joomla\Console\Application;
-use Joomla\Console\Command\AbstractCommand;
-use Joomla\Mediawiki\Http;
-use Joomla\Mediawiki\Mediawiki;
-use Joomla\Registry\Registry;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Style\SymfonyStyle;
-
-/**
- * Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
- */
-const JOOMLA_MINIMUM_PHP = '8.1.0';
-
-if (!\defined('_JDEFINES')) {
-    \define('JPATH_BASE', \dirname(__DIR__));
-    require_once JPATH_BASE . '/includes/defines.php';
-}
-
-// Get the framework.
-require_once JPATH_BASE . '/includes/framework.php';
-
-$command = new class () extends AbstractCommand {
-    /**
-     * The default command name
-     *
-     * @var  string
-     */
-    protected static $defaultName = 'build-help-toc';
-
-    /**
-     * Initialise the command.
-     *
-     * @return  void
-     */
-    protected function configure(): void
-    {
-        $this->setDescription('Generates the help system table of contents file');
-    }
-
-    /**
-     * Internal function to execute the command.
-     *
-     * @param   InputInterface   $input   The input to inject into the command.
-     * @param   OutputInterface  $output  The output to inject into the command.
-     *
-     * @return  integer  The command exit code
-     */
-    protected function doExecute(InputInterface $input, OutputInterface $output): int
-    {
-        $io = new SymfonyStyle($input, $output);
-
-        if (!class_exists(Http::class)) {
-            $io->error(
-                'The `joomla/mediawiki` package is not installed. To use this script, you must run `composer install` to install development'
-                . ' dependencies not tracked in this repo.'
-            );
-
-            return 1;
-        }
-
-        // Set up HTTP driver for MediaWiki
-        $http = new Http([], HttpFactory::getAvailableDriver());
-
-        // Set up options for the Mediawiki class
-        $options = new Registry();
-        $options->set('api.url', 'https://docs.joomla.org');
-
-        $mediawiki = new Mediawiki($options, $http);
-
-        $io->comment('Fetching data from docs wiki');
-
-        $cleanMembers = [];
-
-        $io->comment(\sprintf('Loop through docs wiki categories since Joomla Version %d.0 - Takes a while ...', Version::MAJOR_VERSION));
-
-        // Loop through the Versions since 5.0 to get all HelpTocs - Temporary fix
-        for ($helpScreenMinor=Version::MINOR_VERSION; $helpScreenMinor >= 0; $helpScreenMinor--) {
-
-            // Get the category members (local hack)
-            $categoryMembers = $mediawiki->categories->getCategoryMembers(
-                \sprintf('Category:Help_screen_%s.%s', Version::MAJOR_VERSION, $helpScreenMinor),
-                null,
-                'max'
-            );
-
-            $members = [];
-
-            // Loop through the result objects to get every document
-            foreach ($categoryMembers->query->categorymembers as $catmembers) {
-                foreach ($catmembers as $member) {
-                    $members[] = (string) $member['title'];
-                }
-            }
-
-            /*
-            * Now we start fancy processing so we can get the language key for the titles
-            */
-
-            // Strip the namespace prefix off the titles and replace spaces with underscores
-            $namespace = \sprintf('Help%d.x:', Version::MAJOR_VERSION);
-
-            foreach ($members as $member) {
-                $cleanMembers[str_replace([$namespace, ' '], ['', '_'], $member)] = trim(str_replace($namespace, ' ', $member));
-            }
-        }
-
-        // Make sure we only have an array of unique values before continuing
-
-        $cleanMembers = array_unique($cleanMembers);
-
-        // Get the language object
-        $language = Factory::getLanguage();
-
-        // Load the admin com_admin language file
-        $language->load('com_admin', JPATH_ADMINISTRATOR);
-
-        $toc     = [];
-        $missing = [];
-
-        // filter for translated Media-Wiki articles
-        $translationLanguages = ['/de', '/en', '/fr', '/nl', '/pt-br', '/es', '/pt', '/it'];
-
-        foreach ($cleanMembers as $key => $value) {
-            $string = strtoupper($key);
-
-            // Validate the key exists
-            $io->comment(\sprintf('Validating key COM_ADMIN_HELP_%s', $string));
-
-            if ($language->hasKey('COM_ADMIN_HELP_' . $string)) {
-                $io->comment(\sprintf('Adding %s', $string));
-
-                $toc[$key] = $string;
-            } else {
-                // We check the string for words in singular/plural form and check again
-                $io->comment(\sprintf('Inflecting %s', $string));
-
-                $inflected = '';
-
-                if (strpos($string, '_CATEGORIES') !== false) {
-                    $inflected = str_replace('_CATEGORIES', '_CATEGORY', $string);
-                } elseif (strpos($string, '_USERS') !== false) {
-                    $inflected = str_replace('_USERS', '_USER', $string);
-                } elseif (strpos($string, '_CATEGORY') !== false) {
-                    $inflected = str_replace('_CATEGORY', '_CATEGORIES', $string);
-                } elseif (strpos($string, '_USER') !== false) {
-                    $inflected = str_replace('_USER', '_USERS', $string);
-                }
-
-                if ($inflected === '' && !\in_array(substr($value, strrpos($value, '/')), $translationLanguages)) {
-                    $missing[$string] = $value;
-                }
-
-                // Now try to validate the key
-                if ($inflected !== '') {
-                    $io->comment(\sprintf('Validating key COM_ADMIN_HELP_%s', $inflected));
-
-                    if ($language->hasKey('COM_ADMIN_HELP_' . $inflected)) {
-                        $io->comment(\sprintf('Adding %s', $inflected));
-
-                        $toc[$key] = $inflected;
-                    }
-                }
-            }
-        }
-
-        $io->comment(\sprintf('Number of strings: %d', \count($toc)));
-
-        // JSON encode the file and write it to JPATH_ADMINISTRATOR/help/en-GB/toc.json
-        file_put_contents(JPATH_ADMINISTRATOR . '/help/en-GB/toc.json', json_encode($toc));
-
-        if (\count($missing)) {
-
-            $str_missing = '';
-
-            foreach ($missing as $string => $value) {
-                $str_missing .= 'COM_ADMIN_HELP_' . $string . '="' . $value . '"'. PHP_EOL;
-            }
-
-            // write missing strings to JPATH_BASE/tmp/missing-helptoc.txt
-            file_put_contents(JPATH_BASE . '/tmp/missing-helptoc.txt', $str_missing);
-
-            $io->caution(\sprintf('Number of media-wiki articles without string: %d', \count($missing)));
-
-            $io->note(\sprintf('Missing strings are saved in: %s and should be revised and added to %s', 'tmp/missing-helptoc.txt', 'administrator/language/en-GB/com_admin.ini'));
-
-            $io->caution('TODO: For a complete TOC, please run this script again after adding the missing language strings!');
-
-        }
-
-        $io->success('Help Screen TOC written');
-
-        return 0;
-    }
-};
-
-$input = new ArrayInput(
-    [
-        'command' => $command::getDefaultName(),
-    ]
-);
-
-$app = new class ($input) extends Application {
-    /**
-     * Retrieve the application configuration object.
-     *
-     * @return  Registry
-     */
-    public function getConfig()
-    {
-        return $this->config;
-    }
-};
-$app->addCommand($command);
-
-// Register the application to the factory
-Factory::$application = $app;
-
-$app->execute();
diff --git a/build/layouts/github.php b/build/layouts/github.php
index 46c60ba2784b0..8c4d1f1dd08b9 100644
--- a/build/layouts/github.php
+++ b/build/layouts/github.php
@@ -1,8 +1,8 @@
 <?php
 
-$version = $version ?? '5.0.0'; // set in the build script by extracting it from the Version class
+$version = $version ?? '6.0.0'; // set in the build script by extracting it from the Version class
 $majorVersion = $majorVersion ?? substr($version, 0, strpos($version, '.'));
-$previousVersion = $previousRelease ?? '4.4.0'; // Last patch release
+$previousVersion = $previousRelease ?? '5.4.0'; // Last patch release
 $previousMajorVersion = substr($previousVersion, 0, strpos($previousVersion, '.'));
 $previousMajorMinorVersion = $previousMajorVersion . '.4';
 $tagVersion = $tagVersion ?? $version; // Set in the build script by extracting it from git
@@ -10,7 +10,7 @@
 
 $contributors = 'INSERT_HERE';
 $pullRequests = 'INSERT_HERE';
-$migrationInfo = '[New migration guide](https://manual.joomla.org/migrations/44-50/)';
+$migrationInfo = '[New migration guide](https://manual.joomla.org/migrations/54-60/)';
 $documentation = 'New developer [documentation](https://manual.joomla.org)';
 $releasePage = 'https://www.joomla.org/announcements/release-news/5900-joomla-5-0-and-joomla-4-4-are-here';
 $releaseDownloadPage = 'https://downloads.joomla.org/cms/joomla' . $majorVersion;
@@ -28,11 +28,11 @@
     foreach($githubContent[$type] as $packageName => $hashes) {
         if (str_ends_with($packageName, '.zip')) {
             $table[$type] .= "| [ZIP Archive (.zip)]";
-        } else if (str_ends_with($packageName, '.tar.gz')) {
+        } elseif (str_ends_with($packageName, '.tar.gz')) {
             $table[$type] .= "| [GNU Zip Archive (.tar.gz)]";
-        } else if (str_ends_with($packageName, '.tar.bz2')) {
+        } elseif (str_ends_with($packageName, '.tar.bz2')) {
             $table[$type] .= "| [Bzip2 Archive (.tar.zst)]";
-        } else if (str_ends_with($packageName, '.tar.zst')) {
+        } elseif (str_ends_with($packageName, '.tar.zst')) {
             $table[$type] .= "| [Zstandard Archive (.tar.zst)]";
         } else {
             // Unknown file types
@@ -42,7 +42,7 @@
     }
 }
 
-$echo = function($item) use ($table) {
+$echo = function ($item) use ($table) {
     return $table[$item] ?? '';
 };
 
@@ -93,7 +93,7 @@
 ### ✒️ Upgrade Packages
 
 > [!IMPORTANT]
-> Don't update directly from a version lower than 4.4 it is important that you first update to 4.4 and then update to 5.x
+> Don't update directly from a version lower than 5.4 it is important that you first update to 5.4 and then update to 6.x
 
 | Update from a previous version | SHA-256 Checksums |
 |--------------------------------|-------------------|
diff --git a/build/media_source/com_admin/js/admin-help.es6.js b/build/media_source/com_admin/js/admin-help.es6.js
deleted file mode 100644
index dd12ef11a920b..0000000000000
--- a/build/media_source/com_admin/js/admin-help.es6.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
-  * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
-  * @license     GNU General Public License version 2 or later; see LICENSE.txt
-  */
-
-const helpIndex = document.getElementById('help-index');
-if (helpIndex) {
-  helpIndex.querySelectorAll('a').forEach((element) => element.addEventListener('click', () => window.scroll(0, 0)));
-}
diff --git a/build/media_source/com_guidedtours/images/5_2/enhancedtourheader.png b/build/media_source/com_guidedtours/images/5_2/enhancedtourheader.png
deleted file mode 100644
index 061bdb9602d73..0000000000000
Binary files a/build/media_source/com_guidedtours/images/5_2/enhancedtourheader.png and /dev/null differ
diff --git a/build/media_source/com_guidedtours/images/5_2/mailtemplate.png b/build/media_source/com_guidedtours/images/5_2/mailtemplate.png
deleted file mode 100644
index 93b6f79bf0748..0000000000000
Binary files a/build/media_source/com_guidedtours/images/5_2/mailtemplate.png and /dev/null differ
diff --git a/build/media_source/com_guidedtours/images/5_3/filesdirectory.jpg b/build/media_source/com_guidedtours/images/5_3/filesdirectory.jpg
deleted file mode 100644
index b4310f09a468c..0000000000000
Binary files a/build/media_source/com_guidedtours/images/5_3/filesdirectory.jpg and /dev/null differ
diff --git a/build/media_source/com_guidedtours/images/5_4/automated-updates.jpg b/build/media_source/com_guidedtours/images/5_4/automated-updates.jpg
deleted file mode 100644
index 294e2fa954e42..0000000000000
Binary files a/build/media_source/com_guidedtours/images/5_4/automated-updates.jpg and /dev/null differ
diff --git a/build/media_source/com_workflow/joomla.asset.json b/build/media_source/com_workflow/joomla.asset.json
deleted file mode 100644
index ed1cbf269248f..0000000000000
--- a/build/media_source/com_workflow/joomla.asset.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
-  "name": "com_workflow",
-  "version": "4.0.0",
-  "description": "Joomla CMS",
-  "license": "GPL-2.0-or-later",
-  "assets": [
-    {
-      "name": "com_workflow.admin-items-workflow-buttons",
-      "type": "script",
-      "uri": "com_workflow/admin-items-workflow-buttons.min.js",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "type": "module"
-      }
-    }
-  ]
-}
diff --git a/build/media_source/legacy/joomla.asset.json b/build/media_source/legacy/joomla.asset.json
deleted file mode 100644
index f1849ef812c26..0000000000000
--- a/build/media_source/legacy/joomla.asset.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
-  "name": "joomla",
-  "version": "4.0.0",
-  "description": "Joomla CMS",
-  "license": "GPL-2.0-or-later",
-  "assets": [
-    {
-      "name": "jquery-noconflict",
-      "type": "script",
-      "dependencies": [
-        "jquery"
-      ],
-      "uri": "legacy/jquery-noconflict.min.js"
-    }
-  ]
-}
diff --git a/build/media_source/legacy/js/ajax-chosen.es5.js b/build/media_source/legacy/js/ajax-chosen.es5.js
deleted file mode 100644
index 9790e596793e5..0000000000000
--- a/build/media_source/legacy/js/ajax-chosen.es5.js
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * @copyright   (C) 2013 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-/**
- * ajaxChosen javascript behavior
- *
- * Used for displaying tags
- *
- * @package     Joomla.JavaScript
- * @since       1.5
- * @version     1.0
- */
-(function($) {
-  return $.fn.ajaxChosen = function(settings, callback, chosenOptions) {
-    var chosenXhr, defaultOptions, options, select;
-    if (settings == null) {
-      settings = {};
-    }
-    if (callback == null) {
-      callback = {};
-    }
-    if (chosenOptions == null) {
-      chosenOptions = function() {};
-    }
-    defaultOptions = {
-      minTermLength: 3,
-      afterTypeDelay: 500,
-      jsonTermKey: "term",
-      keepTypingMsg: Joomla.Text._('JGLOBAL_KEEP_TYPING'),
-      lookingForMsg: Joomla.Text._('JGLOBAL_LOOKING_FOR')
-    };
-    select = this;
-    chosenXhr = null;
-    options = $.extend({}, defaultOptions, $(select).data(), settings);
-    this.jchosen(chosenOptions ? chosenOptions : {});
-    return this.each(function() {
-      return $(this).next('.chosen-container').find(".search-field > input, .chosen-search > input").bind('keyup', function() {
-        var field, msg, success, untrimmed_val, val;
-        untrimmed_val = $(this).val();
-        val = $.trim($(this).val());
-        msg = val.length < options.minTermLength ? options.keepTypingMsg : options.lookingForMsg + (" '" + val + "'");
-        select.next('.chosen-container').find('.no-results').text(msg);
-        if (val === $(this).data('prevVal')) {
-          return false;
-        }
-        $(this).data('prevVal', val);
-        if (this.timer) {
-          clearTimeout(this.timer);
-        }
-        if (val.length < options.minTermLength) {
-          return false;
-        }
-        field = $(this);
-        if (!(options.data != null)) {
-          options.data = {};
-        }
-        options.data[options.jsonTermKey] = val;
-        if (options.dataCallback != null) {
-          options.data = options.dataCallback(options.data);
-        }
-        success = options.success;
-        options.success = function(data) {
-          var items, nbItems, selected_values;
-          if (!(data != null)) {
-            return;
-          }
-          selected_values = [];
-          select.find('option').each(function() {
-            if (!$(this).is(":selected")) {
-              return $(this).remove();
-            } else {
-              return selected_values.push($(this).val() + "-" + $(this).text());
-            }
-          });
-          select.find('optgroup:empty').each(function() {
-            return $(this).remove();
-          });
-          items = callback.apply(null, data);
-          nbItems = 0;
-          $.each(items, function(i, element) {
-            var group, text, value;
-            nbItems++;
-            if (element.group) {
-              group = select.find("optgroup[label='" + element.text + "']");
-              if (!group.size()) {
-                group = $("<optgroup />");
-              }
-              group.attr('label', element.text).appendTo(select);
-              return $.each(element.items, function(i, element) {
-                var text, value;
-                if (typeof element === "string") {
-                  value = i;
-                  text = element;
-                } else {
-                  value = element.value;
-                  text = element.text;
-                }
-                if ($.inArray(value + "-" + text, selected_values) === -1) {
-                  return $("<option />").attr('value', value).html(text).appendTo(group);
-                }
-              });
-            } else {
-              if (typeof element === "string") {
-                value = i;
-                text = element;
-              } else {
-                value = element.value;
-                text = element.text;
-              }
-              if ($.inArray(value + "-" + text, selected_values) === -1) {
-                return $("<option />").attr('value', value).html(text).appendTo(select);
-              }
-            }
-          });
-          if (nbItems) {
-            select.trigger("chosen:updated");
-          } else {
-            select.data().jchosen.no_results_clear();
-            select.data().jchosen.no_results(field.val());
-          }
-          if (success != null) {
-            success(data);
-          }
-          return field.val(untrimmed_val);
-        };
-        return this.timer = setTimeout(function() {
-          if (chosenXhr) {
-            chosenXhr.abort();
-          }
-          return chosenXhr = $.ajax(options);
-        }, options.afterTypeDelay);
-      });
-    });
-  };
-})(jQuery);
-
-jQuery(document).ready(function ($) {
-  if (Joomla.getOptions('ajax-chosen')) {
-
-    var options = Joomla.getOptions('ajax-chosen');
-
-    $(options.selector).ajaxChosen({
-      type: options.type,
-      url: options.url,
-      dataType: options.dataType,
-      jsonTermKey: options.jsonTermKey,
-      afterTypeDelay: options.afterTypeDelay,
-      minTermLength: options.minTermLength
-    }, function (data) {
-      var results = [];
-
-      $.each(data, function (i, val) {
-        results.push({ value: val.value, text: val.text });
-      });
-
-      return results;
-    });
-  }
-});
diff --git a/build/media_source/legacy/js/joomla-chosen.es5.js b/build/media_source/legacy/js/joomla-chosen.es5.js
deleted file mode 100644
index 0338cf8b60a24..0000000000000
--- a/build/media_source/legacy/js/joomla-chosen.es5.js
+++ /dev/null
@@ -1,102 +0,0 @@
-(function($, Chosen, AbstractChosen) {
-    $.fn.jchosen = function (options) {
-        if (!AbstractChosen.browser_is_supported()) {
-            return this;
-        }
-        return this.each(function (input_field) {
-            var $this, chosen;
-            $this = $(this);
-            chosen = $this.data('chosen');
-            if (options === 'destroy') {
-                if (chosen instanceof JoomlaChosen) {
-                    chosen.destroy();
-                }
-                return;
-            }
-            if (!(chosen instanceof JoomlaChosen)) {
-                $this.data('chosen', new JoomlaChosen(this, options));
-            }
-        });
-    };
-
-    JoomlaChosen = (function (_super) {
-        var __hasProp = {}.hasOwnProperty,
-        __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
-        __extends(JoomlaChosen, _super);
-
-        function JoomlaChosen() {
-            _ref = JoomlaChosen.__super__.constructor.apply(this, arguments);
-            return _ref;
-        }
-
-        JoomlaChosen.prototype.setup = function () {
-            var return_value;
-            return_value = JoomlaChosen.__super__.setup.apply(this, arguments);
-            this.allow_custom_value = this.form_field_jq.hasClass("chosen-custom-value") || this.options.allow_custom_value;
-            this.custom_value_prefix = this.form_field_jq.attr("data-custom_value_prefix") || this.custom_value_prefix;
-
-            return return_value;
-        };
-
-        JoomlaChosen.prototype.set_default_text = function () {
-            this.custom_group_text = this.form_field.getAttribute("data-custom_group_text") || this.options.custom_group_text || "Custom Value";
-
-            return JoomlaChosen.__super__.set_default_text.apply(this, arguments);
-        };
-
-        JoomlaChosen.prototype.result_select = function (evt) {
-            var group, option, value;
-
-            if (!this.result_highlight && (!this.is_multiple) && this.allow_custom_value) {
-                value = this.search_field.val();
-                group = this.add_unique_custom_group();
-                option = $('<option value="' + this.custom_value_prefix + value + '">' + value + '</option>');
-                group.append(option);
-                this.form_field_jq.append(group);
-                this.form_field.options[this.form_field.options.length - 1].selected = true;
-                if (!evt.metaKey) {
-                    this.results_hide();
-                }
-                return this.results_build();
-            }
-
-            return JoomlaChosen.__super__.result_select.apply(this, arguments);
-        };
-
-        JoomlaChosen.prototype.find_custom_group = function () {
-            var found, group, _i, _len, _ref;
-            _ref = $('optgroup', this.form_field);
-            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-                group = _ref[_i];
-                if (group.getAttribute('label') === this.custom_group_text) {
-                    found = group;
-                }
-            }
-            return found;
-        };
-
-        JoomlaChosen.prototype.add_unique_custom_group = function () {
-            var group;
-            group = this.find_custom_group();
-            if (!group) {
-                group = $('<optgroup label="' + this.custom_group_text + '"></optgroup>');
-            }
-            return $(group);
-        };
-
-        /**
-         * We choose to override this function so deliberately don't call super
-         */
-        JoomlaChosen.prototype.container_width = function () {
-            if (this.options.width != null) {
-                return this.options.width;
-            } else {
-                // Original: return "" + this.form_field.offsetWidth + "px";
-                return this.form_field_jq.css("width") || "" + this.form_field.offsetWidth + "px";
-            }
-        };
-
-        return JoomlaChosen;
-
-    })(Chosen);
-})(jQuery, document.Chosen, document.AbstractChosen);
diff --git a/build/media_source/legacy/js/jquery-noconflict.es5.js b/build/media_source/legacy/js/jquery-noconflict.es5.js
deleted file mode 100644
index bf4ca21eff9cc..0000000000000
--- a/build/media_source/legacy/js/jquery-noconflict.es5.js
+++ /dev/null
@@ -1 +0,0 @@
-var $ = jQuery.noConflict();
diff --git a/build/media_source/legacy/js/tabs-state.es5.js b/build/media_source/legacy/js/tabs-state.es5.js
deleted file mode 100644
index 0ee8bd82123d5..0000000000000
--- a/build/media_source/legacy/js/tabs-state.es5.js
+++ /dev/null
@@ -1,240 +0,0 @@
-/**
- * @copyright   (C) 2013 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-/**
- * JavaScript behavior to allow selected tab to be remembered after save or page reload
- * keeping state in sessionStorage with better handling of multiple tab widgets per page
- * and not saving the state if there is no id in the url (like on the CREATE page of content)
- */
-
-jQuery(function ($) {
-	/**
-	 * Tiny jQuery extension to allow getting of url params
-	 * @use jQuery.urlParam('param') or $.urlParam('myRegex|anotherRegex')
-	 * If no trailing equals sign in name, add one, allows for general reuse
-	 */
-	$.urlParam = function (name) {
-		if (!new RegExp("=$").exec(name)) {
-			name = name + '=';
-		}
-		var results = new RegExp("[\\?&](" + name + ")([^&#]*)").exec(window.location.href);
-		return results ? results[1] : null;
-	};
-
-	// jQuery extension to get the XPATH of a DOM element
-	$.getXpath = function (el) {
-		if (typeof el == "string") {
-			return document.evaluate(el, document, null, 0, null);
-		}
-		if (!el || el.nodeType != 1) {
-			return "";
-		}
-		if (el.id) {
-			return "//*[@id='" + el.id + "']";
-		}
-		var a = [];
-		var sames = a.filter.call(el.parentNode.children, function (x) {
-			return x.tagName == el.tagName;
-		});
-		var b = [];
-		return $.getXpath(el.parentNode) + "/" + el.tagName.toLowerCase() + (sames.length > 1 ? "[" + (b.indexOf.call(sames, el) + 1) + "]" : "");
-	};
-
-	// jQuery extension to get the DOM element from an XPATH
-	$.findXpath = function (exp, ctxt) {
-		var item;
-		var coll = [];
-		var result = document.evaluate(exp, ctxt || document, null, 5, null);
-
-		while (item = result.iterateNext()) {
-			coll.push(item);
-		}
-
-		return $(coll);
-	};
-
-	var loadTabs = function () {
-
-		/**
-		 * Remove an item from an array
-		 */
-		function remove_item(activeTabsHrefs, tabCollection) {
-			for (var i = 0; i < activeTabsHrefs.length; i++) {
-				if (activeTabsHrefs[i].indexOf(tabCollection) > -1) {
-					activeTabsHrefs.splice(i, 1);
-				}
-			}
-
-			return activeTabsHrefs;
-		}
-
-		/**
-		 * Generate the sessionStorage key we will use
-		 * This is the URL minus some cleanup
-		 */
-		function getStorageKey() {
-			return window.location.href.toString().split(window.location.host)[1].replace(/&return=[a-zA-Z0-9%]+/, "").split('#')[0];
-		}
-
-		/**
-		 * Save this tab to the storage in the form of a pseudo keyed array
-		 */
-		function saveActiveTab(event) {
-
-			if (!window.sessionStorage) {
-				return;
-			}
-			// Get a new storage key, normally the full url we are on with some cleanup
-			var storageKey = getStorageKey();
-
-			// get this tabs own href
-			var href = $(event.target).attr("href");
-
-			// find the collection of tabs this tab belongs to, and calculate the unique xpath to it
-			var tabCollection = $.getXpath($(event.target).closest(".nav-tabs").first().get(0));
-
-			// error handling
-			if (!tabCollection || typeof href == "undefined") {
-				return;
-			}
-
-			// Create a dummy keyed array as js doesnt allow keyed arrays
-			var storageValue = tabCollection + "|" + href;
-
-			// Get the current array from the storage
-			var activeTabsHrefs = JSON.parse(sessionStorage.getItem(storageKey));
-
-			// If none start a new array
-			if (!activeTabsHrefs) {
-				var activeTabsHrefs = [];
-			} else {
-				// Avoid Duplicates in the storage
-				remove_item(activeTabsHrefs, tabCollection);
-			}
-
-			// Save clicked tab, with relationship to tabCollection to the array
-			activeTabsHrefs.push(storageValue);
-
-			// Store the selected tabs as an array in sessionStorage
-			sessionStorage.setItem(storageKey, JSON.stringify(activeTabsHrefs));
-		}
-
-		// Array with active tabs hrefs
-		var activeTabsHrefs = JSON.parse(sessionStorage.getItem(getStorageKey()));
-
-		// jQuery object with all tabs links
-		var alltabs = $("a[data-bs-toggle='tab']");
-
-		// When a tab is clicked, save its state!
-		alltabs.on("click", function (e) {
-			saveActiveTab(e);
-		});
-
-		// Clean default tabs
-		alltabs.parent(".active").removeClass("active");
-
-		// If we cannot find a tab storage for this url, see if we are coming from a save of a new item
-		if (!activeTabsHrefs) {
-			var unSavedStateUrl = getStorageKey().replace(/\&id=[0-9]*|[a-z]\&{1}_id=[0-9]*/, '');
-			activeTabsHrefs = JSON.parse(sessionStorage.getItem(unSavedStateUrl));
-			sessionStorage.removeItem(unSavedStateUrl);
-		}
-
-		// we have some tab states to restore, if we see a hash then let that trump the saved state
-		if (activeTabsHrefs !== null && !window.location.hash) {
-
-			// When moving from tab area to a different view
-			$.each(activeTabsHrefs, function (index, tabFakexPath) {
-
-				// Click the tab
-				var parts = tabFakexPath.split("|");
-				$.findXpath(parts[0]).find("a[data-bs-toggle='tab'][href='" + parts[1] + "']").get(0).click();
-
-			});
-
-		} else { // clean slate start
-
-			// a list of tabs to click
-			var tabsToClick = [];
-
-			// If we are passing a hash then this trumps everything
-			if (window.location.hash) {
-
-				// for each set of tabs on the page
-				alltabs.parents("ul").each(function (index, ul) {
-
-					// If no tabs is saved, activate first tab from each tab set and save it
-					var tabToClick = $(ul).find("a[href='" + window.location.hash + "']");
-
-					// If we found some|one
-					if (tabToClick.length) {
-
-						// if we managed to locate its selector directly
-						if (tabToClick.selector) {
-
-							// highlight tab of the tabs if the hash matches
-							tabsToClick.push(tabToClick);
-						} else {
-
-							// highlight first tab of the tabs
-							tabsToClick.push(tabToClick.first());
-						}
-
-						var parentPane = tabToClick.closest('.tab-pane');
-
-						// bubble up for nested tabs (like permissions tabs in the permissions pane)
-						if (parentPane) {
-							var id = parentPane.attr('id');
-							if (id) {
-								var parentTabToClick = $(parentPane).find("a[href='#" + id + "']");
-								if (parentTabToClick) {
-									tabsToClick.push(parentTabToClick);
-								}
-							}
-						}
-					}
-
-					// cleanup for another loop
-					parentTabToClick = null;
-					tabToClick = null;
-					parentPane = null;
-					id = null;
-				});
-
-				// run in the right order bubbling up
-				tabsToClick.reverse();
-
-				// for all queued tabs
-				for (var i = 0; i < tabsToClick.length; i++) {
-
-					// click the tabs, thus storing them
-					jQuery(tabsToClick[i].selector).click();
-				}
-
-				// Remove the #hash in the url - with support for older browsers with no flicker
-				var scrollV, scrollH, loc = window.location;
-				if ("pushState" in history)
-					history.pushState("", document.title, loc.pathname + loc.search);
-				else {
-					// Prevent scrolling by storing the page's current scroll offset
-					scrollV = document.body.scrollTop;
-					scrollH = document.body.scrollLeft;
-					loc.hash = "";
-					// Restore the scroll offset, should be flicker free
-					document.body.scrollTop = scrollV;
-					document.body.scrollLeft = scrollH;
-				}
-
-			} else {
-				alltabs.parents("ul").each(function (index, ul) {
-					// If no tabs is saved, activate first tab from each tab set and save it
-					$(ul).find("a").first().click();
-				});
-			}
-		}
-	};
-
-	setTimeout(loadTabs, 100);
-});
diff --git a/build/media_source/mod_menu/js/menu.es6.js b/build/media_source/mod_menu/js/menu.es6.js
deleted file mode 100644
index eca867aed5711..0000000000000
--- a/build/media_source/mod_menu/js/menu.es6.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * @copyright  (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-(() => {
-  'use strict';
-
-  function topLevelMouseOver(el, settings) {
-    const ulChild = el.querySelector('ul');
-    if (ulChild) {
-      ulChild.setAttribute('aria-hidden', 'false');
-      ulChild.classList.add(settings.menuHoverClass);
-    }
-  }
-
-  function topLevelMouseOut(el, settings) {
-    const ulChild = el.querySelector('ul');
-    if (ulChild) {
-      ulChild.setAttribute('aria-hidden', 'true');
-      ulChild.classList.remove(settings.menuHoverClass);
-    }
-  }
-
-  function setupNavigation(nav) {
-    const settings = {
-      menuHoverClass: 'show-menu',
-      dir: 'ltr',
-    };
-
-    // Set tabIndex to -1 so that top_level_childs can't receive focus until menu is open
-    nav.querySelectorAll(':scope > li').forEach((topLevelEl) => {
-      const linkEl = topLevelEl.querySelector('a');
-      if (linkEl) {
-        linkEl.tabIndex = '0';
-        linkEl.addEventListener('mouseover', topLevelMouseOver(topLevelEl, settings));
-        linkEl.addEventListener('mouseout', topLevelMouseOut(topLevelEl, settings));
-      }
-      const spanEl = topLevelEl.querySelector('span');
-      if (spanEl) {
-        if (spanEl.parentNode.nodeName !== 'A') {
-          spanEl.tabIndex = '0';
-        }
-        spanEl.addEventListener('mouseover', topLevelMouseOver(topLevelEl, settings));
-        spanEl.addEventListener('mouseout', topLevelMouseOut(topLevelEl, settings));
-      }
-
-      topLevelEl.addEventListener('mouseover', ({ currentTarget }) => {
-        const ulChild = currentTarget.querySelector('ul');
-        if (ulChild) {
-          ulChild.setAttribute('aria-hidden', 'false');
-          ulChild.classList.add(settings.menuHoverClass);
-        }
-      });
-
-      topLevelEl.addEventListener('mouseout', ({ currentTarget }) => {
-        const ulChild = currentTarget.querySelector('ul');
-        if (ulChild) {
-          ulChild.setAttribute('aria-hidden', 'true');
-          ulChild.classList.remove(settings.menuHoverClass);
-        }
-      });
-
-      topLevelEl.addEventListener('focus', ({ currentTarget }) => {
-        const ulChild = currentTarget.querySelector('ul');
-        if (ulChild) {
-          ulChild.setAttribute('aria-hidden', 'true');
-          ulChild.classList.add(settings.menuHoverClass);
-        }
-      });
-
-      topLevelEl.addEventListener('blur', ({ currentTarget }) => {
-        const ulChild = currentTarget.querySelector('ul');
-        if (ulChild) {
-          ulChild.setAttribute('aria-hidden', 'false');
-          ulChild.classList.remove(settings.menuHoverClass);
-        }
-      });
-
-      topLevelEl.addEventListener('keydown', (event) => {
-        const keyName = event.key;
-        const curEl = event.target;
-        const curLiEl = curEl.parentElement;
-        const curUlEl = curLiEl.parentElement;
-        let prevLiEl = curLiEl.previousElementSibling;
-        let nextLiEl = curLiEl.nextElementSibling;
-        if (!prevLiEl) {
-          prevLiEl = curUlEl.children[curUlEl.children.length - 1];
-        }
-        if (!nextLiEl) {
-          [nextLiEl] = curUlEl.children;
-        }
-        switch (keyName) {
-          case 'ArrowLeft':
-            event.preventDefault();
-            if (settings.dir === 'rtl') {
-              nextLiEl.children[0].focus();
-            } else {
-              prevLiEl.children[0].focus();
-            }
-            break;
-          case 'ArrowRight':
-            event.preventDefault();
-            if (settings.dir === 'rtl') {
-              prevLiEl.children[0].focus();
-            } else {
-              nextLiEl.children[0].focus();
-            }
-            break;
-          case 'ArrowUp':
-          {
-            event.preventDefault();
-            const parent = curLiEl.parentElement.parentElement;
-            if (parent.nodeName === 'LI') {
-              parent.children[0].focus();
-            } else {
-              prevLiEl.children[0].focus();
-            }
-            break;
-          }
-          case 'ArrowDown':
-            event.preventDefault();
-            if (curLiEl.classList.contains('parent')) {
-              const child = curLiEl.querySelector('ul');
-              if (child != null) {
-                const childLi = child.querySelector('li');
-                childLi.children[0].focus();
-              } else {
-                nextLiEl.children[0].focus();
-              }
-            } else {
-              nextLiEl.children[0].focus();
-            }
-            break;
-          default:
-            break;
-        }
-      });
-    });
-  }
-
-  document.addEventListener('DOMContentLoaded', () => {
-    document.querySelectorAll('.nav').forEach((nav) => setupNavigation(nav));
-  });
-})();
diff --git a/build/media_source/plg_behaviour_compat/es5.asset.json b/build/media_source/plg_behaviour_compat/es5.asset.json
deleted file mode 100644
index a2d72ce8e848b..0000000000000
--- a/build/media_source/plg_behaviour_compat/es5.asset.json
+++ /dev/null
@@ -1,1092 +0,0 @@
-{
-  "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
-  "name": "plg_behaviour_compat",
-  "version": "5.0.0",
-  "description": "Joomla CMS ES5 b/c entries, the entries are only placeholders without functionality.",
-  "license": "GPL-2.0-or-later",
-  "assets": [
-    {
-      "name": "bootstrap.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_actionlogs.admin-actionlogs.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_admin.admin-help.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_associations.admin-associations-default.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_associations.admin-associations-modal.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_associations.associations-edit.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_banners.admin-banner-edit.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_cache.admin-cache.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_categories.shared-categories-accordion.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_config.config.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_config.modules.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_config.templates.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_config.filters.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_contact.admin-contacts-modal.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_contact.contacts-list.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_content.admin-article-pagebreak.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_content.admin-article-readmore.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_content.admin-articles-batch.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_content.admin-articles-stage.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_content.admin-articles-modal.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_content.form-edit.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_content.articles-list.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_content.articles-status.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_contenthistory.admin-compare-compare.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core",
-        "diff"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_contenthistory.admin-history-modal.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_contenthistory.admin-history-versions.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_cpanel.admin-addmodule.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_cpanel.admin-cpanel.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_cpanel.admin-system-loader.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_fields.admin-field-changecontext.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_fields.admin-field-edit.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_fields.admin-field-typehaschanged.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_fields.admin-fields-batch.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_fields.admin-fields-modal.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_finder.debug.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_finder.filters.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_finder.finder.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_finder.finder-edit.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_finder.indexer.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_finder.maps.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_installer.changelog.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_installer.installer.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_joomlaupdate.admin-update-es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core",
-        "bootstrap.modal"
-      ],
-      "attributes": {
-        "defer": true,
-        "nomodule": true
-      }
-    },
-    {
-      "name": "com_joomlaupdate.default-es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "defer": true,
-        "nomodule": true
-      }
-    },
-    {
-      "name": "com_languages.admin-language-edit-change-flag.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_languages.admin-override-edit-refresh-searchstring.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_languages.overrider.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_mails.admin-email-template-edit.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_media.edit-images.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_media.mediamanager.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core",
-        "messages"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_menus.admin-item-edit.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_menus.admin-item-edit-container.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_menus.admin-item-edit-modules.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_menus.admin-item-modal.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_menus.admin-items-modal.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_menus.admin-menus.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_menus.batch-body.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_modules.admin-module-edit.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_modules.admin-module-edit-assignment.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_modules.admin-module-search.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_modules.admin-modules-modal.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_modules.admin-select-modal.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_templates.admin-templates.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "showon.es5",
-      "type": "script",
-      "deprecated": true,
-      "dependencies": [
-        "core"
-      ],
-      "uri": "",
-      "attributes": {
-        "defer": true,
-        "nomodule": true
-      }
-    },
-    {
-      "name": "com_scheduler.test-task.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_scheduler.admin-view-select-task-search.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_scheduler.scheduler-config.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true
-      }
-    },
-    {
-      "name": "com_tags.tag-default.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_tags.tag-list.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_tags.tags-default.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_templates.admin-template-toggle-assignment.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_templates.admin-template-toggle-switch.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_users.admin-users-groups.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_users.two-factor-focus.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_users.two-factor-list.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "com_workflow.admin-items-workflow-buttons.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "plg_multifactorauth_totp.setup.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "qrcode",
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "plg_multifactorauth_webauthn.webauthn.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "plg_system_guidedtours.guidedtours.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "plg_system_jooa11y.jooa11y-es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "defer": true,
-        "nomodule": true
-      }
-    },
-    {
-      "name": "plg_system_schedulerunner.run-schedule.es5",
-      "type": "script",
-      "deprecated": true,
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "template.atum-es5",
-      "description": "The file containing the javascript for this template.",
-      "deprecated": true,
-      "type": "script",
-      "uri": "",
-      "dependencies": [
-        "core"
-      ],
-      "attributes": {
-        "nomodule": true,
-        "defer": true
-      }
-    },
-    {
-      "name": "keepalive.es5",
-      "type": "script",
-      "deprecated": true,
-      "dependencies": [
-        "core"
-      ],
-      "uri": "",
-      "attributes": {
-        "defer": true,
-        "nomodule": true
-      }
-    }
-  ]
-}
diff --git a/build/media_source/plg_captcha_recaptcha/js/recaptcha.es6.js b/build/media_source/plg_captcha_recaptcha/js/recaptcha.es6.js
deleted file mode 100644
index 9b5b2cd18747f..0000000000000
--- a/build/media_source/plg_captcha_recaptcha/js/recaptcha.es6.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @package     Joomla.JavaScript
- * @copyright   (C) 2018 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-((window, document) => {
-  'use strict';
-
-  window.JoomlainitReCaptcha2 = () => {
-    const optionKeys = ['sitekey', 'theme', 'size', 'tabindex', 'callback', 'expired-callback', 'error-callback'];
-
-    document.querySelectorAll('.g-recaptcha').forEach((element) => {
-      let options = {};
-
-      if (element.dataset) {
-        options = element.dataset;
-      } else {
-        optionKeys.forEach((key) => {
-          const optionKeyFq = `data-${key}`;
-          if (element.hasAttribute(optionKeyFq)) {
-            options[key] = element.getAttribute(optionKeyFq);
-          }
-        });
-      }
-
-      // Set the widget id of the recaptcha item
-      element.setAttribute(
-        'data-recaptcha-widget-id',
-        window.grecaptcha.render(element, options),
-      );
-    });
-  };
-})(window, document);
diff --git a/build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.es6.js b/build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.es6.js
deleted file mode 100644
index a4b05dbacd047..0000000000000
--- a/build/media_source/plg_captcha_recaptcha_invisible/js/recaptcha.es6.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @package     Joomla.JavaScript
- * @copyright   (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-((window, document) => {
-  'use strict';
-
-  window.JoomlainitReCaptchaInvisible = () => {
-    const optionKeys = ['sitekey', 'badge', 'size', 'tabindex', 'callback', 'expired-callback', 'error-callback'];
-
-    document.querySelectorAll('.g-recaptcha').forEach((element) => {
-      let options = {};
-
-      if (element.dataset) {
-        options = element.dataset;
-      } else {
-        optionKeys.forEach((key) => {
-          const optionKeyFq = `data-${optionKeys[key]}`;
-
-          if (element.hasAttribute(optionKeyFq)) {
-            options[optionKeys[key]] = element.getAttribute(optionKeyFq);
-          }
-        });
-      }
-
-      // Set the widget id of the recaptcha item
-      element.setAttribute(
-        'data-recaptcha-widget-id',
-        window.grecaptcha.render(element, options),
-      );
-
-      // Execute the invisible reCAPTCHA
-      window.grecaptcha.execute(element.getAttribute('data-recaptcha-widget-id'));
-    });
-  };
-})(window, document);
diff --git a/build/media_source/plg_captcha_recaptcha_invisible/scss/recaptcha_invisible.scss b/build/media_source/plg_captcha_recaptcha_invisible/scss/recaptcha_invisible.scss
deleted file mode 100644
index c4b2a412e877e..0000000000000
--- a/build/media_source/plg_captcha_recaptcha_invisible/scss/recaptcha_invisible.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.grecaptcha-badge {
-  z-index: 999999;
-}
diff --git a/build/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js b/build/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js
deleted file mode 100644
index 6ce1e67346ed6..0000000000000
--- a/build/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js
+++ /dev/null
@@ -1,449 +0,0 @@
-/**
- * Based on:
- * Very simple jQuery Color Picker
- * Copyright (C) 2012 Tanguy Krotoff
- * Licensed under the MIT license
- *
- * ADAPTED BY: Dimitris Grammatikogiannis
- *
- * MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-((customElements) => {
-  const KEYCODE = {
-    TAB: 9,
-    ESC: 27,
-  };
-
-  const colorNames = {
-    aliceblue: '#f0f8ff',
-    antiquewhite: '#faebd7',
-    aqua: '#00ffff',
-    aquamarine: '#7fffd4',
-    azure: '#f0ffff',
-    beige: '#f5f5dc',
-    bisque: '#ffe4c4',
-    black: '#000000',
-    blanchedalmond: '#ffebcd',
-    blue: '#0000ff',
-    blueviolet: '#8a2be2',
-    brown: '#a52a2a',
-    burlywood: '#deb887',
-    cadetblue: '#5f9ea0',
-    chartreuse: '#7fff00',
-    chocolate: '#d2691e',
-    coral: '#ff7f50',
-    cornflowerblue: '#6495ed',
-    cornsilk: '#fff8dc',
-    crimson: '#dc143c',
-    cyan: '#00ffff',
-    darkblue: '#00008b',
-    darkcyan: '#008b8b',
-    darkgoldenrod: '#b8860b',
-    darkgray: '#a9a9a9',
-    darkgreen: '#006400',
-    darkgrey: '#a9a9a9',
-    darkkhaki: '#bdb76b',
-    darkmagenta: '#8b008b',
-    darkolivegreen: '#556b2f',
-    darkorange: '#ff8c00',
-    darkorchid: '#9932cc',
-    darkred: '#8b0000',
-    darksalmon: '#e9967a',
-    darkseagreen: '#8fbc8f',
-    darkslateblue: '#483d8b',
-    darkslategray: '#2f4f4f',
-    darkslategrey: '#2f4f4f',
-    darkturquoise: '#00ced1',
-    darkviolet: '#9400d3',
-    deeppink: '#ff1493',
-    deepskyblue: '#00bfff',
-    dimgray: '#696969',
-    dimgrey: '#696969',
-    dodgerblue: '#1e90ff',
-    firebrick: '#b22222',
-    floralwhite: '#fffaf0',
-    forestgreen: '#228b22',
-    fuchsia: '#ff00ff',
-    gainsboro: '#dcdcdc',
-    ghostwhite: '#f8f8ff',
-    gold: '#ffd700',
-    goldenrod: '#daa520',
-    gray: '#808080',
-    green: '#008000',
-    greenyellow: '#adff2f',
-    grey: '#808080',
-    honeydew: '#f0fff0',
-    hotpink: '#ff69b4',
-    indianred: '#cd5c5c',
-    indigo: '#4b0082',
-    ivory: '#fffff0',
-    khaki: '#f0e68c',
-    lavender: '#e6e6fa',
-    lavenderblush: '#fff0f5',
-    lawngreen: '#7cfc00',
-    lemonchiffon: '#fffacd',
-    lightblue: '#add8e6',
-    lightcoral: '#f08080',
-    lightcyan: '#e0ffff',
-    lightgoldenrodyellow: '#fafad2',
-    lightgray: '#d3d3d3',
-    lightgreen: '#90ee90',
-    lightgrey: '#d3d3d3',
-    lightpink: '#ffb6c1',
-    lightsalmon: '#ffa07a',
-    lightseagreen: '#20b2aa',
-    lightskyblue: '#87cefa',
-    lightslategray: '#778899',
-    lightslategrey: '#778899',
-    lightsteelblue: '#b0c4de',
-    lightyellow: '#ffffe0',
-    lime: '#00ff00',
-    limegreen: '#32cd32',
-    linen: '#faf0e6',
-    magenta: '#ff00ff',
-    maroon: '#800000',
-    mediumaquamarine: '#66cdaa',
-    mediumblue: '#0000cd',
-    mediumorchid: '#ba55d3',
-    mediumpurple: '#9370db',
-    mediumseagreen: '#3cb371',
-    mediumslateblue: '#7b68ee',
-    mediumspringgreen: '#00fa9a',
-    mediumturquoise: '#48d1cc',
-    mediumvioletred: '#c71585',
-    midnightblue: '#191970',
-    mintcream: '#f5fffa',
-    mistyrose: '#ffe4e1',
-    moccasin: '#ffe4b5',
-    navajowhite: '#ffdead',
-    navy: '#000080',
-    oldlace: '#fdf5e6',
-    olive: '#808000',
-    olivedrab: '#6b8e23',
-    orange: '#ffa500',
-    orangered: '#ff4500',
-    orchid: '#da70d6',
-    palegoldenrod: '#eee8aa',
-    palegreen: '#98fb98',
-    paleturquoise: '#afeeee',
-    palevioletred: '#db7093',
-    papayawhip: '#ffefd5',
-    peachpuff: '#ffdab9',
-    peru: '#cd853f',
-    pink: '#ffc0cb',
-    plum: '#dda0dd',
-    powderblue: '#b0e0e6',
-    purple: '#800080',
-    red: '#ff0000',
-    rosybrown: '#bc8f8f',
-    royalblue: '#4169e1',
-    saddlebrown: '#8b4513',
-    salmon: '#fa8072',
-    sandybrown: '#f4a460',
-    seagreen: '#2e8b57',
-    seashell: '#fff5ee',
-    sienna: '#a0522d',
-    silver: '#c0c0c0',
-    skyblue: '#87ceeb',
-    slateblue: '#6a5acd',
-    slategray: '#708090',
-    slategrey: '#708090',
-    snow: '#fffafa',
-    springgreen: '#00ff7f',
-    steelblue: '#4682b4',
-    tan: '#d2b48c',
-    teal: '#008080',
-    thistle: '#d8bfd8',
-    tomato: '#ff6347',
-    turquoise: '#40e0d0',
-    violet: '#ee82ee',
-    wheat: '#f5deb3',
-    white: '#ffffff',
-    whitesmoke: '#f5f5f5',
-    yellow: '#ffff00',
-    yellowgreen: '#9acd32',
-  };
-
-  class JoomlaFieldSimpleColor extends HTMLElement {
-    constructor() {
-      super();
-
-      // Define some variables
-      this.select = '';
-      this.options = [];
-      this.icon = '';
-      this.panel = '';
-      this.buttons = [];
-      this.focusableElements = null;
-      this.focusableSelectors = [
-        'a[href]',
-        'area[href]',
-        'input:not([disabled])',
-        'select:not([disabled])',
-        'textarea:not([disabled])',
-        'button:not([disabled])',
-        'iframe',
-        'object',
-        'embed',
-        '[contenteditable]',
-        '[tabindex]:not([tabindex^="-"])'];
-    }
-
-    connectedCallback() {
-      this.select = this.querySelector('select');
-
-      if (!this.select) {
-        throw new Error('Simple color field requires a select element');
-      }
-
-      this.options = this.select.querySelectorAll('option');
-
-      this.select.classList.add('hidden');
-
-      // Build the pop up
-      this.options.forEach((option) => {
-        let color = option.value;
-        let clss = 'swatch';
-
-        if (color === 'none') {
-          clss += ' nocolor';
-          color = 'transparent';
-        }
-        if (option.selected) {
-          clss += ' active';
-        }
-
-        const el = document.createElement('button');
-        el.setAttribute('class', clss);
-        el.style.backgroundColor = color;
-        el.setAttribute('type', 'button');
-        const a11yColor = color === 'transparent' ? this.textTransp : this.getColorName(color);
-        el.innerHTML = Joomla.sanitizeHtml(`<span class="visually-hidden">${a11yColor}</span>`);
-
-        this.buttons.push(el);
-      });
-
-      // Add a close button
-      const close = document.createElement('button');
-      close.setAttribute('class', 'btn-close');
-      close.setAttribute('type', 'button');
-      close.setAttribute('aria-label', this.textClose);
-
-      this.buttons.push(close);
-
-      let color = this.select.value;
-      let clss = '';
-
-      if (color === 'none') {
-        clss += ' nocolor';
-        color = 'transparent';
-      }
-
-      this.icon = document.createElement('button');
-
-      if (clss) {
-        this.icon.setAttribute('class', clss);
-      }
-
-      const uniqueId = `simple-color-${Math.random().toString(36).substring(2, 12)}`;
-      this.icon.setAttribute('type', 'button');
-      this.icon.setAttribute('tabindex', '0');
-      this.icon.style.backgroundColor = color;
-      this.icon.innerHTML = Joomla.sanitizeHtml(`<span class="visually-hidden">${this.textSelect}</span>`);
-      this.icon.id = uniqueId;
-      this.select.insertAdjacentElement('beforebegin', this.icon);
-      this.icon.addEventListener('click', this.show.bind(this));
-
-      this.panel = document.createElement('div');
-      this.panel.classList.add('simplecolors-panel');
-      this.panel.setAttribute('aria-labelledby', uniqueId);
-      this.hide = this.hide.bind(this);
-      this.colorSelect = this.colorSelect.bind(this);
-
-      this.buttons.forEach((el) => {
-        if (el.classList.contains('btn-close')) {
-          el.addEventListener('click', this.hide);
-        } else {
-          el.addEventListener('click', this.colorSelect);
-        }
-
-        this.panel.insertAdjacentElement('beforeend', el);
-      });
-
-      this.appendChild(this.panel);
-
-      this.focusableElements = [].slice
-        .call(this.panel.querySelectorAll(this.focusableSelectors.join()));
-
-      this.keys = this.keys.bind(this);
-      this.hide = this.hide.bind(this);
-      this.mousedown = this.mousedown.bind(this);
-    }
-
-    static get observedAttributes() {
-      return ['text-select', 'text-color', 'text-close', 'text-transparent'];
-    }
-
-    get textSelect() { return this.getAttribute('text-select'); }
-
-    get textColor() { return this.getAttribute('text-color'); }
-
-    get textClose() { return this.getAttribute('text-close'); }
-
-    get textTransp() { return this.getAttribute('text-transparent'); }
-
-    // Show the panel
-    show() {
-      document.addEventListener('mousedown', this.hide);
-      this.addEventListener('keydown', this.keys);
-      this.panel.addEventListener('mousedown', this.mousedown);
-      this.panel.setAttribute('data-open', '');
-
-      const focused = this.panel.querySelector('button');
-
-      if (focused) {
-        focused.focus();
-      }
-    }
-
-    // Hide panel
-    hide() {
-      document.removeEventListener('mousedown', this.hide, false);
-      this.removeEventListener('keydown', this.keys);
-
-      if (this.panel.hasAttribute('data-open')) {
-        this.panel.removeAttribute('data-open');
-      }
-
-      this.icon.focus();
-    }
-
-    colorSelect(e) {
-      let color = '';
-      let bgcolor = '';
-      let clss = '';
-
-      if (e.target.classList.contains('nocolor')) {
-        color = 'none';
-        bgcolor = 'transparent';
-        clss = 'nocolor';
-      } else {
-        color = this.rgb2hex(e.target.style.backgroundColor);
-        bgcolor = color;
-      }
-
-      // Reset the active class
-      this.buttons.forEach((el) => {
-        if (el.classList.contains('active')) {
-          el.classList.remove('active');
-        }
-      });
-
-      // Add the active class to the selected button
-      e.target.classList.add('active');
-
-      this.icon.classList.remove('nocolor');
-      this.icon.setAttribute('class', clss);
-      this.icon.style.backgroundColor = bgcolor;
-
-      // trigger change event both on the select and on the custom element
-      this.select.dispatchEvent(new Event('change'));
-      this.dispatchEvent(new CustomEvent('change', {
-        detail: { value: color },
-        bubbles: true,
-      }));
-
-      // Hide the panel
-      this.hide();
-
-      // Change select value
-      this.options.forEach((el) => {
-        if (el.selected) {
-          el.removeAttribute('selected');
-        }
-
-        if (el.value === bgcolor) {
-          el.setAttribute('selected', '');
-        }
-      });
-    }
-
-    keys(e) {
-      if (e.keyCode === KEYCODE.ESC) {
-        this.hide();
-      }
-
-      if (e.keyCode === KEYCODE.TAB) {
-        // Get the index of the current active element
-        const focusedIndex = this.focusableElements.indexOf(document.activeElement);
-
-        // If first element is focused and shiftkey is in use, focus last item within modal
-        if (e.shiftKey && (focusedIndex === 0 || focusedIndex === -1)) {
-          this.focusableElements[this.focusableElements.length - 1].focus();
-          e.preventDefault();
-        }
-        // If last element is focused and shiftkey is not in use, focus first item within modal
-        if (!e.shiftKey && focusedIndex === this.focusableElements.length - 1) {
-          this.focusableElements[0].focus();
-          e.preventDefault();
-        }
-      }
-    }
-
-    // Prevents the mousedown event from "eating" the click event.
-    mousedown(e) {
-      e.stopPropagation();
-      e.preventDefault();
-    }
-
-    getColorName(value) {
-      // Expand any short code
-      let newValue = value;
-      if (value.length === 4) {
-        const tmpValue = value.split('');
-        newValue = tmpValue[0] + tmpValue[1] + tmpValue[1] + tmpValue[2]
-          + tmpValue[2] + tmpValue[3] + tmpValue[3];
-      }
-
-      for (const color in colorNames) {
-        if (colorNames.hasOwnProperty(color) && newValue.toLowerCase() === colorNames[color]) {
-          return color;
-        }
-      }
-
-      return `${this.textColor} ${value.replace('#', '').split('').join(', ')}`;
-    }
-
-    /**
-     * Converts a RGB color to its hexadecimal value.
-     * See http://stackoverflow.com/questions/1740700/get-hex-value-rather-than-rgb-value-using-$
-     */
-    rgb2hex(rgb) {
-      const hex = (x) => (`0${parseInt(x, 10).toString(16)}`).slice(-2);
-      const matches = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
-
-      return `#${hex(matches[1])}${hex(matches[2])}${hex(matches[3])}`;
-    }
-  }
-
-  customElements.define('joomla-field-simple-color', JoomlaFieldSimpleColor);
-})(customElements);
diff --git a/build/media_source/system/js/fields/tag.es5.js b/build/media_source/system/js/fields/tag.es5.js
deleted file mode 100644
index 0cc2af0634be0..0000000000000
--- a/build/media_source/system/js/fields/tag.es5.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * @copyright   (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-/**
- * Field user
- */
-jQuery(document).ready(function ($) {
-
-	if (Joomla.getOptions('field-tag-custom')) {
-
-		var options = Joomla.getOptions('field-tag-custom'),
-			customTagPrefix = '#new#';
-
-		// Method to add tags pressing enter
-		$(options.selector + '_chosen input').keyup(function(event) {
-
-			var tagOption;
-
-			// Tag is greater than the minimum required chars and enter pressed
-			if (this.value && this.value.length >= options.minTermLength && (event.which === 13 || event.which === 188)) {
-
-				// Search a highlighted result
-				var highlighted = $(options.selector + '_chosen').find('li.active-result.highlighted').first();
-
-				// Add the highlighted option
-				if (event.which === 13 && highlighted.text() !== '')
-				{
-					// Extra check. If we have added a custom tag with this text remove it
-					var customOptionValue = customTagPrefix + highlighted.text();
-					$(options.selector + ' option').filter(function () { return $(this).val() == customOptionValue; }).remove();
-
-					// Select the highlighted result
-					tagOption = $(options.selector + ' option').filter(function () { return $(this).html() == highlighted.text(); });
-					tagOption.attr('selected', 'selected');
-				}
-				// Add the custom tag option
-				else
-				{
-					var customTag = this.value;
-
-					// Extra check. Search if the custom tag already exists (typed faster than AJAX ready)
-					tagOption = $(options.selector + ' option').filter(function () { return $(this).html() == customTag; });
-					if (tagOption.text() !== '')
-					{
-						tagOption.attr('selected', 'selected');
-					}
-					else
-					{
-						var option = $('<option>');
-						option.text(this.value).val(customTagPrefix + this.value);
-						option.attr('selected','selected');
-
-						// Append the option and repopulate the chosen field
-						$(options.selector).append(option);
-					}
-				}
-
-				this.value = '';
-				$(options.selector).trigger('chosen:updated');
-				event.preventDefault();
-			}
-		});
-	}
-});
diff --git a/build/media_source/system/scss/fields/joomla-field-simple-color.scss b/build/media_source/system/scss/fields/joomla-field-simple-color.scss
deleted file mode 100644
index d7c9f3691eb35..0000000000000
--- a/build/media_source/system/scss/fields/joomla-field-simple-color.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-joomla-field-simple-color {
-  display: block;
-
-  .hidden {
-    display: none;
-  }
-
-  .visually-hidden {
-    position: absolute;
-    width: 1px;
-    height: 1px;
-    padding: 0;
-    margin: -1px;
-    overflow: hidden;
-    clip: rect(0,0,0,0);
-    border: 0;
-  }
-
-  button {
-    width: 20px;
-    height: 20px;
-    overflow: hidden;
-    vertical-align: middle;
-    background: none;
-    border: solid 1px #ccc;
-    border-radius: 3px;
-    appearance: none;
-  }
-
-  .btn-close {
-    width: auto;
-    padding: 0 6px;
-    margin-top: -4px;
-    font-size: 1rem;
-    line-height: 1.5;
-    text-align: center;
-    vertical-align: middle;
-  }
-
-  .nocolor {
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3ggRDQENU0dyawAAACZJREFUGNNjPHXqDAMSMDY2ROYyMeAFNJVm/Pv3LzL/7Nnzg8VpAKebCGpIIxHBAAAAAElFTkSuQmCC") !important;
-  }
-  .simplecolors-panel .swatch {
-    margin: 0 4px 4px 0;
-  }
-
-  .swatch:hover,
-  .swatch.active {
-    border-color: rgba(82, 168, 236, .8);
-    box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82, 168, 236, .6);
-  }
-
-  .simplecolors-panel[data-open=""] {
-    display: block;
-  }
-  .simplecolors-panel {
-    position: absolute;
-    z-index: 12;
-    display: none;
-    float: left;
-    padding: 6px 2px 2px 6px;
-    margin: 1px 0 0;
-    background-color: #fff;
-    background-clip: padding-box;
-    border: 1px solid #ddd;
-    border-radius: 5px;
-    box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
-  }
-}
diff --git a/build/media_source/system/scss/joomla-fontawesome.scss b/build/media_source/system/scss/joomla-fontawesome.scss
deleted file mode 100644
index 065b91451793b..0000000000000
--- a/build/media_source/system/scss/joomla-fontawesome.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-// Override the font path
-$fa-font-path: "../../../media/vendor/fontawesome-free/webfonts" !default;
-$fa-font-display: block !default;
-
-// Font Awesome 6 Free
-@import "../../../../media/vendor/fontawesome-free/scss/fontawesome";
-@import "../../../../media/vendor/fontawesome-free/scss/regular";
-@import "../../../../media/vendor/fontawesome-free/scss/solid";
-
-// Brands must be imported last
-@import "../../../../media/vendor/fontawesome-free/scss/brands";
-
-// B/C for Icomoon
-@import "icomoon";
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/awesomplete/awesomplete.scss b/build/media_source/templates/administrator/atum/scss/vendor/awesomplete/awesomplete.scss
deleted file mode 100644
index 639aa912dcd8d..0000000000000
--- a/build/media_source/templates/administrator/atum/scss/vendor/awesomplete/awesomplete.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-// Awesomplete
-@import "../../../../../../../../media/vendor/awesomplete/css/awesomplete";
-
-.awesomplete {
-  display: block;
-}
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_modal.scss b/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_modal.scss
deleted file mode 100644
index 94f6afcc497e8..0000000000000
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_modal.scss
+++ /dev/null
@@ -1,108 +0,0 @@
-// Modal
-
-.jviewport-height {
-  &10 {
-    height: 10vh;
-  }
-
-  &20 {
-    height: 20vh;
-  }
-
-  &30 {
-    height: 30vh;
-  }
-
-  &40 {
-    height: 40vh;
-  }
-
-  &50 {
-    height: 50vh;
-  }
-
-  &60 {
-    height: 60vh;
-  }
-
-  &70 {
-    height: 70vh;
-  }
-
-  &80 {
-    height: 80vh;
-  }
-
-  &90 {
-    height: 90vh;
-  }
-
-  &100 {
-    height: 100vh;
-  }
-}
-
-[class*=jviewport-height] iframe {
-  height: 100%;
-}
-
-.modal-dialog.jviewport-width {
-  &10 {
-    width: 10vw;
-  }
-
-  &20 {
-    width: 20vw;
-    max-width: none;
-  }
-
-  &30 {
-    width: 30vw;
-    max-width: none;
-  }
-
-  &40 {
-    width: 40vw;
-    max-width: none;
-  }
-
-  &50 {
-    width: 50vw;
-    max-width: none;
-  }
-
-  &60 {
-    width: 60vw;
-    max-width: none;
-  }
-
-  &70 {
-    width: 70vw;
-    max-width: none;
-  }
-
-  &80 {
-    width: 80vw;
-    max-width: none;
-  }
-
-  &90 {
-    width: 90vw;
-    max-width: none;
-  }
-
-  &100 {
-    width: 100vw;
-    max-width: none;
-  }
-}
-
-.modal-dialog {
-  @include media-breakpoint-down(md) {
-    margin: 1.75rem auto;
-  }
-
-  .modal-body {
-    padding: 0;
-  }
-}
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/minicolors/minicolors.scss b/build/media_source/templates/administrator/atum/scss/vendor/minicolors/minicolors.scss
deleted file mode 100644
index 27ec546848da4..0000000000000
--- a/build/media_source/templates/administrator/atum/scss/vendor/minicolors/minicolors.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-// Minicolours
-@import "../../../../../../../../media/vendor/minicolors/css/jquery.minicolors";
-
-.minicolors-theme-bootstrap {
-
-  .minicolors-input {
-    width: 140px;
-  }
-
-  .rgb {
-    width: 175px;
-  }
-
-  .rgba {
-    width: 220px;
-  }
-}
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss b/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss
deleted file mode 100644
index ed0b79d7d20b8..0000000000000
--- a/build/media_source/templates/site/cassiopeia/scss/vendor/_chosen.scss
+++ /dev/null
@@ -1,121 +0,0 @@
-// Chosen
-
-$chosen-select-padding-y: $form-select-padding-y + .21;
-
-.chosen-container.chosen-container-single {
-  max-width: $input-max-width;
-  font-size: $font-size-base;
-
-  .chosen-single {
-    display: inline-block;
-    height: #{$input-height};
-    padding: $chosen-select-padding-y ($form-select-padding-x + $form-select-indicator-padding) $chosen-select-padding-y $form-select-padding-x;
-    line-height: 1.5;
-    color: $form-select-color;
-    vertical-align: middle;
-    background: $form-select-bg $form-select-indicator no-repeat right $form-select-padding-x center;
-    background-image: none \9;
-    background-size: $form-select-bg-size;
-    border: $form-select-border-width solid $form-select-border-color;
-    box-shadow: none;
-    appearance: none;
-    @include border-radius($form-select-border-radius, 0);
-
-    abbr {
-      top: 10px;
-    }
-
-    &:focus {
-      @include box-shadow($form-select-focus-box-shadow);
-      border-color: $form-select-focus-border-color;
-      outline: none;
-    }
-
-    &:disabled {
-      color: $form-select-disabled-color;
-      cursor: not-allowed;
-      background-color: $form-select-disabled-bg;
-    }
-
-    div b {
-      background: none !important;
-    }
-  }
-
-  .chosen-drop {
-    background: $white;
-    border: $form-select-border-width solid $form-select-border-color;
-  }
-
-  .chosen-results li {
-    line-height: calc(#{$font-size-base} + .3rem);
-  }
-
-  &.chosen-container-active .chosen-single {
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-}
-
-.chosen-container.chosen-container-multi {
-  .chosen-choices {
-    max-width: $input-max-width;
-    min-height: #{$input-height};
-    font-size: $font-size-base;
-    line-height: $input-line-height;
-    background-image: $white;
-
-    li.search-choice {
-      $chosen-multi-close-width: 20px;
-
-      padding: 5px (13 + $chosen-multi-close-width) 5px 10px;
-      color: $white;
-      background: var(--primary);
-      border: 0;
-      box-shadow: $cassiopeia-box-shadow;
-
-      @if $enable-rounded {
-        border-radius: $form-select-border-radius;
-      } @else {
-        border-radius: 0;
-      }
-
-      .search-choice-close {
-        top: 0;
-        right: 0;
-        width: $chosen-multi-close-width;
-        height: 100%;
-        background: hsla(0, 0%, 0%, .2);
-        background-image: none !important;
-
-        &::before {
-          position: absolute;
-          top: 6px;
-          right: $chosen-multi-close-width * .25;
-          font-size: $font-size-base;
-          color: $white;
-          content: "\00d7";
-        }
-      }
-    }
-  }
-}
-
-.chosen-container-active.chosen-with-drop .chosen-single {
-  box-shadow: none;
-}
-
-// TEMPORARY
-.chosen-container-single {
-  width: auto !important;
-}
-
-// END TEMPORARY
-
-.card .chosen-container.chosen-container-single {
-  width: 100% !important;
-
-  .chosen-single {
-    width: 100% !important;
-  }
-}
diff --git a/build/media_source/vendor/tinymce/langs/af.es5.js b/build/media_source/vendor/tinymce/langs/af.es5.js
deleted file mode 100644
index 8e758c94ab8fa..0000000000000
--- a/build/media_source/vendor/tinymce/langs/af.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('af',{
-"Cut": "Knip",
-"Heading 5": "Hooflyn 5",
-"Header 2": "Hooflyn 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Jou webblaaier ondersteun nie toegang tot die knipbord nie. Gebruik asb. Ctrl+X\/C\/V.",
-"Heading 4": "Hooflyn 4",
-"Div": "Div",
-"Heading 2": "Hooflyn 2",
-"Paste": "Plak",
-"Close": "Sluit",
-"Font Family": "Font Familie",
-"Pre": "Pre",
-"Align right": "Regs-gerig",
-"New document": "Nuwe dokument",
-"Blockquote": "Aanhaaling",
-"Numbered list": "Genommerde lys",
-"Heading 1": "Hooflyn 1",
-"Headings": "Koppe",
-"Increase indent": "Inkeping vergroot",
-"Formats": "Formate",
-"Headers": "Hooflyn-tekste",
-"Select all": "Alles selekteer",
-"Header 3": "Hooflyn 3",
-"Blocks": "Blok",
-"Undo": "Ongedaan maak",
-"Strikethrough": "Deurhaal",
-"Bullet list": "Opsommingsteken-lys",
-"Header 1": "Hooflyn 1",
-"Superscript": "Superskrif",
-"Clear formatting": "Herstel Formateering",
-"Font Sizes": "Tekengrootte",
-"Subscript": "Subskrif",
-"Header 6": "Hooflyn 6",
-"Redo": "Herdoen",
-"Paragraph": "Paragraaf",
-"Ok": "OK",
-"Bold": "Vetdruk",
-"Code": "Kode",
-"Italic": "Kursief",
-"Align center": "Sentreer",
-"Header 5": "Hooflyn 5",
-"Heading 6": "Hooflyn 6",
-"Heading 3": "Hooflyn 3",
-"Decrease indent": "Inkeping verklein",
-"Header 4": "Hooflyn 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Die plak funksie is nou in plat-teks modus. Teks word ingevoeg sonder enige formateering, todat jy hierdie opsie wissel.",
-"Underline": "Onderlyn",
-"Cancel": "Kanselleer",
-"Justify": "Gerigstelling",
-"Inline": "Inlyn",
-"Copy": "Kopieer",
-"Align left": "Linksgerig",
-"Visual aids": "Hulpmiddels",
-"Lower Greek": "Griekse letters",
-"Square": "Vierkantjie",
-"Default": "Verstek",
-"Lower Alpha": "Klein letters",
-"Circle": "Sirkeltjie",
-"Disc": "Balletjie",
-"Upper Alpha": "Hoofletters",
-"Upper Roman": "Romeinse syfers groot",
-"Lower Roman": "Romeinse syfers klein",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id moet met 'n letter begin en kan slegs deur letters, koppeltekens, syfers, punte en onderstreep-karakters gevolg word",
-"Name": "Naam",
-"Anchor": "Anker",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "Jy het ongestoorde wysigings op hierdier bladsy - is jy seker dat jy die bladsy wil verlaat?",
-"Restore last draft": "Herstel die laatste konsep",
-"Special character": "Spesiaale karakter",
-"Source code": "Bronkode",
-"Language": "Taal",
-"Insert\/Edit code sample": "Voeg\/Redigeer voorbeeld-kode",
-"B": "Blou",
-"R": "Rooi",
-"G": "Groen",
-"Color": "Kleur",
-"Right to left": "Regs na links",
-"Left to right": "Links na regs",
-"Emoticons": "Emotikons",
-"Robots": "Robotte",
-"Document properties": "Dokument eienskappe",
-"Title": "Titel",
-"Keywords": "Sleutelwoorde",
-"Encoding": "Kodering",
-"Description": "Beskrywing",
-"Author": "Outeur",
-"Fullscreen": "Voll-skerm",
-"Horizontal line": "Horisontale lyn",
-"Horizontal space": "Horisontale ruimte",
-"Insert\/edit image": "Afbeelding invoeg\/bewerk",
-"General": "Algemeen",
-"Advanced": "Gevorderd",
-"Source": "Bron",
-"Border": "Rand",
-"Constrain proportions": "Behou verhoudings",
-"Vertical space": "Vertikale ruimte",
-"Image description": "Afbeelding bemskrywing",
-"Style": "Styl",
-"Dimensions": "Afmetings",
-"Insert image": "Afbeelding invoeg",
-"Image": "Afbeelding",
-"Zoom in": "Inzoem",
-"Contrast": "Kontras",
-"Back": "Terug",
-"Gamma": "Gamma",
-"Flip horizontally": "Horisontaal weerspie\u00ebl",
-"Resize": "Grootte wysig",
-"Sharpen": "Verskerp",
-"Zoom out": "Uitzoem",
-"Image options": "Afbeelding opsies",
-"Apply": "Toepas",
-"Brightness": "Helderheid",
-"Rotate clockwise": "Regsom draai",
-"Rotate counterclockwise": "Linksom draai",
-"Edit image": "Bewerk afbeelding",
-"Color levels": "Kleurvlakke",
-"Crop": "Afknip",
-"Orientation": "Orienteering",
-"Flip vertically": "Vertikaal weerspie\u00ebl",
-"Invert": "Omkeer",
-"Date\/time": "Datum\/tyd",
-"Insert date\/time": "Voeg datum\/tyd in",
-"Remove link": "Skakel verwyder",
-"Url": "URL",
-"Text to display": "Skakelteks",
-"Anchors": "Anker",
-"Insert link": "Skakel invoeg",
-"Link":"Skakel",
-"New window": "Nuwe venster",
-"None": "Geen",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Die URL verwys na 'n eksterne adres. Wil jy die \"http:\/\/\" voorvoegsel byvoeg?",
-"Paste or type a link": "Plak of tik 'n skalel in",
-"Target": "Teiken",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Die URL lyk soos 'n eposadres. Wil jy die \"mailto:\" voorvoegsel byvoeg?",
-"Insert\/edit link": "Skakel invoeg\/bewerk",
-"Insert\/edit video": "Video invoeg\/bewerk",
-"Poster": "Plakaat",
-"Insert\/edit media": "Voeg in\/Redigeer media",
-"Media": "Media",
-"Alternative source": "Alternatiewe bron",
-"Paste your embed code below:": "Plak jou ingesluite kode hieronder in:",
-"Insert video": "Video invoeg",
-"Embed": "Insluit",
-"Nonbreaking space": "Vaste spasie invoeg",
-"Page break": "Nuwe Bladsy",
-"Paste as text": "As teks plak",
-"Preview": "Voorbeeld",
-"Print": "Druk",
-"Save": "Stoor",
-"Could not find the specified string.": "Kon nie die gesoekde string vind nie",
-"Replace": "Vervang",
-"Next": "Volgende",
-"Whole words": "Sleg hele woorde",
-"Find and replace": "Soek-en-Vervang",
-"Replace with": "Vervang met",
-"Find": "Soek",
-"Replace all": "Alles vervang",
-"Match case": "Kassensitief",
-"Prev": "Vorige",
-"Spellcheck": "Speltoets",
-"Finish": "Einde",
-"Ignore all": "Alles ignoreer",
-"Ignore": "Ignoreer",
-"Add to Dictionary": "Aan woordelys byvoeg",
-"Insert row before": "Voeg nuwe ry boaan",
-"Rows": "Rye",
-"Height": "Hoogte",
-"Paste row after": "Plak ry onder",
-"Alignment": "Gerigdheid",
-"Border color": "Randkleur",
-"Column group": "Kolomgroep",
-"Row": "Ry",
-"Insert column before": "Voeg kolom vooraan",
-"Split cell": "Split sel",
-"Cell padding": "Ruimte binnein sel",
-"Cell spacing": "Ruimte rondom sel",
-"Row type": "Ry tipe",
-"Insert table": "Tabel invoeg",
-"Body": "Tabel Inhoud",
-"Caption": "Onderskrif",
-"Footer": "Voetskrif",
-"Delete row": "Verwyder ry",
-"Paste row before": "Plak ry vooraan",
-"Scope": "Bereik",
-"Delete table": "Verwyder tabel",
-"H Align": "Horisontaal-gerigdheid",
-"Top": "Bo",
-"Header cell": "Kop sel",
-"Column": "Kolom",
-"Row group": "Rygroep",
-"Cell": "Sel",
-"Middle": "Sentreer",
-"Cell type": "Seltipe",
-"Copy row": "Kopieer ry",
-"Row properties": "Ry eienskappe",
-"Table properties": "Tabel eienskappe",
-"Bottom": "Onder",
-"V Align": "Vertikaal-rerigdheid",
-"Header": "Kopteks",
-"Right": "Regs",
-"Insert column after": "Voeg kolom na",
-"Cols": "Kolomme",
-"Insert row after": "Voeg ry onderaan",
-"Width": "Breedte",
-"Cell properties": "Sel eienskappe",
-"Left": "Links",
-"Cut row": "Knip ry",
-"Delete column": "Verwyder kolom",
-"Center": "Middel",
-"Merge cells": "Selle saamvoeg",
-"Insert template": "Sjabloon invoeg",
-"Templates": "Sjablone",
-"Background color": "Agtergrondkleur",
-"Custom...": "Pasgemaakte...",
-"Custom color": "Pasgemaakte kleur",
-"No color": "Geen kleur",
-"Text color": "Tekskleur",
-"Table of Contents":"Inhouds-opgawe",
-"Show blocks": "Blokke vertoon",
-"Show invisible characters": "Onsigbare karakters vertoon",
-"Words: {0}": "Woorde: {0}",
-"Insert": "Invoeg",
-"File": "L\u00eaer",
-"Edit": "Bewerk",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Ryk Teks Area. Druk ALT-F9 vir menu, ALT-F10 vir die nutsbalk, ALT-0 vir hulp.",
-"Tools": "Gereedskap",
-"View": "Beeld",
-"Table": "Tabel",
-"Format": "Formateering"
-});
diff --git a/build/media_source/vendor/tinymce/langs/ar.es5.js b/build/media_source/vendor/tinymce/langs/ar.es5.js
deleted file mode 100644
index c632810bb3795..0000000000000
--- a/build/media_source/vendor/tinymce/langs/ar.es5.js
+++ /dev/null
@@ -1,231 +0,0 @@
-tinymce.addI18n('ar',{
-"Cut": "\u0642\u0635",
-"Heading 5": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 5",
-"Header 2": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0645\u062a\u0635\u0641\u062d\u0643 \u0644\u0627 \u064a\u062f\u0639\u0645 \u0627\u0644\u0648\u0635\u0648\u0644 \u0627\u0644\u0645\u0628\u0627\u0634\u0631 \u0625\u0644\u0649 \u0627\u0644\u062d\u0627\u0641\u0638\u0629. \u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0627\u062e\u062a\u0635\u0627\u0631\u0627\u062a \u0644\u0648\u062d\u0629 \u0627\u0644\u0645\u0641\u0627\u062a\u064a\u062d Ctrl+X\/C\/V \u0628\u062f\u0644\u0627 \u0645\u0646 \u0630\u0644\u0643.",
-"Heading 4": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 4",
-"Div": "Div",
-"Heading 2": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 2",
-"Paste": "\u0644\u0635\u0642",
-"Close": "\u0625\u063a\u0644\u0627\u0642",
-"Font Family": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0627\u0644\u062e\u0637",
-"Pre": "\u0633\u0627\u0628\u0642",
-"Align right": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0627\u0644\u0646\u0635 \u0644\u0644\u064a\u0645\u064a\u0646",
-"New document": "\u0645\u0633\u062a\u0646\u062f \u062c\u062f\u064a\u062f",
-"Blockquote": "\u0639\u0644\u0627\u0645\u0627\u062a \u0627\u0644\u0627\u0642\u062a\u0628\u0627\u0633",
-"Numbered list": "\u062a\u0631\u0642\u064a\u0645",
-"Heading 1": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 1",
-"Headings": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a\u0629",
-"Increase indent": "\u0632\u064a\u0627\u062f\u0629 \u0627\u0644\u0645\u0633\u0627\u0641\u0629 \u0627\u0644\u0628\u0627\u062f\u0626\u0629",
-"Formats": "\u0627\u0644\u062a\u0646\u0633\u064a\u0642\u0627\u062a",
-"Headers": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646",
-"Select all": "\u062a\u062d\u062f\u064a\u062f \u0627\u0644\u0643\u0644",
-"Header 3": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 3",
-"Blocks": "\u0627\u0644\u0623\u0642\u0633\u0627\u0645",
-"Undo": "\u062a\u0631\u0627\u062c\u0639",
-"Strikethrough": "\u064a\u062a\u0648\u0633\u0637 \u062e\u0637",
-"Bullet list": "\u062a\u0639\u062f\u0627\u062f \u0646\u0642\u0637\u064a",
-"Header 1": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 1",
-"Superscript": "\u0645\u0631\u062a\u0641\u0639",
-"Clear formatting": "\u0645\u0633\u062d \u0627\u0644\u062a\u0646\u0633\u064a\u0642",
-"Font Sizes": "\u062d\u062c\u0645 \u0627\u0644\u062e\u0637",
-"Subscript": "\u0645\u0646\u062e\u0641\u0636",
-"Header 6": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 6",
-"Redo": "\u0625\u0639\u0627\u062f\u0629",
-"Paragraph": "\u0641\u0642\u0631\u0629",
-"Ok": "\u0645\u0648\u0627\u0641\u0642",
-"Bold": "\u063a\u0627\u0645\u0642",
-"Code": "\u0631\u0645\u0632",
-"Italic": "\u0645\u0627\u0626\u0644",
-"Align center": "\u062a\u0648\u0633\u064a\u0637",
-"Header 5": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 5",
-"Heading 6": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 6",
-"Heading 3": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u0631\u0626\u064a\u0633\u064a 3",
-"Decrease indent": "\u0625\u0646\u0642\u0627\u0635 \u0627\u0644\u0645\u0633\u0627\u0641\u0629 \u0627\u0644\u0628\u0627\u062f\u0626\u0629",
-"Header 4": "\u0627\u0644\u0639\u0646\u0627\u0648\u064a\u0646 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u064a\u062a\u0645 \u0627\u0644\u0644\u0635\u0642 \u062d\u0627\u0644\u064a\u0627\u064b \u0643\u0646\u0635 \u0639\u0627\u062f\u064a. \u0627\u0644\u0645\u062d\u062a\u0648\u0649 \u0633\u064a\u0628\u0642\u0649 \u0643\u0646\u0635 \u0639\u0627\u062f\u064a \u062d\u062a\u0649 \u062a\u0642\u0648\u0645 \u0628\u062a\u0639\u0637\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u062e\u064a\u0627\u0631.",
-"Underline": "\u062a\u0633\u0637\u064a\u0631",
-"Cancel": "\u0625\u0644\u063a\u0627\u0621",
-"Justify": "\u0636\u0628\u0637",
-"Inline": "\u062e\u0644\u0627\u0644",
-"Copy": "\u0646\u0633\u062e",
-"Align left": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0627\u0644\u0646\u0635 \u0644\u0644\u064a\u0633\u0627\u0631",
-"Visual aids": "\u0627\u0644\u0645\u0639\u064a\u0646\u0627\u062a \u0627\u0644\u0628\u0635\u0631\u064a\u0629",
-"Lower Greek": "\u062a\u0631\u0642\u064a\u0645 \u064a\u0648\u0646\u0627\u0646\u064a \u0635\u063a\u064a\u0631",
-"Square": "\u0645\u0631\u0628\u0639",
-"Default": "\u0627\u0644\u0627\u0641\u062a\u0631\u0627\u0636\u064a",
-"Lower Alpha": "\u062a\u0631\u0642\u064a\u0645 \u0623\u062e\u0631\u0641 \u0635\u063a\u064a\u0631\u0629",
-"Circle": "\u062f\u0627\u0626\u0631\u0629",
-"Disc": "\u0642\u0631\u0635",
-"Upper Alpha": "\u062a\u0631\u0642\u064a\u0645 \u0623\u062d\u0631\u0641 \u0643\u0628\u064a\u0631\u0629",
-"Upper Roman": "\u062a\u0631\u0642\u064a\u0645 \u0631\u0648\u0645\u0627\u0646\u064a \u0643\u0628\u064a\u0631",
-"Lower Roman": "\u062a\u0631\u0642\u064a\u0645 \u0631\u0648\u0645\u0627\u0646\u064a \u0635\u063a\u064a\u0631",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u0631\u0642\u0645 \u0627\u0644\u0645\u0639\u0631\u0641 \u064a\u062c\u0628 \u0623\u0646 \u062a\u0628\u062f\u0623 \u0628\u062d\u0631\u0641\u060c \u064a\u062a\u0628\u0639 \u0641\u0642\u0637 \u0628\u062d\u0631\u0648\u0641 \u0648\u0623\u0631\u0642\u0627\u0645\u060c \u0634\u0631\u0637\u0627\u062a\u060c \u0623\u0648 \u0627\u0644\u0646\u0642\u0627\u0637\u060c \u0627\u0644\u0646\u0642\u0637\u062a\u064a\u0646 \u0623\u0648 \u0627\u0644\u0634\u0631\u0637\u0627\u062a \u0627\u0644\u0633\u0641\u0644\u064a\u0629.",
-"Name": "\u0627\u0644\u0627\u0633\u0645",
-"Anchor": "\u0645\u0631\u0633\u0627\u0629",
-"Id": "\u0631\u0642\u0645 \u0627\u0644\u0645\u0639\u0631\u0641",
-"You have unsaved changes are you sure you want to navigate away?": "\u0644\u062f\u064a\u0643 \u062a\u063a\u064a\u064a\u0631\u0627\u062a \u0644\u0645 \u064a\u062a\u0645 \u062d\u0641\u0638\u0647\u0627 \u0647\u0644 \u0623\u0646\u062a \u0645\u062a\u0623\u0643\u062f \u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0641\u064a \u0627\u0644\u0627\u0646\u062a\u0642\u0627\u0644 \u0628\u0639\u064a\u062f\u0627\u061f",
-"Restore last draft": "\u0627\u0633\u062a\u0639\u0627\u062f\u0629 \u0623\u062e\u0631 \u0645\u0633\u0648\u062f\u0629",
-"Special character": "\u0631\u0645\u0632",
-"Source code": "\u0634\u0641\u0631\u0629 \u0627\u0644\u0645\u0635\u062f\u0631",
-"Language": "\u0627\u0644\u0644\u063a\u0629",
-"Insert\/Edit code sample": "\u0625\u062f\u0631\u0627\u062c/\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0643\u0648\u062f",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "\u0627\u0644\u0644\u0648\u0646",
-"Right to left": "\u0645\u0646 \u0627\u0644\u064a\u0645\u064a\u0646 \u0644\u0644\u064a\u0633\u0627\u0631",
-"Left to right": "\u0645\u0646 \u0627\u0644\u064a\u0633\u0627\u0631 \u0644\u0644\u064a\u0645\u064a\u0646",
-"Emoticons": "\u0627\u0644\u0631\u0645\u0648\u0632",
-"Robots": "\u0627\u0644\u0631\u0648\u0628\u0648\u062a\u0627\u062a",
-"Document properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u0645\u0633\u062a\u0646\u062f",
-"Title": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646",
-"Keywords": "\u0643\u0644\u0645\u0627\u062a \u0627\u0644\u0628\u062d\u062b",
-"Encoding": "\u0627\u0644\u062a\u0631\u0645\u064a\u0632",
-"Description": "\u0627\u0644\u0648\u0635\u0641",
-"Author": "\u0627\u0644\u0643\u0627\u062a\u0628",
-"Fullscreen": "\u0645\u0644\u0621 \u0627\u0644\u0634\u0627\u0634\u0629",
-"Horizontal line": "\u062e\u0637 \u0623\u0641\u0642\u064a",
-"Horizontal space": "\u0645\u0633\u0627\u0641\u0629 \u0623\u0641\u0642\u064a\u0629",
-"Insert\/edit image": "\u0625\u062f\u0631\u0627\u062c\/\u062a\u062d\u0631\u064a\u0631 \u0635\u0648\u0631\u0629",
-"General": "\u0639\u0627\u0645",
-"Advanced": "\u062e\u0635\u0627\u0626\u0635 \u0645\u062a\u0642\u062f\u0645\u0647",
-"Source": "\u0627\u0644\u0645\u0635\u062f\u0631",
-"Border": "\u062d\u062f\u0648\u062f",
-"Constrain proportions": "\u0627\u0644\u062a\u0646\u0627\u0633\u0628",
-"Vertical space": "\u0645\u0633\u0627\u0641\u0629 \u0639\u0645\u0648\u062f\u064a\u0629",
-"Image description": "\u0648\u0635\u0641 \u0627\u0644\u0635\u0648\u0631\u0629",
-"Style": "\u0627\u0644\u0646\u0645\u0637 \/ \u0627\u0644\u0634\u0643\u0644",
-"Dimensions": "\u0627\u0644\u0623\u0628\u0639\u0627\u062f",
-"Insert image": "\u0625\u062f\u0631\u0627\u062c \u0635\u0648\u0631\u0629",
-"Image": "\u0627\u0644\u0635\u0648\u0631\u0629",
-"Zoom in": "\u062a\u0643\u0628\u064a\u0631",
-"Contrast": "\u0627\u0644\u062a\u0628\u0627\u064a\u0646",
-"Back": "\u0644\u0644\u062e\u0644\u0641",
-"Gamma": "\u063a\u0627\u0645\u0627",
-"Flip horizontally": "\u0627\u0646\u0639\u0643\u0627\u0633 \u0623\u0641\u0642\u064a",
-"Resize": "\u062a\u063a\u064a\u064a\u0631 \u062d\u062c\u0645",
-"Sharpen": "\u062d\u0627\u062f\u0629",
-"Zoom out": "\u062a\u0635\u063a\u064a\u0631",
-"Image options": "\u0627\u0639\u062f\u0627\u062f\u0627\u062a \u0627\u0644\u0635\u0648\u0631\u0629",
-"Apply": "\u062a\u0637\u0628\u064a\u0642",
-"Brightness": "\u0627\u0644\u0625\u0636\u0627\u0621\u0629",
-"Rotate clockwise": "\u062a\u062f\u0648\u064a\u0631 \u0641\u064a \u0627\u062a\u062c\u0627\u0647 \u0639\u0642\u0627\u0631\u0628 \u0627\u0644\u0633\u0627\u0639\u0629",
-"Rotate counterclockwise": "\u062a\u062f\u0648\u064a\u0631 \u0639\u0643\u0633 \u0627\u062a\u062c\u0627\u0647 \u0639\u0642\u0627\u0631\u0628 \u0627\u0644\u0633\u0627\u0639\u0629",
-"Edit image": "\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0635\u0648\u0631\u0629",
-"Color levels": "\u0645\u0633\u062a\u0648\u0649 \u0627\u0644\u0644\u0648\u0646",
-"Crop": "\u0642\u0635",
-"Orientation": "\u0627\u0644\u0645\u062d\u0627\u0630\u0627\u0629",
-"Flip vertically": "\u0627\u0646\u0639\u0643\u0627\u0633 \u0639\u0627\u0645\u0648\u062f\u064a",
-"Invert": "\u0639\u0643\u0633",
-"Date\/time": "\u0627\u0644\u062a\u0627\u0631\u064a\u062e/\u0627\u0644\u0648\u0642\u062a",
-"Insert date\/time": "\u0625\u062f\u0631\u0627\u062c \u062a\u0627\u0631\u064a\u062e\/\u0648\u0642\u062a",
-"Remove link": "\u062d\u0630\u0641 \u0627\u0644\u0631\u0627\u0628\u0637",
-"Url": "\u0627\u0644\u0639\u0646\u0648\u0627\u0646",
-"Text to display": "\u0627\u0644\u0646\u0635 \u0627\u0644\u0645\u0637\u0644\u0648\u0628 \u0639\u0631\u0636\u0647",
-"Anchors": "\u0627\u0644\u0645\u0631\u0633\u0627\u0629",
-"Insert link": "\u0625\u062f\u0631\u0627\u062c \u0631\u0627\u0628\u0637",
-"Link": "\u0627\u0644\u0631\u0627\u0628\u0637",
-"New window": "\u0646\u0627\u0641\u0630\u0629 \u062c\u062f\u064a\u062f\u0629",
-"None": "\u0628\u0644\u0627",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0646\u062a\u0648\u0642\u0639 \u0627\u0646\u0643 \u0642\u0645\u062a \u0628\u0625\u062f\u0631\u0627\u062c \u0631\u0627\u0628\u0637 \u0644\u0645\u0648\u0642\u0639 \u062e\u0627\u0631\u062c\u064a. \u0647\u0644 \u062a\u0631\u064a\u062f \u0627\u0646 \u0646\u0636\u064a\u0641 \u0627\u0644\u0644\u0627\u062d\u0642\u0629 http:\/\/ \u0644\u0644\u0631\u0627\u0628\u0637 \u0627\u0644\u0630\u064a \u0627\u062f\u062e\u0644\u062a\u0647\u061f",
-"Paste or type a link": "\u0623\u062f\u062e\u0644 \u0623\u0648 \u0627\u0643\u062a\u0628 \u0627\u0644\u0631\u0627\u0628\u0637",
-"Target": "\u0627\u0644\u0625\u0637\u0627\u0631 \u0627\u0644\u0647\u062f\u0641",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0627\u0644\u0631\u0627\u0628\u0637 \u0627\u0644\u0630\u064a \u0642\u0645\u062a \u0628\u0625\u062f\u0631\u0627\u062c\u0647 \u064a\u0634\u0627\u0628\u0647 \u0627\u0644\u0628\u0631\u064a\u062f \u0627\u0644\u0627\u0644\u0643\u062a\u0631\u0648\u0646\u064a. \u0647\u0644 \u062a\u0631\u064a\u062f \u0627\u0646 \u062a\u0636\u064a\u0641 \u0627\u0644\u0644\u0627\u062d\u0642\u0629 mailto: \u0645\u0639\u062a\u0628\u0631\u0627\u064b \u0647\u0630\u0627 \u0627\u0644\u0631\u0627\u0628\u0637 \u0628\u0631\u064a\u062f\u0627 \u0627\u0644\u0643\u062a\u0631\u0648\u0646\u064a\u0627\u064b\u061f",
-"Insert\/edit link": "\u0625\u062f\u0631\u0627\u062c\/\u062a\u062d\u0631\u064a\u0631 \u0631\u0627\u0628\u0637",
-"Insert\/edit video": "\u0625\u062f\u0631\u0627\u062c\/\u062a\u062d\u0631\u064a\u0631 \u0641\u064a\u062f\u064a\u0648",
-"Media": "\u0627\u0644\u0648\u0633\u0627\u0626\u0637 \u0627\u0644\u0645\u062a\u0639\u062f\u062f\u0629",
-"Alternative source": "\u0645\u0635\u062f\u0631 \u0628\u062f\u064a\u0644",
-"Paste your embed code below:": "\u0644\u0635\u0642 \u0643\u0648\u062f \u0627\u0644\u062a\u0636\u0645\u064a\u0646 \u0647\u0646\u0627:",
-"Insert video": "\u0625\u062f\u0631\u0627\u062c \u0641\u064a\u062f\u064a\u0648",
-"Poster": "\u0645\u0644\u0635\u0642",
-"Insert\/edit media": "\u0625\u062f\u0631\u0627\u062c/\u062a\u062d\u0631\u064a\u0631 \u0627\u0644\u0648\u0633\u0627\u0626\u0637 \u0627\u0644\u0645\u062a\u0639\u062f\u062f\u0629",
-"Embed": "\u062a\u0636\u0645\u064a\u0646",
-"Nonbreaking space": "\u0645\u0633\u0627\u0641\u0629 \u063a\u064a\u0631 \u0645\u0646\u0642\u0633\u0645\u0629",
-"Page break": "\u0641\u0627\u0635\u0644 \u0644\u0644\u0635\u0641\u062d\u0629",
-"Paste as text": "\u0644\u0635\u0642 \u0643\u0646\u0635",
-"Preview": "\u0645\u0639\u0627\u064a\u0646\u0629",
-"Print": "\u0637\u0628\u0627\u0639\u0629",
-"Save": "\u062d\u0641\u0638",
-"Could not find the specified string.": "\u062a\u0639\u0630\u0631 \u0627\u0644\u0639\u062b\u0648\u0631 \u0639\u0644\u0649 \u0627\u0644\u0643\u0644\u0645\u0629 \u0627\u0644\u0645\u062d\u062f\u062f\u0629",
-"Replace": "\u0627\u0633\u062a\u0628\u062f\u0627\u0644",
-"Next": "\u0627\u0644\u062a\u0627\u0644\u064a",
-"Whole words": "\u0645\u0637\u0627\u0628\u0642\u0629 \u0627\u0644\u0643\u0644\u0645\u0627\u062a \u0628\u0627\u0644\u0643\u0627\u0645\u0644",
-"Find and replace": "\u0628\u062d\u062b \u0648\u0627\u0633\u062a\u0628\u062f\u0627\u0644",
-"Replace with": "\u0627\u0633\u062a\u0628\u062f\u0627\u0644 \u0628\u0640",
-"Find": "\u0628\u062d\u062b",
-"Replace all": "\u0627\u0633\u062a\u0628\u062f\u0627\u0644 \u0627\u0644\u0643\u0644",
-"Match case": "\u0645\u0637\u0627\u0628\u0642\u0629 \u062d\u0627\u0644\u0629 \u0627\u0644\u0623\u062d\u0631\u0641",
-"Prev": "\u0627\u0644\u0633\u0627\u0628\u0642",
-"Spellcheck": "\u062a\u062f\u0642\u064a\u0642 \u0625\u0645\u0644\u0627\u0626\u064a",
-"Finish": "\u0627\u0646\u062a\u0647\u064a",
-"Ignore all": "\u062a\u062c\u0627\u0647\u0644 \u0627\u0644\u0643\u0644",
-"Ignore": "\u062a\u062c\u0627\u0647\u0644",
-"Add to Dictionary": "\u0627\u0636\u0641 \u0627\u0644\u064a \u0627\u0644\u0642\u0627\u0645\u0648\u0633",
-"Insert row before": "\u0625\u062f\u0631\u0627\u062c \u0635\u0641 \u0644\u0644\u0623\u0639\u0644\u0649",
-"Rows": "\u0639\u062f\u062f \u0627\u0644\u0635\u0641\u0648\u0641",
-"Height": "\u0627\u0631\u062a\u0641\u0627\u0639",
-"Paste row after": "\u0644\u0635\u0642 \u0627\u0644\u0635\u0641 \u0644\u0644\u0623\u0633\u0641\u0644",
-"Alignment": "\u0645\u062d\u0627\u0630\u0627\u0629",
-"Border color": "\u0644\u0648\u0646 \u0627\u0644\u0625\u0637\u0627\u0631",
-"Column group": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0639\u0645\u0648\u062f",
-"Row": "\u0635\u0641",
-"Insert column before": "\u0625\u062f\u0631\u0627\u062c \u0639\u0645\u0648\u062f \u0644\u0644\u064a\u0633\u0627\u0631",
-"Split cell": "\u062a\u0642\u0633\u064a\u0645 \u0627\u0644\u062e\u0644\u0627\u064a\u0627",
-"Cell padding": "\u062a\u0628\u0627\u0639\u062f \u0627\u0644\u062e\u0644\u064a\u0629",
-"Cell spacing": "\u0627\u0644\u0645\u0633\u0627\u0641\u0629 \u0628\u064a\u0646 \u0627\u0644\u062e\u0644\u0627\u064a\u0627",
-"Row type": "\u0646\u0648\u0639 \u0627\u0644\u0635\u0641",
-"Insert table": "\u0625\u062f\u0631\u0627\u062c \u062c\u062f\u0648\u0644",
-"Body": "\u0647\u064a\u0643\u0644",
-"Caption": "\u0634\u0631\u062d",
-"Footer": "\u062a\u0630\u064a\u064a\u0644",
-"Delete row": "\u062d\u0630\u0641 \u0635\u0641",
-"Paste row before": "\u0644\u0635\u0642 \u0627\u0644\u0635\u0641 \u0644\u0644\u0623\u0639\u0644\u0649",
-"Scope": "\u0627\u0644\u0645\u062c\u0627\u0644",
-"Delete table": "\u062d\u0630\u0641 \u062c\u062f\u0648\u0644",
-"H Align": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0623\u0641\u0642\u064a\u0629",
-"Top": "\u0623\u0639\u0644\u064a",
-"Header cell": "\u0631\u0623\u0633 \u0627\u0644\u062e\u0644\u064a\u0629",
-"Column": "\u0639\u0645\u0648\u062f",
-"Row group": "\u0645\u062c\u0645\u0648\u0639\u0629 \u0635\u0641",
-"Cell": "\u062e\u0644\u064a\u0629",
-"Middle": "\u0627\u0644\u0648\u0633\u0637",
-"Cell type": "\u0646\u0648\u0639 \u0627\u0644\u062e\u0644\u064a\u0629",
-"Copy row": "\u0646\u0633\u062e \u0627\u0644\u0635\u0641",
-"Row properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u0635\u0641",
-"Table properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u062c\u062f\u0648\u0644",
-"Bottom": "\u0627\u0644\u0623\u0633\u0641\u0644",
-"V Align": "\u0645\u062d\u0627\u0630\u0627\u0629 \u0631\u0623\u0633\u064a\u0629",
-"Header": "\u0627\u0644\u0631\u0623\u0633",
-"Right": "\u064a\u0645\u064a\u0646",
-"Insert column after": "\u0625\u062f\u0631\u0627\u062c \u0639\u0645\u0648\u062f \u0644\u0644\u064a\u0645\u064a\u0646",
-"Cols": "\u0639\u062f\u062f \u0627\u0644\u0623\u0639\u0645\u062f\u0629",
-"Insert row after": "\u0625\u062f\u0631\u0627\u062c \u0635\u0641 \u0644\u0644\u0623\u0633\u0641\u0644",
-"Width": "\u0639\u0631\u0636",
-"Cell properties": "\u062e\u0635\u0627\u0626\u0635 \u0627\u0644\u062e\u0644\u064a\u0629",
-"Left": "\u064a\u0633\u0627\u0631",
-"Cut row": "\u0642\u0635 \u0627\u0644\u0635\u0641",
-"Delete column": "\u062d\u0630\u0641 \u0639\u0645\u0648\u062f",
-"Center": "\u062a\u0648\u0633\u064a\u0637",
-"Merge cells": "\u062f\u0645\u062c \u062e\u0644\u0627\u064a\u0627",
-"Insert template": "\u0625\u062f\u0631\u0627\u062c \u0642\u0627\u0644\u0628",
-"Templates": "\u0642\u0648\u0627\u0644\u0628",
-"Background color": "\u0644\u0648\u0646 \u0627\u0644\u062e\u0644\u0641\u064a\u0629",
-"Custom...": "\u062a\u062e\u0635\u064a\u0635 ...",
-"Custom color": "\u0644\u0648\u0646 \u0645\u062e\u0635\u0635",
-"No color": "\u0628\u062f\u0648\u0646 \u0644\u0648\u0646",
-"Text color": "\u0644\u0648\u0646 \u0627\u0644\u0646\u0635",
-"Table of Contents": "\u062c\u062f\u0648\u0644 \u0627\u0644\u0645\u062d\u062a\u0648\u064a\u0627\u062a",
-"Show blocks": "\u0645\u0634\u0627\u0647\u062f\u0629 \u0627\u0644\u0643\u062a\u0644",
-"Show invisible characters": "\u0623\u0638\u0647\u0631 \u0627\u0644\u0623\u062d\u0631\u0641 \u0627\u0644\u063a\u064a\u0631 \u0645\u0631\u0626\u064a\u0629",
-"Words: {0}": "\u0627\u0644\u0643\u0644\u0645\u0627\u062a:{0}",
-"Insert": "\u0625\u062f\u0631\u0627\u062c",
-"File": "\u0645\u0644\u0641",
-"Edit": "\u062a\u062d\u0631\u064a\u0631",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0645\u0646\u0637\u0642\u0629 \u0646\u0635 \u0645\u0646\u0633\u0642. \u0627\u0636\u063a\u0637 ALT-F9 \u0644\u0644\u0642\u0627\u0626\u0645\u0629. \u0627\u0636\u063a\u0637 ALT-F10 \u0644\u0634\u0631\u064a\u0637 \u0627\u0644\u0623\u062f\u0648\u0627\u062a. \u0627\u0636\u063a\u0637 ALT-0 \u0644\u0644\u062d\u0635\u0648\u0644 \u0639\u0644\u0649 \u0645\u0633\u0627\u0639\u062f\u0629",
-"Tools": "\u0623\u062f\u0627\u0648\u0627\u062a",
-"View": "\u0639\u0631\u0636",
-"Table": "\u062c\u062f\u0648\u0644",
-"Format": "\u062a\u0646\u0633\u064a\u0642",
-"_dir": "rtl"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/be.es5.js b/build/media_source/vendor/tinymce/langs/be.es5.js
deleted file mode 100644
index ec4e13f16b344..0000000000000
--- a/build/media_source/vendor/tinymce/langs/be.es5.js
+++ /dev/null
@@ -1,197 +0,0 @@
-tinymce.addI18n('be',{
-"Cut": "\u0412\u044b\u0440\u0430\u0437\u0430\u0446\u044c",
-"Heading 5": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 5",
-"Header 2": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u045e\u0437\u044d\u0440 \u043d\u0435 \u043f\u0430\u0434\u0442\u0440\u044b\u043c\u043b\u0456\u0432\u0430\u0435 \u043f\u0440\u0430\u043c\u044b \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u0430 \u0431\u0443\u0444\u0435\u0440\u0430 \u0430\u0431\u043c\u0435\u043d\u0443. \u041a\u0430\u043b\u0456 \u043b\u0430\u0441\u043a\u0430, \u0432\u044b\u043a\u0430\u0440\u044b\u0441\u0442\u043e\u045e\u0432\u0430\u0439\u0446\u0435 \u043d\u0430\u0441\u0442\u0443\u043f\u043d\u044b\u044f \u0441\u043f\u0430\u043b\u0443\u0447\u044d\u043d\u043d\u044f \u043a\u043b\u0430\u0432\u0456\u0448: Ctrl + X\/C\/V.",
-"Heading 4": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 4",
-"Div": "\u0411\u043b\u043e\u043a",
-"Heading 2": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 2",
-"Paste": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c",
-"Close": "\u0417\u0430\u0447\u044b\u043d\u0456\u0446\u044c",
-"Font Family": "\u0428\u0440\u044b\u0444\u0442",
-"Pre": "\u041f\u0440\u0430\u0434\u0444\u0430\u0440\u043c\u0430\u0442\u0430\u0432\u0430\u043d\u043d\u0435",
-"Align right": "\u041f\u0430 \u043f\u0440\u0430\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
-"New document": "\u041d\u043e\u0432\u044b \u0434\u0430\u043a\u0443\u043c\u0435\u043d\u0442",
-"Blockquote": "\u0426\u044b\u0442\u0430\u0442\u0430",
-"Numbered list": "\u041d\u0443\u043c\u0430\u0440\u0430\u0432\u0430\u043d\u044b \u0441\u043f\u0456\u0441",
-"Heading 1": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 1",
-"Headings": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043a\u0456",
-"Increase indent": "\u041f\u0430\u0432\u044f\u043b\u0456\u0447\u044b\u0446\u044c \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
-"Formats": "\u0424\u0430\u0440\u043c\u0430\u0442",
-"Headers": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043a\u0456",
-"Select all": "\u0412\u044b\u043b\u0443\u0447\u044b\u0446\u044c \u0443\u0441\u0451",
-"Header 3": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 3",
-"Blocks": "\u0411\u043b\u043e\u043a\u0456",
-"Undo": "\u0412\u044f\u0440\u043d\u0443\u0446\u044c",
-"Strikethrough": "\u0417\u0430\u043a\u0440\u044d\u0441\u043b\u0435\u043d\u044b",
-"Bullet list": "\u041c\u0430\u0440\u043a\u0456\u0440\u0430\u0432\u0430\u043d\u044b \u0441\u043f\u0456\u0441",
-"Header 1": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 1",
-"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0456 \u0456\u043d\u0434\u044d\u043a\u0441",
-"Clear formatting": "\u0410\u0447\u044b\u0441\u0446\u0456\u0446\u044c \u0444\u0430\u0440\u043c\u0430\u0442",
-"Font Sizes": "\u041f\u0430\u043c\u0435\u0440 \u0448\u0440\u044b\u0444\u0442\u0430",
-"Subscript": "\u041d\u0456\u0436\u043d\u0456 \u0456\u043d\u0434\u044d\u043a\u0441",
-"Header 6": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 6",
-"Redo": "\u0410\u0434\u043c\u044f\u043d\u0456\u0446\u044c",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Ok": "Ok",
-"Bold": "\u0422\u043b\u0443\u0441\u0442\u044b",
-"Code": "\u041a\u043e\u0434",
-"Italic": "\u041a\u0443\u0440\u0441\u0456\u045e",
-"Align center": "\u041f\u0430 \u0446\u044d\u043d\u0442\u0440\u044b",
-"Header 5": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 5",
-"Heading 6": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 6",
-"Heading 3": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 3",
-"Decrease indent": "\u041f\u0430\u043c\u0435\u043d\u0448\u044b\u0446\u044c \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
-"Header 4": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0423\u0441\u0442\u0430\u045e\u043a\u0430 \u0437\u0434\u0437\u044f\u0439\u0441\u043d\u044f\u0435\u0446\u0446\u0430 \u045e \u0432\u044b\u0433\u043b\u044f\u0434\u0437\u0435 \u043f\u0440\u043e\u0441\u0442\u0430\u0433\u0430 \u0442\u044d\u043a\u0441\u0442\u0443, \u043f\u0430\u043a\u0443\u043b\u044c \u043d\u0435 \u0430\u0434\u043a\u043b\u044e\u0447\u044b\u0446\u044c \u0434\u0430\u0434\u0437\u0435\u043d\u0443\u044e \u043e\u043f\u0446\u044b\u044e.",
-"Underline": "\u041f\u0430\u0434\u043a\u0440\u044d\u0441\u043b\u0435\u043d\u044b",
-"Cancel": "\u0410\u0434\u043c\u044f\u043d\u0456\u0446\u044c",
-"Justify": "\u041f\u0430 \u0448\u044b\u0440\u044b\u043d\u0456",
-"Inline": "\u0420\u0430\u0434\u043a\u043e\u0432\u044b",
-"Copy": "\u041a\u0430\u043f\u0456\u0440\u0430\u0432\u0430\u0446\u044c",
-"Align left": "\u041f\u0430 \u043b\u0435\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
-"Visual aids": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u043a\u043e\u043d\u0442\u0443\u0440\u044b",
-"Lower Greek": "\u041c\u0430\u043b\u044b\u044f \u0433\u0440\u044d\u0447\u0430\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
-"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u044b",
-"Default": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b",
-"Lower Alpha": "\u041c\u0430\u043b\u044b\u044f \u043b\u0430\u0446\u0456\u043d\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
-"Circle": "\u0410\u043a\u0440\u0443\u0436\u043d\u0430\u0441\u0446\u0456",
-"Disc": "\u041a\u0440\u0443\u0433\u0456",
-"Upper Alpha": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043d\u044b\u044f \u043b\u0430\u0446\u0456\u043d\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
-"Upper Roman": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043d\u044b\u044f \u0440\u044b\u043c\u0441\u043a\u0456\u044f \u043b\u0456\u0447\u0431\u044b",
-"Lower Roman": "\u041c\u0430\u043b\u044b\u044f \u0440\u044b\u043c\u0441\u043a\u0456\u044f \u043b\u0456\u0447\u0431\u044b",
-"Name": "\u0406\u043c\u044f",
-"Anchor": "\u042f\u043a\u0430\u0440",
-"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0432\u0430\u0441 \u0451\u0441\u0446\u044c \u043d\u0435\u0437\u0430\u0445\u0430\u0432\u0430\u043d\u044b\u044f \u0437\u043c\u0435\u043d\u044b. \u0412\u044b \u045e\u043f\u044d\u045e\u043d\u0435\u043d\u044b\u044f, \u0448\u0442\u043e \u0445\u043e\u0447\u0430\u0446\u0435 \u0432\u044b\u0439\u0441\u0446\u0456?",
-"Restore last draft": "\u0410\u0434\u043d\u0430\u045e\u043b\u0435\u043d\u043d\u0435 \u0430\u043f\u043e\u0448\u043d\u044f\u0433\u0430 \u043f\u0440\u0430\u0435\u043a\u0442\u0430",
-"Special character": "\u0421\u043f\u0435\u0446\u044b\u044f\u043b\u044c\u043d\u044b\u044f \u0441\u0456\u043c\u0432\u0430\u043b\u044b",
-"Source code": "\u0417\u044b\u0445\u043e\u0434\u043d\u044b \u043a\u043e\u0434",
-"Color": "\u041a\u043e\u043b\u0435\u0440",
-"Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u0430",
-"Left to right": "\u0417\u043b\u0435\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u0430",
-"Emoticons": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043c\u0430\u0439\u043b",
-"Robots": "\u0420\u043e\u0431\u0430\u0442\u044b",
-"Document properties": "\u0423\u043b\u0430\u0441\u0446\u0456\u0432\u0430\u0441\u0446\u0456 \u0434\u0430\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Title": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
-"Keywords": "\u041a\u043b\u044e\u0447\u0430\u0432\u044b\u044f \u0441\u043b\u043e\u0432\u044b",
-"Encoding": "\u041a\u0430\u0434\u044b\u0440\u043e\u045e\u043a\u0430",
-"Description": "\u0410\u043f\u0456\u0441\u0430\u043d\u043d\u0435",
-"Author": "\u0410\u045e\u0442\u0430\u0440",
-"Fullscreen": "\u041f\u043e\u045e\u043d\u0430\u044d\u043a\u0440\u0430\u043d\u043d\u044b \u0440\u044d\u0436\u044b\u043c",
-"Horizontal line": "\u0413\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u0430\u044f \u043b\u0456\u043d\u0456\u044f",
-"Horizontal space": "\u0413\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u044b \u0456\u043d\u0442\u044d\u0440\u0432\u0430\u043b",
-"Insert\/edit image": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
-"General": "\u0410\u0433\u0443\u043b\u044c\u043d\u0430\u0435",
-"Advanced": "\u041f\u0430\u0448\u044b\u0440\u0430\u043d\u0430\u0435",
-"Source": "\u041a\u0440\u044b\u043d\u0456\u0446\u0430",
-"Border": "\u041c\u044f\u0436\u0430",
-"Constrain proportions": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c \u043f\u0440\u0430\u043f\u043e\u0440\u0446\u044b\u0456",
-"Vertical space": "\u0412\u0435\u0440\u0442\u044b\u043a\u0430\u043b\u044c\u043d\u044b \u0456\u043d\u0442\u044d\u0440\u0432\u0430\u043b",
-"Image description": "\u0410\u043f\u0456\u0441\u0430\u043d\u043d\u0435 \u0432\u044b\u044f\u0432\u044b",
-"Style": "\u0421\u0442\u044b\u043b\u044c",
-"Dimensions": "\u041f\u0430\u043c\u0435\u0440",
-"Insert image": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
-"Insert date\/time": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0434\u0430\u0442\u0443\/\u0447\u0430\u0441",
-"Remove link": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"Url": "\u0410\u0434\u0440\u0430\u0441 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0456",
-"Text to display": "\u0422\u044d\u043a\u0441\u0442 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0456",
-"Anchors": "\u042f\u043a\u0430\u0440\u044b",
-"Insert link": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"New window": "\u0423 \u043d\u043e\u0432\u044b\u043c \u0430\u043a\u043d\u0435",
-"None": "\u041d\u044f\u043c\u0430",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0423\u0432\u0435\u0434\u0437\u0435\u043d\u044b \u0430\u0434\u0440\u0430\u0441 \u043f\u0430\u0434\u043e\u0431\u043d\u044b \u043d\u0430 \u0437\u043d\u0435\u0448\u043d\u044e\u044e \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443. \u0416\u0430\u0434\u0430\u0435\u0446\u0435 \u0434\u0430\u0434\u0430\u0446\u044c \u043d\u0435\u0430\u0431\u0445\u043e\u0434\u043d\u044b http:\/\/ \u043f\u0440\u044d\u0444\u0456\u043a\u0441?",
-"Target": "\u0410\u0434\u043a\u0440\u044b\u0432\u0430\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0423\u0432\u0435\u0434\u0437\u0435\u043d\u044b \u0430\u0434\u0440\u0430\u0441 \u043f\u0430\u0434\u043e\u0431\u043d\u044b \u043d\u0430 \u0430\u0434\u0440\u0430\u0441 \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u0430\u0439 \u043f\u043e\u0448\u0442\u044b. \u0416\u0430\u0434\u0430\u0435\u0446\u0435 \u0434\u0430\u0434\u0430\u0446\u044c \u043d\u0435\u0430\u0431\u0445\u043e\u0434\u043d\u044b mailto: \u043f\u0440\u044d\u0444\u0456\u043a\u0441?",
-"Insert\/edit link": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
-"Insert\/edit video": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u0456\u0434\u044d\u0430",
-"Poster": "\u0412\u044b\u044f\u0432\u0430",
-"Alternative source": "\u0410\u043b\u044c\u0442\u044d\u0440\u043d\u0430\u0442\u044b\u045e\u043d\u0430\u044f \u043a\u0440\u044b\u043d\u0456\u0446\u0430",
-"Paste your embed code below:": "\u0423\u0441\u0442\u0430\u045e\u0446\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0456\u0436\u044d\u0439:",
-"Insert video": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0432\u0456\u0434\u044d\u0430",
-"Embed": "\u041a\u043e\u0434 \u0434\u043b\u044f \u045e\u0441\u0442\u0430\u045e\u043a\u0456",
-"Nonbreaking space": "\u041d\u0435\u043f\u0430\u0440\u044b\u045e\u043d\u044b \u043f\u0440\u0430\u0431\u0435\u043b",
-"Page break": "\u0420\u0430\u0437\u0440\u044b\u045e \u0441\u0442\u0430\u0440\u043e\u043d\u043a\u0456",
-"Paste as text": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u044f\u043a \u0442\u044d\u043a\u0441\u0442",
-"Preview": "\u041f\u0440\u0430\u0434\u043f\u0440\u0430\u0433\u043b\u044f\u0434",
-"Print": "\u0414\u0440\u0443\u043a",
-"Save": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c",
-"Could not find the specified string.": "\u0417\u0430\u0434\u0430\u0434\u0437\u0435\u043d\u044b \u0440\u0430\u0434\u043e\u043a \u043d\u0435 \u0437\u043d\u043e\u0439\u0434\u0437\u0435\u043d\u044b",
-"Replace": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c",
-"Next": "\u0423\u043d\u0456\u0437",
-"Whole words": "\u0421\u043b\u043e\u0432\u044b \u0446\u0430\u043b\u043a\u0430\u043c",
-"Find and replace": "\u041f\u043e\u0448\u0443\u043a \u0456 \u0437\u0430\u043c\u0435\u043d\u0430",
-"Replace with": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u043d\u0430",
-"Find": "\u0417\u043d\u0430\u0439\u0441\u0446\u0456",
-"Replace all": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u0443\u0441\u0435",
-"Match case": "\u0423\u043b\u0456\u0447\u0432\u0430\u0446\u044c \u0440\u044d\u0433\u0456\u0441\u0442\u0440",
-"Prev": "\u0423\u0432\u0435\u0440\u0445",
-"Spellcheck": "\u041f\u0440\u0430\u0432\u0435\u0440\u043a\u0430 \u043f\u0440\u0430\u0432\u0430\u043f\u0456\u0441\u0443",
-"Finish": "\u0421\u043a\u043e\u043d\u0447\u044b\u0446\u044c",
-"Ignore all": "\u0406\u0433\u043d\u0430\u0440\u0430\u0432\u0430\u0446\u044c \u0443\u0441\u0435",
-"Ignore": "\u0406\u0433\u043d\u0430\u0440\u0430\u0432\u0430\u0446\u044c",
-"Add to Dictionary": "\u0414\u0430\u0434\u0430\u0446\u044c \u0443 \u0441\u043b\u043e\u045e\u043d\u0456\u043a",
-"Insert row before": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
-"Rows": "\u0420\u0430\u0434\u043a\u0456",
-"Height": "\u0412\u044b\u0448\u044b\u043d\u044f",
-"Paste row after": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u043d\u0456\u0437\u0443",
-"Alignment": "\u0412\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
-"Border color": "\u041a\u043e\u043b\u0435\u0440 \u043c\u044f\u0436\u044b",
-"Column group": "\u0413\u0440\u0443\u043f\u0430 \u0441\u043b\u0443\u043f\u043a\u043e\u045e",
-"Row": "\u0420\u0430\u0434\u043e\u043a",
-"Insert column before": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a \u0437\u043b\u0435\u0432\u0430",
-"Split cell": "\u0420\u0430\u0437\u0431\u0456\u0446\u044c \u044f\u0447\u044d\u0439\u043a\u0443",
-"Cell padding": "\u0423\u043d\u0443\u0442\u0440\u0430\u043d\u044b \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
-"Cell spacing": "\u0417\u043d\u0435\u0448\u043d\u0456 \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
-"Row type": "\u0422\u044b\u043f \u0440\u0430\u0434\u043a\u0430",
-"Insert table": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0442\u0430\u0431\u043b\u0456\u0446\u0443",
-"Body": "\u0426\u0435\u043b\u0430",
-"Caption": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
-"Footer": "\u041d\u0456\u0437",
-"Delete row": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
-"Paste row before": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
-"Scope": "\u0421\u0444\u0435\u0440\u0430",
-"Delete table": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0442\u0430\u0431\u043b\u0456\u0446\u0443",
-"H Align": "\u0413\u0430\u0440. \u0432\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
-"Top": "\u0412\u0435\u0440\u0445",
-"Header cell": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
-"Column": "\u0421\u043b\u0443\u043f\u043e\u043a",
-"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u0430\u0434\u043a\u043e\u045e",
-"Cell": "\u042f\u0447\u044d\u0439\u043a\u0430",
-"Middle": "\u0421\u044f\u0440\u044d\u0434\u0437\u0456\u043d\u0430",
-"Cell type": "\u0422\u044b\u043f \u044f\u0447\u044d\u0439\u043a\u0456",
-"Copy row": "\u041a\u0430\u043f\u0456\u044f\u0432\u0430\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
-"Row properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0440\u0430\u0434\u043a\u0430",
-"Table properties": "\u0423\u043b\u0430\u0441\u0446\u0456\u0432\u0430\u0441\u0446\u0456 \u0442\u0430\u0431\u043b\u0456\u0446\u044b",
-"Bottom": "\u041d\u0456\u0437",
-"V Align": "\u0412\u0435\u0440. \u0432\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
-"Header": "\u0428\u0430\u043f\u043a\u0430",
-"Right": "\u041f\u0430 \u043f\u0440\u0430\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
-"Insert column after": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a \u0441\u043f\u0440\u0430\u0432\u0430",
-"Cols": "\u0421\u043b\u0443\u043f\u043a\u0456",
-"Insert row after": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u043d\u0456\u0437\u0443",
-"Width": "\u0428\u044b\u0440\u044b\u043d\u044f",
-"Cell properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u044f\u0447\u044d\u0439\u043a\u0456",
-"Left": "\u041f\u0430 \u043b\u0435\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
-"Cut row": "\u0412\u044b\u0440\u0430\u0437\u0430\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
-"Delete column": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a",
-"Center": "\u041f\u0430 \u0446\u044d\u043d\u0442\u0440\u044b",
-"Merge cells": "\u0410\u0431'\u044f\u0434\u043d\u0430\u0446\u044c \u044f\u0447\u044d\u0439\u043a\u0456",
-"Insert template": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u044b",
-"Background color": "\u041a\u043e\u043b\u0435\u0440 \u0444\u043e\u043d\u0443",
-"Custom...": "\u041a\u0430\u0440\u044b\u0441\u0442\u0430\u0446\u043a\u0456...",
-"Custom color": "\u041a\u0430\u0440\u044b\u0441\u0442\u0430\u0446\u043a\u0456 \u043a\u043e\u043b\u0435\u0440",
-"No color": "\u0411\u0435\u0437 \u043a\u043e\u043b\u0435\u0440\u0443",
-"Text color": "\u041a\u043e\u043b\u0435\u0440 \u0442\u044d\u043a\u0441\u0442\u0443",
-"Show blocks": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u0431\u043b\u043e\u043a\u0456",
-"Show invisible characters": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u043d\u044f\u0431\u0430\u0447\u043d\u044b\u044f \u0441\u0456\u043c\u0432\u0430\u043b\u044b",
-"Words: {0}": "\u041a\u043e\u043b\u044c\u043a\u0430\u0441\u0446\u044c \u0441\u043b\u043e\u045e: {0}",
-"Insert": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0422\u044d\u043a\u0441\u0442\u0430\u0432\u0430\u0435 \u043f\u043e\u043b\u0435. \u041d\u0430\u0446\u0456\u0441\u043d\u0456\u0446\u0435 ALT-F9, \u043a\u0430\u0431 \u0432\u044b\u043a\u043b\u0456\u043a\u0430\u0446\u044c \u043c\u0435\u043d\u044e, ALT-F10 - \u043f\u0430\u043d\u044d\u043b\u044c \u043f\u0440\u044b\u043b\u0430\u0434\u0430\u045e, ALT-0 - \u0434\u043b\u044f \u0432\u044b\u043a\u043b\u0456\u043a\u0443 \u0434\u0430\u043f\u0430\u043c\u043e\u0433\u0456.",
-"Tools": "\u041f\u0440\u044b\u043b\u0430\u0434\u044b",
-"View": "\u0412\u044b\u0433\u043b\u044f\u0434",
-"Table": "\u0422\u0430\u0431\u043b\u0456\u0446\u0430",
-"Format": "\u0424\u0430\u0440\u043c\u0430\u0442"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/bg.es5.js b/build/media_source/vendor/tinymce/langs/bg.es5.js
deleted file mode 100644
index 4fa87455757e9..0000000000000
--- a/build/media_source/vendor/tinymce/langs/bg.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('bg',{
-"Cut": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435",
-"Header 2": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448\u0438\u044f\u0442 \u0431\u0440\u0430\u0443\u0437\u044a\u0440 \u043d\u0435 \u043f\u043e\u0434\u0434\u044a\u0440\u0436\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u0435\u043d \u0434\u043e\u0441\u0442\u044a\u043f \u0434\u043e \u043a\u043b\u0438\u043f\u0431\u043e\u0440\u0434\u0430. \u0412\u043c\u0435\u0441\u0442\u043e \u0442\u043e\u0432\u0430 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439\u0442\u0435 \u043a\u043b\u0430\u0432\u0438\u0448\u043d\u0438\u0442\u0435 \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u0438 Ctrl+X (\u0437\u0430 \u0438\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435), Ctrl+C (\u0437\u0430 \u043a\u043e\u043f\u0438\u0440\u0430\u043d\u0435) \u0438 Ctrl+V (\u0437\u0430 \u043f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435).",
-"Div": "\u0411\u043b\u043e\u043a",
-"Paste": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435",
-"Close": "\u0417\u0430\u0442\u0432\u0430\u0440\u044f\u043d\u0435",
-"Font Family": "\u0428\u0440\u0438\u0444\u0442",
-"Pre": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u043d\u043e \u043e\u0444\u043e\u0440\u043c\u0435\u043d \u0442\u0435\u043a\u0441\u0442",
-"Align right": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435 \u043e\u0442\u0434\u044f\u0441\u043d\u043e",
-"New document": "\u041d\u043e\u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Blockquote": "\u0426\u0438\u0442\u0430\u0442",
-"Numbered list": "\u041d\u043e\u043c\u0435\u0440\u0438\u0440\u0430\u043d \u0441\u043f\u0438\u0441\u044a\u043a",
-"Increase indent": "\u0423\u0432\u0435\u043b\u0438\u0447\u0430\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u0442\u0441\u0442\u044a\u043f\u0430",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435",
-"Headers": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u044f",
-"Select all": "\u041c\u0430\u0440\u043a\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0446\u044f\u043b\u043e\u0442\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435",
-"Header 3": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 3",
-"Blocks": "\u0411\u043b\u043e\u043a\u043e\u0432\u0435",
-"Undo": "\u0412\u044a\u0440\u043d\u0438",
-"Strikethrough": "\u0417\u0430\u0447\u0435\u0440\u0442\u0430\u0432\u0430\u043d\u0435",
-"Bullet list": "\u0421\u043f\u0438\u0441\u044a\u043a \u0441 \u0432\u043e\u0434\u0430\u0447\u0438",
-"Header 1": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 1",
-"Superscript": "\u0413\u043e\u0440\u0435\u043d \u0438\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u0418\u0437\u0447\u0438\u0441\u0442\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435\u0442\u043e",
-"Font Sizes": "\u0420\u0430\u0437\u043c\u0435\u0440 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430",
-"Subscript": "\u0414\u043e\u043b\u0435\u043d \u0438\u043d\u0434\u0435\u043a\u0441",
-"Header 6": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 6",
-"Redo": "\u041e\u0442\u043c\u0435\u043d\u0438",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Ok": "\u0414\u043e\u0431\u0440\u0435",
-"Bold": "\u0423\u0434\u0435\u0431\u0435\u043b\u0435\u043d (\u043f\u043e\u043b\u0443\u0447\u0435\u0440)",
-"Code": "\u041a\u043e\u0434",
-"Italic": "\u041d\u0430\u043a\u043b\u043e\u043d\u0435\u043d (\u043a\u0443\u0440\u0441\u0438\u0432)",
-"Align center": "\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u0430\u043d\u043e",
-"Header 5": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 5",
-"Decrease indent": "\u041d\u0430\u043c\u0430\u043b\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043e\u0442\u0441\u0442\u044a\u043f\u0430",
-"Header 4": "\u0417\u0430\u0433\u043b\u0430\u0432\u0438\u0435 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435\u0442\u043e \u0432 \u043c\u043e\u043c\u0435\u043d\u0442\u0430 \u0435 \u0432 \u043e\u0431\u0438\u043a\u043d\u043e\u0432\u0435\u043d \u0440\u0435\u0436\u0438\u043c. \u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435\u0442\u043e \u0449\u0435 \u0431\u044a\u0434\u0435 \u043f\u043e\u0441\u0442\u0430\u0432\u0435\u043d\u043e \u043a\u0430\u0442\u043e \u043d\u0435\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d \u0442\u0435\u043a\u0441\u0442, \u0434\u043e\u043a\u0430\u0442\u043e \u0438\u0437\u043a\u043b\u044e\u0447\u0438\u0442\u0435 \u0442\u0430\u0437\u0438 \u043e\u043f\u0446\u0438\u044f.",
-"Underline": "\u041f\u043e\u0434\u0447\u0435\u0440\u0442\u0430\u043d",
-"Cancel": "\u041e\u0442\u043a\u0430\u0437",
-"Justify": "\u0414\u0432\u0443\u0441\u0442\u0440\u0430\u043d\u043d\u043e \u043f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"Inline": "\u041d\u0430 \u0435\u0434\u0438\u043d \u0440\u0435\u0434",
-"Copy": "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435",
-"Align left": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435 \u043e\u0442\u043b\u044f\u0432\u043e",
-"Visual aids": "\u0412\u0438\u0437\u0443\u0430\u043b\u043d\u043e \u043e\u0442\u043a\u0440\u043e\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0438 \u0431\u0435\u0437 \u043a\u0430\u043d\u0442\u043e\u0432\u0435 (\u0440\u0430\u043c\u043a\u0438)",
-"Lower Greek": "\u041c\u0430\u043b\u043a\u0438 \u0433\u0440\u044a\u0446\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Square": "\u0417\u0430\u043f\u044a\u043b\u043d\u0435\u043d\u0438 \u043a\u0432\u0430\u0434\u0440\u0430\u0442\u0438",
-"Default": "\u041f\u043e \u043f\u043e\u0434\u0440\u0430\u0437\u0431\u0438\u0440\u0430\u043d\u0435",
-"Lower Alpha": "\u041c\u0430\u043b\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Circle": "\u041e\u043a\u0440\u044a\u0436\u043d\u043e\u0441\u0442\u0438",
-"Disc": "\u041a\u0440\u044a\u0433\u0447\u0435\u0442\u0430",
-"Upper Alpha": "\u0413\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Upper Roman": "\u0420\u0438\u043c\u0441\u043a\u0438 \u0447\u0438\u0441\u043b\u0430 \u0441 \u0433\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Lower Roman": "\u0420\u0438\u043c\u0441\u043a\u0438 \u0447\u0438\u0441\u043b\u0430 \u0441 \u043c\u0430\u043b\u043a\u0438 \u0431\u0443\u043a\u0432\u0438",
-"Name": "\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435",
-"Anchor": "\u041a\u043e\u0442\u0432\u0430 (\u0432\u0440\u044a\u0437\u043a\u0430 \u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430)",
-"You have unsaved changes are you sure you want to navigate away?": "\u0412 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0438\u043c\u0430 \u043d\u0435\u0437\u0430\u043f\u0430\u0437\u0435\u043d\u0438 \u043f\u0440\u043e\u043c\u0435\u043d\u0438. \u0429\u0435 \u043f\u0440\u043e\u0434\u044a\u043b\u0436\u0438\u0442\u0435 \u043b\u0438?",
-"Restore last draft": "\u0412\u044a\u0437\u0441\u0442\u0430\u043d\u043e\u0432\u044f\u0432\u0430\u043d\u0435 \u043d\u0430 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0430\u0442\u0430 \u0447\u0435\u0440\u043d\u043e\u0432\u0430",
-"Special character": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u0435\u043d \u0437\u043d\u0430\u043a",
-"Source code": "\u0418\u0437\u0445\u043e\u0434\u0435\u043d \u043a\u043e\u0434 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430 \u0432 HTML",
-"Right to left": "\u041e\u0442\u0434\u044f\u0441\u043d\u043e \u043d\u0430\u043b\u044f\u0432\u043e",
-"Left to right": "\u041e\u0442\u043b\u044f\u0432\u043e \u043d\u0430\u0434\u044f\u0441\u043d\u043e",
-"Emoticons": "\u0415\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438 \u043d\u0430 \u0443\u0435\u0431 \u0442\u044a\u0440\u0441\u0430\u0447\u043a\u0438",
-"Document properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Title": "\u041d\u0430\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u043d\u0438\u0435",
-"Keywords": "\u041a\u043b\u044e\u0447\u043e\u0432\u0438 \u0434\u0443\u043c\u0438",
-"Encoding": "\u041a\u043e\u0434\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0437\u043d\u0430\u0446\u0438\u0442\u0435",
-"Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Fullscreen": "\u041d\u0430 \u0446\u044f\u043b \u0435\u043a\u0440\u0430\u043d",
-"Horizontal line": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u0430 \u0447\u0435\u0440\u0442\u0430",
-"Horizontal space": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e",
-"Insert\/edit image": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430",
-"General": "\u041e\u0431\u0449\u043e",
-"Advanced": "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e",
-"Source": "\u0410\u0434\u0440\u0435\u0441",
-"Border": "\u041a\u0430\u043d\u0442 (\u0440\u0430\u043c\u043a\u0430)",
-"Constrain proportions": "\u0417\u0430\u0432\u0430\u0437\u043d\u0430\u0432\u0435 \u043d\u0430 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438\u0442\u0435",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u043e",
-"Image description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u043d\u0430 \u043a\u0430\u0440\u0442\u0438\u043d\u043a\u0430\u0442\u0430",
-"Style": "\u0421\u0442\u0438\u043b",
-"Dimensions": "\u0420\u0430\u0437\u043c\u0435\u0440",
-"Insert image": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"Insert date\/time": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0434\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Remove link": "\u041f\u0440\u0435\u043c\u0430\u0445\u0432\u0430\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430",
-"Url": "\u0410\u0434\u0440\u0435\u0441 (URL)",
-"Text to display": "\u0422\u0435\u043a\u0441\u0442",
-"Anchors": "\u041a\u043e\u0442\u0432\u0438",
-"Insert link": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 (\u043b\u0438\u043d\u043a)",
-"New window": "\u0412 \u043d\u043e\u0432 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446 (\u043f\u043e\u0434\u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446)",
-"None": "\u0411\u0435\u0437",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "\u0426\u0435\u043b \u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u0445\u0438\u043f\u0435\u0440\u0432\u0440\u044a\u0437\u043a\u0430 (\u043b\u0438\u043d\u043a)",
-"Insert\/edit video": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435\/\u043a\u043e\u0440\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u0432\u0438\u0434\u0435\u043e",
-"Poster": "\u041f\u043e\u0441\u0442\u0435\u0440",
-"Alternative source": "\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d \u0430\u0434\u0440\u0435\u0441",
-"Paste your embed code below:": "\u041f\u043e\u0441\u0442\u0430\u0432\u0435\u0442\u0435 \u043a\u043e\u0434\u0430 \u0437\u0430 \u0432\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435 \u0432 \u043f\u043e\u043b\u0435\u0442\u043e \u043f\u043e-\u0434\u043e\u043b\u0443:",
-"Insert video": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0432\u0438\u0434\u0435\u043e",
-"Embed": "\u0412\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435",
-"Nonbreaking space": "\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Page break": "\u041d\u043e\u0432\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430",
-"Paste as text": "\u041f\u043e\u0441\u0442\u0430\u0432\u0438 \u043a\u0430\u0442\u043e \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u0435\u043d \u0438\u0437\u0433\u043b\u0435\u0434",
-"Print": "\u041f\u0435\u0447\u0430\u0442",
-"Save": "\u0421\u044a\u0445\u0440\u0430\u043d\u044f\u0432\u0430\u043d\u0435",
-"Could not find the specified string.": "\u0422\u044a\u0440\u0441\u0435\u043d\u0438\u044f\u0442 \u0442\u0435\u043a\u0441\u0442 \u043d\u0435 \u0435 \u043d\u0430\u043c\u0435\u0440\u0435\u043d.",
-"Replace": "\u0417\u0430\u043c\u044f\u043d\u0430",
-"Next": "\u0421\u043b\u0435\u0434\u0432\u0430\u0449",
-"Whole words": "\u0421\u0430\u043c\u043e \u0446\u0435\u043b\u0438 \u0434\u0443\u043c\u0438",
-"Find and replace": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u0438 \u0437\u0430\u043c\u044f\u043d\u0430",
-"Replace with": "\u0417\u0430\u043c\u044f\u043d\u0430 \u0441",
-"Find": "\u0422\u044a\u0440\u0441\u0435\u043d\u0435 \u0437\u0430",
-"Replace all": "\u0417\u0430\u043c\u044f\u043d\u0430 \u043d\u0430 \u0432\u0441\u0438\u0447\u043a\u0438 \u0441\u0440\u0435\u0449\u0430\u043d\u0438\u044f",
-"Match case": "\u0421\u044a\u0432\u043f\u0430\u0434\u0435\u043d\u0438\u0435 \u043d\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u044a\u0440\u0430 (\u043c\u0430\u043b\u043a\u0438\/\u0433\u043b\u0430\u0432\u043d\u0438 \u0431\u0443\u043a\u0432\u0438)",
-"Prev": "\u041f\u0440\u0435\u0434\u0438\u0448\u0435\u043d",
-"Spellcheck": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043d\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430",
-"Finish": "\u041a\u0440\u0430\u0439",
-"Ignore all": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0432\u0441\u0438\u0447\u043a\u043e",
-"Ignore": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u043d\u0435",
-"Insert row before": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434\u0438",
-"Rows": "\u0420\u0435\u0434\u043e\u0432\u0435",
-"Height": "\u0412\u0438\u0441\u043e\u0447\u0438\u043d\u0430",
-"Paste row after": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u0441\u043b\u0435\u0434",
-"Alignment": "\u041f\u043e\u0434\u0440\u0430\u0432\u043d\u044f\u0432\u0430\u043d\u0435",
-"Column group": "Column group",
-"Row": "\u0420\u0435\u0434",
-"Insert column before": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u043f\u0440\u0435\u0434\u0438",
-"Split cell": "\u0420\u0430\u0437\u0434\u0435\u043b\u044f\u043d\u0435 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430",
-"Cell padding": "\u0420\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u0434\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435\u0442\u043e",
-"Cell spacing": "\u0420\u0430\u0437\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u043c\u0435\u0436\u0434\u0443 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435",
-"Row type": "\u0422\u0438\u043f \u043d\u0430 \u0440\u0435\u0434\u0430",
-"Insert table": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430",
-"Body": "\u0421\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435 (body)",
-"Caption": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0437\u0430\u0433\u043b\u0430\u0432\u0438\u0435 \u043f\u0440\u0435\u0434\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
-"Footer": "\u0414\u043e\u043b\u0435\u043d \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b (footer)",
-"Delete row": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434\u0430",
-"Paste row before": "\u041f\u043e\u0441\u0442\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434\u0438",
-"Scope": "\u041e\u0431\u0445\u0432\u0430\u0442",
-"Delete table": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
-"Header cell": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430 (\u0430\u043d\u0442\u0435\u0442\u043a\u0430)",
-"Column": "\u041a\u043e\u043b\u043e\u043d\u0430",
-"Cell": "\u041a\u043b\u0435\u0442\u043a\u0430",
-"Header": "\u0413\u043e\u0440\u0435\u043d \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b (header)",
-"Cell type": "\u0422\u0438\u043f \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430\u0442\u0430",
-"Copy row": "\u041a\u043e\u043f\u0438\u0440\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434",
-"Row properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0440\u0435\u0434\u0430",
-"Table properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u0430\u0442\u0430",
-"Row group": "Row group",
-"Right": "\u0414\u044f\u0441\u043d\u043e",
-"Insert column after": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u0441\u043b\u0435\u0434",
-"Cols": "\u041a\u043e\u043b\u043e\u043d\u0438",
-"Insert row after": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434 \u0441\u043b\u0435\u0434",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Cell properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0430\u0442\u0430",
-"Left": "\u041b\u044f\u0432\u043e",
-"Cut row": "\u0418\u0437\u0440\u044f\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0440\u0435\u0434",
-"Delete column": "\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430\u0442\u0430",
-"Center": "\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u0430\u043d\u043e",
-"Merge cells": "\u0421\u043b\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u043a\u043b\u0435\u0442\u043a\u0438\u0442\u0435",
-"Insert template": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435 \u043d\u0430 \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
-"Background color": "\u0424\u043e\u043d\u043e\u0432 \u0446\u0432\u044f\u0442",
-"Text color": "\u0426\u0432\u044f\u0442 \u043d\u0430 \u0448\u0440\u0438\u0444\u0442\u0430",
-"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u0431\u043b\u043e\u043a\u043e\u0432\u0435\u0442\u0435",
-"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u0432\u0430\u043d\u0435 \u043d\u0430 \u043d\u0435\u043f\u0435\u0447\u0430\u0442\u0430\u0435\u043c\u0438 \u0437\u043d\u0430\u0446\u0438",
-"Words: {0}": "\u0411\u0440\u043e\u0439 \u0434\u0443\u043c\u0438: {0}",
-"Insert": "\u0412\u043c\u044a\u043a\u0432\u0430\u043d\u0435",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u0430\u043d\u0435",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u041f\u043e\u043b\u0435 \u0437\u0430 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d \u0442\u0435\u043a\u0441\u0442. \u041d\u0430\u0442\u0438\u0441\u043d\u0435\u0442\u0435 Alt+F9 \u0437\u0430 \u043c\u0435\u043d\u044e; Alt+F10 \u0437\u0430 \u043b\u0435\u043d\u0442\u0430 \u0441 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438; Alt+0 \u0437\u0430 \u043f\u043e\u043c\u043e\u0449.",
-"Tools": "\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438",
-"View": "\u0418\u0437\u0433\u043b\u0435\u0434",
-"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u0435"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/bs.es5.js b/build/media_source/vendor/tinymce/langs/bs.es5.js
deleted file mode 100644
index eaf0b2c9ecfec..0000000000000
--- a/build/media_source/vendor/tinymce/langs/bs.es5.js
+++ /dev/null
@@ -1,231 +0,0 @@
-tinymce.addI18n('bs',{
-"Cut": "Izre\u017ei",
-"Heading 5": "Naslov 5",
-"Header 2": "Zaglavlje 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Va\u0161 preglednik ne podr\u017eava direktan pristup me\u0111uspremniku (clipboard). Molimo Vas da umjesto toga koristite kratice na tastaturi Ctrl+X\/C\/V.",
-"Heading 4": "Naslov 4",
-"Div": "Div",
-"Heading 2": "Naslov 2",
-"Paste": "Zalijepi",
-"Close": "Zatvori",
-"Font Family": "Vrsta pisma",
-"Pre": "Pre",
-"Align right": "Poravnaj desno",
-"New document": "Novi dokument",
-"Blockquote": "Blockquote",
-"Numbered list": "Numerisana lista",
-"Heading 1": "Naslov 1",
-"Headings": "Naslovi",
-"Increase indent": "Pove\u0107aj uvla\u010denje",
-"Formats": "Formati",
-"Headers": "Zaglavlja",
-"Select all": "Ozna\u010di sve",
-"Header 3": "Zaglavlje 3",
-"Blocks": "Blokovi",
-"Undo": "Poni\u0161ti",
-"Strikethrough": "Crta kroz sredinu",
-"Bullet list": "Lista",
-"Header 1": "Zaglavlje 1",
-"Superscript": "Eksponent",
-"Clear formatting": "Ukloni oblikovanje",
-"Font Sizes": "Veli\u010dine fonta",
-"Subscript": "Indeks",
-"Header 6": "Zaglavlje 6",
-"Redo": "Vrati",
-"Paragraph": "Paragraf",
-"Ok": "U redu",
-"Bold": "Podebljano",
-"Code": "Kod",
-"Italic": "Kurziv",
-"Align center": "Poravnaj po sredini",
-"Header 5": "Zaglavlje 5",
-"Heading 6": "Naslov 6",
-"Heading 3": "Naslov 3",
-"Decrease indent": "Smanji uvla\u010denje",
-"Header 4": "Zaglavlje 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Akcija zalijepi od sada lijepi \u010disti tekst. Sadr\u017eaj \u0107e biti zaljepljen kao \u010disti tekst sve dok ne isklju\u010dite ovu opciju.",
-"Underline": "Linija ispod",
-"Cancel": "Odustani",
-"Justify": "Obostrano poravnanje",
-"Inline": "Unutra\u0161nje",
-"Copy": "Kopiraj",
-"Align left": "Poravnaj lijevo",
-"Visual aids": "Vizualna pomo\u0107",
-"Lower Greek": "Mala gr\u010dka slova",
-"Square": "Kvadrat",
-"Default": "Zadano",
-"Lower Alpha": "Mala slova",
-"Circle": "Krug",
-"Disc": "Disk",
-"Upper Alpha": "Velika slova",
-"Upper Roman": "Velika rimska slova",
-"Lower Roman": "Mala rimska slova",
-"Name": "Ime",
-"Anchor": "Sidro",
-"You have unsaved changes are you sure you want to navigate away?": "Postoje izmjene koje nisu snimljene, jeste li sigurni da \u017eelite iza\u0107i?",
-"Restore last draft": "Vrati posljednju skicu",
-"Special character": "Poseban znak",
-"Source code": "Izvorni kod",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Boja",
-"Right to left": "S desna na lijevo",
-"Left to right": "S lijeva na desno",
-"Emoticons": "Emotikoni",
-"Robots": "Roboti pretra\u017eiva\u010da",
-"Document properties": "Svojstva dokumenta",
-"Title": "Naslov",
-"Keywords": "Klju\u010dne rije\u010di",
-"Encoding": "Kodna stranica",
-"Description": "Opis",
-"Author": "Autor",
-"Fullscreen": "Cijeli ekran",
-"Horizontal line": "Horizontalna linija",
-"Horizontal space": "Horizontalan razmak",
-"Insert\/edit image": "Ubaci\/izmijeni sliku",
-"Insert\/Edit code sample": "Ubaci\/izmijeni uzorak koda",
-"General": "Op\u0107enito",
-"Advanced": "Napredno",
-"Source": "Izvor",
-"Border": "Ivica",
-"Constrain proportions": "Zadr\u017ei proporcije",
-"Vertical space": "Vertikalni razmak",
-"Image description": "Opis slike",
-"Style": "Stil",
-"Dimensions": "Dimenzije",
-"Insert image": "Ubaci sliku",
-"Zoom in": "Pove\u0107aj",
-"Contrast": "Kontrast",
-"Back": "Nazad",
-"Gamma": "Gamma",
-"Flip horizontally": "Obrni horizontalno",
-"Resize": "Promjeni veli\u010dinu",
-"Sharpen": "Izo\u0161travanje",
-"Zoom out": "Smanji",
-"Insert image": "Ubaci sliku",
-"Apply": "Primijeni",
-"Brightness": "Svjetlina",
-"Rotate clockwise": "Rotiraj desno",
-"Rotate counterclockwise": "Rotiraj lijevo",
-"Edit image": "Uredi sliku",
-"Color levels": "Nivoi boje",
-"Crop": "Obre\u017ei",
-"Orientation": "Orijentacija",
-"Flip vertically": "Obrni vertikalno",
-"Invert": "Invertuj",
-"Insert date\/time": "Ubaci datum\/vrijeme",
-"Remove link": "Ukloni poveznicu",
-"Url": "Url",
-"Text to display": "Tekst za prikaz",
-"Anchors": "Kra\u0107e poveznice",
-"Insert link": "Ubaci poveznicu",
-"New window": "Novi prozor",
-"None": "Ni\u0161ta",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL koji ste unijeli izgleda da je eksterni link. \u017delite li dodati potrebni http:\/\/ prefiks?",
-"Target": "Meta",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL koji ste unijeli izgleda da je adresa e-po\u0161te. \u017delite li dodati potrebni mailto: prefiks?",
-"Insert\/edit link": "Umetni\/izmijeni link",
-"Insert\/edit video": "Umetni\/izmijeni video",
-"Poster": "Poster",
-"Alternative source": "Alternativni izvor",
-"Paste your embed code below:": "Umetnite va\u0161 kod za ugradnju ispod:",
-"Insert video": "Umetni video",
-"Embed": "Ugradi",
-"Nonbreaking space": "Neprekidaju\u0107i razmak",
-"Page break": "Prijelom stranice",
-"Paste as text": "Zalijepi kao tekst",
-"Preview": "Pregled",
-"Print": "Ispis",
-"Save": "Spremi",
-"Could not find the specified string.": "Tra\u017eeni tekst nije prona\u0111en",
-"Replace": "Zamijeni",
-"Next": "Sljede\u0107i",
-"Whole words": "Cijele rije\u010di",
-"Find and replace": "Prona\u0111i i zamijeni",
-"Replace with": "Zamijeni sa",
-"Find": "Tra\u017ei",
-"Replace all": "Zamijeni sve",
-"Match case": "Pazi na mala i velika slova",
-"Prev": "Prethodni",
-"Spellcheck": "Provjeri pravopis",
-"Finish": "Zavr\u0161i",
-"Ignore all": "Zanemari sve",
-"Ignore": "Zanemari",
-"Add to Dictionary": "Dodaj u rje\u010dnik",
-"Insert row before": "Umetni redak prije",
-"Rows": "Redovi",
-"Height": "Visina",
-"Paste row after": "Zalijepi redak nakon",
-"Alignment": "Poravnanje",
-"Border color": "Boja ivice",
-"Column group": "Grupirane kolone",
-"Row": "Redak",
-"Insert column before": "Umetni kolonu prije",
-"Split cell": "Razdvoji polja",
-"Cell padding": "Razmak unutar polja",
-"Cell spacing": "Razmak izme\u0111u polja",
-"Row type": "Vrsta redka",
-"Insert table": "Umetni tablicu",
-"Body": "Sadr\u017eaj",
-"Caption": "Naslov",
-"Footer": "Podno\u017eje",
-"Delete row": "Izbri\u0161i redak",
-"Paste row before": "Zalijepi redak prije",
-"Scope": "Doseg",
-"Delete table": "Izbri\u0161i tablicu",
-"H Align": "H Poravnavanje",
-"Top": "Vrh",
-"Header cell": "Polje zaglavlja",
-"Column": "Kolona",
-"Row group": "Grupirani redovi",
-"Cell": "Polje",
-"Middle": "Sredina",
-"Cell type": "Vrsta polja",
-"Copy row": "Kopiraj redak",
-"Row properties": "Svojstva redka",
-"Table properties": "Svojstva tablice",
-"Bottom": "Dno",
-"V Align": "V Poravnavanje",
-"Header": "Zaglavlje",
-"Right": "Desno",
-"Insert column after": "Umetni kolonu poslije",
-"Cols": "Stupci",
-"Insert row after": "Umetni redak poslije",
-"Width": "\u0160irina",
-"Cell properties": "Svojstva polja",
-"Left": "Lijevo",
-"Cut row": "Izre\u017ei redak",
-"Delete column": "Izbri\u0161i kolonu",
-"Center": "Sredina",
-"Merge cells": "Spoji polja",
-"Insert template": "Umetni predlo\u017eak",
-"Templates": "Predlo\u0161ci",
-"Background color": "Boja pozadine",
-"Custom...": "Prilago\u0111eno...",
-"Custom color": "Prilago\u0111ena boja",
-"No color": "Bez boje",
-"Text color": "Boja teksta",
-"Show blocks": "Prika\u017ei blokove",
-"Show invisible characters": "Prika\u017ei nevidljive znakove",
-"Words: {0}": "Rije\u010di: {0}",
-"Insert": "Umetni",
-"File": "Datoteka",
-"Edit": "Izmijeni",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Pritisni ALT-F9 za izbornik. Pritisni ALT-F10 za alatnu traku. Pritisni ALT-0 za pomo\u0107",
-"Tools": "Alati",
-"View": "Pogled",
-"Table": "Tablica",
-"Format": "Format",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id treba da po\u010dinje sa slovom, i pored slova mogu se koristiti samo brojevi, crtice, ta\u010dke, zarezi ili donje crte.",
-"Insert/Edit code sample": "Ubaci/Izmijeni primjer koda",
-"Language": "Jezik",
-"Image": "Image",
-"Date/time": "Datum/vrijeme",
-"Link": "Link",
-"Paste or type a link": "Zalijepi ili unesi link",
-"Insert/Edit Media": "Ubaci/Izmijeni medij",
-"Media": "Medij",
-"Table of Contents": "Sadr\u017eaj"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/ca.es5.js b/build/media_source/vendor/tinymce/langs/ca.es5.js
deleted file mode 100644
index 6491aa09210ea..0000000000000
--- a/build/media_source/vendor/tinymce/langs/ca.es5.js
+++ /dev/null
@@ -1,219 +0,0 @@
-tinymce.addI18n('ca',{
-"Cut": "Retalla",
-"Heading 5": "Encap\u00e7alament 5",
-"Header 2": "Cap\u00e7alera 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "El vostre navegador no suporta l'acc\u00e9s directe al portaobjectes. Si us plau, feu servir les dreceres de teclat Ctrl+X\/C\/V.",
-"Heading 4": "Encap\u00e7alament 4",
-"Div": "Div",
-"Heading 2": "Encap\u00e7alament 2",
-"Paste": "Enganxa",
-"Close": "Tanca",
-"Font Family": "Fam\u00edlia de la font",
-"Pre": "Pre",
-"Align right": "Aliniat a la dreta",
-"New document": "Nou document",
-"Blockquote": "Cita",
-"Numbered list": "Llista enumerada",
-"Heading 1": "Encap\u00e7alament 1",
-"Headings": "Encap\u00e7alaments",
-"Increase indent": "Augmentar sagnat",
-"Formats": "Formats",
-"Headers": "Cap\u00e7aleres",
-"Select all": "Seleccionar-ho tot",
-"Header 3": "Cap\u00e7alera 3",
-"Blocks": "Blocs",
-"Undo": "Desfer",
-"Strikethrough": "Ratllat",
-"Bullet list": "Llista no ordenada",
-"Header 1": "Cap\u00e7alera 1",
-"Superscript": "Super\u00edndex",
-"Clear formatting": "Eliminar format",
-"Font Sizes": "Mides de la font",
-"Subscript": "Sub\u00edndex",
-"Header 6": "Cap\u00e7alera 6",
-"Redo": "Refer",
-"Paragraph": "Par\u00e0graf",
-"Ok": "Acceptar",
-"Bold": "Negreta",
-"Code": "Codi",
-"Italic": "Cursiva",
-"Align center": "Centrat",
-"Header 5": "Cap\u00e7alera 5",
-"Heading 6": "Encap\u00e7alament 6",
-"Heading 3": "Encap\u00e7alament 3",
-"Decrease indent": "Disminuir sagnat",
-"Header 4": "Cap\u00e7alera 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Enganxar ara est\u00e0 en mode text pla. Els continguts s'enganxaran com a text pla fins que desactivis aquesta opci\u00f3. ",
-"Underline": "Subratllat",
-"Cancel": "Cancel\u00b7la",
-"Justify": "Justificat",
-"Inline": "En l\u00ednia",
-"Copy": "Copia",
-"Align left": "Aliniat a l'esquerra",
-"Visual aids": "Assist\u00e8ncia visual",
-"Lower Greek": "Grec menor",
-"Square": "Quadrat",
-"Default": "Per defecte",
-"Lower Alpha": "Alfa menor",
-"Circle": "Cercle",
-"Disc": "Disc",
-"Upper Alpha": "Alfa major",
-"Upper Roman": "Roman major",
-"Lower Roman": "Roman menor",
-"Name": "Nom",
-"Anchor": "\u00c0ncora",
-"You have unsaved changes are you sure you want to navigate away?": "Teniu canvis sense desar, esteu segur que voleu deixar-ho ara?",
-"Restore last draft": "Restaurar l'\u00faltim esborrany",
-"Special character": "Car\u00e0cter especial",
-"Source code": "Codi font",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Color",
-"Right to left": "De dreta a esquerra",
-"Left to right": "D'esquerra a dreta",
-"Emoticons": "Emoticones",
-"Robots": "Robots",
-"Document properties": "Propietats del document",
-"Title": "T\u00edtol",
-"Keywords": "Paraules clau",
-"Encoding": "Codificaci\u00f3",
-"Description": "Descripci\u00f3",
-"Author": "Autor",
-"Fullscreen": "Pantalla completa",
-"Horizontal line": "L\u00ednia horitzontal",
-"Horizontal space": "Espai horitzontal",
-"Insert\/edit image": "Inserir\/editar imatge",
-"General": "General",
-"Advanced": "Avan\u00e7at",
-"Source": "Font",
-"Border": "Vora",
-"Constrain proportions": "Mantenir proporcions",
-"Vertical space": "Espai vertical",
-"Image description": "Descripci\u00f3 de la imatge",
-"Style": "Estil",
-"Dimensions": "Dimensions",
-"Insert image": "Inserir imatge",
-"Zoom in": "Ampliar",
-"Contrast": "Contrast",
-"Back": "Tornar",
-"Gamma": "Gamma",
-"Flip horizontally": "Capgirar horitzontalment",
-"Resize": "Canviar mida",
-"Sharpen": "Remarcar vores",
-"Zoom out": "Empetitir",
-"Image options": "Opcions d'imatge",
-"Apply": "Aplicar",
-"Brightness": "Brillantor",
-"Rotate clockwise": "Girar a la dreta",
-"Rotate counterclockwise": "Girar a l'esquerra",
-"Edit image": "Editar imatge",
-"Color levels": "Nivells de color",
-"Crop": "Escap\u00e7ar",
-"Orientation": "Orientaci\u00f3",
-"Flip vertically": "Capgirar verticalment",
-"Invert": "Invertir",
-"Insert date\/time": "Inserir data\/hora",
-"Remove link": "Treure enlla\u00e7",
-"Url": "URL",
-"Text to display": "Text per mostrar",
-"Anchors": "\u00c0ncores",
-"Insert link": "Inserir enlla\u00e7",
-"New window": "Finestra nova",
-"None": "Cap",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que has escrit sembla un enlla\u00e7 extern. Vols afegir-li el prefix obligatori http:\/\/ ?",
-"Target": "Dest\u00ed",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que has escrit sembla una adre\u00e7a de correu electr\u00f2nic. Vols afegir-li el prefix obligatori mailto: ?",
-"Insert\/edit link": "Inserir\/editar enlla\u00e7",
-"Insert\/edit video": "Inserir\/editar v\u00eddeo",
-"Poster": "P\u00f3ster",
-"Alternative source": "Font alternativa",
-"Paste your embed code below:": "Enganxau el codi a sota:",
-"Insert video": "Inserir v\u00eddeo",
-"Embed": "Incloure",
-"Nonbreaking space": "Espai fixe",
-"Page break": "Salt de p\u00e0gina",
-"Paste as text": "Enganxar com a text",
-"Preview": "Previsualitzaci\u00f3",
-"Print": "Imprimir",
-"Save": "Desa",
-"Could not find the specified string.": "No es pot trobar el text especificat.",
-"Replace": "Rempla\u00e7ar",
-"Next": "Seg\u00fcent",
-"Whole words": "Paraules senceres",
-"Find and replace": "Buscar i rempla\u00e7ar",
-"Replace with": "Rempla\u00e7ar amb",
-"Find": "Buscar",
-"Replace all": "Rempla\u00e7ar-ho tot",
-"Match case": "Coincidir maj\u00fascules",
-"Prev": "Anterior",
-"Spellcheck": "Comprovar ortrografia",
-"Finish": "Finalitzar",
-"Ignore all": "Ignorar tots",
-"Ignore": "Ignorar",
-"Add to Dictionary": "Afegir al diccionari",
-"Insert row before": "Inserir fila a sobre",
-"Rows": "Files",
-"Height": "Al\u00e7ada",
-"Paste row after": "Enganxar fila a sota",
-"Alignment": "Aliniament",
-"Border color": "Color de vora",
-"Column group": "Grup de columna",
-"Row": "Fila",
-"Insert column before": "Inserir columna abans",
-"Split cell": "Dividir cel\u00b7les",
-"Cell padding": "Marge intern",
-"Cell spacing": "Espai entre cel\u00b7les",
-"Row type": "Tipus de fila",
-"Insert table": "Inserir taula",
-"Body": "Cos",
-"Caption": "Encap\u00e7alament",
-"Footer": "Peu",
-"Delete row": "Esborrar fila",
-"Paste row before": "Enganxar fila a sobre",
-"Scope": "\u00c0mbit",
-"Delete table": "Esborrar taula",
-"H Align": "Al\u00edniament H",
-"Top": "Superior",
-"Header cell": "Cel\u00b7la de cap\u00e7alera",
-"Column": "Columna",
-"Row group": "Grup de fila",
-"Cell": "Cel\u00b7la",
-"Middle": "Mitj\u00e0",
-"Cell type": "Tipus de cel\u00b7la",
-"Copy row": "Copiar fila",
-"Row properties": "Propietats de fila",
-"Table properties": "Propietats de taula",
-"Bottom": "Inferior",
-"V Align": "Al\u00edniament V",
-"Header": "Cap\u00e7alera",
-"Right": "A la dreta",
-"Insert column after": "Inserir columna despr\u00e9s",
-"Cols": "Cols",
-"Insert row after": "Inserir fila a sota",
-"Width": "Amplada",
-"Cell properties": "Propietats de cel\u00b7la",
-"Left": "A l'esquerra",
-"Cut row": "Retallar fila",
-"Delete column": "Esborrar columna",
-"Center": "Centrat",
-"Merge cells": "Fusionar cel\u00b7les",
-"Insert template": "Inserir plantilla",
-"Templates": "Plantilles",
-"Background color": "Color del fons",
-"Custom...": "Personalitzar...",
-"Custom color": "Personalitzar el color",
-"No color": "Sense color",
-"Text color": "Color del text",
-"Show blocks": "Mostrar blocs",
-"Show invisible characters": "Mostrar car\u00e0cters invisibles",
-"Words: {0}": "Paraules: {0}",
-"Insert": "Inserir",
-"File": "Arxiu",
-"Edit": "Edici\u00f3",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c0rea de text amb format. Premeu ALT-F9 per mostrar el men\u00fa, ALT F10 per la barra d'eines i ALT-0 per ajuda.",
-"Tools": "Eines",
-"View": "Veure",
-"Table": "Taula",
-"Format": "Format"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/cs.es5.js b/build/media_source/vendor/tinymce/langs/cs.es5.js
deleted file mode 100644
index 724f051aa9c5f..0000000000000
--- a/build/media_source/vendor/tinymce/langs/cs.es5.js
+++ /dev/null
@@ -1,462 +0,0 @@
-tinymce.addI18n('cs',{
-"Redo": "Znovu",
-"Undo": "Zp\u011bt",
-"Cut": "Vyjmout",
-"Copy": "Kop\u00edrovat",
-"Paste": "Vlo\u017eit",
-"Select all": "Vybrat v\u0161e",
-"New document": "Nov\u00fd dokument",
-"Ok": "Ok",
-"Cancel": "Zru\u0161it",
-"Visual aids": "Vizu\u00e1ln\u00ed pom\u016fcky",
-"Bold": "Tu\u010dn\u011b",
-"Italic": "Kurz\u00edva",
-"Underline": "Podtr\u017een\u00e9",
-"Strikethrough": "P\u0159e\u0161krtnut\u00e9",
-"Superscript": "Horn\u00ed index",
-"Subscript": "Doln\u00ed index",
-"Clear formatting": "Vymazat form\u00e1tov\u00e1n\u00ed",
-"Align left": "Vlevo",
-"Align center": "Na st\u0159ed",
-"Align right": "Vpravo",
-"Justify": "Zarovnat do bloku",
-"Bullet list": "Odr\u00e1\u017eky",
-"Numbered list": "\u010c\u00edslov\u00e1n\u00ed",
-"Decrease indent": "Zmen\u0161it odsazen\u00ed",
-"Increase indent": "Zv\u011b\u0161it odsazen\u00ed",
-"Close": "Zav\u0159\u00edt",
-"Formats": "Form\u00e1ty",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "V\u00e1\u0161 prohl\u00ed\u017ee\u010d nepodporuje p\u0159\u00edm\u00fd p\u0159\u00edstup do schr\u00e1nky. Pou\u017eijte pros\u00edm kl\u00e1vesov\u00e9 zkratky Ctrl+X\/C\/V.",
-"Headers": "Nadpisy",
-"Header 1": "Nadpis 1",
-"Header 2": "Nadpis 2",
-"Header 3": "Nadpis 3",
-"Header 4": "Nadpis 4",
-"Header 5": "Nadpis 5",
-"Header 6": "Nadpis 6",
-"Headings": "Nadpisy",
-"Heading 1": "Nadpis 1",
-"Heading 2": "Nadpis 2",
-"Heading 3": "Nadpis 3",
-"Heading 4": "Nadpis 4",
-"Heading 5": "Nadpis 5",
-"Heading 6": "Nadpis 6",
-"Preformatted": "P\u0159edform\u00e1tovan\u00fd text",
-"Div": "Div (blok)",
-"Pre": "Pre (p\u0159edform\u00e1tov\u00e1no)",
-"Code": "Code (k\u00f3d)",
-"Paragraph": "Odstavec",
-"Blockquote": "Citace",
-"Inline": "\u0158\u00e1dkov\u00e9 zobrazen\u00ed (inline)",
-"Blocks": "Blokov\u00e9 zobrazen\u00ed (block)",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Je zapnuto vkl\u00e1d\u00e1n\u00ed \u010dist\u00e9ho textu. Dokud nebude tato volba vypnuta, bude ve\u0161ker\u00fd obsah vlo\u017een jako \u010dist\u00fd text.",
-"Fonts": "P\u00edsma",
-"Font Sizes": "Velikost p\u00edsma",
-"Class": "T\u0159\u00edda",
-"Browse for an image": "Vybrat obr\u00e1zek",
-"OR": "NEBO",
-"Drop an image here": "P\u0159et\u00e1hn\u011bte obr\u00e1zek sem",
-"Upload": "Nahr\u00e1t",
-"Block": "Blok",
-"Align": "Zarovnat",
-"Default": "V\u00fdchoz\u00ed",
-"Circle": "Kole\u010dko",
-"Disc": "Punt\u00edk",
-"Square": "\u010ctvere\u010dek",
-"Lower Alpha": "Mal\u00e1 p\u00edsmena",
-"Lower Greek": "\u0158eck\u00e1 p\u00edsmena",
-"Lower Roman": "Mal\u00e9 \u0159\u00edmsl\u00e9 \u010d\u00edslice",
-"Upper Alpha": "Velk\u00e1 p\u00edsmena",
-"Upper Roman": "\u0158\u00edmsk\u00e9 \u010d\u00edslice",
-"Anchor...": "Kotva",
-"Name": "N\u00e1zev",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID by m\u011blo za\u010d\u00ednat p\u00edsmenem, n\u00e1sledovan\u00fdm pouze p\u00edsmeny, \u010d\u00edsly, poml\u010dkami, te\u010dkami, \u010d\u00e1rkami a nebo podtr\u017e\u00edtky.",
-"You have unsaved changes are you sure you want to navigate away?": "M\u00e1te neulo\u017een\u00e9 zm\u011bny. Opravdu chcete opustit str\u00e1nku?",
-"Restore last draft": "Obnovit posledn\u00ed koncept.",
-"Special character...": "Speci\u00e1ln\u00ed znak",
-"Source code": "Zdrojov\u00fd k\u00f3d",
-"Insert\/Edit code sample": "Vlo\u017eit\/Upravit uk\u00e1zku k\u00f3du",
-"Language": "Jazyk",
-"Code sample...": "Uk\u00e1zkov\u00fd k\u00f3d",
-"Color Picker": "V\u00fdb\u011br barvy",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Zleva doprava",
-"Right to left": "Zprava doleva",
-"Emoticons": "Emotikony",
-"Emoticons...": "Emotikony",
-"Metadata and Document Properties": "Metadata a vlastnosti dokumentu",
-"Title": "Titulek",
-"Keywords": "Kl\u00ed\u010dov\u00e1 slova",
-"Description": "Popis",
-"Robots": "Roboti",
-"Author": "Autor",
-"Encoding": "K\u00f3dov\u00e1n\u00ed",
-"Fullscreen": "Celk\u00e1 obrazovka",
-"Action": "Akce",
-"Shortcut": "Kl\u00e1vesov\u00e1 zkratka",
-"Help": "N\u00e1pov\u011bda",
-"Address": "Blok s po\u0161tovn\u00ed adresou",
-"Focus to menubar": "P\u0159ej\u00edt do menu",
-"Focus to toolbar": "P\u0159ej\u00edt na panel n\u00e1stroj\u016f",
-"Focus to element path": "Focus to element path",
-"Focus to contextual toolbar": "P\u0159ej\u00edt na kontextov\u00fd panel n\u00e1stroj\u016f",
-"Insert link (if link plugin activated)": "Vlo\u017eit odkaz (pokud je aktivn\u00ed link plugin)",
-"Save (if save plugin activated)": "Ulo\u017eit (pokud je aktivni save plugin)",
-"Find (if searchreplace plugin activated)": "Hledat (pokud je aktivn\u00ed plugin searchreplace)",
-"Plugins installed ({0}):": "Instalovan\u00e9 pluginy ({0}):",
-"Premium plugins:": "Pr\u00e9miov\u00e9 pluginy:",
-"Learn more...": "Zjistit v\u00edce...",
-"You are using {0}": "Pou\u017e\u00edv\u00e1te {0}",
-"Plugins": "Pluginy",
-"Handy Shortcuts": "U\u017eite\u010dn\u00e9 kl\u00e1vesov\u00e9 zkratky",
-"Horizontal line": "Vodorovn\u00e1 linka",
-"Insert\/edit image": "Vlo\u017eit \/ upravit obr\u00e1zek",
-"Alternative description": "Alternativn\u00ed text",
-"Accessibility": "Bez alternativn\u00edho textu",
-"Image is decorative": "(dekorativn\u00ed obr\u00e1zek bez alternativn\u00edho textu)",
-"Source": "URL",
-"Dimensions": "Rozm\u011bry",
-"Constrain proportions": "Zachovat proporce",
-"General": "Obecn\u00e9",
-"Advanced": "Pokro\u010dil\u00e9",
-"Style": "Styl",
-"Vertical space": "Vertik\u00e1ln\u00ed mezera",
-"Horizontal space": "Horizont\u00e1ln\u00ed mezera",
-"Border": "R\u00e1me\u010dek",
-"Insert image": "Vlo\u017eit obr\u00e1zek",
-"Image...": "Obr\u00e1zek...",
-"Image list": "Seznam obr\u00e1zk\u016f",
-"Rotate counterclockwise": "Oto\u010dit doleva",
-"Rotate clockwise": "Oto\u010dit doprava",
-"Flip vertically": "P\u0159evr\u00e1tit svisle",
-"Flip horizontally": "P\u0159evr\u00e1tit vodorovn\u011b",
-"Edit image": "Upravit obr\u00e1zek",
-"Image options": "Vlastnosti obr\u00e1zku",
-"Zoom in": "P\u0159ibl\u00ed\u017eit",
-"Zoom out": "Odd\u00e1lit",
-"Crop": "O\u0159\u00edznout",
-"Resize": "Zm\u011bnit velikost",
-"Orientation": "Orientace",
-"Brightness": "Jas",
-"Sharpen": "Ostrost",
-"Contrast": "Kontrast",
-"Color levels": "\u00darovn\u011b barev",
-"Gamma": "Gama",
-"Invert": "Invertovat",
-"Apply": "Pou\u017e\u00edt",
-"Back": "Zp\u011bt",
-"Insert date\/time": "Vlo\u017eit datum \/ \u010das",
-"Date\/time": "Datum\/\u010das",
-"Insert\/edit link": "Vlo\u017eit \/ upravit odkaz",
-"Text to display": "Text odkazu",
-"Url": "URL",
-"Open link in...": "C\u00edlov\u00e9 okno URL",
-"Current window": "Otev\u0159\u00edt v aktu\u00e1ln\u00edm okn\u011b",
-"None": "\u017d\u00e1dn\u00fd",
-"New window": "Nov\u00e9 okno",
-"Open link": "C\u00edlov\u00e9 okno URL",
-"Remove link": "Odstranit odkaz",
-"Anchors": "Kotvy",
-"Link...": "Odkaz...",
-"Paste or type a link": "Vlo\u017ete nebo napi\u0161te adresu odkazu",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Zadan\u00e9 URL vypad\u00e1 jako e-mailov\u00e1 adresa. Chcete doplnit povinn\u00fd prefix mailto:?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Zadan\u00e9 URL vypad\u00e1 jako odkaz na jin\u00fd web. Chcete doplnit povinn\u00fd prefix http:\/\/?",
-"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Zadan\u00e9 URL vypad\u00e1 jako odkaz na jin\u00fd web. Chcete doplnit povinn\u00fd prefix https:\/\/?",
-"Link list": "Seznam odkaz\u016f",
-"Insert video": "Vlo\u017eit video",
-"Insert\/edit video": "Vlo\u017eit \/ upravit video",
-"Insert\/edit media": "Vlo\u017eit\/upravit m\u00e9dia",
-"Alternative source": "Alternativn\u00ed zdroj",
-"Alternative source URL": "Alternativn\u00ed zdrojov\u00e1 URL",
-"Media poster (Image URL)": "URL n\u00e1hledu",
-"Paste your embed code below:": "Vlo\u017ete k\u00f3d pro vlo\u017een\u00ed",
-"Embed": "Vlo\u017een\u00fd",
-"Media...": "M\u00e9dia",
-"Nonbreaking space": "Pevn\u00e1 mezera",
-"Page break": "Konec str\u00e1nky",
-"Paste as text": "Vlo\u017eit jako \u010dist\u00fd text",
-"Preview": "N\u00e1hled",
-"Print...": "Tisk",
-"Save": "Ulo\u017eit",
-"Find": "Naj\u00edt",
-"Replace with": "Nahradit za",
-"Replace": "Nahradit",
-"Replace all": "Nahradit v\u0161e",
-"Previous": "P\u0159edchoz\u00ed",
-"Next": "Dal\u0161\u00ed",
-"Find and Replace": "Naj\u00edt a nahradit",
-"Find and replace...": "Naj\u00edt a nahradit",
-"Could not find the specified string.": "Zadan\u00fd \u0159et\u011bzec nebyl nalezen.",
-"Match case": "Rozli\u0161ovat mal\u00e1 a velk\u00e1 p\u00edsmena",
-"Find whole words only": "Pouze cel\u00e1 slova",
-"Find in selection": "Ozna\u010den\u00fd text",
-"Spellcheck": "Kontrola pravopisu",
-"Spellcheck Language": "Jazyk kontroly pravopisu",
-"No misspellings found.": "Nebyly nalezeny \u017e\u00e1dn\u00e9 p\u0159eklepy.",
-"Ignore": "Ignorovat",
-"Ignore all": "Ignorovat v\u0161e",
-"Finish": "Dokon\u010dit",
-"Add to Dictionary": "P\u0159idat do slovn\u00edku",
-"Insert table": "Vlo\u017eit tabulku",
-"Table properties": "Vlastnosti tabulky",
-"Delete table": "Smazat tabulku",
-"Cell": "Bu\u0148ka",
-"Row": "\u0158\u00e1dek",
-"Column": "Sloupec",
-"Cell properties": "Vlastnosti bu\u0148ky",
-"Merge cells": "Slou\u010dit bu\u0148ky",
-"Split cell": "Rozd\u011blit bu\u0148ku",
-"Insert row before": "Vlo\u017eit \u0159\u00e1dek p\u0159ed",
-"Insert row after": "Vlo\u017eit \u0159\u00e1dek za",
-"Delete row": "Smazat \u0159\u00e1dek",
-"Row properties": "Vlastnosti \u0159\u00e1dku",
-"Cut row": "Vyjmout \u0159\u00e1dek",
-"Copy row": "Kop\u00edrovat \u0159\u00e1dek",
-"Paste row before": "Vlo\u017eit \u0159\u00e1dek nad",
-"Paste row after": "Vlo\u017eit \u0159\u00e1dek pod",
-"Insert column before": "Vlo\u017eit sloupec vlevo",
-"Insert column after": "Vlo\u017eit sloupec vpravo",
-"Delete column": "Smazat sloupec",
-"Cols": "Sloupce",
-"Rows": "\u0158\u00e1dky",
-"Width": "\u0160\u00ed\u0159ka",
-"Height": "V\u00fd\u0161ka",
-"Cell spacing": "Vn\u011bj\u0161\u00ed okraj bun\u011bk",
-"Cell padding": "Vnit\u0159n\u00ed okraj bun\u011bk",
-"Caption": "Titulek",
-"Show caption": "Popisek pod obr\u00e1zkem",
-"Left": "Vlevo",
-"Center": "Na st\u0159ed",
-"Right": "Vpravo",
-"Cell type": "Typ bu\u0148ky",
-"Scope": "Rozsah",
-"Alignment": "Zarovn\u00e1n\u00ed",
-"H Align": "Horizont\u00e1ln\u00ed zarovn\u00e1n\u00ed",
-"V Align": "Vertik\u00e1ln\u00ed zarovn\u00e1n\u00ed",
-"Top": "Nahoru",
-"Middle": "Na st\u0159ed",
-"Bottom": "Dol\u016f",
-"Header cell": "Hlavi\u010dkov\u00e1 bu\u0148ka",
-"Row group": "Skupina \u0159\u00e1dk\u016f",
-"Column group": "Skupina sloupc\u016f",
-"Row type": "Typ \u0159\u00e1dku",
-"Header": "Hlavi\u010dka",
-"Body": "T\u011blo",
-"Footer": "Pati\u010dka",
-"Border color": "Barva r\u00e1me\u010dku",
-"Insert template...": "Vlo\u017eit \u0161ablonu...",
-"Templates": "\u0160ablony",
-"Template": "\u0160ablona",
-"Text color": "Barva p\u00edsma",
-"Background color": "Barva pozad\u00ed",
-"Custom...": "Vlastn\u00ed",
-"Custom color": "Vlastn\u00ed barva",
-"No color": "Bez barvy",
-"Remove color": "Odebrat barvu",
-"Table of Contents": "Generovat obsah",
-"Show blocks": "Uk\u00e1zat bloky",
-"Show invisible characters": "Uk\u00e1zat skryt\u00e9 znaky",
-"Word count": "Po\u010det slov",
-"Count": "Po\u010det",
-"Document": "Dokument",
-"Selection": "V\u00fdb\u011br",
-"Words": "Slova",
-"Words: {0}": "Slova: {0}",
-"{0} words": "{0} slov",
-"File": "Soubor",
-"Edit": "\u00dapravy",
-"Insert": "Vlo\u017eit",
-"View": "Zobrazit",
-"Format": "Form\u00e1t",
-"Table": "Tabulka",
-"Tools": "N\u00e1stroje",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "RTF dokument. Stikn\u011bte ALT-F9 pro zobrazen\u00ed menu, ALT-F10 pro zobrazen\u00ed n\u00e1strojov\u00e9 li\u0161ty, ALT-0 pro n\u00e1pov\u011bdu.",
-"Image title": "Titulek obr\u00e1zku",
-"Border width": "\u0160\u00ed\u0159ka ohrani\u010den\u00ed",
-"Border style": "Styl ohrani\u010den\u00ed",
-"Error": "Chyba",
-"Warn": "Varov\u00e1n\u00ed",
-"Valid": "Platn\u00fd",
-"To open the popup, press Shift+Enter": "Vyskakovac\u00ed okno otev\u0159ete stisknut\u00edm Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "Oblast Rich Text, stiskn\u011bte ALT-0 pro n\u00e1pov\u011bdu.",
-"System Font": "Syst\u00e9mov\u00e9 p\u00edsmo",
-"Failed to upload image: {0}": "Nahr\u00e1n\u00ed obr\u00e1zku selhalo: {0}",
-"Failed to load plugin: {0} from url {1}": "Na\u010dten\u00ed pluginu selhalo: {0} z URL {1}",
-"Failed to load plugin url: {0}": "Na\u010dten\u00ed pluginu URL selhalo: {0}",
-"Failed to initialize plugin: {0}": "Inicializace pluginu selhala:",
-"example": "p\u0159\u00edklad",
-"Search": "Hledat",
-"All": "V\u0161e",
-"Currency": "M\u011bna",
-"Text": "Text",
-"Quotations": "Citace",
-"Mathematical": "Matematick\u00e9 symboly",
-"Extended Latin": "Roz\u0161\u00ed\u0159en\u00e1 latinka",
-"Symbols": "Symboly",
-"Arrows": "\u0160ipky",
-"User Defined": "Definovan\u00e9 u\u017eivatelem",
-"dollar sign": "znak dolaru",
-"currency sign": "znak m\u011bny",
-"euro-currency sign": "znak euro",
-"colon sign": "znak dvojte\u010dky",
-"cruzeiro sign": "znak cruzeiro",
-"french franc sign": "znak francouzsk\u00e9ho franku",
-"lira sign": "znak liry",
-"mill sign": "znak mill",
-"naira sign": "znak nairy",
-"peseta sign": "znak pesety",
-"rupee sign": "znak rupie",
-"won sign": "znak wonu",
-"new sheqel sign": "znak nov\u00e9ho \u0161ekelu",
-"dong sign": "znak dongu",
-"kip sign": "znak kipu",
-"tugrik sign": "znak tugriku",
-"drachma sign": "znak drachmy",
-"german penny symbol": "znak n\u011bmeck\u00e9ho feniku",
-"peso sign": "znak pesa",
-"guarani sign": "znak guaran\u00ed",
-"austral sign": "znak austral",
-"hryvnia sign": "znak h\u0159ivny",
-"cedi sign": "znak cedi",
-"livre tournois sign": "znak tournois libry",
-"spesmilo sign": "znak spesmilo",
-"tenge sign": "znak tenge",
-"indian rupee sign": "znak indick\u00e9 rupie",
-"turkish lira sign": "znak tureck\u00e9 liry",
-"nordic mark sign": "znak norsk\u00e9 marky",
-"manat sign": "znak manatu",
-"ruble sign": "znak rublu",
-"yen character": "znak jenu",
-"yuan character": "znak juanu",
-"yuan character, in hong kong and taiwan": "znak juanu v hongkongu a tchaj-wanu",
-"yen\/yuan character variant one": "znak jenu\/juanu, varianta 1",
-"Loading emoticons...": "Na\u010d\u00edt\u00e1n\u00ed emotikon\u016f...",
-"Could not load emoticons": "Nelze na\u010d\u00edst emotikony",
-"People": "Lid\u00e9",
-"Animals and Nature": "Zv\u00ed\u0159ata a p\u0159\u00edroda",
-"Food and Drink": "J\u00eddlo a pit\u00ed",
-"Activity": "Aktivita",
-"Travel and Places": "Cestov\u00e1n\u00ed a m\u00edsta",
-"Objects": "Objekty",
-"Flags": "Vlajky",
-"Characters": "Znaky",
-"Characters (no spaces)": "Znaky (bez mezer)",
-"{0} characters": "{0} znak\u016f",
-"Error: Form submit field collision.": "Chyba: Kolize odes\u00edlac\u00edho formul\u00e1\u0159ov\u00e9ho pole.",
-"Error: No form element found.": "Chyba: Nebyl nalezen \u017e\u00e1dn\u00fd prvek formul\u00e1\u0159e.",
-"Update": "Aktualizovat",
-"Color swatch": "Vzorek barvy",
-"Turquoise": "Tyrkysov\u00e1",
-"Green": "Zelen\u00e1",
-"Blue": "Modr\u00e1",
-"Purple": "Fialov\u00e1",
-"Navy Blue": "N\u00e1mo\u0159nick\u00e1 mod\u0159",
-"Dark Turquoise": "Tmav\u011b tyrkysov\u00e1",
-"Dark Green": "Tmav\u011b zelen\u00e1",
-"Medium Blue": "St\u0159edn\u011b modr\u00e1",
-"Medium Purple": "St\u0159edn\u011b fialov\u00e1",
-"Midnight Blue": "P\u016flno\u010dn\u00ed modr\u00e1",
-"Yellow": "\u017dlut\u00e1",
-"Orange": "Oran\u017eov\u00e1",
-"Red": "\u010cerven\u00e1",
-"Light Gray": "Sv\u011btle \u0161ed\u00e1",
-"Gray": "\u0160ed\u00e1",
-"Dark Yellow": "Tmav\u011b \u017elut\u00e1",
-"Dark Orange": "Tmav\u011b oran\u017eov\u00e1",
-"Dark Red": "Tmav\u011b \u010derven\u00e1",
-"Medium Gray": "St\u0159edn\u011b \u0161ed\u00e1",
-"Dark Gray": "Tmav\u011b \u0161ed\u00e1",
-"Light Green": "Sv\u011btle zelen\u00e1",
-"Light Yellow": "Sv\u011btle \u017elut\u00e1",
-"Light Red": "Sv\u011btle \u010derven\u00e1",
-"Light Purple": "Sv\u011btle fialov\u00e1",
-"Light Blue": "Sv\u011btle modr\u00e1",
-"Dark Purple": "Tmav\u011b fialov\u00e1",
-"Dark Blue": "Tmav\u011b modr\u00e1",
-"Black": "\u010cern\u00e1",
-"White": "B\u00edl\u00e1",
-"Switch to or from fullscreen mode": "P\u0159ep\u00edn\u00e1n\u00ed mezi re\u017eimem cel\u00e9 obrazovky",
-"Open help dialog": "Otev\u0159\u00edt okno n\u00e1pov\u011bdy",
-"history": "historie",
-"styles": "styly",
-"formatting": "form\u00e1tov\u00e1n\u00ed",
-"alignment": "zarovn\u00e1n\u00ed",
-"indentation": "odsazen\u00ed",
-"Font": "P\u00edsmo",
-"Size": "Velikost",
-"More...": "Dal\u0161\u00ed\u2026",
-"Select...": "Vybrat",
-"Preferences": "Preference",
-"Yes": "Ano",
-"No": "Ne",
-"Keyboard Navigation": "Navigace pomoc\u00ed kl\u00e1vesnice",
-"Version": "Verze",
-"Code view": "Zobrazit k\u00f3d",
-"Open popup menu for split buttons": "Otev\u0159ete vyskakovac\u00ed nab\u00eddku pro rozd\u011blen\u00e1 tla\u010d\u00edtka",
-"List Properties": "Vlastnosti seznamu",
-"List properties...": "Vlastnosti seznamu...",
-"Start list at number": "Po\u010d\u00e1te\u010dn\u00ed \u010d\u00edslo seznamu",
-"Line height": "V\u00fd\u0161ka \u0159\u00e1dku",
-"comments": "koment\u00e1\u0159e",
-"Format Painter": "Kop\u00edrovat form\u00e1t",
-"Insert\/edit iframe": "Vlo\u017eit \/ upravit prvek iframe",
-"Capitalization": "Velk\u00e1 p\u00edsmena",
-"lowercase": "mal\u00e1 p\u00edsmena",
-"UPPERCASE": "VELK\u00c1 P\u00cdSMENA",
-"Title Case": "V\u0161echna Prvn\u00ed Velk\u00e1",
-"permanent pen": "permanentn\u00ed pero",
-"Permanent Pen Properties": "Vlastnosti permanentn\u00edho pera",
-"Permanent pen properties...": "Vlastnosti permanentn\u00edho pera\u2026",
-"case change": "Zm\u011bna velikosti p\u00edsma",
-"page embed": "Vlo\u017een\u00ed str\u00e1nky",
-"Advanced sort...": "Roz\u0161\u00ed\u0159en\u00e9 \u0159azen\u00ed...",
-"Advanced Sort": "Roz\u0161\u00ed\u0159en\u00e9 \u0159azen\u00ed",
-"Sort table by column ascending": "Se\u0159adit tabulku podle sloupce vzestupn\u011b",
-"Sort table by column descending": "Se\u0159adit tabulku podle sloupce sestupn\u011b",
-"Sort": "\u0158adit",
-"Order": "\u0158azen\u00ed",
-"Sort by": "\u0158adit dle",
-"Ascending": "Vzestupn\u011b",
-"Descending": "Sestupn\u011b",
-"Column {0}": "Sloupec {0}",
-"Row {0}": "\u0158\u00e1dek {0}",
-"Spellcheck...": "Kontrola pravopisu",
-"Misspelled word": "\u0160patn\u011b napsan\u00e9 slovo",
-"Suggestions": "N\u00e1vrhy",
-"Change": "Zm\u011bnit",
-"Finding word suggestions": "Hled\u00e1n\u00ed n\u00e1vrh\u016f slov",
-"Success": "\u00dasp\u011b\u0161n\u00e9",
-"Repair": "Opraveno",
-"Issue {0} of {1}": "Probl\u00e9m {0} z {1}",
-"Images must be marked as decorative or have an alternative text description": "Obr\u00e1zky mus\u00ed b\u00fdt ozna\u010deny jako dekorativn\u00ed nebo mus\u00ed m\u00edt alternativn\u00ed textov\u00fd popis.",
-"Images must have an alternative text description. Decorative images are not allowed.": "Obr\u00e1zky mus\u00ed m\u00edt alternativn\u00ed textov\u00fd popis. Dekorativn\u00ed obr\u00e1zky nejsou povoleny.",
-"Or provide alternative text:": "Nebo zadejte alternativn\u00ed text:",
-"Make image decorative:": "Nastavit obr\u00e1zek jako dekorativn\u00ed:",
-"ID attribute must be unique": "ID atributu mus\u00ed b\u00fdt jedine\u010dn\u00e9",
-"Make ID unique": "Nastavit ID jako jedine\u010dn\u00e9",
-"Keep this ID and remove all others": "Ponechat toto ID a odstranit v\u0161echny ostatn\u00ed",
-"Remove this ID": "Odebrat toto ID",
-"Remove all IDs": "Odebrat v\u0161echna ID",
-"Checklist": "Kontroln\u00ed seznam",
-"Anchor": "Kotva",
-"Special character": "Speci\u00e1ln\u00ed znak",
-"Code sample": "Uk\u00e1zka k\u00f3du",
-"Color": "Barva",
-"Document properties": "Vlastnosti dokumentu",
-"Image description": "Popis obr\u00e1zku",
-"Image": "Obr\u00e1zek",
-"Insert link": "Vlo\u017eit odkaz",
-"Target": "C\u00edl",
-"Link": "Odkaz",
-"Poster": "Poster",
-"Media": "M\u00e9dia",
-"Print": "Tisk",
-"Prev": "P\u0159edchoz\u00ed",
-"Find and replace": "Naj\u00edt a nahradit",
-"Whole words": "Pouze cel\u00e1 slova",
-"Insert template": "Vlo\u017eit ze \u0161ablony"
-});
diff --git a/build/media_source/vendor/tinymce/langs/cy.es5.js b/build/media_source/vendor/tinymce/langs/cy.es5.js
deleted file mode 100644
index 775b20de382c3..0000000000000
--- a/build/media_source/vendor/tinymce/langs/cy.es5.js
+++ /dev/null
@@ -1,461 +0,0 @@
-tinymce.addI18n('cy',{
-"Redo": "Ailwneud",
-"Undo": "Dadwneud",
-"Cut": "Torri",
-"Copy": "Cop\u00efo",
-"Paste": "Gludo",
-"Select all": "Dewis popeth",
-"New document": "Dogfen newydd",
-"Ok": "Iawn",
-"Cancel": "Canslo",
-"Visual aids": "Cymorth gweledol",
-"Bold": "Trwm",
-"Italic": "Italig",
-"Underline": "Tanlinellu",
-"Strikethrough": "Llinell drwodd",
-"Superscript": "Uwchsgript",
-"Subscript": "Is-sgript",
-"Clear formatting": "Clirio pob fformat",
-"Align left": "Aliniad chwith",
-"Align center": "Aliniad canol",
-"Align right": "Aliniad de",
-"Justify": "Unioni",
-"Bullet list": "Rhestr fwled",
-"Numbered list": "Rhestr rifol",
-"Decrease indent": "Lleihau mewnoliad",
-"Increase indent": "Cynyddu mewnoliad",
-"Close": "Cau",
-"Formats": "Fformatau",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Dyw eich porwr ddim yn cynnal mynediad uniongyrchol i'r clipfwrdd. Yn hytrach defnyddiwch y bysellau llwybrau byr Ctrl+X\/C\/V.",
-"Headers": "Penawdau",
-"Header 1": "Pennawd 1",
-"Header 2": "Pennawd 2",
-"Header 3": "Pennawd 3",
-"Header 4": "Pennawd 4",
-"Header 5": "Pennawd 5",
-"Header 6": "Pennawd 6",
-"Headings": "Penawdau",
-"Heading 1": "Pennawd 1",
-"Heading 2": "Pennawd 2",
-"Heading 3": "Pennawd 3",
-"Heading 4": "Pennawd 4",
-"Heading 5": "Pennawd 5",
-"Heading 6": "Pennawd 6",
-"Preformatted": "Wedi ei rag-fformatio",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Cod",
-"Paragraph": "Paragraff",
-"Blockquote": "Dyfyniad Bloc",
-"Inline": "Mewnlin",
-"Blocks": "Blociau",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Mae gludo nawr yn gweithio yn y modd testun plaen.  Caiff testun plaen ei ludo nawr tan gaiff yr opsiwn ei doglo i'w ddiffodd.",
-"Fonts": "Ffontau",
-"Font Sizes": "Meintiau Ffont",
-"Class": "Dosbarth",
-"Browse for an image": "Pori am ddelwedd",
-"OR": "NEU",
-"Drop an image here": "Gollwng delwedd yma",
-"Upload": "Uwchlwytho",
-"Block": "Bloc",
-"Align": "Alinio",
-"Default": "Diofyn",
-"Circle": "Cylch",
-"Disc": "Disg",
-"Square": "Sgw\u00e2r",
-"Lower Alpha": "Alffa Is",
-"Lower Greek": "Groeg Is",
-"Lower Roman": "Rhufeinig Is",
-"Upper Alpha": "Alffa Uwch",
-"Upper Roman": "Rhufeinig Uwch",
-"Anchor...": "Angor...",
-"Name": "Enw",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Dylai Id gychwyn gyda llythyren ac yna dim ond llythrennau, rhifau, llinellau toriad,dotiau, colonau neu danlinellau.",
-"You have unsaved changes are you sure you want to navigate away?": "Mae newidiadau heb eu cadw - ydych chi wir am symud i ffwrdd?",
-"Restore last draft": "Adfer y drafft olaf",
-"Special character...": "Nod arbennig...",
-"Source code": "Cod gwreiddiol",
-"Insert\/Edit code sample": "Mewnosod\/golygu sampl cod",
-"Language": "Iaith",
-"Code sample...": "Sampl cod...",
-"Color Picker": "Dewisydd Lliw",
-"R": "C",
-"G": "Gw",
-"B": "Gl",
-"Left to right": "Chwith i'r dde",
-"Right to left": "De i'r chwith",
-"Emoticons": "Gwenogluniau",
-"Emoticons...": "Gwenogluniau...",
-"Metadata and Document Properties": "Metaddata a Priodweddau'r ddogfen",
-"Title": "Teitl",
-"Keywords": "Allweddeiriau",
-"Description": "Disgrifiad",
-"Robots": "Robotiaid",
-"Author": "Awdur",
-"Encoding": "Amgodiad",
-"Fullscreen": "Sgrin llawn",
-"Action": "Gweithred",
-"Shortcut": "Llwybr Byr",
-"Help": "Help",
-"Address": "Cyfeiriad",
-"Focus to menubar": "Ffocws i'r bar dewislen",
-"Focus to toolbar": "Ffocws i'r bar offer",
-"Focus to element path": "Ffocws i lwybr elfen",
-"Focus to contextual toolbar": "Ffocws i far offer y cyd-destun",
-"Insert link (if link plugin activated)": "Mewnosod dolen (os yw'r ategyn dolen yn weithredol)",
-"Save (if save plugin activated)": "Cadw (os yw'r ategyn cadw yn weithredol)",
-"Find (if searchreplace plugin activated)": "Canfod (os yw'r ategyn chwilio ac amnewid yn weithredol)",
-"Plugins installed ({0}):": "Ategio wedi eu gosod ({0}):",
-"Premium plugins:": "Ategion premiwm:",
-"Learn more...": "Dysgu Mwy...",
-"You are using {0}": "Rydych yn defnyddio {0}",
-"Plugins": "Ategion",
-"Handy Shortcuts": "Llwybrau byr cyfleus",
-"Horizontal line": "Llinell lorweddol",
-"Insert\/edit image": "Mewnosod\/golygu delwedd",
-"Alternative description": "Disgrifiad arall",
-"Accessibility": "Hygyrchedd",
-"Image is decorative": "Delwedd yn addurniadol",
-"Source": "Ffynhonnell",
-"Dimensions": "Dimensiynau",
-"Constrain proportions": "Gorfodi cyfrannedd",
-"General": "Cyffredinol",
-"Advanced": "Uwch",
-"Style": "Arddull",
-"Vertical space": "Gofod fertigol",
-"Horizontal space": "Gofod llorweddol",
-"Border": "Border",
-"Insert image": "Mewnosod delwedd",
-"Image...": "Delwedd...",
-"Image list": "Rhestr delweddau",
-"Rotate counterclockwise": "Troi gwrthgloc",
-"Rotate clockwise": "Troi clocwedd",
-"Flip vertically": "Fflipio fertigol",
-"Flip horizontally": "Fflipio llorweddol",
-"Edit image": "Golygu delwedd",
-"Image options": "Dewisiadau delwedd",
-"Zoom in": "Chwyddo mewn",
-"Zoom out": "Chwyddo allan",
-"Crop": "Tocio",
-"Resize": "Ailfeintio",
-"Orientation": "Cyfeiriadaeth",
-"Brightness": "Disgleirdeb",
-"Sharpen": "Hogi",
-"Contrast": "Cyferbynnedd",
-"Color levels": "Lefelau Lliw",
-"Gamma": "Gamma",
-"Invert": "Gwrthdroi",
-"Apply": "Rhoi ar waith",
-"Back": "Nol",
-"Insert date\/time": "Mewnosod dyddiad\/amser",
-"Date\/time": "Dyddiad\/amser",
-"Insert\/edit link": "Mewnosod\/golygu dolen",
-"Text to display": "Testun i'w ddangos",
-"Url": "Url",
-"Open link in...": "Agor dolen yn...",
-"Current window": "Ffenestr gyfredol",
-"None": "Dim",
-"New window": "Ffenest newydd",
-"Open link": "Agor dolen",
-"Remove link": "Tynnu dolen",
-"Anchors": "Angorau",
-"Link...": "Dolen...",
-"Paste or type a link": "Pastio neu deipio dolen",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Mae'n debyg mai cyfeiriad e-bost yw'r URL hwn. Ydych chi am ychwanegu'r rhagddoddiad mailto:?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Mae'n debyg mai dolen allanol yw'r URL hwn. Ydych chi am ychwanegu'r rhagddodiad http:\/\/ ?",
-"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Ymddengys mai dolen allannol yw'r URL a roddoch chi. Ydych chi eisiau ychwanegu'r rhagddodiad https:\/\/ gofynnol?",
-"Link list": "Rhestr dolenni",
-"Insert video": "Mewnosod fideo",
-"Insert\/edit video": "Mewnosod\/golygu fideo",
-"Insert\/edit media": "Mewnosod\/golygu cyfrwng",
-"Alternative source": "Ffynhonnell amgen",
-"Alternative source URL": "Ffynhonnell URL arall",
-"Media poster (Image URL)": "Poster cyfrwng (URL delwedd)",
-"Paste your embed code below:": "Gludwch eich cod mewnosod isod:",
-"Embed": "Mewnosod",
-"Media...": "Cyfrwng...",
-"Nonbreaking space": "Bwlch heb dorri",
-"Page break": "Toriad tudalen",
-"Paste as text": "Gludo fel testun",
-"Preview": "Rhagolwg",
-"Print...": "Argraffu...",
-"Save": "Cadw",
-"Find": "Chwilio",
-"Replace with": "Amnewid gyda",
-"Replace": "Amnewid",
-"Replace all": "Amnewid y cwbl",
-"Previous": "Blaenorol",
-"Next": "Nesaf",
-"Find and Replace": "Canfod a Newid",
-"Find and replace...": "Chwilio ac amnewid",
-"Could not find the specified string.": "Methu ffeindio'r llinyn hwnnw.",
-"Match case": "Cas yn cyfateb",
-"Find whole words only": "Canfod geiriau llawn yn unig",
-"Find in selection": "Canfod yn y dewisiad",
-"Spellcheck": "Sillafydd",
-"Spellcheck Language": "Iaith Gwirio Sillafu",
-"No misspellings found.": "Dim camsillafiadau.",
-"Ignore": "Anwybyddu",
-"Ignore all": "Amwybyddu pob",
-"Finish": "Gorffen",
-"Add to Dictionary": "Adio i'r Geiriadur",
-"Insert table": "Mewnosod tabl",
-"Table properties": "Priodweddau tabl",
-"Delete table": "Dileu'r tabl",
-"Cell": "Cell",
-"Row": "Rhes",
-"Column": "Colofn",
-"Cell properties": "Priodweddau'r gell",
-"Merge cells": "Cyfuno celloedd",
-"Split cell": "Hollti celloedd",
-"Insert row before": "Mewnosod rhes cyn",
-"Insert row after": "Mewnosod rhes ar \u00f4l",
-"Delete row": "Dileu rhes",
-"Row properties": "Priodweddau rhes",
-"Cut row": "Torri rhes",
-"Copy row": "Cop\u00efo rhes",
-"Paste row before": "Gludo rhes cyn",
-"Paste row after": "Gludo rhes ar \u00f4l",
-"Insert column before": "Mewnosod colofn cyn",
-"Insert column after": "Mewnosod colofn ar \u00f4l",
-"Delete column": "Dileu colofn",
-"Cols": "Colofnau",
-"Rows": "Rhesi",
-"Width": "Lled",
-"Height": "Uchder",
-"Cell spacing": "Bylchiad celloedd",
-"Cell padding": "Padio celloedd",
-"Caption": "Pennawd",
-"Show caption": "Dangos capsiwn",
-"Left": "Chwith",
-"Center": "Canol",
-"Right": "De",
-"Cell type": "Math y gell",
-"Scope": "Cwmpas",
-"Alignment": "Aliniad",
-"H Align": "Aliniad Ll",
-"V Align": "Aliniad F",
-"Top": "Brig",
-"Middle": "Canol",
-"Bottom": "Gwaelod",
-"Header cell": "Cell bennawd",
-"Row group": "Gr\u0175p rhes",
-"Column group": "Gr\u0175p colofn",
-"Row type": "Math y rhes",
-"Header": "Pennyn",
-"Body": "Corff",
-"Footer": "Troedyn",
-"Border color": "Lliw Border",
-"Insert template...": "Mewnosod templed...",
-"Templates": "Templedi",
-"Template": "Templed",
-"Text color": "Lliw testun",
-"Background color": "Lliw cefndir",
-"Custom...": "Personol...",
-"Custom color": "Lliw personol",
-"No color": "Dim Lliw",
-"Remove color": "Tynnu lliw",
-"Table of Contents": "Tabl Cynnwys",
-"Show blocks": "Dangos blociau",
-"Show invisible characters": "Dangos nodau anweledig",
-"Word count": "Cyfri geiriau",
-"Count": "Cyfrif",
-"Document": "Dogfen",
-"Selection": "Dewis",
-"Words": "Geiriau",
-"Words: {0}": "Geiriau: {0}",
-"{0} words": "{0} o eiriau",
-"File": "Ffeil",
-"Edit": "Golygu",
-"Insert": "Mewnosod",
-"View": "Dangos",
-"Format": "Fformat",
-"Table": "Tabl",
-"Tools": "Offer",
-"Powered by {0}": "Gyrrir gan {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Ardal Testun Uwch. Pwyswch ALT-F9 ar gyfer y ddewislen, Pwyswch ALT-F10 ar gyfer y bar offer. Pwyswch ALT-0 am gymorth",
-"Image title": "Teitl delwedd",
-"Border width": "Lled border",
-"Border style": "Steil border",
-"Error": "Gwall",
-"Warn": "Rhybuddio",
-"Valid": "Dilys",
-"To open the popup, press Shift+Enter": "I agor y llamlen, pwyswch Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "Ardal testun cyfoethog. Pwyswch ALT-0 am help.",
-"System Font": "Ffont system",
-"Failed to upload image: {0}": "Wedi methu uwchlwytho'r ddelwedd: {0}",
-"Failed to load plugin: {0} from url {1}": "Wedi methu llwytho'r ategyn: {0} o'r url {1}",
-"Failed to load plugin url: {0}": "Wedi methu llwytho url yr ategyn: {0}",
-"Failed to initialize plugin: {0}": "Wedi methu ymgychwyn yr ategyn: {0}",
-"example": "enghraifft",
-"Search": "Chwilio",
-"All": "Y cwbl",
-"Currency": "Arian cyfred",
-"Text": "Testun",
-"Quotations": "Dyfyniadau",
-"Mathematical": "Mathemategol",
-"Extended Latin": "Lladin estynedig",
-"Symbols": "Symbolau",
-"Arrows": "Saethau",
-"User Defined": "Diffinir gan y defnyddiwr",
-"dollar sign": "Arwydd dolar",
-"currency sign": "Arwydd arian cyfred",
-"euro-currency sign": "Arwydd euro",
-"colon sign": "Arwydd colon",
-"cruzeiro sign": "Arwydd cruzeiro",
-"french franc sign": "Arwydd ffranc Ffrengig",
-"lira sign": "Arwydd lira",
-"mill sign": "arwydd mill",
-"naira sign": "arwydd naira",
-"peseta sign": "arwydd peseta",
-"rupee sign": "arwydd rupee",
-"won sign": "arwydd won",
-"new sheqel sign": "arwydd sheqel newydd",
-"dong sign": "arwydd dong",
-"kip sign": "arwydd kip",
-"tugrik sign": "arwydd tugrik",
-"drachma sign": "arwydd drachma",
-"german penny symbol": "arwydd ceiniog almaenig",
-"peso sign": "arwydd peso",
-"guarani sign": "arwydd quarani",
-"austral sign": "arwydd austral",
-"hryvnia sign": "arwydd hryvnia",
-"cedi sign": "arwydd cedi",
-"livre tournois sign": "arwydd punt tournois",
-"spesmilo sign": "arwydd spesmilo",
-"tenge sign": "arwydd tenge",
-"indian rupee sign": "arwydd rupee india",
-"turkish lira sign": "arwydd lira twrcaidd",
-"nordic mark sign": "arwydd marc nordig",
-"manat sign": "arwydd manat",
-"ruble sign": "arwydd ruble",
-"yen character": "nod yen",
-"yuan character": "nod yuan",
-"yuan character, in hong kong and taiwan": "nod yuan yn Hong Kong a Taiwan",
-"yen\/yuan character variant one": "nod yen\/yuan amrywiad un",
-"Loading emoticons...": "Yn llwytho gwenogluniau",
-"Could not load emoticons": "Wedi methu llwytho gwenogluniau",
-"People": "Pobl",
-"Animals and Nature": "Anifeiliaid a Natur",
-"Food and Drink": "Bwyd a Diod",
-"Activity": "Gweithgaredd",
-"Travel and Places": "Teithio a lleoedd",
-"Objects": "Gwrthrychau",
-"Flags": "Baneri",
-"Characters": "Nodau",
-"Characters (no spaces)": "Nodau (dim gofod)",
-"{0} characters": "{0} nod",
-"Error: Form submit field collision.": "Gwall: Gwrthdrawiad maes cyflwyno ffurflen",
-"Error: No form element found.": "Gwall: Ni chafwyd elfen ffurflen",
-"Update": "Diweddaru",
-"Color swatch": "Casgliad lliwiau",
-"Turquoise": "Gwyrddlas",
-"Green": "Gwyrdd",
-"Blue": "Glas",
-"Purple": "Porffor",
-"Navy Blue": "Dulas",
-"Dark Turquoise": "Gwyrddlas tywyll",
-"Dark Green": "Gwyrdd tywyll",
-"Medium Blue": "Glas canolig",
-"Medium Purple": "Porffor canolig",
-"Midnight Blue": "Glas y nos",
-"Yellow": "Melyn",
-"Orange": "Oren",
-"Red": "Coch",
-"Light Gray": "Llwyd golau",
-"Gray": "d",
-"Dark Yellow": "Melyn tywyll",
-"Dark Orange": "Oren tywyll",
-"Dark Red": "Coch tywyll",
-"Medium Gray": "Llwyd canolig",
-"Dark Gray": "Llwyd tywyll",
-"Light Green": "Gwyrdd Golau",
-"Light Yellow": "Melyn Golau",
-"Light Red": "Coch Golau",
-"Light Purple": "Porffor Golau",
-"Light Blue": "Glas Golau",
-"Dark Purple": "Porffor Tywyll",
-"Dark Blue": "Glas Tywyll",
-"Black": "Du",
-"White": "Gwyn",
-"Switch to or from fullscreen mode": "Newid i neu o'r modd sgr\u00een llawn",
-"Open help dialog": "Agor y ddeialog gymorth",
-"history": "hanes",
-"styles": "steiliau",
-"formatting": "fformatio",
-"alignment": "aliniad",
-"indentation": "mewnoli",
-"Font": "Ffont",
-"Size": "Maint",
-"More...": "Mwy...",
-"Select...": "Dewis...",
-"Preferences": "Dewisiadau",
-"Yes": "Iawn",
-"No": "Na",
-"Keyboard Navigation": "Llywio Bysellfwrdd",
-"Version": "Fersiwn",
-"Code view": "Golwg cod",
-"Open popup menu for split buttons": "Agor naidlen ar gyfer botymau hollt",
-"List Properties": "Rhestru Priodweddau",
-"List properties...": "Rhestru priodweddau...",
-"Start list at number": "Dechrau rhestr efo rhif",
-"Line height": "Uchder llinell",
-"comments": "Sylwadau",
-"Format Painter": "Brwsh Fformat",
-"Insert\/edit iframe": "Mewnosod\/golygu iframe",
-"Capitalization": "Priflythrennu",
-"lowercase": "llythrennau bach",
-"UPPERCASE": "PRIFLYTHRENNAU",
-"Title Case": "Priflythyren i bob gair",
-"permanent pen": "pen sefydlog",
-"Permanent Pen Properties": "Priodweddau Yswgrifbin Parhaol",
-"Permanent pen properties...": "Priodweddau ysgrifbin parhaol...",
-"case change": "Newid Cas",
-"page embed": "Mewnblannu i'r dudalen",
-"Advanced sort...": "Trefnu uwch...",
-"Advanced Sort": "Trefnu Uwch",
-"Sort table by column ascending": "Trefnu tabl yn \u00f4l colofn yn esgynnol",
-"Sort table by column descending": "Trefnu tabl yn \u00f4l colofn yn ddisgynnol",
-"Sort": "Trefnu",
-"Order": "Trefn",
-"Sort by": "Trefnu yn \u00f4l",
-"Ascending": "yn Esgynnol",
-"Descending": "yn Ddisgynnol",
-"Column {0}": "Colofn {0}",
-"Row {0}": "Rhes {0}",
-"Spellcheck...": "Gwirydd sillafu...",
-"Misspelled word": "Gair wedi ei gamsillafu",
-"Suggestions": "Awgrymiadau",
-"Change": "Newid",
-"Finding word suggestions": "Darganfod geiriau a awgrymir",
-"Success": "Llwyddiant",
-"Repair": "Trwsio",
-"Issue {0} of {1}": "Problem  {0} o {1}",
-"Images must be marked as decorative or have an alternative text description": "Rhaid bod delwedd wedi ei marcio yn addurniadol neu gyda disgrifiad testun arall",
-"Images must have an alternative text description. Decorative images are not allowed.": "Rhaid bod gan ddelwedd ddisgrifiad testun arall. Ni chaniateir delweddau addurniadol.",
-"Or provide alternative text:": "Neu darparu testun arall:",
-"Make image decorative:": "Gwneud delwedd yn addurniadol:",
-"ID attribute must be unique": "Rhaid i'r priodoledd ID fod yn unigryw",
-"Make ID unique": "Gwneud yr ID yn unigryw",
-"Keep this ID and remove all others": "Cadwch yr ID hwn a dileu pob un arall",
-"Remove this ID": "Dileu'r ID hwn",
-"Remove all IDs": "Dileu pob ID",
-"Checklist": "Rhestr wirio",
-"Anchor": "Angor",
-"Special character": "Nod arbennig",
-"Color": "Lliw",
-"Document properties": "Priodweddau'r ddogfen",
-"Image description": "Disgrifiad y ddelwedd",
-"Image": "Delwedd",
-"Insert link": "Mewnosod dolen",
-"Link": "Dolen",
-"Target": "Targed",
-"Media": "Cyfrwng",
-"Poster": "Poster",
-"Print": "Argraffu",
-"Whole words": "Geiriau cyfan",
-"Find and replace": "Chwilio ac amnewid",
-"Prev": "Blaenorol",
-"Insert template": "Mewnosod templed"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/da.es5.js b/build/media_source/vendor/tinymce/langs/da.es5.js
deleted file mode 100644
index e08c040325532..0000000000000
--- a/build/media_source/vendor/tinymce/langs/da.es5.js
+++ /dev/null
@@ -1,462 +0,0 @@
-tinymce.addI18n('da',{
-"Redo": "Gendan",
-"Undo": "Fortryd",
-"Cut": "Klip",
-"Copy": "Kopier",
-"Paste": "S\u00e6t ind",
-"Select all": "V\u00e6lg alle",
-"New document": "Nyt dokument",
-"Ok": "Ok",
-"Cancel": "Annuller",
-"Visual aids": "Visuel hj\u00e6lp",
-"Bold": "Fed",
-"Italic": "Kursiv",
-"Underline": "Understreget",
-"Strikethrough": "Gennemstreget",
-"Superscript": "H\u00e6vet skrift",
-"Subscript": "S\u00e6nket skrift",
-"Clear formatting": "Nulstil formattering",
-"Align left": "Opstil til venstre",
-"Align center": "Centrer",
-"Align right": "Opstil til h\u00f8jre",
-"Justify": "Justering",
-"Bullet list": "Punktopstillet liste",
-"Numbered list": "Nummereret liste",
-"Decrease indent": "Formindsk indrykning",
-"Increase indent": "For\u00f8g indrykning",
-"Close": "Luk",
-"Formats": "Formater",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Din browser underst\u00f8tter ikke direkte adgang til udklipsholder. Benyt Ctrl+X\/C\/ tastaturgenveje i stedet for.",
-"Headers": "Overskrifter",
-"Header 1": "Overskrift 1",
-"Header 2": "Overskrift 2",
-"Header 3": "Overskrift 3",
-"Header 4": "Overskrift 4",
-"Header 5": "Overskrift 5",
-"Header 6": "Overskrift 6",
-"Headings": "Overskrifter",
-"Heading 1": "Overskrift 1",
-"Heading 2": "Overskrift 2",
-"Heading 3": "Overskrift 3",
-"Heading 4": "Overskrift 4",
-"Heading 5": "Overskrift 5",
-"Heading 6": "Overskrift 6",
-"Preformatted": "Forudformateret",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kode",
-"Paragraph": "Afsnit",
-"Blockquote": "Blockquote",
-"Inline": "Inline",
-"Blocks": "Blokke",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "S\u00e6t ind er indstillet til at inds\u00e6tte som ren tekst. Indhold bliver nu indsat uden formatering indtil du \u00e6ndrer indstillingen.",
-"Fonts": "Skrifttyper",
-"Font Sizes": "Skriftst\u00f8rrelse",
-"Class": "Class",
-"Browse for an image": "S\u00f8g efter et billede",
-"OR": "OR",
-"Drop an image here": "Slip et billede her",
-"Upload": "Upload",
-"Block": "Blok\u00e9r",
-"Align": "Align",
-"Default": "Standard",
-"Circle": "Cirkel",
-"Disc": "Disk",
-"Square": "Kvadrat",
-"Lower Alpha": "Lower Alpha",
-"Lower Greek": "Lower Gr\u00e6sk",
-"Lower Roman": "Lower Roman",
-"Upper Alpha": "Upper Alpha",
-"Upper Roman": "Upper Roman",
-"Anchor...": "Anker...",
-"Name": "Navn",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id b\u00f8r starte med et bogstav, efterfulgt af bogstaver, tal, bindestreger, punktummer, koloner eller underscores.",
-"You have unsaved changes are you sure you want to navigate away?": "Du har ikke gemte \u00e6ndringer. Er du sikker p\u00e5 at du vil forts\u00e6tte?",
-"Restore last draft": "Genopret sidste kladde",
-"Special character...": "Specielle tegn...",
-"Source code": "Kildekode",
-"Insert\/Edit code sample": "Inds\u00e6t\/Ret kodeeksempel",
-"Language": "Sprog",
-"Code sample...": "Kodeeksempel...",
-"Color Picker": "Farvev\u00e6lger",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Venstre til h\u00f8jre",
-"Right to left": "H\u00f8jre til venstre",
-"Emoticons": "Emot-ikoner",
-"Emoticons...": "Emotikoner...",
-"Metadata and Document Properties": "Metadata og dokumentegenskaber",
-"Title": "Titel",
-"Keywords": "S\u00f8geord",
-"Description": "Beskrivelse",
-"Robots": "Robotter",
-"Author": "Forfatter",
-"Encoding": "Kodning",
-"Fullscreen": "Fuldsk\u00e6rm",
-"Action": "Handling",
-"Shortcut": "Genvej",
-"Help": "Hj\u00e6lp",
-"Address": "Adresse",
-"Focus to menubar": "Fokus p\u00e5 menulinjen",
-"Focus to toolbar": "Fokus p\u00e5 v\u00e6rkt\u00f8jslinjen",
-"Focus to element path": "Fokuser p\u00e5 elementvej",
-"Focus to contextual toolbar": "Fokuser p\u00e5 kontekstuelle v\u00e6rkt\u00f8jslinje",
-"Insert link (if link plugin activated)": "Inds\u00e6t link (hvis link plugin er aktiveret)",
-"Save (if save plugin activated)": "Gem (hvis save plugin er aktiveret)",
-"Find (if searchreplace plugin activated)": "Find (hvis searchreplace plugin er aktiveret)",
-"Plugins installed ({0}):": "Installerede plugins ({0}):",
-"Premium plugins:": "Premium plugins:",
-"Learn more...": "L\u00e6r mere...",
-"You are using {0}": "Du benytter {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Praktiske Genveje",
-"Horizontal line": "Vandret linie",
-"Insert\/edit image": "Inds\u00e6t\/ret billede",
-"Alternative description": "Alternativ beskrivelse",
-"Accessibility": "Tilg\u00e6ngelighed",
-"Image is decorative": "Billede er dekorativt",
-"Source": "Kilde",
-"Dimensions": "Dimensioner",
-"Constrain proportions": "Behold propertioner",
-"General": "Generelt",
-"Advanced": "Avanceret",
-"Style": "Stil",
-"Vertical space": "Lodret afstand",
-"Horizontal space": "Vandret afstand",
-"Border": "Kant",
-"Insert image": "Inds\u00e6t billede",
-"Image...": "Billede...",
-"Image list": "Billede liste",
-"Rotate counterclockwise": "Drej modsat urets retning",
-"Rotate clockwise": "Drej med urets retning",
-"Flip vertically": "Flip vertikalt",
-"Flip horizontally": "Flip horisontalt",
-"Edit image": "Rediger billede",
-"Image options": "Billede indstillinger",
-"Zoom in": "Zoom ind",
-"Zoom out": "Zoom ud",
-"Crop": "Besk\u00e6r",
-"Resize": "Skaler",
-"Orientation": "Retning",
-"Brightness": "Lysstyrke",
-"Sharpen": "G\u00f8r skarpere",
-"Contrast": "Kontrast",
-"Color levels": "Farve niveauer",
-"Gamma": "Gamma",
-"Invert": "Inverter",
-"Apply": "Anvend",
-"Back": "Tilbage",
-"Insert date\/time": "Inds\u00e6t dato\/klokkeslet",
-"Date\/time": "Dato\/klokkeslet",
-"Insert\/edit link": "Inds\u00e6t\/ret link",
-"Text to display": "Vis tekst",
-"Url": "Url",
-"Open link in...": "\u00c5bn link med...",
-"Current window": "Aktuelle vindue",
-"None": "Ingen",
-"New window": "Nyt vindue",
-"Open link": "\u00c5ben link",
-"Remove link": "Fjern link",
-"Anchors": "Ankre",
-"Link...": "Link...",
-"Paste or type a link": "Inds\u00e6t eller skriv et link",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URLen som du angav ser ud til at v\u00e6re en email adresse. \u00d8nsker du at tilf\u00f8je det kr\u00e6vede prefiks  mailto: ?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URLen som du angav ser ud til at v\u00e6re et eksternt link. \u00d8nsker du at tilf\u00f8je det kr\u00e6vede prefiks http:\/\/ ?",
-"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "URL'en som du angav ser ud til at v\u00e6re et eksternt link. \u00d8nsker du at tilf\u00f8je det n\u00f8dvendige https:\/\/ pr\u00e6fiks?",
-"Link list": "Link liste",
-"Insert video": "Inds\u00e6t video",
-"Insert\/edit video": "Inds\u00e6t\/ret video",
-"Insert\/edit media": "Inds\u00e6t\/ret medier",
-"Alternative source": "Alternativ kilde",
-"Alternative source URL": "Alternativ kilde URL",
-"Media poster (Image URL)": "Medieplakat (billede URL)",
-"Paste your embed code below:": "Inds\u00e6t din embed kode herunder:",
-"Embed": "Integrer",
-"Media...": "Medie...",
-"Nonbreaking space": "H\u00e5rdt mellemrum",
-"Page break": "Sideskift",
-"Paste as text": "Inds\u00e6t som ren tekst",
-"Preview": "Forh\u00e5ndsvisning",
-"Print...": "Udskriv...",
-"Save": "Gem",
-"Find": "Find",
-"Replace with": "Erstat med",
-"Replace": "Erstat",
-"Replace all": "Erstat alt",
-"Previous": "Forrige",
-"Next": "N\u00e6ste",
-"Find and Replace": "Find og erstat",
-"Find and replace...": "Find og erstat...",
-"Could not find the specified string.": "Kunne ikke finde s\u00f8getekst",
-"Match case": "STORE og sm\u00e5 bogstaver",
-"Find whole words only": "Find kun hele ord",
-"Find in selection": "Find i det valgte",
-"Spellcheck": "Stavekontrol",
-"Spellcheck Language": "Sprog til stavekontrol",
-"No misspellings found.": "Ingen stavefejl fundet.",
-"Ignore": "Ignorer",
-"Ignore all": "Ignorer alt",
-"Finish": "F\u00e6rdig",
-"Add to Dictionary": "Tilf\u00f8j til ordbog",
-"Insert table": "Inds\u00e6t tabel",
-"Table properties": "Tabel egenskaber",
-"Delete table": "Slet tabel",
-"Cell": "Celle",
-"Row": "R\u00e6kke",
-"Column": "Kolonne",
-"Cell properties": "Celle egenskaber",
-"Merge cells": "Flet celler",
-"Split cell": "Split celle",
-"Insert row before": "Inds\u00e6t r\u00e6kke f\u00f8r",
-"Insert row after": "Inds\u00e6t r\u00e6kke efter",
-"Delete row": "Slet r\u00e6kke",
-"Row properties": "R\u00e6kke egenskaber",
-"Cut row": "Klip r\u00e6kke",
-"Copy row": "Kopier r\u00e6kke",
-"Paste row before": "Inds\u00e6t r\u00e6kke f\u00f8r",
-"Paste row after": "Inds\u00e6t r\u00e6kke efter",
-"Insert column before": "Inds\u00e6t kolonne f\u00f8r",
-"Insert column after": "Inds\u00e6t kolonne efter",
-"Delete column": "Slet kolonne",
-"Cols": "Kolonne",
-"Rows": "R\u00e6kker",
-"Width": "Bredde",
-"Height": "H\u00f8jde",
-"Cell spacing": "Celle afstand",
-"Cell padding": "Celle padding",
-"Caption": "Tekst",
-"Show caption": "Vis overskrift",
-"Left": "Venstre",
-"Center": "Centrering",
-"Right": "H\u00f8jre",
-"Cell type": "Celle type",
-"Scope": "Anvendelsesomr\u00e5de",
-"Alignment": "Tilpasning",
-"H Align": "H juster",
-"V Align": "V juster",
-"Top": "Top",
-"Middle": "Midt",
-"Bottom": "Bund",
-"Header cell": "Sidehoved celle",
-"Row group": "R\u00e6kke gruppe",
-"Column group": "Kolonne gruppe",
-"Row type": "R\u00e6kke type",
-"Header": "Sidehoved",
-"Body": "Krop",
-"Footer": "Sidefod",
-"Border color": "Kant farve",
-"Insert template...": "Inds\u00e6t skabelon...",
-"Templates": "Skabeloner",
-"Template": "Skabelon",
-"Text color": "Tekst farve",
-"Background color": "Baggrunds farve",
-"Custom...": "Brugerdefineret...",
-"Custom color": "Brugerdefineret farve",
-"No color": "Ingen farve",
-"Remove color": "Fjern farve",
-"Table of Contents": "Indholdsfortegnelse",
-"Show blocks": "Vis klokke",
-"Show invisible characters": "Vis usynlige tegn",
-"Word count": "Optalte ord",
-"Count": "Antal",
-"Document": "Dokument",
-"Selection": "Valg",
-"Words": "Ord",
-"Words: {0}": "Ord: {0}",
-"{0} words": "{0} ord",
-"File": "Fil",
-"Edit": "Rediger",
-"Insert": "Inds\u00e6t",
-"View": "Vis",
-"Format": "Format",
-"Table": "Tabel",
-"Tools": "V\u00e6rkt\u00f8j",
-"Powered by {0}": "Drevet af {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text omr\u00e5de. Tryk ALT-F9 for menu. Tryk ALT-F10 for toolbar. Tryk ALT-0 for hj\u00e6lp",
-"Image title": "Billedtitel",
-"Border width": "Kantbredde",
-"Border style": "Kantstil",
-"Error": "Fejl",
-"Warn": "Advar",
-"Valid": "Gyldig",
-"To open the popup, press Shift+Enter": "Tryk skift + enter for at \u00e5bne pop op",
-"Rich Text Area. Press ALT-0 for help.": "Rich tekst omr\u00e5de. Tryk p\u00e5 ALT-0 for hj\u00e6lp.",
-"System Font": "Systemskrifttype",
-"Failed to upload image: {0}": "Mislykket billed-upload:",
-"Failed to load plugin: {0} from url {1}": "Mislykket plugin indl\u00e6sning: {0}  fra url {1}",
-"Failed to load plugin url: {0}": "Mislykket indl\u00e6sning af plugin-url: {0}",
-"Failed to initialize plugin: {0}": "Mislykket initiering a plugin: {0}",
-"example": "eksempel",
-"Search": "S\u00f8g",
-"All": "Alle",
-"Currency": "Valuta",
-"Text": "Tekst",
-"Quotations": "Anf\u00f8rselstegn",
-"Mathematical": "Matematiske tegn",
-"Extended Latin": "Udvidet Latin",
-"Symbols": "Symboler",
-"Arrows": "Pile",
-"User Defined": "Brugerdefineret",
-"dollar sign": "dollartegn",
-"currency sign": "valutategn",
-"euro-currency sign": "euro-tegn",
-"colon sign": "kolontegn",
-"cruzeiro sign": "cruzeiro-tegn",
-"french franc sign": "fransk frank-tegn",
-"lira sign": "lira-tegn",
-"mill sign": "mill-tegn",
-"naira sign": "naira-tegn",
-"peseta sign": "peseta-tegn",
-"rupee sign": "rupee-tegn",
-"won sign": "won-tegn",
-"new sheqel sign": "ny sheqel-tegn",
-"dong sign": "dong-tegn",
-"kip sign": "kip-tegn",
-"tugrik sign": "tugrik-tegn",
-"drachma sign": "drakmer-tegn",
-"german penny symbol": "tysk penny-symbol",
-"peso sign": "peso-tegn",
-"guarani sign": "guarani-tegn",
-"austral sign": "austral-tegn",
-"hryvnia sign": "hryvnia-tegn",
-"cedi sign": "cedi-tegn",
-"livre tournois sign": "livre tournois-tegn",
-"spesmilo sign": "spesmilo-tegn",
-"tenge sign": "tenge-tegn",
-"indian rupee sign": "indisk rupee-tegn",
-"turkish lira sign": "tyrkisk lira-tegn",
-"nordic mark sign": "nordisk mark-tegn",
-"manat sign": "manat-tegn",
-"ruble sign": "rubel-tegn",
-"yen character": "yen-tegn",
-"yuan character": "yuan-tegn",
-"yuan character, in hong kong and taiwan": "yuan-tegn, i hong kong og taiwan",
-"yen\/yuan character variant one": "yen\/yuan-tegn variant en",
-"Loading emoticons...": "Indl\u00e6ser emotikoner...",
-"Could not load emoticons": "Kunne ikke indl\u00e6se emotikoner",
-"People": "Folk",
-"Animals and Nature": "Dyr og natur",
-"Food and Drink": "F\u00f8de og drikke",
-"Activity": "Aktivitet",
-"Travel and Places": "Rejser og steder",
-"Objects": "Objekter",
-"Flags": "Flag",
-"Characters": "Tegn",
-"Characters (no spaces)": "Tegn (uden mellemrum)",
-"{0} characters": "{0} tegn",
-"Error: Form submit field collision.": "Fejl: Form submit felt kollision",
-"Error: No form element found.": "Fejl: Ingen form element fundet.",
-"Update": "Opdater",
-"Color swatch": "Farvepr\u00f8ve",
-"Turquoise": "Turkis",
-"Green": "Gr\u00f8n",
-"Blue": "Bl\u00e5",
-"Purple": "Lilla",
-"Navy Blue": "Marinebl\u00e5",
-"Dark Turquoise": "M\u00f8rketurkis",
-"Dark Green": "M\u00f8rkegr\u00f8n",
-"Medium Blue": "Medium bl\u00e5",
-"Medium Purple": "Medium lilla",
-"Midnight Blue": "Midnatsbl\u00e5",
-"Yellow": "Gul",
-"Orange": "Orange",
-"Red": "R\u00f8d",
-"Light Gray": "Lysegr\u00e5",
-"Gray": "Gr\u00e5",
-"Dark Yellow": "M\u00f8rkegul",
-"Dark Orange": "M\u00f8rkeorange",
-"Dark Red": "M\u00f8rker\u00f8d",
-"Medium Gray": "Mellemgr\u00e5",
-"Dark Gray": "M\u00f8rkegr\u00e5",
-"Light Green": "Lysegr\u00f8n",
-"Light Yellow": "Lysegul",
-"Light Red": "Lyser\u00f8d",
-"Light Purple": "Lyslilla",
-"Light Blue": "Lysebl\u00e5",
-"Dark Purple": "M\u00f8rkelilla",
-"Dark Blue": "M\u00f8rkebl\u00e5",
-"Black": "Sort",
-"White": "Hvid",
-"Switch to or from fullscreen mode": "Skift til eller fra fuldsk\u00e6rmstilstand",
-"Open help dialog": "\u00c5bn hj\u00e6lpedialog",
-"history": "historie",
-"styles": "stile",
-"formatting": "formatering",
-"alignment": "justering",
-"indentation": "indrykning",
-"Font": "Skrifttype",
-"Size": "St\u00f8rrelse",
-"More...": "Mere...",
-"Select...": "V\u00e6lg...",
-"Preferences": "Pr\u00e6ferencer",
-"Yes": "Ja",
-"No": "Nej",
-"Keyboard Navigation": "Navigation med tastatur",
-"Version": "Version",
-"Code view": "Kodevisning",
-"Open popup menu for split buttons": "\u00c5ben popup menu for split knapper",
-"List Properties": "List indstillinger",
-"List properties...": "List indstillinger...",
-"Start list at number": "Start liste ved nummer",
-"Line height": "Linjeh\u00f8jde",
-"comments": "kommentarer",
-"Format Painter": "Formatpensel",
-"Insert\/edit iframe": "Inds\u00e6t\/rediger iframe",
-"Capitalization": "Store bogstaver",
-"lowercase": "sm\u00e5 bogstaver",
-"UPPERCASE": "STORE BOGSTAVER",
-"Title Case": "Stort begyndelsesbogstav",
-"permanent pen": "permanent pen",
-"Permanent Pen Properties": "Permanente penegenskaber",
-"Permanent pen properties...": "Permanente penegenskaber...",
-"case change": "\u00e6ndring af stort\/sm\u00e5t",
-"page embed": "side indlejring",
-"Advanced sort...": "Avanceret sortering...",
-"Advanced Sort": "Avanceret sortering",
-"Sort table by column ascending": "Sorter tabel efter kolonne stigende",
-"Sort table by column descending": "Sorter tabel efter kolonne faldende",
-"Sort": "Sorter",
-"Order": "R\u00e6kkef\u00f8lge",
-"Sort by": "Sorter efter",
-"Ascending": "Stigende",
-"Descending": "Faldende",
-"Column {0}": "Kolonne {0}",
-"Row {0}": "R\u00e6kke {0}",
-"Spellcheck...": "Stavekontrol...",
-"Misspelled word": "Ord med stavefejl",
-"Suggestions": "Forslag",
-"Change": "\u00c6ndring",
-"Finding word suggestions": "Finder ord forslag",
-"Success": "Succes",
-"Repair": "Reparer",
-"Issue {0} of {1}": "Problem {0} ud af {1}",
-"Images must be marked as decorative or have an alternative text description": "Billeder skal markeres som dekorative eller have en alternativ tekstbeskrivelse",
-"Images must have an alternative text description. Decorative images are not allowed.": "Billeder skal have en alternativ tekstbeskrivelse. Dekorative billeder er ikke tilladte.",
-"Or provide alternative text:": "Eller angiv en alternativ tekst:",
-"Make image decorative:": "G\u00f8r billede dekorativ:",
-"ID attribute must be unique": "ID attribut skal v\u00e6re unik",
-"Make ID unique": "G\u00f8r ID unik",
-"Keep this ID and remove all others": "Behold dette ID og fjern alle andre",
-"Remove this ID": "Fjern dette ID",
-"Remove all IDs": "Fjern alle ID'er",
-"Checklist": "Kontrolliste",
-"Anchor": "Anker",
-"Special character": "Specielle tegn",
-"Code sample": "Kodepr\u00f8ve",
-"Color": "Farve",
-"Document properties": "Dokument egenskaber",
-"Image description": "Billedbeskrivelse",
-"Image": "Billede",
-"Insert link": "Inds\u00e6t link",
-"Target": "Target",
-"Link": "Link",
-"Poster": "Poster",
-"Media": "Medier",
-"Print": "Udskriv",
-"Prev": "Forrige",
-"Find and replace": "Find og erstat",
-"Whole words": "Hele ord",
-"Insert template": "Inds\u00e6t skabelon"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/de.es5.js b/build/media_source/vendor/tinymce/langs/de.es5.js
deleted file mode 100644
index 074b5597b3486..0000000000000
--- a/build/media_source/vendor/tinymce/langs/de.es5.js
+++ /dev/null
@@ -1,462 +0,0 @@
-tinymce.addI18n('de',{
-"Redo": "Wiederholen",
-"Undo": "R\u00fcckg\u00e4ngig machen",
-"Cut": "Ausschneiden",
-"Copy": "Kopieren",
-"Paste": "Einf\u00fcgen",
-"Select all": "Alles ausw\u00e4hlen",
-"New document": "Neues Dokument",
-"Ok": "Ok",
-"Cancel": "Abbrechen",
-"Visual aids": "Visuelle Hilfen",
-"Bold": "Fett",
-"Italic": "Kursiv",
-"Underline": "Unterstrichen",
-"Strikethrough": "Durchgestrichen",
-"Superscript": "Hochgestellt",
-"Subscript": "Tiefgestellt",
-"Clear formatting": "Formatierung entfernen",
-"Align left": "Linksb\u00fcndig ausrichten",
-"Align center": "Zentrieren",
-"Align right": "Rechtsb\u00fcndig ausrichten",
-"Justify": "Blocksatz",
-"Bullet list": "Aufz\u00e4hlung",
-"Numbered list": "Nummerierte Liste",
-"Decrease indent": "Einzug verkleinern",
-"Increase indent": "Einzug vergr\u00f6\u00dfern",
-"Close": "Schlie\u00dfen",
-"Formats": "Formate",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Ihr Browser unterst\u00fctzt leider keinen direkten Zugriff auf die Zwischenablage. Bitte benutzen Sie die Tastenkombinationen Strg+X\/C\/V.",
-"Headers": "\u00dcberschriften",
-"Header 1": "\u00dcberschrift 1",
-"Header 2": "\u00dcberschrift 2",
-"Header 3": "\u00dcberschrift 3",
-"Header 4": "\u00dcberschrift 4",
-"Header 5": "\u00dcberschrift 5",
-"Header 6": "\u00dcberschrift 6",
-"Headings": "\u00dcberschriften",
-"Heading 1": "Kopfzeile 1",
-"Heading 2": "Kopfzeile 2",
-"Heading 3": "Kopfzeile 3",
-"Heading 4": "Kopfzeile 4",
-"Heading 5": "Kopfzeile 5",
-"Heading 6": "Kopfzeile 6",
-"Preformatted": "Vorformatiert",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Code",
-"Paragraph": "Absatz",
-"Blockquote": "Blockquote",
-"Inline": "Zeichenformate",
-"Blocks": "Bl\u00f6cke",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Einf\u00fcgen ist nun im einfachen Textmodus. Inhalte werden ab jetzt als unformatierter Text eingef\u00fcgt, bis Sie diese Einstellung wieder ausschalten!",
-"Fonts": "Schriftarten",
-"Font Sizes": "Schriftgr\u00f6\u00dfe",
-"Class": "Klasse",
-"Browse for an image": "Bild...",
-"OR": "ODER",
-"Drop an image here": "Bild hier ablegen",
-"Upload": "Hochladen",
-"Block": "Blocksatz",
-"Align": "Ausrichten",
-"Default": "Standard",
-"Circle": "Kreis",
-"Disc": "Punkt",
-"Square": "Quadrat",
-"Lower Alpha": "Kleinbuchstaben",
-"Lower Greek": "Griechische Kleinbuchstaben",
-"Lower Roman": "R\u00f6mische Zahlen (Kleinbuchstaben)",
-"Upper Alpha": "Gro\u00dfbuchstaben",
-"Upper Roman": "R\u00f6mische Zahlen (Gro\u00dfbuchstaben)",
-"Anchor...": "Textmarke",
-"Name": "Name",
-"Id": "Kennung",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Die Kennung sollte mit einem Buchstaben anfangen. Nachfolgend nur Buchstaben, Zahlen, Striche (Minus), Punkte, Kommas und Unterstriche.",
-"You have unsaved changes are you sure you want to navigate away?": "Die \u00c4nderungen wurden noch nicht gespeichert, sind Sie sicher, dass Sie diese Seite verlassen wollen?",
-"Restore last draft": "Letzten Entwurf wiederherstellen",
-"Special character...": "Sonderzeichen...",
-"Source code": "Quelltext",
-"Insert\/Edit code sample": "Codebeispiel einf\u00fcgen\/bearbeiten",
-"Language": "Sprache",
-"Code sample...": "Codebeispiel...",
-"Color Picker": "Farbwahl",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Von links nach rechts",
-"Right to left": "Von rechts nach links",
-"Emoticons": "Emoticons",
-"Emoticons...": "Emoticons...",
-"Metadata and Document Properties": "Dokument-Eigenschaften und -Metadaten",
-"Title": "Titel",
-"Keywords": "Sch\u00fcsselw\u00f6rter",
-"Description": "Beschreibung",
-"Robots": "Robots",
-"Author": "Verfasser",
-"Encoding": "Zeichenkodierung",
-"Fullscreen": "Vollbild",
-"Action": "Aktion",
-"Shortcut": "Shortcut",
-"Help": "Hilfe",
-"Address": "Adresse",
-"Focus to menubar": "Fokus auf Men\u00fcleiste",
-"Focus to toolbar": "Fokus auf Werkzeugleiste",
-"Focus to element path": "Fokus auf Elementpfad",
-"Focus to contextual toolbar": "Fokus auf kontextbezogene Werkzeugleiste",
-"Insert link (if link plugin activated)": "Link einf\u00fcgen (wenn Link-Plugin aktiviert ist)",
-"Save (if save plugin activated)": "Speichern (wenn Save-Plugin aktiviert ist)",
-"Find (if searchreplace plugin activated)": "Suchen einf\u00fcgen (wenn Suchen\/Ersetzen-Plugin aktiviert ist)",
-"Plugins installed ({0}):": "installierte Plugins ({0}):",
-"Premium plugins:": "Premium Plugins:",
-"Learn more...": "Erfahren Sie mehr dazu...",
-"You are using {0}": "Sie verwenden {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Praktische Tastenkombinationen",
-"Horizontal line": "Horizontale Linie",
-"Insert\/edit image": "Bild einf\u00fcgen\/bearbeiten",
-"Alternative description": "Alternative Beschreibung",
-"Accessibility": "Barrierefreiheit",
-"Image is decorative": "Bild ist dekorativ",
-"Source": "Quelle",
-"Dimensions": "Abmessungen",
-"Constrain proportions": "Seitenverh\u00e4ltnis beibehalten",
-"General": "Allgemein",
-"Advanced": "Erweitert",
-"Style": "Stil",
-"Vertical space": "Vertikaler Abstand",
-"Horizontal space": "Horizontaler Abstand",
-"Border": "Rahmen",
-"Insert image": "Bild einf\u00fcgen",
-"Image...": "Bild...",
-"Image list": "Bildliste",
-"Rotate counterclockwise": "Gegen den Uhrzeigersinn drehen",
-"Rotate clockwise": "Im Uhrzeigersinn drehen",
-"Flip vertically": "Vertikal spiegeln",
-"Flip horizontally": "Horizontal spiegeln",
-"Edit image": "Bild bearbeiten",
-"Image options": "Bildeigenschaften",
-"Zoom in": "Ansicht vergr\u00f6\u00dfern",
-"Zoom out": "Ansicht verkleinern",
-"Crop": "Bescheiden",
-"Resize": "Skalieren",
-"Orientation": "Ausrichtung",
-"Brightness": "Helligkeit",
-"Sharpen": "Sch\u00e4rfen",
-"Contrast": "Kontrast",
-"Color levels": "Farbwerte",
-"Gamma": "Gamma",
-"Invert": "Invertieren",
-"Apply": "Anwenden",
-"Back": "Zur\u00fcck",
-"Insert date\/time": "Datum\/Uhrzeit einf\u00fcgen ",
-"Date\/time": "Datum\/Uhrzeit",
-"Insert\/edit link": "Link einf\u00fcgen\/bearbeiten",
-"Text to display": "Anzuzeigender Text",
-"Url": "URL",
-"Open link in...": "Link \u00f6ffnen in...",
-"Current window": "Aktuelles Fenster",
-"None": "Keine",
-"New window": "Neues Fenster",
-"Open link": "Link \u00f6ffnen",
-"Remove link": "Link entfernen",
-"Anchors": "Textmarken",
-"Link...": "Link...",
-"Paste or type a link": "Link einf\u00fcgen oder eintippen",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Diese Adresse scheint eine E-Mail-Adresse zu sein. M\u00f6chten Sie das dazu ben\u00f6tigte \"mailto:\" voranstellen?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Diese Adresse scheint ein externer Link zu sein. M\u00f6chten Sie das dazu ben\u00f6tigte \"http:\/\/\" voranstellen?",
-"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Die eingegebene URL scheint ein externer Link zu sein. Soll das fehlende https:\/\/ davor erg\u00e4nzt werden?",
-"Link list": "Linkliste",
-"Insert video": "Video einf\u00fcgen",
-"Insert\/edit video": "Video einf\u00fcgen\/bearbeiten",
-"Insert\/edit media": "Medien einf\u00fcgen\/bearbeiten",
-"Alternative source": "Alternative Quelle",
-"Alternative source URL": "URL der alternativen Quelle",
-"Media poster (Image URL)": "Medienposter (Bild-URL)",
-"Paste your embed code below:": "F\u00fcgen Sie Ihren Einbettungscode hier ein:",
-"Embed": "Einbetten",
-"Media...": "Medien...",
-"Nonbreaking space": "Gesch\u00fctztes Leerzeichen",
-"Page break": "Seitenumbruch",
-"Paste as text": "Als Text einf\u00fcgen",
-"Preview": "Vorschau",
-"Print...": "Drucken...",
-"Save": "Speichern",
-"Find": "Suchen",
-"Replace with": "Ersetzen durch",
-"Replace": "Ersetzen",
-"Replace all": "Alles ersetzen",
-"Previous": "Vorherige",
-"Next": "Weiter",
-"Find and Replace": "Suchen und Ersetzen",
-"Find and replace...": "Suchen und ersetzen...",
-"Could not find the specified string.": "Die Zeichenfolge wurde nicht gefunden.",
-"Match case": "Gro\u00df-\/Kleinschreibung beachten",
-"Find whole words only": "Nur ganze W\u00f6rter suchen",
-"Find in selection": "In Auswahl suchen",
-"Spellcheck": "Rechtschreibpr\u00fcfung",
-"Spellcheck Language": "Sprache f\u00fcr die Rechtschreibpr\u00fcfung",
-"No misspellings found.": "Keine Rechtschreibfehler gefunden",
-"Ignore": "Ignorieren",
-"Ignore all": "Alles Ignorieren",
-"Finish": "Ende",
-"Add to Dictionary": "Zum W\u00f6rterbuch hinzuf\u00fcgen",
-"Insert table": "Tabelle einf\u00fcgen",
-"Table properties": "Tabelleneigenschaften",
-"Delete table": "Tabelle l\u00f6schen",
-"Cell": "Zelle",
-"Row": "Zeile",
-"Column": "Spalte",
-"Cell properties": "Zelleneigenschaften",
-"Merge cells": "Zellen verbinden",
-"Split cell": "Zelle aufteilen",
-"Insert row before": "Neue Zeile davor einf\u00fcgen ",
-"Insert row after": "Neue Zeile danach einf\u00fcgen",
-"Delete row": "Zeile l\u00f6schen",
-"Row properties": "Zeileneigenschaften",
-"Cut row": "Zeile ausschneiden",
-"Copy row": "Zeile kopieren",
-"Paste row before": "Zeile davor einf\u00fcgen",
-"Paste row after": "Zeile danach einf\u00fcgen",
-"Insert column before": "Neue Spalte davor einf\u00fcgen",
-"Insert column after": "Neue Spalte danach einf\u00fcgen",
-"Delete column": "Spalte l\u00f6schen",
-"Cols": "Spalten",
-"Rows": "Zeilen",
-"Width": "Breite",
-"Height": "H\u00f6he",
-"Cell spacing": "Zellenabstand",
-"Cell padding": "Zelleninnenabstand",
-"Caption": "Beschriftung",
-"Show caption": "Beschriftung anzeigen",
-"Left": "Linksb\u00fcndig",
-"Center": "Zentriert",
-"Right": "Rechtsb\u00fcndig",
-"Cell type": "Zellentyp",
-"Scope": "G\u00fcltigkeitsbereich",
-"Alignment": "Ausrichtung",
-"H Align": "Horizontale Ausrichtung",
-"V Align": "Vertikale Ausrichtung",
-"Top": "Oben",
-"Middle": "Mitte",
-"Bottom": "Unten",
-"Header cell": "Kopfzelle",
-"Row group": "Zeilengruppe",
-"Column group": "Spaltengruppe",
-"Row type": "Zeilentyp",
-"Header": "Kopfzeile",
-"Body": "Inhalt",
-"Footer": "Fu\u00dfzeile",
-"Border color": "Rahmenfarbe",
-"Insert template...": "Vorlage einf\u00fcgen...",
-"Templates": "Vorlagen",
-"Template": "Vorlage",
-"Text color": "Textfarbe",
-"Background color": "Hintergrundfarbe",
-"Custom...": "Benutzerdefiniert...",
-"Custom color": "Benutzerdefinierte Farbe",
-"No color": "Keine Farbe",
-"Remove color": "Farbauswahl aufheben",
-"Table of Contents": "Inhaltsverzeichnis",
-"Show blocks": "Bl\u00f6cke anzeigen",
-"Show invisible characters": "Unsichtbare Zeichen anzeigen",
-"Word count": "Anzahl der W\u00f6rter",
-"Count": "Anzahl",
-"Document": "Dokument",
-"Selection": "Auswahl",
-"Words": "W\u00f6rter",
-"Words: {0}": "W\u00f6rter: {0}",
-"{0} words": "{0} W\u00f6rter",
-"File": "Datei",
-"Edit": "Bearbeiten",
-"Insert": "Einf\u00fcgen",
-"View": "Ansicht",
-"Format": "Format",
-"Table": "Tabelle",
-"Tools": "Werkzeuge",
-"Powered by {0}": "Betrieben von {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich-Text- Area. Dr\u00fccken Sie ALT-F9 f\u00fcr das Men\u00fc. Dr\u00fccken Sie ALT-F10 f\u00fcr Symbolleiste. Dr\u00fccken Sie ALT-0 f\u00fcr Hilfe",
-"Image title": "Bildtitel",
-"Border width": "Rahmenbreite",
-"Border style": "Rahmenstil",
-"Error": "Fehler",
-"Warn": "Warnung",
-"Valid": "G\u00fcltig",
-"To open the popup, press Shift+Enter": "Dr\u00fccken Sie Umschalt+Eingabe, um das Popup-Fenster zu \u00f6ffnen.",
-"Rich Text Area. Press ALT-0 for help.": "Rich-Text-Bereich. Dr\u00fccken Sie Alt+0 f\u00fcr Hilfe.",
-"System Font": "Betriebssystemschriftart",
-"Failed to upload image: {0}": "Bild konnte nicht hochgeladen werden: {0}",
-"Failed to load plugin: {0} from url {1}": "Plugin konnte nicht geladen werden: {0} von URL {1}",
-"Failed to load plugin url: {0}": "Plugin-URL konnte nicht geladen werden: {0}",
-"Failed to initialize plugin: {0}": "Plugin konnte nicht initialisiert werden: {0}",
-"example": "Beispiel",
-"Search": "Suchen",
-"All": "Alles",
-"Currency": "W\u00e4hrung",
-"Text": "Text",
-"Quotations": "Anf\u00fchrungszeichen",
-"Mathematical": "Mathematisch",
-"Extended Latin": "Erweitertes Latein",
-"Symbols": "Symbole",
-"Arrows": "Pfeile",
-"User Defined": "Benutzerdefiniert",
-"dollar sign": "Dollarzeichen",
-"currency sign": "W\u00e4hrungssymbol",
-"euro-currency sign": "Eurozeichen",
-"colon sign": "Doppelpunkt",
-"cruzeiro sign": "Cruzeirozeichen",
-"french franc sign": "Franczeichen",
-"lira sign": "Lirezeichen",
-"mill sign": "Millzeichen",
-"naira sign": "Nairazeichen",
-"peseta sign": "Pesetazeichen",
-"rupee sign": "Rupiezeichen",
-"won sign": "Wonzeichen",
-"new sheqel sign": "Schekelzeichen",
-"dong sign": "Dongzeichen",
-"kip sign": "Kipzeichen",
-"tugrik sign": "Tugrikzeichen",
-"drachma sign": "Drachmezeichen",
-"german penny symbol": "Pfennigzeichen",
-"peso sign": "Pesozeichen",
-"guarani sign": "Guaranizeichen",
-"austral sign": "Australzeichen",
-"hryvnia sign": "Hrywnjazeichen",
-"cedi sign": "Cedizeichen",
-"livre tournois sign": "Livrezeichen",
-"spesmilo sign": "Spesmilozeichen",
-"tenge sign": "Tengezeichen",
-"indian rupee sign": "Indisches Rupiezeichen",
-"turkish lira sign": "T\u00fcrkisches Lirazeichen",
-"nordic mark sign": "Zeichen nordische Mark",
-"manat sign": "Manatzeichen",
-"ruble sign": "Rubelzeichen",
-"yen character": "Yenzeichen",
-"yuan character": "Yuanzeichen",
-"yuan character, in hong kong and taiwan": "Yuanzeichen in Hongkong und Taiwan",
-"yen\/yuan character variant one": "Yen-\/Yuanzeichen Variante 1",
-"Loading emoticons...": "Emoticons werden geladen...",
-"Could not load emoticons": "Emoticons konnten nicht geladen werden",
-"People": "Menschen",
-"Animals and Nature": "Tiere und Natur",
-"Food and Drink": "Essen und Trinken",
-"Activity": "Aktivit\u00e4t",
-"Travel and Places": "Reisen und Orte",
-"Objects": "Objekte",
-"Flags": "Flaggen",
-"Characters": "Zeichen",
-"Characters (no spaces)": "Zeichen (ohne Leerzeichen)",
-"{0} characters": "{0}\u00a0Zeichen",
-"Error: Form submit field collision.": "Fehler: Kollision der Formularbest\u00e4tigungsfelder.",
-"Error: No form element found.": "Fehler: Kein Formularelement gefunden.",
-"Update": "Aktualisieren",
-"Color swatch": "Farbpalette",
-"Turquoise": "T\u00fcrkis",
-"Green": "Gr\u00fcn",
-"Blue": "Blau",
-"Purple": "Violett",
-"Navy Blue": "Marineblau",
-"Dark Turquoise": "Dunkelt\u00fcrkis",
-"Dark Green": "Dunkelgr\u00fcn",
-"Medium Blue": "Mittleres Blau",
-"Medium Purple": "Mittelviolett",
-"Midnight Blue": "Mitternachtsblau",
-"Yellow": "Gelb",
-"Orange": "Orange",
-"Red": "Rot",
-"Light Gray": "Hellgrau",
-"Gray": "Grau",
-"Dark Yellow": "Dunkelgelb",
-"Dark Orange": "Dunkelorange",
-"Dark Red": "Dunkelrot",
-"Medium Gray": "Mittelgrau",
-"Dark Gray": "Dunkelgrau",
-"Light Green": "Hellgr\u00fcn",
-"Light Yellow": "Hellgelb",
-"Light Red": "Hellrot",
-"Light Purple": "Helllila",
-"Light Blue": "Hellblau",
-"Dark Purple": "Dunkellila",
-"Dark Blue": "Dunkelblau",
-"Black": "Schwarz",
-"White": "Wei\u00df",
-"Switch to or from fullscreen mode": "Vollbildmodus umschalten",
-"Open help dialog": "Hilfe-Dialog \u00f6ffnen",
-"history": "Historie",
-"styles": "Stile",
-"formatting": "Formatierung",
-"alignment": "Ausrichtung",
-"indentation": "Einr\u00fcckungen",
-"Font": "Schriftart",
-"Size": "Schriftgr\u00f6\u00dfe",
-"More...": "Mehr...",
-"Select...": "Auswahl...",
-"Preferences": "Einstellungen",
-"Yes": "Ja",
-"No": "Nein",
-"Keyboard Navigation": "Tastaturnavigation",
-"Version": "Version",
-"Code view": "Code Ansicht",
-"Open popup menu for split buttons": "\u00d6ffne Popup Menge um Buttons zu trennen",
-"List Properties": "Liste Eigenschaften",
-"List properties...": "Liste Eigenschaften",
-"Start list at number": "Beginne Liste mit Nummer",
-"Line height": "Liniendicke",
-"comments": "Anmerkungen",
-"Format Painter": "Format-Painter",
-"Insert\/edit iframe": "iframe einf\u00fcgen\/bearbeiten",
-"Capitalization": "Gro\u00dfschreibung",
-"lowercase": "Kleinbuchstaben",
-"UPPERCASE": "Gro\u00dfbuchstaben",
-"Title Case": "Gro\u00df-\/Kleinschreibung des Titels",
-"permanent pen": "Textmarker",
-"Permanent Pen Properties": "Eigenschaften von Permanent Pen",
-"Permanent pen properties...": "Eigenschaften von Permanent Pen...",
-"case change": "Gro\u00df-\/Kleinschreibung",
-"page embed": "Seite einbetten",
-"Advanced sort...": "Erweiterte Sortierung...",
-"Advanced Sort": "Erweiterte Sortierung",
-"Sort table by column ascending": "Tabelle aufsteigend nach Spalten sortieren",
-"Sort table by column descending": "Tabelle absteigend nach Spalten sortieren",
-"Sort": "Sortieren",
-"Order": "Reihenfolge",
-"Sort by": "Sortieren nach",
-"Ascending": "Aufsteigend",
-"Descending": "Absteigend",
-"Column {0}": "Spalte {0}",
-"Row {0}": "Reihe {0}",
-"Spellcheck...": "Rechtschreibpr\u00fcfung...",
-"Misspelled word": "Rechtschreibfehler",
-"Suggestions": "Vorschl\u00e4ge",
-"Change": "Ver\u00e4ndere",
-"Finding word suggestions": "Finde Wort Vorschl\u00e4ge",
-"Success": "Erfolg",
-"Repair": "Reparieren",
-"Issue {0} of {1}": "Fehler {0} von {1}",
-"Images must be marked as decorative or have an alternative text description": "Bilder m\u00fcssen entweder als dekorativ markiert werden oder eine alternative Beschreibung bekommen",
-"Images must have an alternative text description. Decorative images are not allowed.": "Bilder ben\u00f6tigen alternativen Text. Dekorative Bilder nicht erlaubt!",
-"Or provide alternative text:": "Oder definiere alternativen Text:",
-"Make image decorative:": "Markiere Bild als dekorativ:",
-"ID attribute must be unique": "ID muss einzigartig sein",
-"Make ID unique": "Mache diese ID einzigartig",
-"Keep this ID and remove all others": "Behalte diese ID und entferne alle anderen",
-"Remove this ID": "Entferne diese ID",
-"Remove all IDs": "Entferne alle IDs",
-"Checklist": "Checkliste",
-"Anchor": "Textmarke",
-"Special character": "Sonderzeichen",
-"Code sample": "Codebeispiel",
-"Color": "Farbe",
-"Document properties": "Dokumenteigenschaften",
-"Image description": "Bildbeschreibung",
-"Image": "Bild",
-"Insert link": "Link einf\u00fcgen",
-"Target": "Ziel",
-"Link": "Link",
-"Poster": "Poster",
-"Media": "Medium",
-"Print": "Drucken",
-"Prev": "Zur\u00fcck",
-"Find and replace": "Suchen und ersetzen",
-"Whole words": "Nur ganze W\u00f6rter",
-"Insert template": "Vorlage einf\u00fcgen "
-});
diff --git a/build/media_source/vendor/tinymce/langs/el.es5.js b/build/media_source/vendor/tinymce/langs/el.es5.js
deleted file mode 100644
index 9e74da4d63730..0000000000000
--- a/build/media_source/vendor/tinymce/langs/el.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('el',{
-"Cut": "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae",
-"Header 2": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u039f \u03c0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03c4\u03ae\u03c2 \u03c3\u03b1\u03c2 \u03b4\u03b5\u03bd \u03c5\u03c0\u03bf\u03c3\u03c4\u03b7\u03c1\u03af\u03b6\u03b5\u03b9 \u03ac\u03bc\u03b5\u03c3\u03b7 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03c3\u03c4\u03bf \u03c0\u03c1\u03cc\u03c7\u03b5\u03b9\u03c1\u03bf. \u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03c3\u03c5\u03bd\u03c4\u03bf\u03bc\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2 \u03c0\u03bb\u03b7\u03ba\u03c4\u03c1\u03bf\u03bb\u03bf\u03b3\u03af\u03bf\u03c5 Ctrl+X\/C\/V.",
-"Div": "Div",
-"Paste": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7",
-"Close": "\u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf",
-"Font Family": "\u0393\u03c1\u03b1\u03bc\u03bc\u03b1\u03c4\u03bf\u03c3\u03b5\u03b9\u03c1\u03ac",
-"Pre": "Pre",
-"Align right": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03b4\u03b5\u03be\u03b9\u03ac",
-"New document": "\u039d\u03ad\u03bf \u03ad\u03b3\u03b3\u03c1\u03b1\u03c6\u03bf",
-"Blockquote": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae \u03c0\u03b1\u03c1\u03ac\u03b8\u03b5\u03c3\u03b7\u03c2",
-"Numbered list": "\u0391\u03c1\u03b9\u03b8\u03bc\u03b7\u03bc\u03ad\u03bd\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1",
-"Increase indent": "\u0391\u03cd\u03be\u03b7\u03c3\u03b7 \u03b5\u03c3\u03bf\u03c7\u03ae\u03c2",
-"Formats": "\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
-"Headers": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b5\u03c2",
-"Select all": "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03cc\u03bb\u03c9\u03bd",
-"Header 3": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 3",
-"Blocks": "\u03a4\u03bc\u03ae\u03bc\u03b1\u03c4\u03b1",
-"Undo": "\u0391\u03bd\u03b1\u03af\u03c1\u03b5\u03c3\u03b7",
-"Strikethrough": "\u0394\u03b9\u03b1\u03ba\u03c1\u03b9\u03c4\u03ae \u03b4\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae",
-"Bullet list": "\u039b\u03af\u03c3\u03c4\u03b1 \u03bc\u03b5 \u03ba\u03bf\u03c5\u03ba\u03ba\u03af\u03b4\u03b5\u03c2",
-"Header 1": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 1",
-"Superscript": "\u0395\u03ba\u03b8\u03ad\u03c4\u03b7\u03c2",
-"Clear formatting": "\u0391\u03c0\u03b1\u03bb\u03bf\u03b9\u03c6\u03ae \u03bc\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7\u03c2",
-"Font Sizes": "\u039c\u03ad\u03b3\u03b5\u03b8\u03bf\u03c2",
-"Subscript": "\u0394\u03b5\u03af\u03ba\u03c4\u03b7\u03c2",
-"Header 6": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 6",
-"Redo": "\u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7",
-"Paragraph": "\u03a0\u03b1\u03c1\u03ac\u03b3\u03c1\u03b1\u03c6\u03bf\u03c2",
-"Ok": "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9",
-"Bold": "\u0388\u03bd\u03c4\u03bf\u03bd\u03b7",
-"Code": "\u039a\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2",
-"Italic": "\u03a0\u03bb\u03ac\u03b3\u03b9\u03b1",
-"Align center": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03c3\u03c4\u03bf \u03ba\u03ad\u03bd\u03c4\u03c1\u03bf",
-"Header 5": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 5",
-"Decrease indent": "\u039c\u03b5\u03af\u03c9\u03c3\u03b7 \u03b5\u03c3\u03bf\u03c7\u03ae\u03c2",
-"Header 4": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0397 \u03b5\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b5\u03af\u03bd\u03b1\u03b9 \u03c4\u03ce\u03c1\u03b1 \u03c3\u03b5 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03b1\u03c0\u03bb\u03bf\u03cd \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5. \u03a4\u03b1 \u03c0\u03b5\u03c1\u03b9\u03b5\u03c7\u03cc\u03bc\u03b5\u03bd\u03b1 \u03bc\u03b9\u03b1\u03c2 \u03b5\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7\u03c2 \u03b8\u03b1 \u03b5\u03c0\u03b9\u03ba\u03bf\u03bb\u03bb\u03bf\u03cd\u03bd\u03c4\u03b1\u03b9 \u03c9\u03c2 \u03b1\u03c0\u03bb\u03cc \u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf \u03cc\u03c3\u03bf \u03b7 \u03bb\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03b1\u03c5\u03c4\u03ae \u03c0\u03b1\u03c1\u03b1\u03bc\u03ad\u03bd\u03b5\u03b9 \u03b5\u03bd\u03b5\u03c1\u03b3\u03ae.",
-"Underline": "\u03a5\u03c0\u03bf\u03b3\u03c1\u03ac\u03bc\u03bc\u03b9\u03c3\u03b7",
-"Cancel": "\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7",
-"Justify": "\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03c3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
-"Inline": "\u0395\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03b7",
-"Copy": "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
-"Align left": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
-"Visual aids": "O\u03c0\u03c4\u03b9\u03ba\u03ac \u03b2\u03bf\u03b7\u03b8\u03ae\u03bc\u03b1\u03c4\u03b1 ",
-"Lower Greek": "\u03a0\u03b5\u03b6\u03ac \u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac",
-"Square": "\u03a4\u03b5\u03c4\u03c1\u03ac\u03b3\u03c9\u03bd\u03bf",
-"Default": "\u03a0\u03c1\u03bf\u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf",
-"Lower Alpha": "\u03a0\u03b5\u03b6\u03ac \u03bb\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac",
-"Circle": "\u039a\u03cd\u03ba\u03bb\u03bf\u03c2",
-"Disc": "\u0394\u03af\u03c3\u03ba\u03bf\u03c2",
-"Upper Alpha": "\u039a\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03b1 \u03bb\u03b1\u03c4\u03b9\u03bd\u03b9\u03ba\u03ac",
-"Upper Roman": "\u039a\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03b1 \u03c1\u03c9\u03bc\u03b1\u03ca\u03ba\u03ac",
-"Lower Roman": "\u03a0\u03b5\u03b6\u03ac \u03c1\u03c9\u03bc\u03b1\u03ca\u03ba\u03ac",
-"Name": "\u038c\u03bd\u03bf\u03bc\u03b1",
-"Anchor": "\u0391\u03b3\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7",
-"You have unsaved changes are you sure you want to navigate away?": "\u0388\u03c7\u03b5\u03c4\u03b5 \u03bc\u03b7 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03bc\u03ad\u03bd\u03b5\u03c2 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2. \u0395\u03af\u03c3\u03c4\u03b5 \u03b2\u03ad\u03b2\u03b1\u03b9\u03bf\u03b9 \u03cc\u03c4\u03b9 \u03b8\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c6\u03cd\u03b3\u03b5\u03c4\u03b5 \u03b1\u03c0\u03cc \u03c4\u03b7\u03bd \u03c3\u03b5\u03bb\u03af\u03b4\u03b1;",
-"Restore last draft": "\u0395\u03c0\u03b1\u03bd\u03b1\u03c6\u03bf\u03c1\u03ac \u03c4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf\u03c5 \u03c3\u03c7\u03b5\u03b4\u03af\u03bf\u03c5",
-"Special character": "\u0395\u03b9\u03b4\u03b9\u03ba\u03cc\u03c2 \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03b1\u03c2",
-"Source code": "\u03a0\u03b7\u03b3\u03b1\u03af\u03bf\u03c2 \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2",
-"Right to left": "\u0391\u03c0\u03cc \u03b4\u03b5\u03be\u03b9\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
-"Left to right": "\u0391\u03c0\u03cc \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03b4\u03b5\u03be\u03b9\u03ac",
-"Emoticons": "\u03a6\u03b1\u03c4\u03c3\u03bf\u03cd\u03bb\u03b5\u03c2",
-"Robots": "\u03a1\u03bf\u03bc\u03c0\u03cc\u03c4",
-"Document properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b5\u03b3\u03b3\u03c1\u03ac\u03c6\u03bf\u03c5",
-"Title": "\u03a4\u03af\u03c4\u03bb\u03bf\u03c2",
-"Keywords": "\u039b\u03ad\u03be\u03b5\u03b9\u03c2 \u03ba\u03bb\u03b5\u03b9\u03b4\u03b9\u03ac",
-"Encoding": "\u039a\u03c9\u03b4\u03b9\u03ba\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7",
-"Description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae",
-"Author": "\u03a3\u03c5\u03bd\u03c4\u03ac\u03ba\u03c4\u03b7\u03c2",
-"Fullscreen": "\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03bf\u03b8\u03cc\u03bd\u03b7",
-"Horizontal line": "\u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae",
-"Horizontal space": "\u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03bf \u03b4\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1",
-"Insert\/edit image": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"General": "\u0393\u03b5\u03bd\u03b9\u03ba\u03ac",
-"Advanced": "\u0393\u03b9\u03b1 \u03a0\u03c1\u03bf\u03c7\u03c9\u03c1\u03b7\u03bc\u03ad\u03bd\u03bf\u03c5\u03c2",
-"Source": "\u03a0\u03b7\u03b3\u03ae",
-"Border": "\u03a0\u03bb\u03b1\u03af\u03c3\u03b9\u03bf",
-"Constrain proportions": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03b1\u03bd\u03b1\u03bb\u03bf\u03b3\u03b9\u03ce\u03bd",
-"Vertical space": "\u039a\u03ac\u03b8\u03b5\u03c4\u03bf \u03b4\u03b9\u03ac\u03c3\u03c4\u03b7\u03bc\u03b1",
-"Image description": "\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"Style": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7",
-"Dimensions": "\u0394\u03b9\u03b1\u03c3\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2",
-"Insert image": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2",
-"Insert date\/time": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b7\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1\u03c2\/\u03ce\u03c1\u03b1\u03c2",
-"Remove link": "\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
-"Url": "URL",
-"Text to display": "\u039a\u03b5\u03af\u03bc\u03b5\u03bd\u03bf \u03b3\u03b9\u03b1 \u03b5\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7",
-"Anchors": "\u0386\u03b3\u03ba\u03c5\u03c1\u03b5\u03c2",
-"Insert link": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
-"New window": "\u039d\u03ad\u03bf \u03c0\u03b1\u03c1\u03ac\u03b8\u03c5\u03c1\u03bf",
-"None": "\u039a\u03b1\u03bc\u03af\u03b1",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL \u03c0\u03bf\u03c5 \u03b5\u03b9\u03c3\u03ac\u03c7\u03b8\u03b7\u03ba\u03b5 \u03c0\u03b9\u03b8\u03b1\u03bd\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b5\u03be\u03c9\u03c4\u03b5\u03c1\u03b9\u03ba\u03cc\u03c2 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03c2. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03c0\u03c1\u03cc\u03b8\u03b7\u03bc\u03b1 http:\/\/;",
-"Target": "\u03a0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0397 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 URL \u03c0\u03bf\u03c5 \u03b5\u03b9\u03c3\u03ac\u03c7\u03b8\u03b7\u03ba\u03b5 \u03c0\u03b9\u03b8\u03b1\u03bd\u03ce\u03c2 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03b9\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7 email. \u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c0\u03c1\u03bf\u03c3\u03b8\u03ad\u03c3\u03b5\u03c4\u03b5 \u03c4\u03bf \u03b1\u03c0\u03b1\u03b9\u03c4\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03c0\u03c1\u03cc\u03b8\u03b7\u03bc\u03b1 mailto:;",
-"Insert\/edit link": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5",
-"Insert\/edit video": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae\/\u03b5\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03b2\u03af\u03bd\u03c4\u03b5\u03bf",
-"Poster": "\u0391\u03c6\u03af\u03c3\u03b1",
-"Alternative source": "\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u03c0\u03c1\u03bf\u03ad\u03bb\u03b5\u03c5\u03c3\u03b7",
-"Paste your embed code below:": "\u0395\u03b9\u03c3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c4\u03bf\u03bd \u03b5\u03bd\u03c3\u03c9\u03bc\u03b1\u03c4\u03c9\u03bc\u03ad\u03bd\u03bf \u03ba\u03ce\u03b4\u03b9\u03ba\u03b1 \u03c0\u03b1\u03c1\u03b1\u03ba\u03ac\u03c4\u03c9:",
-"Insert video": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b2\u03af\u03bd\u03c4\u03b5\u03bf",
-"Embed": "\u0395\u03bd\u03c3\u03c9\u03bc\u03ac\u03c4\u03c9\u03c3\u03b7",
-"Nonbreaking space": "\u039a\u03b5\u03bd\u03cc \u03c7\u03c9\u03c1\u03af\u03c2 \u03b4\u03b9\u03b1\u03ba\u03bf\u03c0\u03ae",
-"Page break": "\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2",
-"Paste as text": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03c9\u03c2 \u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03bf",
-"Preview": "\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7",
-"Print": "\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7",
-"Save": "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7",
-"Could not find the specified string.": "\u0394\u03b5\u03bd \u03ae\u03c4\u03b1\u03bd \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b5\u03cd\u03c1\u03b5\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf\u03c5 \u03b1\u03bb\u03c6\u03b1\u03c1\u03b9\u03b8\u03bc\u03b7\u03c4\u03b9\u03ba\u03bf\u03cd.",
-"Replace": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
-"Next": "\u0395\u03c0\u03cc\u03bc.",
-"Whole words": "\u039f\u03bb\u03cc\u03ba\u03bb\u03b7\u03c1\u03b5\u03c2 \u03bb\u03ad\u03be\u03b5\u03b9\u03c2",
-"Find and replace": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7 \u03ba\u03b1\u03b9 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7",
-"Replace with": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03bc\u03b5",
-"Find": "\u0395\u03cd\u03c1\u03b5\u03c3\u03b7",
-"Replace all": "\u0391\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7 \u03cc\u03bb\u03c9\u03bd",
-"Match case": "\u03a4\u03b1\u03af\u03c1\u03b9\u03b1\u03c3\u03bc\u03b1 \u03c0\u03b5\u03b6\u03ce\u03bd\/\u03ba\u03b5\u03c6\u03b1\u03bb\u03b1\u03af\u03c9\u03bd",
-"Prev": "\u03a0\u03c1\u03bf\u03b7\u03b3.",
-"Spellcheck": "\u039f\u03c1\u03b8\u03bf\u03b3\u03c1\u03b1\u03c6\u03b9\u03ba\u03cc\u03c2 \u03ad\u03bb\u03b5\u03b3\u03c7\u03bf\u03c2 ",
-"Finish": "\u03a4\u03ad\u03bb\u03bf\u03c2",
-"Ignore all": "\u03a0\u03b1\u03c1\u03ac\u03b2\u03bb\u03b5\u03c8\u03b7 \u03cc\u03bb\u03c9\u03bd",
-"Ignore": "\u03a0\u03b1\u03c1\u03ac\u03b2\u03bb\u03b5\u03c8\u03b7",
-"Insert row before": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03b5\u03c0\u03ac\u03bd\u03c9",
-"Rows": "\u0393\u03c1\u03b1\u03bc\u03bc\u03ad\u03c2",
-"Height": "\u038e\u03c8\u03bf\u03c2",
-"Paste row after": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03ba\u03ac\u03c4\u03c9",
-"Alignment": "\u03a3\u03c4\u03bf\u03af\u03c7\u03b9\u03c3\u03b7",
-"Column group": "\u039f\u03bc\u03ac\u03b4\u03b1 \u03c3\u03c4\u03b7\u03bb\u03ce\u03bd",
-"Row": "\u0393\u03c1\u03b1\u03bc\u03bc\u03ae",
-"Insert column before": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
-"Split cell": "\u0394\u03b9\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
-"Cell padding": "\u0391\u03bd\u03b1\u03c0\u03bb\u03ae\u03c1\u03c9\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
-"Cell spacing": "\u0391\u03c0\u03cc\u03c3\u03c4\u03b1\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
-"Row type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Insert table": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
-"Body": "\u03a3\u03ce\u03bc\u03b1",
-"Caption": "\u039b\u03b5\u03b6\u03ac\u03bd\u03c4\u03b1",
-"Footer": "\u03a5\u03c0\u03bf\u03c3\u03ad\u03bb\u03b9\u03b4\u03bf",
-"Delete row": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Paste row before": "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03b5\u03c0\u03ac\u03bd\u03c9",
-"Scope": "\u0388\u03ba\u03c4\u03b1\u03c3\u03b7",
-"Delete table": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
-"Header cell": "\u039a\u03b5\u03bb\u03af-\u03ba\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1",
-"Column": "\u03a3\u03c4\u03ae\u03bb\u03b7",
-"Cell": "\u039a\u03b5\u03bb\u03af",
-"Header": "\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1",
-"Cell type": "\u03a4\u03cd\u03c0\u03bf\u03c2 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
-"Copy row": "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Row properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Table properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03c0\u03af\u03bd\u03b1\u03ba\u03b1",
-"Row group": "\u039f\u03bc\u03ac\u03b4\u03b1 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ce\u03bd",
-"Right": "\u0394\u03b5\u03be\u03b9\u03ac",
-"Insert column after": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2 \u03b4\u03b5\u03be\u03b9\u03ac",
-"Cols": "\u03a3\u03c4\u03ae\u03bb\u03b5\u03c2",
-"Insert row after": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2 \u03ba\u03ac\u03c4\u03c9",
-"Width": "\u03a0\u03bb\u03ac\u03c4\u03bf\u03c2",
-"Cell properties": "\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u03ba\u03b5\u03bb\u03b9\u03bf\u03cd",
-"Left": "\u0391\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac",
-"Cut row": "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2",
-"Delete column": "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae \u03c3\u03c4\u03ae\u03bb\u03b7\u03c2",
-"Center": "\u039a\u03b5\u03bd\u03c4\u03c1\u03b1\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03b7",
-"Merge cells": "\u03a3\u03c5\u03b3\u03c7\u03ce\u03bd\u03b5\u03c5\u03c3\u03b7 \u03ba\u03b5\u03bb\u03b9\u03ce\u03bd",
-"Insert template": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03c0\u03c1\u03bf\u03c4\u03cd\u03c0\u03bf\u03c5 ",
-"Templates": "\u03a0\u03c1\u03cc\u03c4\u03c5\u03c0\u03b1",
-"Background color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03c6\u03cc\u03bd\u03c4\u03bf\u03c5",
-"Text color": "\u03a7\u03c1\u03ce\u03bc\u03b1 \u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5 ",
-"Show blocks": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c4\u03bc\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd",
-"Show invisible characters": "\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03ba\u03c1\u03c5\u03c6\u03ce\u03bd \u03c7\u03b1\u03c1\u03b1\u03ba\u03c4\u03ae\u03c1\u03c9\u03bd",
-"Words: {0}": "\u039b\u03ad\u03be\u03b5\u03b9\u03c2: {0}",
-"Insert": "\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae",
-"File": "\u0391\u03c1\u03c7\u03b5\u03af\u03bf",
-"Edit": "\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u03a0\u03b5\u03c1\u03b9\u03bf\u03c7\u03ae \u0395\u03bc\u03c0\u03bb\u03bf\u03c5\u03c4\u03b9\u03c3\u03bc\u03ad\u03bd\u03bf \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-F9 \u03b3\u03b9\u03b1 \u03c4\u03bf \u03bc\u03b5\u03bd\u03bf\u03cd. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-F10 \u03b3\u03b9\u03b1  \u03c4\u03b7 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd. \u03a0\u03b1\u03c4\u03ae\u03c3\u03c4\u03b5 ALT-0 \u03b3\u03b9\u03b1 \u03b2\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1",
-"Tools": "\u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03b1",
-"View": "\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae",
-"Table": "\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2",
-"Format": "\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/es.es5.js b/build/media_source/vendor/tinymce/langs/es.es5.js
deleted file mode 100644
index 64cc6ca7cdb5b..0000000000000
--- a/build/media_source/vendor/tinymce/langs/es.es5.js
+++ /dev/null
@@ -1,462 +0,0 @@
-tinymce.addI18n('es',{
-"Redo": "Rehacer",
-"Undo": "Deshacer",
-"Cut": "Cortar",
-"Copy": "Copiar",
-"Paste": "Pegar",
-"Select all": "Seleccionar todo",
-"New document": "Nuevo documento",
-"Ok": "Ok",
-"Cancel": "Cancelar",
-"Visual aids": "Ayudas visuales",
-"Bold": "Negrita",
-"Italic": "Cursiva",
-"Underline": "Subrayado",
-"Strikethrough": "Tachado",
-"Superscript": "Super\u00edndice",
-"Subscript": "Sub\u00edndice",
-"Clear formatting": "Limpiar formato",
-"Align left": "Alinear a la izquierda",
-"Align center": "Centrar",
-"Align right": "Alinear a la derecha",
-"Justify": "Justificar",
-"Bullet list": "Lista de vi\u00f1etas",
-"Numbered list": "Lista numerada",
-"Decrease indent": "Disminuir sangr\u00eda",
-"Increase indent": "Aumentar sangr\u00eda",
-"Close": "Cerrar",
-"Formats": "Formatos",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Su navegador no soporta el acceso directo al portapapeles. Por favor, use los comandos de teclado Ctrl+X\/C\/V",
-"Headers": "Encabezados",
-"Header 1": "Encabezado 1",
-"Header 2": "Encabezado 2",
-"Header 3": "Encabezado 3",
-"Header 4": "Encabezado 4",
-"Header 5": "Encabezado 5",
-"Header 6": "Encabezado 6",
-"Headings": "T\u00edtulos",
-"Heading 1": "T\u00edtulo 1",
-"Heading 2": "T\u00edtulo 2",
-"Heading 3": "T\u00edtulo 3",
-"Heading 4": "T\u00edtulo 4",
-"Heading 5": "T\u00edtulo 5",
-"Heading 6": "T\u00edtulo 6",
-"Preformatted": "Preformateado",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "C\u00f3digo",
-"Paragraph": "P\u00e1rrafo",
-"Blockquote": "Cita",
-"Inline": "En l\u00ednea",
-"Blocks": "Bloques",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Pegar ahora est\u00e1 en modo de texto sin formato. El contenido ahora se pegar\u00e1 como texto sin formato hasta que desactive esta opci\u00f3nn.",
-"Fonts": "Fonts",
-"Font Sizes": "Tama\u00f1os de fuente",
-"Class": "Clase",
-"Browse for an image": "Examinar imagen",
-"OR": "O",
-"Drop an image here": "Arrastrar imagen aqu\u00ed",
-"Upload": "Subir",
-"Block": "Bloque",
-"Align": "Alinear",
-"Default": "Predeterminado",
-"Circle": "C\u00edrculo",
-"Disc": "Disco",
-"Square": "Cuadrado",
-"Lower Alpha": "Alfa min\u00fascula",
-"Lower Greek": "Griega min\u00fascula",
-"Lower Roman": "Romana min\u00fascula",
-"Upper Alpha": "Alfa may\u00fascula",
-"Upper Roman": "Romana may\u00fascula",
-"Anchor...": "Ancla...",
-"Name": "Nombre",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "El ID debe comenzar con una letra, seguida solo de letras, n\u00fameros, guiones, puntos, dos puntos o guiones bajos.",
-"You have unsaved changes are you sure you want to navigate away?": "Tiene cambios sin guardar, \u00bfest\u00e1 seguro de que desea salir?",
-"Restore last draft": "Restaurar el \u00faltimo borrador",
-"Special character...": "Car\u00e1cter especial...",
-"Source code": "C\u00f3digo fuente",
-"Insert\/Edit code sample": "Insertar\/Editar c\u00f3ndigo de ejemplo",
-"Language": "Idioma",
-"Code sample...": "C\u00f3ndigo de ejemplo...",
-"Color Picker": "Selector de color",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "De derecha a izquierda",
-"Right to left": "De izquierda a derecha",
-"Emoticons": "Emoticonos",
-"Emoticons...": "Emoticonos...",
-"Metadata and Document Properties": "Metadatos y Propiedades del documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palabras clave",
-"Description": "Descripci\u00f3nn",
-"Robots": "Robots",
-"Author": "Author",
-"Encoding": "Codificaci\u00f3nn",
-"Fullscreen": "Pantalla completa",
-"Action": "Acci\u00f3nn",
-"Shortcut": "Atajo",
-"Help": "Ayuda",
-"Address": "Direcci\u00f3nn",
-"Focus to menubar": "Enfoque a la barra de men\u00fa",
-"Focus to toolbar": "Enfoque a la barra de herramientas",
-"Focus to element path": "Enfoque a la ruta del elemento",
-"Focus to contextual toolbar": "Enfoque a la barra de herramientas contextual",
-"Insert link (if link plugin activated)": "Insertar enlace (Si est\u00e1 activado el plugin de 'Enlaces')",
-"Save (if save plugin activated)": "Guardar (Si est\u00e1 activado el plugin de 'Guardar')",
-"Find (if searchreplace plugin activated)": "Buscar (Si est\u00e1 activado el plugin 'searchreplace')",
-"Plugins installed ({0}):": "Plugins instalados ({0}):",
-"Premium plugins:": "Plugins premium:",
-"Learn more...": "Saber m\u00e1s...",
-"You are using {0}": "Est\u00e1 usando {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Atajos pr\u00e1cticos",
-"Horizontal line": "L\u00ednea horizontal",
-"Insert\/edit image": "Insertar\/Editar imagen",
-"Alternative description": "Descripci\u00f3n alternativa",
-"Accessibility": "Accesibilidad",
-"Image is decorative": "La imagen es decorativa",
-"Source": "Origen",
-"Dimensions": "Dimensiones",
-"Constrain proportions": "Restringir las proporciones",
-"General": "General",
-"Advanced": "Advanzado",
-"Style": "Estilo",
-"Vertical space": "Espacio vertical",
-"Horizontal space": "Espacio horizontal",
-"Border": "Borde",
-"Insert image": "Insertar imagen",
-"Image...": "Imagen...",
-"Image list": "Lista de im\u00e1genes",
-"Rotate counterclockwise": "Rotar en sentido antihorario",
-"Rotate clockwise": "Rotar en sentido horario",
-"Flip vertically": "Voltear verticalmente",
-"Flip horizontally": "Voltear horizontalmente",
-"Edit image": "Editar imagen",
-"Image options": "Opciones de imagen",
-"Zoom in": "Ampliar",
-"Zoom out": "Disminuir",
-"Crop": "Recortar",
-"Resize": "Redimensionar",
-"Orientation": "Orientation",
-"Brightness": "Brillo",
-"Sharpen": "Agudizar",
-"Contrast": "Contraste",
-"Color levels": "Niveles de color",
-"Gamma": "Gama",
-"Invert": "Invertir",
-"Apply": "Aplicar",
-"Back": "Volver",
-"Insert date\/time": "Insertar fecha\/hora",
-"Date\/time": "Fecha\/Hora",
-"Insert\/edit link": "Insertar\/Editar enlace",
-"Text to display": "Texto a mostrar",
-"Url": "Url",
-"Open link in...": "Abrir el enlace en...",
-"Current window": "Misma ventana",
-"None": "Ninguna",
-"New window": "Nueva ventana",
-"Open link": "Abrir enlace",
-"Remove link": "Eliminar enlace",
-"Anchors": "Anclas",
-"Link...": "Enlace...",
-"Paste or type a link": "Pegue o escriba un enlace",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "La URL que ha introducido parece ser una direcci\u00f3nn de correo electr\u00f3nnico. \u00bfDesea a\u00f1adir el prefijo requerido 'para:'?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "La URL que ha introducido parece ser un enlace externo. \u00bfDesea agregar el prefijo requerido 'http:\/\/'?",
-"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "La URL que ha introducido parece ser un enlace externo. \u00bfDesea a\u00f1adir el prefijo requerido 'https:\/\/'?",
-"Link list": "Lista de enlaces",
-"Insert video": "Insertar v\u00eddeo",
-"Insert\/edit video": "Insertar\/Editar v\u00eddeo",
-"Insert\/edit media": "Insertar\/Editar multimedia",
-"Alternative source": "Fuente alternativa",
-"Alternative source URL": "Fuente alternativa de la URL",
-"Media poster (Image URL)": "Poster multimedia (Imagen URL)",
-"Paste your embed code below:": "Pegue su c\u00f3ndigo de inserci\u00f3nn a continuaci\u00f3nn:",
-"Embed": "Insertado",
-"Media...": "Multimedia...",
-"Nonbreaking space": "Espacio irrompible",
-"Page break": "Salto de p\u00e1gina",
-"Paste as text": "Pegue un texto",
-"Preview": "Vista previa",
-"Print...": "Imprimir...",
-"Save": "Guardar",
-"Find": "Buscar",
-"Replace with": "Reemplazar con",
-"Replace": "Reemplazar",
-"Replace all": "Reemplazar todo",
-"Previous": "Anterior",
-"Next": "Siguiente",
-"Find and Replace": "Buscar y Reemplazar",
-"Find and replace...": "Buscar y Reemplazar...",
-"Could not find the specified string.": "No se pudo encontrar el texto especificado.",
-"Match case": "Caso de coincidencia",
-"Find whole words only": "Buscar solo por palabras completas",
-"Find in selection": "Encontrar en la selecci\u00f3n",
-"Spellcheck": "Corrector ortogr\u00e1fico",
-"Spellcheck Language": "Idioma del corrector ortogr\u00e1fico",
-"No misspellings found.": "No se encontraron errores ortogr\u00e1ficos.",
-"Ignore": "Ignorar",
-"Ignore all": "Ignorar todo",
-"Finish": "Terminar",
-"Add to Dictionary": "A\u00f1adir al diccionario",
-"Insert table": "Insertar tabla",
-"Table properties": "Propiedades de la tabla",
-"Delete table": "Borrar tabla",
-"Cell": "Celda",
-"Row": "Fila",
-"Column": "Columna",
-"Cell properties": "Propiedades de la celda",
-"Merge cells": "Combinar celdas",
-"Split cell": "Separar celdas",
-"Insert row before": "Insertar fila antes",
-"Insert row after": "Insertar fila despu\u00e9s",
-"Delete row": "Borrar fila",
-"Row properties": "Propiedades de la fila",
-"Cut row": "Cortar fila",
-"Copy row": "Copiar fila",
-"Paste row before": "Pegar fila antes",
-"Paste row after": "Paste fila despu\u00e9s",
-"Insert column before": "Insertar columna antes",
-"Insert column after": "Insertar columna despu\u00e9s",
-"Delete column": "Borrar columna",
-"Cols": "Columnas",
-"Rows": "Filas",
-"Width": "Ancho",
-"Height": "Alto",
-"Cell spacing": "Espaciado de celdas",
-"Cell padding": "Relleno de celdas",
-"Caption": "T\u00edtulo",
-"Show caption": "Mostrar t\u00edtulo",
-"Left": "Izquierda",
-"Center": "Centro",
-"Right": "Derecha",
-"Cell type": "Tipo de celda",
-"Scope": "\u00c1mbito",
-"Alignment": "Alineaci\u00f3nn",
-"H Align": "Alineamineto H",
-"V Align": "Alineamiento V",
-"Top": "Superior",
-"Middle": "Mitad",
-"Bottom": "Inferior",
-"Header cell": "Encabezado de celda",
-"Row group": "Grupo de fila",
-"Column group": "Grupo de columna",
-"Row type": "Tipo de fila",
-"Header": "Encabezado",
-"Body": "Cuerpo",
-"Footer": "Pie",
-"Border color": "Color del borde",
-"Insert template...": "Insertar plantilla...",
-"Templates": "Plantillas",
-"Template": "Plantilla",
-"Text color": "Color del texto",
-"Background color": "Color del fondo",
-"Custom...": "Personalizado...",
-"Custom color": "Color personalizado",
-"No color": "Sin color",
-"Remove color": "Quitar color",
-"Table of Contents": "Tabla de contenidos",
-"Show blocks": "Mostrar bloques",
-"Show invisible characters": "Mostrar caracteres invisibles",
-"Word count": "Contar palabras",
-"Count": "Contar",
-"Document": "Documento",
-"Selection": "Selecci\u00f3nn",
-"Words": "Palabras",
-"Words: {0}": "Palabras: {0}",
-"{0} words": "{0} palabras",
-"File": "Archivo",
-"Edit": "Editar",
-"Insert": "Insertar",
-"View": "Vista",
-"Format": "Formato",
-"Table": "Tabla",
-"Tools": "Herramientas",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00e1rea de texto enriquecido. Presione ALT-F9 para el men\u00fa. Presione ALT-F10 para la barra de herramientas. Presione ALT-0 para obtener ayuda",
-"Image title": "T\u00edtulo de la imagen",
-"Border width": "Ancho del borde",
-"Border style": "Estilo del borde",
-"Error": "Error",
-"Warn": "Advertencia",
-"Valid": "V\u00e1lido",
-"To open the popup, press Shift+Enter": "Para abrir la ventana emergente, presione Shift + Enter",
-"Rich Text Area. Press ALT-0 for help.": "\u00e1rea de texto enriquecido. Presione ALT-0 para obtener ayuda.",
-"System Font": "Fuente del sistema",
-"Failed to upload image: {0}": "No se pudo subir la imagen: {0}",
-"Failed to load plugin: {0} from url {1}": "No se pudo cargar el plugin: {0} desde la URL {1}",
-"Failed to load plugin url: {0}": "No se pudo cargar la URL del plugin: {0}",
-"Failed to initialize plugin: {0}": "No se pudo inicializar el plugin: {0}",
-"example": "ejemplo",
-"Search": "Buscar",
-"All": "Todo",
-"Currency": "Moneda",
-"Text": "Texto",
-"Quotations": "Citas",
-"Mathematical": "Matem\u00e1tico",
-"Extended Latin": "Lat\u00edn extendido",
-"Symbols": "Simbolos",
-"Arrows": "Flechas",
-"User Defined": "Definido por el usuario",
-"dollar sign": "s\u00edmbolo de d\u00f3nlar",
-"currency sign": "s\u00edmbolo de moneda",
-"euro-currency sign": "s\u00edmbolo de moneda euro",
-"colon sign": "s\u00edmbolo de dos puntos",
-"cruzeiro sign": "s\u00edmbolo de cruzeiro",
-"french franc sign": "s\u00edmbolo del franco franc\u00e9s",
-"lira sign": "s\u00edmbolo de lira",
-"mill sign": "s\u00edmbolo de mill",
-"naira sign": "s\u00edmbolo de naira",
-"peseta sign": "s\u00edmbolo de peseta",
-"rupee sign": "s\u00edmbolo de rupia",
-"won sign": "s\u00edmbolo de won",
-"new sheqel sign": "s\u00edmbolo de nuevo sheqel",
-"dong sign": "s\u00edmbolo de dong",
-"kip sign": "s\u00edmbolo de kip",
-"tugrik sign": "s\u00edmbolo de tugrik",
-"drachma sign": "s\u00edmbolo de dragma",
-"german penny symbol": "s\u00edmbolo de un centavo alem\u00e1n",
-"peso sign": "s\u00edmbolo de peso",
-"guarani sign": "s\u00edmbolo de guarani",
-"austral sign": "s\u00edmbolo de austral",
-"hryvnia sign": "s\u00edmbolo de hryvnia",
-"cedi sign": "s\u00edmbolo de cedi",
-"livre tournois sign": "s\u00edmbolo de livre tournois",
-"spesmilo sign": "s\u00edmbolo de spesmilo",
-"tenge sign": "s\u00edmbolo de tenge",
-"indian rupee sign": "s\u00edmbolo de rupia india",
-"turkish lira sign": "s\u00edmbolo de lira turca",
-"nordic mark sign": "s\u00edmbolo de marco n\u00f3nrdico",
-"manat sign": "s\u00edmbolo de manat",
-"ruble sign": "s\u00edmbolo de rublo",
-"yen character": "caracter de yen",
-"yuan character": "caracter de yuan",
-"yuan character, in hong kong and taiwan": "caracter de yuan, en Hong Kong y Taiw\u00e1n",
-"yen\/yuan character variant one": "variante uno de caracter yen\/yuan",
-"Loading emoticons...": "Cargando emoticonos...",
-"Could not load emoticons": "No se pudieron cargar emoticonos",
-"People": "Gente",
-"Animals and Nature": "Animales y naturaleza",
-"Food and Drink": "Comida y bebida",
-"Activity": "Actividad",
-"Travel and Places": "Viajes y lugares",
-"Objects": "Objectos",
-"Flags": "Banderas",
-"Characters": "Characteres",
-"Characters (no spaces)": "Characteres (sin espacios)",
-"{0} characters": "{0} characteres",
-"Error: Form submit field collision.": "Error: Colisi\u00f3nn con env\u00edo de campo del formulario.",
-"Error: No form element found.": "Error: no se encontr\u00f3n ning\u00fan elemento de formulario.",
-"Update": "Actualizar",
-"Color swatch": "Muestra de color",
-"Turquoise": "Turquesa",
-"Green": "Verde",
-"Blue": "Azul",
-"Purple": "Violeta",
-"Navy Blue": "Azul marino",
-"Dark Turquoise": "Turquesa oscuro",
-"Dark Green": "Verde oscuro",
-"Medium Blue": "Azul intermedio",
-"Medium Purple": "Violeta intermedio",
-"Midnight Blue": "Azul intermedio",
-"Yellow": "Amarillo",
-"Orange": "Naranja",
-"Red": "Rojo",
-"Light Gray": "Gris claro",
-"Gray": "Gris",
-"Dark Yellow": "Amarillo oscuro",
-"Dark Orange": "Naranja oscuro",
-"Dark Red": "Rojo oscuro",
-"Medium Gray": "Gris intermedio",
-"Dark Gray": "Gris oscuro",
-"Light Green": "Verde claro",
-"Light Yellow": "Amarillo claro",
-"Light Red": "Rojo claro",
-"Light Purple": "Violeta claro",
-"Light Blue": "Azul claro",
-"Dark Purple": "Vileta oscuro",
-"Dark Blue": "Azul oscuro",
-"Black": "Negro",
-"White": "Blanco",
-"Switch to or from fullscreen mode": "Cambiar hacia o desde el modo de pantalla completa",
-"Open help dialog": "Abrir di\u00e1logo de ayuda",
-"history": "historia",
-"styles": "estilos",
-"formatting": "formateo",
-"alignment": "alineaci\u00f3nn",
-"indentation": "sangr\u00eda",
-"Font": "Fuente",
-"Size": "Tama\u00f1o",
-"More...": "M\u00e1s...",
-"Select...": "Seleccionar...",
-"Preferences": "Prefer\u00e9ncias",
-"Yes": "S\u00ed",
-"No": "No",
-"Keyboard Navigation": "Navegaci\u00f3nn por teclado",
-"Version": "Versi\u00f3nn",
-"Code view": "Vista de c\u00f3digo",
-"Open popup menu for split buttons": "Abrir men\u00fa emergente para botones divididos",
-"List Properties": "Propiedades de lista",
-"List properties...": "Propiedades de lista...",
-"Start list at number": "Iniciar lista en el n\u00famero",
-"Line height": "Altura de la l\u00ednea",
-"comments": "comment\u00e1rios",
-"Format Painter": "Pintura de formato",
-"Insert\/edit iframe": "Insertar\/editar 'iframe'",
-"Capitalization": "Capitalizaci\u00f3nn",
-"lowercase": "min\u00f1scula",
-"UPPERCASE": "MAY\u00daSCULA",
-"Title Case": "Capitalizaci\u00f3nn del t\u00edtulo",
-"permanent pen": "pluma permanente",
-"Permanent Pen Properties": "Propiedades permanentes de la pluma",
-"Permanent pen properties...": "Propiedades permanentes de la pluma...",
-"case change": "Cambiar may\u00fasculas y min\u00fasculas",
-"page embed": "p\u00e1gina incrustada",
-"Advanced sort...": "Orden avanzado...",
-"Advanced Sort": "Orden Avanzado",
-"Sort table by column ascending": "Ordenar tabla por columna ascendente",
-"Sort table by column descending": "Ordenar tabla por columna descendente",
-"Sort": "Ordenar",
-"Order": "Orden",
-"Sort by": "Ordenar por",
-"Ascending": "Ascendente",
-"Descending": "Descendente",
-"Column {0}": "Columna {0}",
-"Row {0}": "Fila {0}",
-"Spellcheck...": "Corrector...",
-"Misspelled word": "Palabra mal escrita",
-"Suggestions": "Sugerencias",
-"Change": "Cambiar",
-"Finding word suggestions": "Encontrar sugerencias de palabras",
-"Success": "\u00c9xito",
-"Repair": "Reparar",
-"Issue {0} of {1}": "Problema {0} de {1}",
-"Images must be marked as decorative or have an alternative text description": "Las im\u00e1genes deben estar marcadas como decorativas o tener una descripci\u00f3n de texto alternativo",
-"Images must have an alternative text description. Decorative images are not allowed.": "Las im\u00e1genes deben tener una descripci\u00f3n de texto alternativa. No se permiten im\u00e1genes decorativas.",
-"Or provide alternative text:": "O proporcione un texto alternativo:",
-"Make image decorative:": "Hacer la imagen decorativa:",
-"ID attribute must be unique": "El atributo del ID debe ser \u00fanico",
-"Make ID unique": "Hacer que el ID sea \u00fanico",
-"Keep this ID and remove all others": "Conserve este ID y elimine todos los dem\u00e1s",
-"Remove this ID": "Eliminar este ID",
-"Remove all IDs": "Eliminar todos los ID",
-"Checklist": "Lista de verificaci\u00f3n",
-"Anchor": "Ancla",
-"Special character": "Car\u00e1cter especial",
-"Code sample": "C\u00f3ndigo de ejemplo",
-"Color": "Color",
-"Document properties": "Propiedades del documento",
-"Image description": "Descripci\u00f3nn de la imagen",
-"Image": "Imagen",
-"Insert link": "Insertar enlace",
-"Target": "Destino",
-"Link": "Enlace",
-"Poster": "Poster",
-"Media": "Multimedia",
-"Print": "Imprimir",
-"Prev": "Previsualizar",
-"Find and replace": "Buscar y reemplazar",
-"Whole words": "Palabras completas",
-"Insert template": "Insertar plantilla"
-});
diff --git a/build/media_source/vendor/tinymce/langs/et.es5.js b/build/media_source/vendor/tinymce/langs/et.es5.js
deleted file mode 100644
index 752cc59f671fe..0000000000000
--- a/build/media_source/vendor/tinymce/langs/et.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('et',{
-"Cut": "L\u00f5ika",
-"Header 2": "Pealkiri 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Sinu veebilehitseja ei toeta otsest ligip\u00e4\u00e4su l\u00f5ikelauale. Palun kasuta selle asemel klaviatuuri kiirk\u00e4sklusi Ctrl+X\/C\/V.",
-"Div": "Sektsioon",
-"Paste": "Kleebi",
-"Close": "Sulge",
-"Font Family": "Kirjastiilid",
-"Pre": "Eelvormindatud",
-"Align right": "Joonda paremale",
-"New document": "Uus dokument",
-"Blockquote": "Plokktsitaat",
-"Numbered list": "J\u00e4rjestatud loend",
-"Increase indent": "Suurenda taanet",
-"Formats": "Vormingud",
-"Headers": "P\u00e4ised",
-"Select all": "Vali k\u00f5ik",
-"Header 3": "Pealkiri 3",
-"Blocks": "Plokid",
-"Undo": "V\u00f5ta tagasi",
-"Strikethrough": "L\u00e4bikriipsutatud",
-"Bullet list": "J\u00e4rjestamata loend",
-"Header 1": "Pealkiri 1",
-"Superscript": "\u00dclaindeks",
-"Clear formatting": "Puhasta vorming",
-"Font Sizes": "Kirja suurused",
-"Subscript": "Alaindeks",
-"Header 6": "Pealkiri 6",
-"Redo": "Tee uuesti",
-"Paragraph": "L\u00f5ik",
-"Ok": "Ok",
-"Bold": "Rasvane",
-"Code": "Kood",
-"Italic": "Kaldkiri",
-"Align center": "Joonda keskele",
-"Header 5": "Pealkiri 5",
-"Decrease indent": "V\u00e4henda taanet",
-"Header 4": "Pealkiri 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Asetamine on n\u00fc\u00fcd tekstire\u017eiimis. Sisu asetatakse n\u00fc\u00fcd lihttekstina, kuni sa l\u00fclitad selle valiku v\u00e4lja.",
-"Underline": "Allakriipsutatud",
-"Cancel": "Katkesta",
-"Justify": "Joonda r\u00f6\u00f6pselt",
-"Inline": "Reasisene",
-"Copy": "Kopeeri",
-"Align left": "Joonda vasakule",
-"Visual aids": "N\u00e4itevahendid",
-"Lower Greek": "Kreeka v\u00e4iket\u00e4hed (\u03b1, \u03b2, \u03b3)",
-"Square": "Ruut",
-"Default": "Vaikimisi",
-"Lower Alpha": "V\u00e4iket\u00e4hed (a, b, c)",
-"Circle": "Ring",
-"Disc": "Ketas",
-"Upper Alpha": "Suurt\u00e4hed (A, B, C)",
-"Upper Roman": "Rooma suurt\u00e4hed (I, II, III)",
-"Lower Roman": "Rooma v\u00e4iket\u00e4hed (i, ii, iii)",
-"Name": "Nimi",
-"Anchor": "Ankur",
-"You have unsaved changes are you sure you want to navigate away?": "Sul on salvestamata muudatusi. Oled Sa kindel, et soovid mujale navigeeruda?",
-"Restore last draft": "Taasta viimane mustand",
-"Special character": "Erim\u00e4rk",
-"Source code": "L\u00e4htekood",
-"Right to left": "Paremalt vasakule",
-"Left to right": "Vasakult paremale",
-"Emoticons": "Emotikonid",
-"Robots": "Robotid",
-"Document properties": "Dokumendi omadused",
-"Title": "Pealkiri",
-"Keywords": "M\u00e4rks\u00f5nad",
-"Encoding": "M\u00e4rgistik",
-"Description": "Kirjeldus",
-"Author": "Autor",
-"Fullscreen": "T\u00e4isekraan",
-"Horizontal line": "Horisontaaljoon",
-"Horizontal space": "Reavahe",
-"Insert\/edit image": "Lisa\/muuda pilt",
-"General": "\u00dcldine",
-"Advanced": "T\u00e4iendavad seaded",
-"Source": "Allikas",
-"Border": "\u00c4\u00e4ris",
-"Constrain proportions": "S\u00e4ilita kuvasuhe",
-"Vertical space": "P\u00fcstine vahe",
-"Image description": "Pildi kirjeldus",
-"Style": "Stiil",
-"Dimensions": "M\u00f5\u00f5tmed",
-"Insert image": "Lisa pilt",
-"Insert date\/time": "Lisa kuup\u00e4ev\/kellaaeg",
-"Remove link": "Eemalda link",
-"Url": "Viide (url)",
-"Text to display": "Kuvatav tekst",
-"Anchors": "Ankrud",
-"Insert link": "Lisa link",
-"New window": "Uus aken",
-"None": "Puudub",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "Sihtm\u00e4rk",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "Lisa\/muuda link",
-"Insert\/edit video": "Lisa\/muuda video",
-"Poster": "Lisaja",
-"Alternative source": "Teine allikas",
-"Paste your embed code below:": "Kleebi oma manustamiskood siia alla:",
-"Insert video": "Lisa video",
-"Embed": "Manusta",
-"Nonbreaking space": "T\u00fchim\u00e4rk (nbsp)",
-"Page break": "Lehevahetus",
-"Paste as text": "Aseta tekstina",
-"Preview": "Eelvaade",
-"Print": "Tr\u00fcki",
-"Save": "Salvesta",
-"Could not find the specified string.": "Ei suutnud leida etteantud s\u00f5net.",
-"Replace": "Asenda",
-"Next": "J\u00e4rg",
-"Whole words": "Terviks\u00f5nad",
-"Find and replace": "Otsi ja asenda",
-"Replace with": "Asendus",
-"Find": "Otsi",
-"Replace all": "Asenda k\u00f5ik",
-"Match case": "Erista suur- ja v\u00e4iket\u00e4hti",
-"Prev": "Eelm",
-"Spellcheck": "\u00d5igekirja kontroll",
-"Finish": "L\u00f5peta",
-"Ignore all": "Eira k\u00f5iki",
-"Ignore": "Eira",
-"Insert row before": "Lisa rida enne",
-"Rows": "Read",
-"Height": "K\u00f5rgus",
-"Paste row after": "Kleebi rida j\u00e4rele",
-"Alignment": "Joondus",
-"Column group": "Veergude r\u00fchm",
-"Row": "Rida",
-"Insert column before": "Lisa tulp enne",
-"Split cell": "T\u00fckelda lahter",
-"Cell padding": "Lahtri sisu ja tabeli \u00e4\u00e4rise vahe",
-"Cell spacing": "Lahtrivahe",
-"Row type": "Rea t\u00fc\u00fcp",
-"Insert table": "Lisa tabel",
-"Body": "P\u00f5hiosa",
-"Caption": "Alapealkiri",
-"Footer": "Jalus",
-"Delete row": "Kustuta rida",
-"Paste row before": "Kleebi rida enne",
-"Scope": "Ulatus",
-"Delete table": "Kustuta tabel",
-"Header cell": "P\u00e4islahter",
-"Column": "Tulp",
-"Cell": "Lahter",
-"Header": "P\u00e4is",
-"Cell type": "Lahtri t\u00fc\u00fcp",
-"Copy row": "Kopeeri rida",
-"Row properties": "Rea omadused",
-"Table properties": "Tabeli omadused",
-"Row group": "Ridade r\u00fchm",
-"Right": "Paremal",
-"Insert column after": "Lisa tulp j\u00e4rele",
-"Cols": "Veerud",
-"Insert row after": "Lisa rida j\u00e4rele",
-"Width": "Laius",
-"Cell properties": "Lahtri omadused",
-"Left": "Vasakul",
-"Cut row": "L\u00f5ika rida",
-"Delete column": "Kustuta tulp",
-"Center": "Keskel",
-"Merge cells": "\u00dchenda lahtrid",
-"Insert template": "Lisa mall",
-"Templates": "Mallid",
-"Background color": "Tausta v\u00e4rv",
-"Text color": "Teksti v\u00e4rv",
-"Show blocks": "N\u00e4ita plokke",
-"Show invisible characters": "N\u00e4ita peidetud m\u00e4rke",
-"Words: {0}": "S\u00f5nu: {0}",
-"Insert": "Sisesta",
-"File": "Fail",
-"Edit": "Muuda",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rikastatud teksti ala. Men\u00fc\u00fc jaoks vajuta ALT-F9. T\u00f6\u00f6riistariba jaoks vajuta ALT-F10. Abi saamiseks vajuta ALT-0.",
-"Tools": "T\u00f6\u00f6riistad",
-"View": "Vaade",
-"Table": "Tabel",
-"Format": "Vorming"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/eu.es5.js b/build/media_source/vendor/tinymce/langs/eu.es5.js
deleted file mode 100644
index ac1edd497b457..0000000000000
--- a/build/media_source/vendor/tinymce/langs/eu.es5.js
+++ /dev/null
@@ -1,219 +0,0 @@
-tinymce.addI18n('eu',{
-"Cut": "Ebaki",
-"Heading 5": "5 Izenburua",
-"Header 2": "2 Goiburua",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Zure nabigatzaileak ez du arbela zuzenean erabiltzeko euskarririk. Mesedez erabili CTRL+X\/C\/V teklatuko lasterbideak.",
-"Heading 4": "4 Izenburua",
-"Div": "Div",
-"Heading 2": "2 Izenburua",
-"Paste": "Itsatsi",
-"Close": "Itxi",
-"Font Family": "Letra-tipo familia",
-"Pre": "Pre",
-"Align right": "Lerrokatu eskuinean",
-"New document": "Dokumentu berria",
-"Blockquote": "Blockquote",
-"Numbered list": "Zerrenda  zenbakiduna",
-"Heading 1": "1 Izenburua",
-"Headings": "Izenburuak",
-"Increase indent": "Handitu koska",
-"Formats": "Formatuak",
-"Headers": "Goiburuak",
-"Select all": "Hautatu dena",
-"Header 3": "3 Goiburua",
-"Blocks": "Blokeak",
-"Undo": "Desegin",
-"Strikethrough": "Marratua",
-"Bullet list": "Bulet zerrenda",
-"Header 1": "1 Goiburua",
-"Superscript": "Goi-indizea",
-"Clear formatting": "Garbitu formatua",
-"Font Sizes": "Letra-tamainak",
-"Subscript": "Azpiindize",
-"Header 6": "6 Goiburua",
-"Redo": "Berregin",
-"Paragraph": "Paragrafoa",
-"Ok": "Ados",
-"Bold": "Lodia",
-"Code": "Kodea",
-"Italic": "Etzana",
-"Align center": "Lerrokatu erdian",
-"Header 5": "5 Goiburua",
-"Heading 6": "6 Izenburua",
-"Heading 3": "3 Izenburua",
-"Decrease indent": "Txikitu koska",
-"Header 4": "4 Goiburua",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Itsatsi testu arrunt moduan dago orain. Edukiak testu arruntak bezala itsatsiko dira aukera hau desaktibatu arte.",
-"Underline": "Azpimarratua",
-"Cancel": "Utzi",
-"Justify": "Justifikatuta",
-"Inline": "Lerroan",
-"Copy": "Kopiatu",
-"Align left": "Lerrokatu ezkerrean",
-"Visual aids": "Laguntza bisualak",
-"Lower Greek": "Greko minuskula",
-"Square": "Karratua",
-"Default": "Lehenetsia",
-"Lower Alpha": "Letra minuskula",
-"Circle": "Zirkulua",
-"Disc": "Diskoa",
-"Upper Alpha": "Letra maiuskula",
-"Upper Roman": "Erromatar maiuskula",
-"Lower Roman": "Erromatar minuskula",
-"Name": "Izena",
-"Anchor": "Esteka",
-"You have unsaved changes are you sure you want to navigate away?": "Gorde gabeko aldaketak dituzu, ziur zaude hemendik irten nahi duzula?",
-"Restore last draft": "Leheneratu azken zirriborroa",
-"Special character": "Karaktere berezia",
-"Source code": "Iturburu-kodea",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Kolorea",
-"Right to left": "Eskuinetik ezkerrera",
-"Left to right": "Ezkerretik eskuinera",
-"Emoticons": "Aurpegierak",
-"Robots": "Robotak",
-"Document properties": "Dokumentuaren propietateak",
-"Title": "Titulua",
-"Keywords": "Gako-hitzak",
-"Encoding": "Kodeketa",
-"Description": "Deskribapena",
-"Author": "Egilea",
-"Fullscreen": "Pantaila osoa",
-"Horizontal line": "Marra horizontala",
-"Horizontal space": "Tarte horizontala",
-"Insert\/edit image": "Txertatu\/editatu irudia",
-"General": "Orokorra",
-"Advanced": "Aurreratua",
-"Source": "Iturburua",
-"Border": "Ertza",
-"Constrain proportions": "Mugatu proportzioak",
-"Vertical space": "Tarte bertikala",
-"Image description": "Irudiaren deskribapena",
-"Style": "Estiloa",
-"Dimensions": "Neurriak",
-"Insert image": "Txertatu irudia",
-"Zoom in": "Handiagotu",
-"Contrast": "Kontrastea",
-"Back": "Atzera",
-"Gamma": "Gamma",
-"Flip horizontally": "Irauli horizontalki",
-"Resize": "Aldatu tamaina",
-"Sharpen": "Araztu",
-"Zoom out": "Txikiagotu",
-"Image options": "Irudiaren aukerak",
-"Apply": "Aplikatu",
-"Brightness": "Distira",
-"Rotate clockwise": "Biratu erlojuaren noranzkoan",
-"Rotate counterclockwise": "Biratu erlojuaren aurkako noranzkoan",
-"Edit image": "Editatu irudia",
-"Color levels": "Kolore-mailak",
-"Crop": "Moztu",
-"Orientation": "Orientazioa",
-"Flip vertically": "Irauli bertikalki",
-"Invert": "Alderantzikatu",
-"Insert date\/time": "Txertatu data\/ordua",
-"Remove link": "Kendu esteka",
-"Url": "Url",
-"Text to display": "Bistaratzeko testua",
-"Anchors": "Estekak",
-"Insert link": "Txertatu esteka",
-"New window": "Leiho berria",
-"None": "Bat ere ez",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Sartu duzun URL-ak kanpoko esteka dirudi. Nahi duzu dagokion http:\/\/ aurrizkia gehitzea?",
-"Target": "Helburua",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Sartu duzun URL-ak posta helbide elektronikoa dirudi. Nahi duzu dagokion mailto: aurrizkia gehitzea?",
-"Insert\/edit link": "Txertatu\/editatu esteka",
-"Insert\/edit video": "Txertatu\/editatu bideoa",
-"Poster": "Posterra",
-"Alternative source": "Ordezko iturburua",
-"Paste your embed code below:": "Itsatsi hemen zure kapsulatze-kodea:",
-"Insert video": "Txertatu bideoa",
-"Embed": "Kapsulatu",
-"Nonbreaking space": "Zuriune zatiezina",
-"Page break": "Orrialde-jauzia",
-"Paste as text": "Itsatsi testu gisa",
-"Preview": "Aurrebista",
-"Print": "Inprimatu",
-"Save": "Gorde",
-"Could not find the specified string.": "Ezin izan da zehaztutako katea aurkitu.",
-"Replace": "Ordeztu",
-"Next": "Hurrengoa",
-"Whole words": "hitz osoak",
-"Find and replace": "Bilatu eta ordeztu",
-"Replace with": "Ordeztu honekin",
-"Find": "Bilatu",
-"Replace all": "Ordeztu dena",
-"Match case": "Maiuskula\/minuskula",
-"Prev": "Aurrekoa",
-"Spellcheck": "Ortografia-egiaztapena",
-"Finish": "Amaitu",
-"Ignore all": "Ez ikusi egin dena",
-"Ignore": "Ez ikusi egin",
-"Add to Dictionary": "Gehitu hiztegian",
-"Insert row before": "Txertatu errenkada aurretik",
-"Rows": "Errenkadak",
-"Height": "Altuera",
-"Paste row after": "Itsatsi errenkada ondoren",
-"Alignment": "Lerrokatzea",
-"Border color": "Ertzaren kolorea",
-"Column group": "Zutabe taldea",
-"Row": "Errenkada",
-"Insert column before": "Txertatu zutabea aurretik",
-"Split cell": "Zatitu gelaxka",
-"Cell padding": "Gelaxka-betegarria",
-"Cell spacing": "Gelaxka-bitartea",
-"Row type": "Lerro mota",
-"Insert table": "Txertatu taula",
-"Body": "Gorputza",
-"Caption": "Epigrafea",
-"Footer": "Oina",
-"Delete row": "Ezabatu errenkada",
-"Paste row before": "Itsatsi errenkada aurretik",
-"Scope": "Esparrua",
-"Delete table": "Ezabatu taula",
-"H Align": "Lerrokatze horizontala",
-"Top": "Goian",
-"Header cell": "Goiburu-gelaxka",
-"Column": "Zutabea",
-"Row group": "Lerro taldea",
-"Cell": "Gelaxka",
-"Middle": "Erdian",
-"Cell type": "Gelaxka mota",
-"Copy row": "Kopiatu errenkada",
-"Row properties": "Errenkadaren propietateak",
-"Table properties": "Taularen propietateak",
-"Bottom": "Behean",
-"V Align": "Lerrokatze bertikala",
-"Header": "Goiburua",
-"Right": "Eskuina",
-"Insert column after": "Txertatu zutabea ondoren",
-"Cols": "Zutabeak",
-"Insert row after": "Txertatu errenkada ondoren",
-"Width": "Zabalera",
-"Cell properties": "Gelaxkaren propietateak",
-"Left": "Ezkerra",
-"Cut row": "Ebaki errenkada",
-"Delete column": "Ezabatu zutabea",
-"Center": "Erdia",
-"Merge cells": "Konbinatu gelaxkak",
-"Insert template": "Txertatu txantiloia",
-"Templates": "Txantiloiak",
-"Background color": "Atzeko planoaren kolorea",
-"Custom...": "Pertsonalizatua...",
-"Custom color": "Kolore pertsonalizatua",
-"No color": "Kolorerik gabe",
-"Text color": "Testuaren kolorea",
-"Show blocks": "Erakutsi blokeak",
-"Show invisible characters": "Erakutsi karaktere ikusezinak",
-"Words: {0}": "Hitzak: {0}",
-"Insert": "Txertatu",
-"File": "Fitxategia",
-"Edit": "Editatu",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Testu aberastuaren area. Sakatu ALT-F9 menurako. Sakatu ALT-F10 tresna-barrarako. Sakatu ALT-0 laguntzarako",
-"Tools": "Tresnak",
-"View": "Ikusi",
-"Table": "Taula",
-"Format": "Formatua"
-});
diff --git a/build/media_source/vendor/tinymce/langs/fa.es5.js b/build/media_source/vendor/tinymce/langs/fa.es5.js
deleted file mode 100644
index 385c0ab64f62c..0000000000000
--- a/build/media_source/vendor/tinymce/langs/fa.es5.js
+++ /dev/null
@@ -1,180 +0,0 @@
-tinymce.addI18n('fa',{
-"Cut": "\u0628\u0631\u062f\u0627\u0634\u062a\u0646",
-"Header 2": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0645\u0631\u0648\u0631\u06af\u0631 \u0634\u0645\u0627 \u0627\u0632 \u062f\u0633\u062a\u0631\u0633\u06cc \u0645\u0633\u062a\u0642\u06cc\u0645 \u0628\u0647 \u062d\u0627\u0641\u0638\u0647 \u06a9\u067e\u06cc \u067e\u0634\u062a\u06cc\u0628\u0627\u0646\u06cc \u0646\u0645\u06cc \u06a9\u0646\u062f. \u0644\u0637\u0641\u0627 \u0627\u0632 \u06a9\u0644\u06cc\u062f \u0647\u0627\u06cc Ctrl+X\/C\/V \u062f\u0631 \u06a9\u06cc\u0628\u0648\u0631\u062f \u0628\u0631\u0627\u06cc \u0627\u06cc\u0646 \u06a9\u0627\u0631 \u0627\u0633\u062a\u0641\u0627\u062f\u0647 \u06a9\u0646\u06cc\u062f.",
-"Div": "\u062a\u06af \u0628\u062e\u0634 - Div",
-"Paste": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646",
-"Close": "\u0628\u0633\u062a\u0646",
-"Font Family": "\u0641\u0648\u0646\u062a",
-"Pre": "\u062a\u06af \u062a\u0628\u062f\u06cc\u0644 \u0628\u0647 \u0645\u062a\u0646 \u0633\u0627\u062f\u0647 - Pre",
-"Align right": "\u0631\u0627\u0633\u062a \u0686\u06cc\u0646",
-"New document": "\u0633\u0646\u062f \u062c\u062f\u06cc\u062f",
-"Blockquote": "\u062a\u06af \u0646\u0642\u0644 \u0642\u0648\u0644 - Blockquote",
-"Numbered list": "\u0644\u06cc\u0633\u062a \u0634\u0645\u0627\u0631\u0647 \u0627\u06cc",
-"Increase indent": "\u0627\u0641\u0632\u0627\u06cc\u0634 \u062a\u0648 \u0631\u0641\u062a\u06af\u06cc",
-"Formats": "\u0642\u0627\u0644\u0628",
-"Headers": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647\u200c\u0647\u0627",
-"Select all": "\u0627\u0646\u062a\u062e\u0627\u0628 \u0647\u0645\u0647",
-"Header 3": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 3",
-"Blocks": "\u0628\u0644\u0648\u06a9",
-"Undo": "\t\n\u0628\u0627\u0637\u0644 \u06a9\u0631\u062f\u0646",
-"Strikethrough": "\u062e\u0637 \u062e\u0648\u0631\u062f\u0647",
-"Bullet list": "\u0644\u06cc\u0633\u062a \u062f\u0627\u06cc\u0631\u0647 \u0627\u06cc",
-"Header 1": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 1",
-"Superscript": "\u0628\u0627\u0644\u0627\u0646\u0648\u06cc\u0633 - \u062d\u0627\u0644\u062a \u062a\u0648\u0627\u0646",
-"Clear formatting": "\u067e\u0627\u06a9 \u06a9\u0631\u062f\u0646 \u0642\u0627\u0644\u0628 \u0628\u0646\u062f\u06cc",
-"Font Sizes": "\u0627\u0646\u062f\u0627\u0632\u0647 \u0641\u0648\u0646\u062a",
-"Subscript": "\u0632\u06cc\u0631 \u0646\u0648\u06cc\u0633 - \u062d\u0627\u0644\u062a \u0627\u0646\u062f\u06cc\u0633",
-"Header 6": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 6",
-"Redo": "\u0627\u0646\u062c\u0627\u0645 \u062f\u0648\u0628\u0627\u0631\u0647",
-"Paragraph": "\u062a\u06af \u067e\u0627\u0631\u0627\u06af\u0631\u0627\u0641 - Paragraph",
-"Ok": "\u0628\u0627\u0634\u0647",
-"Bold": "\u062f\u0631\u0634\u062a",
-"Code": "\u062a\u06af \u06a9\u062f - Code",
-"Italic": "\u062e\u0637 \u06a9\u062c",
-"Align center": "\u0648\u0633\u0637 \u0686\u06cc\u0646",
-"Header 5": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 5",
-"Decrease indent": "\u06a9\u0627\u0647\u0634 \u062a\u0648 \u0631\u0641\u062a\u06af\u06cc",
-"Header 4": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0647\u0645 \u0627\u06a9\u0646\u0648\u0646 \u062f\u0631 \u062d\u0627\u0644\u062a \u0645\u062a\u0646 \u0633\u0627\u062f\u0647 \u0627\u0633\u062a. \u062a\u0627 \u0632\u0645\u0627\u0646\u06cc \u06a9\u0647 \u0627\u06cc\u0646 \u062d\u0627\u0644\u062a \u0631\u0627 \u063a\u06cc\u0631\u200c\u0641\u0639\u0627\u0644 \u0646\u06a9\u0646\u06cc\u062f\u060c \u0645\u062d\u062a\u0648\u0627 \u062f\u0631 \u062d\u0627\u0644\u062a \u0645\u062a\u0646 \u0633\u0627\u062f\u0647 \u0627\u0636\u0627\u0641\u0647 \u0645\u06cc\u200c\u0634\u0648\u062f.",
-"Underline": "\u062e\u0637 \u0632\u06cc\u0631",
-"Cancel": "\u0644\u063a\u0648",
-"Justify": "\u0645\u0633\u0627\u0648\u06cc \u0627\u0632 \u0637\u0631\u0641\u06cc\u0646",
-"Inline": "\u062e\u0637\u06cc",
-"Copy": "\u06a9\u067e\u06cc",
-"Align left": "\u0686\u067e \u0686\u06cc\u0646",
-"Visual aids": "\u06a9\u0645\u06a9 \u0647\u0627\u06cc \u0628\u0635\u0631\u06cc",
-"Lower Greek": "\u06cc\u0648\u0646\u0627\u0646\u06cc \u06a9\u0648\u0686\u06a9",
-"Square": "\u0645\u0631\u0628\u0639",
-"Default": "\u067e\u06cc\u0634\u0641\u0631\u0636",
-"Lower Alpha": "\u0622\u0644\u0641\u0627\u0621 \u06a9\u0648\u0686\u06a9",
-"Circle": "\u062f\u0627\u06cc\u0631\u0647",
-"Disc": "\u062f\u06cc\u0633\u06a9",
-"Upper Alpha": "\u0622\u0644\u0641\u0627\u0621 \u0628\u0632\u0631\u06af",
-"Upper Roman": "\u0631\u0648\u0645\u06cc \u0628\u0632\u0631\u06af",
-"Lower Roman": "\u0631\u0648\u0645\u06cc \u06a9\u0648\u0686\u06a9",
-"Name": "\u0646\u0627\u0645",
-"Anchor": "\u0644\u0646\u06af\u0631 - \u0644\u06cc\u0646\u06a9",
-"You have unsaved changes are you sure you want to navigate away?": "\u0634\u0645\u0627 \u062a\u063a\u06cc\u06cc\u0631\u0627\u062a \u0630\u062e\u06cc\u0631\u0647 \u0646\u0634\u062f\u0647 \u0627\u06cc \u062f\u0627\u0631\u06cc\u062f\u060c \u0622\u06cc\u0627 \u0645\u0637\u0645\u0626\u0646\u06cc\u062f \u06a9\u0647 \u0645\u06cc\u062e\u0648\u0627\u0647\u06cc\u062f \u0627\u0632 \u0627\u06cc\u0646 \u0635\u0641\u062d\u0647 \u0628\u0631\u0648\u06cc\u062f\u061f",
-"Restore last draft": "\u0628\u0627\u0632\u06af\u0631\u062f\u0627\u0646\u062f\u0646 \u0622\u062e\u0631\u06cc\u0646 \u067e\u06cc\u0634 \u0646\u0648\u06cc\u0633",
-"Special character": "\u06a9\u0627\u0631\u0627\u06a9\u062a\u0631 \u0647\u0627\u06cc \u062e\u0627\u0635",
-"Source code": "\u06a9\u062f \u0645\u0646\u0628\u0639",
-"Right to left": "\u0631\u0627\u0633\u062a \u0628\u0647 \u0686\u067e",
-"Left to right": "\u0686\u067e \u0628\u0647 \u0631\u0627\u0633\u062a",
-"Emoticons": "\u0634\u06a9\u0644\u06a9\u200c\u0647\u0627",
-"Robots": "\u0631\u0628\u0627\u062a\u200c\u0647\u0627",
-"Document properties": "\u0648\u06cc\u0698\u06af\u06cc\u200c\u0647\u0627\u06cc \u0633\u0646\u062f",
-"Title": "\u0639\u0646\u0648\u0627\u0646",
-"Keywords": "\u06a9\u0644\u0645\u0627\u062a \u06a9\u0644\u06cc\u062f\u06cc",
-"Encoding": "\u06a9\u062f \u06af\u0630\u0627\u0631\u06cc",
-"Description": "\u062a\u0648\u0636\u06cc\u062d\u0627\u062a",
-"Author": "\u0646\u0648\u06cc\u0633\u0646\u062f\u0647",
-"Fullscreen": "\u062a\u0645\u0627\u0645 \u0635\u0641\u062d\u0647",
-"Horizontal line": "\u062e\u0637 \u0627\u0641\u0642\u06cc",
-"Horizontal space": "\u0641\u0636\u0627\u06cc \u0627\u0641\u0642\u06cc",
-"Insert\/edit image": "\u0627\u0636\u0627\u0641\u0647\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0631\u062f\u0646 \u062a\u0635\u0648\u06cc\u0631",
-"General": "\u0639\u0645\u0648\u0645\u06cc",
-"Advanced": "\u067e\u06cc\u0634\u0631\u0641\u062a\u0647",
-"Source": "\u0645\u0646\u0628\u0639",
-"Border": "\u062d\u0627\u0634\u06cc\u0647",
-"Constrain proportions": "\u062d\u0641\u0638 \u062a\u0646\u0627\u0633\u0628",
-"Vertical space": "\u0641\u0636\u0627\u06cc \u0639\u0645\u0648\u062f\u06cc",
-"Image description": "\u062a\u0648\u0636\u06cc\u062d\u0627\u062a \u0639\u06a9\u0633",
-"Style": "\u0633\u0628\u06a9",
-"Dimensions": "\u0627\u0628\u0639\u0627\u062f",
-"Insert image": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u062a\u0635\u0648\u06cc\u0631",
-"Insert date\/time": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u062a\u0627\u0631\u06cc\u062e\/\u0632\u0645\u0627\u0646",
-"Remove link": "\u062d\u0630\u0641 \u0644\u06cc\u0646\u06a9",
-"Url": "\u0627\u062f\u0631\u0633 \u0644\u06cc\u0646\u06a9",
-"Text to display": "\u0645\u062a\u0646 \u0628\u0631\u0627\u06cc \u0646\u0645\u0627\u06cc\u0634",
-"Anchors": "\u0644\u0646\u06af\u0631 - \u0644\u06cc\u0646\u06a9 \u062f\u0627\u062e\u0644 \u0635\u0641\u062d\u0647",
-"Insert link": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0644\u06cc\u0646\u06a9",
-"New window": "\u067e\u0646\u062c\u0631\u0647 \u062c\u062f\u06cc\u062f",
-"None": "\u0647\u06cc\u0686 \u06a9\u062f\u0627\u0645",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "\u0646\u062d\u0648\u0647 \u0628\u0627\u0632 \u0634\u062f\u0646 \u062f\u0631 \u0645\u0631\u0648\u0631\u06af\u0631",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "\u0627\u0636\u0627\u0641\u0647\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0631\u062f\u0646 \u0644\u06cc\u0646\u06a9",
-"Insert\/edit video": "\u0627\u0636\u0627\u0641\u0647\/\u0648\u06cc\u0631\u0627\u06cc\u0634 \u06a9\u0631\u062f\u0646 \u0641\u0627\u06cc\u0644 \u062a\u0635\u0648\u06cc\u0631\u06cc",
-"Poster": "\u067e\u0648\u0633\u062a\u0631",
-"Alternative source": "\u0645\u0646\u0628\u0639 \u062f\u06cc\u06af\u0631",
-"Paste your embed code below:": "\u06a9\u062f \u062e\u0648\u062f \u0631\u0627 \u0628\u0631\u0627\u06cc \u062c\u0627 \u062f\u0627\u062f\u0646 \u062f\u0631 \u0633\u0627\u06cc\u062a - embed - \u060c \u062f\u0631 \u0632\u06cc\u0631 \u0642\u0631\u0627\u0631 \u062f\u0647\u06cc\u062f:",
-"Insert video": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0641\u0627\u06cc\u0644 \u062a\u0635\u0648\u06cc\u0631\u06cc",
-"Embed": "\u062c\u0627 \u062f\u0627\u062f\u0646",
-"Nonbreaking space": "\u0641\u0636\u0627\u06cc \u063a\u06cc\u0631 \u0634\u06a9\u0633\u062a\u0646",
-"Page break": "\u0634\u06a9\u0633\u062a\u0646 \u0635\u0641\u062d\u0647",
-"Paste as text": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0628\u0647 \u0639\u0646\u0648\u0627\u0646 \u0645\u062a\u0646",
-"Preview": "\u067e\u06cc\u0634 \u0646\u0645\u0627\u06cc\u0634",
-"Print": "\u0686\u0627\u067e",
-"Save": "\u0630\u062e\u06cc\u0631\u0647",
-"Could not find the specified string.": "\u0631\u0634\u062a\u0647 \u0645\u062a\u0646\u06cc \u0645\u0648\u0631\u062f \u0646\u0638\u0631 \u067e\u06cc\u062f\u0627 \u0646\u0634\u062f.",
-"Replace": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646",
-"Next": "\u0628\u0639\u062f\u06cc",
-"Whole words": "\u0647\u0645\u0647 \u06a9\u0644\u0645\u0647\u200c\u0647\u0627",
-"Find and replace": "\u062c\u0633\u062a\u200c\u0648\u200c\u062c\u0648 \u0648 \u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646",
-"Replace with": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646 \u0628\u0627",
-"Find": "\u062c\u0633\u062a\u200c\u0648\u200c\u062c\u0648",
-"Replace all": "\u062c\u0627\u06cc\u06af\u0632\u06cc\u0646 \u06a9\u0631\u062f\u0646 \u0647\u0645\u0647",
-"Match case": "\u062d\u0633\u0627\u0633 \u0628\u0647 \u062d\u0631\u0648\u0641 \u06a9\u0648\u0686\u06a9 \u0648 \u0628\u0632\u0631\u06af",
-"Prev": "\u0642\u0628\u0644\u06cc",
-"Spellcheck": "\u0628\u0631\u0631\u0633\u06cc \u0627\u0645\u0644\u0627\u06cc\u06cc",
-"Finish": "\u067e\u0627\u06cc\u0627\u0646",
-"Ignore all": "\u0646\u0627\u062f\u06cc\u062f\u0647 \u06af\u0631\u0641\u062a\u0646 \u0647\u0645\u0647",
-"Ignore": "\u0646\u0627\u062f\u06cc\u062f\u0647 \u06af\u0631\u0641\u062a\u0646",
-"Insert row before": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0633\u0637\u0631 \u062c\u062f\u06cc\u062f \u0642\u0628\u0644 \u0627\u0632 \u0627\u06cc\u0646 \u0633\u0637\u0631",
-"Rows": "\u062a\u0639\u062f\u0627\u062f \u0633\u0637\u0631\u200c\u0647\u0627",
-"Height": "\u0627\u0631\u062a\u0641\u0627\u0639",
-"Paste row after": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0633\u0637\u0631\u060c \u0628\u0639\u062f \u0627\u0632 \u0627\u06cc\u0646 \u0633\u0637\u0631",
-"Alignment": "\u0631\u062f\u06cc\u0641 \u0628\u0646\u062f\u06cc \u0646\u0648\u0634\u062a\u0647",
-"Column group": "\u06af\u0631\u0648\u0647 \u0633\u062a\u0648\u0646",
-"Row": "\u0633\u0637\u0631",
-"Insert column before": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0633\u062a\u0648\u0646 \u062c\u062f\u06cc\u062f \u0642\u0628\u0644 \u0627\u0632 \u0627\u06cc\u0646 \u0633\u062a\u0648\u0646",
-"Split cell": "\u062a\u0642\u0633\u06cc\u0645 \u0633\u0644\u0648\u0644 \u062c\u062f\u0648\u0644",
-"Cell padding": "\u062d\u0627\u0634\u06cc\u0647 \u0633\u0644\u0648\u0644 \u0647\u0627",
-"Cell spacing": "\u0641\u0627\u0635\u0644\u0647\u200c\u06cc \u0628\u06cc\u0646 \u0633\u0644\u0648\u0644 \u0647\u0627",
-"Row type": "\u0646\u0648\u0639 \u0633\u0637\u0631",
-"Insert table": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u062c\u062f\u0648\u0644",
-"Body": "\u0628\u062f\u0646\u0647",
-"Caption": "\u0639\u0646\u0648\u0627\u0646",
-"Footer": "\u067e\u0627\u0646\u0648\u06cc\u0633",
-"Delete row": "\u062d\u0630\u0641 \u0633\u0637\u0631",
-"Paste row before": "\u0686\u0633\u0628\u0627\u0646\u062f\u0646 \u0633\u0637\u0631\u060c \u0642\u0628\u0644 \u0627\u0632 \u0627\u06cc\u0646 \u0633\u0637\u0631",
-"Scope": "\u0645\u062d\u062f\u0648\u062f\u0647\u200c\u06cc \u0639\u0646\u0648\u0627\u0646",
-"Delete table": "\u062d\u0630\u0641 \u062c\u062f\u0648\u0644",
-"Header cell": "\u0633\u0631\u0622\u06cc\u0646\u062f \u0633\u0644\u0648\u0644",
-"Column": "\u0633\u062a\u0648\u0646",
-"Cell": "\u0633\u0644\u0648\u0644",
-"Header": "\u0633\u0631\u0622\u06cc\u0646\u062f",
-"Cell type": "\u0646\u0648\u0639 \u0633\u0644\u0648\u0644",
-"Copy row": "\u06a9\u067e\u06cc \u0633\u0637\u0631",
-"Row properties": "\u0648\u06cc\u0698\u06af\u06cc\u200c\u0647\u0627\u06cc \u0633\u0637\u0631",
-"Table properties": "\u0648\u06cc\u0698\u06af\u06cc\u200c\u0647\u0627\u06cc \u062c\u062f\u0648\u0644",
-"Row group": "\u06af\u0631\u0648\u0647 \u0633\u0637\u0631",
-"Right": "\u0631\u0627\u0633\u062a",
-"Insert column after": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0633\u062a\u0648\u0646 \u062c\u062f\u06cc\u062f \u0628\u0639\u062f \u0627\u0632 \u0627\u06cc\u0646 \u0633\u062a\u0648\u0646",
-"Cols": "\u062a\u0639\u062f\u0627\u062f \u0633\u062a\u0648\u0646\u200c\u0647\u0627",
-"Insert row after": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0633\u0637\u0631 \u062c\u062f\u06cc\u062f \u0628\u0639\u062f \u0627\u0632 \u0627\u06cc\u0646 \u0633\u0637\u0631",
-"Width": "\u0639\u0631\u0636",
-"Cell properties": "\u0648\u06cc\u0698\u06af\u06cc\u200c\u0647\u0627\u06cc \u0633\u0644\u0648\u0644",
-"Left": "\u0686\u067e",
-"Cut row": "\u0628\u0631\u0634 \u0633\u0637\u0631",
-"Delete column": "\u062d\u0630\u0641 \u0633\u062a\u0648\u0646",
-"Center": "\u0648\u0633\u0637",
-"Merge cells": "\u0627\u062f\u063a\u0627\u0645 \u0633\u0644\u0648\u0644\u200c\u0647\u0627",
-"Insert template": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646 \u0627\u0644\u06af\u0648",
-"Templates": "\u0627\u0644\u06af\u0648\u200c\u0647\u0627",
-"Background color": "\u0631\u0646\u06af \u0632\u0645\u06cc\u0646\u0647 \u0645\u062a\u0646",
-"Text color": "\u0631\u0646\u06af \u0645\u062a\u0646",
-"Show blocks": "\u0646\u0645\u0627\u06cc\u0634 \u0628\u062e\u0634\u200c\u0647\u0627",
-"Show invisible characters": "\u0646\u0645\u0627\u06cc\u0634 \u06a9\u0627\u0631\u0627\u06a9\u062a\u0631\u0647\u0627\u06cc \u063a\u06cc\u0631 \u0642\u0627\u0628\u0644 \u0686\u0627\u067e",
-"Words: {0}": "\u06a9\u0644\u0645\u0627\u062a : {0}",
-"Insert": "\u0627\u0636\u0627\u0641\u0647 \u06a9\u0631\u062f\u0646",
-"File": "\u067e\u0631\u0648\u0646\u062f\u0647",
-"Edit": "\u0648\u06cc\u0631\u0627\u06cc\u0634",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0648\u06cc\u0631\u0627\u06cc\u0634\u06af\u0631 \u067e\u06cc\u0634\u0631\u0641\u062a\u0647\u200c\u06cc \u0645\u062a\u0646. \u0628\u0631\u0627\u06cc \u062f\u0633\u062a\u0631\u0633\u06cc \u0628\u0647 \u0645\u0646\u0648 \u06a9\u0644\u06cc\u062f\u0647\u0627\u06cc ALT-F9\u060c \u0646\u0648\u0627\u0631 \u0627\u0628\u0632\u0627\u0631 ALT-F10 \u0648 \u0628\u0631\u0627\u06cc \u0645\u0634\u0627\u0647\u062f\u0647\u200c\u06cc \u0631\u0627\u0647\u0646\u0645\u0627 ALT-0 \u0631\u0627 \u0641\u0634\u0627\u0631 \u062f\u0647\u06cc\u062f.",
-"Tools": "\u0627\u0628\u0632\u0627\u0631\u0647\u0627",
-"View": "\u0646\u0645\u0627\u06cc\u0634",
-"Table": "\u062c\u062f\u0648\u0644",
-"Format": "\u0642\u0627\u0644\u0628",
-"_dir": "rtl"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/fi.es5.js b/build/media_source/vendor/tinymce/langs/fi.es5.js
deleted file mode 100644
index ee74c58e58ba5..0000000000000
--- a/build/media_source/vendor/tinymce/langs/fi.es5.js
+++ /dev/null
@@ -1,197 +0,0 @@
-tinymce.addI18n('fi',{
-"Cut": "Leikkaa",
-"Heading 5": "Otsikko 5",
-"Header 2": "Otsikko 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Selaimesi ei tue leikekirjan suoraa k\u00e4ytt\u00e4mist\u00e4. Ole hyv\u00e4 ja k\u00e4yt\u00e4 n\u00e4pp\u00e4imist\u00f6n Ctrl+X ja Ctrl+V n\u00e4pp\u00e4inyhdistelmi\u00e4.",
-"Heading 4": "Otsikko 4",
-"Div": "Div",
-"Heading 2": "Otsikko 2",
-"Paste": "Liit\u00e4",
-"Close": "Sulje",
-"Font Family": "Fontti",
-"Pre": "Esimuotoiltu",
-"Align right": "Tasaa oikealle",
-"New document": "Uusi dokumentti",
-"Blockquote": "Lainauslohko",
-"Numbered list": "J\u00e4rjestetty lista",
-"Heading 1": "Otsikko 1",
-"Headings": "Otsikot",
-"Increase indent": "Loitonna",
-"Formats": "Muotoilut",
-"Headers": "Otsikot",
-"Select all": "Valitse kaikki",
-"Header 3": "Otsikko 3",
-"Blocks": "Lohkot",
-"Undo": "Peru",
-"Strikethrough": "Yliviivaus",
-"Bullet list": "J\u00e4rjest\u00e4m\u00e4t\u00f6n lista",
-"Header 1": "Otsikko 1",
-"Superscript": "Yl\u00e4indeksi",
-"Clear formatting": "Poista muotoilu",
-"Font Sizes": "Fonttikoko",
-"Subscript": "Alaindeksi",
-"Header 6": "Otsikko 6",
-"Redo": "Tee uudelleen",
-"Paragraph": "Kappale",
-"Ok": "Ok",
-"Bold": "Lihavointi",
-"Code": "Koodi",
-"Italic": "Kursivointi",
-"Align center": "Keskit\u00e4",
-"Header 5": "Otsikko 5",
-"Heading 6": "Otsikko 6",
-"Heading 3": "Otsikko 3",
-"Decrease indent": "Sisenn\u00e4",
-"Header 4": "Otsikko 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Liitt\u00e4minen on nyt pelk\u00e4n tekstin -tilassa. Sis\u00e4ll\u00f6t liitet\u00e4\u00e4n nyt pelkk\u00e4n\u00e4 tekstin\u00e4, kunnes otat vaihtoehdon pois k\u00e4yt\u00f6st\u00e4.",
-"Underline": "Alleviivaus",
-"Cancel": "Peruuta",
-"Justify": "Tasaa",
-"Inline": "Samalla rivill\u00e4",
-"Copy": "Kopioi",
-"Align left": "Tasaa vasemmalle",
-"Visual aids": "Visuaaliset neuvot",
-"Lower Greek": "pienet kirjaimet: \u03b1, \u03b2, \u03b3",
-"Square": "Neli\u00f6",
-"Default": "Oletus",
-"Lower Alpha": "pienet kirjaimet: a, b, c",
-"Circle": "Pallo",
-"Disc": "Ympyr\u00e4",
-"Upper Alpha": "isot kirjaimet: A, B, C",
-"Upper Roman": "isot kirjaimet: I, II, III",
-"Lower Roman": "pienet kirjaimet: i, ii, iii",
-"Name": "Nimi",
-"Anchor": "Ankkuri",
-"You have unsaved changes are you sure you want to navigate away?": "Sinulla on tallentamattomia muutoksia, haluatko varmasti siirty\u00e4 toiselle sivulle?",
-"Restore last draft": "Palauta aiempi luonnos",
-"Special character": "Erikoismerkki",
-"Source code": "L\u00e4hdekoodi",
-"Color": "V\u00e4ri",
-"Right to left": "Oikealta vasemmalle",
-"Left to right": "Vasemmalta oikealle",
-"Emoticons": "Hymi\u00f6t",
-"Robots": "Robotit",
-"Document properties": "Dokumentin ominaisuudet",
-"Title": "Otsikko",
-"Keywords": "Avainsanat",
-"Encoding": "Merkist\u00f6",
-"Description": "Kuvaus",
-"Author": "Tekij\u00e4",
-"Fullscreen": "Koko ruutu",
-"Horizontal line": "Vaakasuora viiva",
-"Horizontal space": "Horisontaalinen tila",
-"Insert\/edit image": "Lis\u00e4\u00e4\/muokkaa kuva",
-"General": "Yleiset",
-"Advanced": "Lis\u00e4asetukset",
-"Source": "L\u00e4hde",
-"Border": "Reunus",
-"Constrain proportions": "S\u00e4ilyt\u00e4 mittasuhteet",
-"Vertical space": "Vertikaalinen tila",
-"Image description": "Kuvaus",
-"Style": "Tyyli",
-"Dimensions": "Mittasuhteet",
-"Insert image": "Lis\u00e4\u00e4 kuva",
-"Insert date\/time": "Lis\u00e4\u00e4 p\u00e4iv\u00e4m\u00e4\u00e4r\u00e4 tai aika",
-"Remove link": "Poista linkki",
-"Url": "Osoite",
-"Text to display": "N\u00e4ytett\u00e4v\u00e4 teksti",
-"Anchors": "Ankkurit",
-"Insert link": "Lis\u00e4\u00e4 linkki",
-"New window": "Uusi ikkuna",
-"None": "Ei mit\u00e4\u00e4n",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Antamasi osoite n\u00e4ytt\u00e4\u00e4 olevan ulkoinen linkki. Haluatko lis\u00e4t\u00e4 osoitteeseen vaaditun http:\/\/ -etuliitteen?",
-"Target": "Kohde",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Antamasi osoite n\u00e4ytt\u00e4\u00e4 olevan s\u00e4hk\u00f6postiosoite. Haluatko lis\u00e4t\u00e4 osoitteeseen vaaditun mailto: -etuliitteen?",
-"Insert\/edit link": "Lis\u00e4\u00e4 tai muokkaa linkki",
-"Insert\/edit video": "Lis\u00e4\u00e4\/muokkaa video",
-"Poster": "L\u00e4hett\u00e4j\u00e4",
-"Alternative source": "Vaihtoehtoinen l\u00e4hde",
-"Paste your embed code below:": "Liit\u00e4 upotuskoodisi alapuolelle:",
-"Insert video": "Lis\u00e4\u00e4 video",
-"Embed": "Upota",
-"Nonbreaking space": "Sitova v\u00e4lily\u00f6nti",
-"Page break": "Sivunvaihto",
-"Paste as text": "Liit\u00e4 tekstin\u00e4",
-"Preview": "Esikatselu",
-"Print": "Tulosta",
-"Save": "Tallenna",
-"Could not find the specified string.": "Haettua merkkijonoa ei l\u00f6ytynyt.",
-"Replace": "Korvaa",
-"Next": "Seur.",
-"Whole words": "Koko sanat",
-"Find and replace": "Etsi ja korvaa",
-"Replace with": "Korvaa",
-"Find": "Etsi",
-"Replace all": "Korvaa kaikki",
-"Match case": "Erota isot ja pienet kirjaimet",
-"Prev": "Edel.",
-"Spellcheck": "Oikolue",
-"Finish": "Lopeta",
-"Ignore all": "\u00c4l\u00e4 huomioi mit\u00e4\u00e4n",
-"Ignore": "\u00c4l\u00e4 huomioi",
-"Add to Dictionary": "Lis\u00e4\u00e4 sanakirjaan",
-"Insert row before": "Lis\u00e4\u00e4 rivi ennen",
-"Rows": "Rivit",
-"Height": "Korkeus",
-"Paste row after": "Liit\u00e4 rivi j\u00e4lkeen",
-"Alignment": "Tasaus",
-"Border color": "Reunuksen v\u00e4ri",
-"Column group": "Sarakeryhm\u00e4",
-"Row": "Rivi",
-"Insert column before": "Lis\u00e4\u00e4 rivi ennen",
-"Split cell": "Jaa solu",
-"Cell padding": "Solun tyhj\u00e4 tila",
-"Cell spacing": "Solun v\u00e4li",
-"Row type": "Rivityyppi",
-"Insert table": "Lis\u00e4\u00e4 taulukko",
-"Body": "Runko",
-"Caption": "Seloste",
-"Footer": "Alaosa",
-"Delete row": "Poista rivi",
-"Paste row before": "Liit\u00e4 rivi ennen",
-"Scope": "Laajuus",
-"Delete table": "Poista taulukko",
-"H Align": "H tasaus",
-"Top": "Yl\u00e4reuna",
-"Header cell": "Otsikkosolu",
-"Column": "Sarake",
-"Row group": "Riviryhm\u00e4",
-"Cell": "Solu",
-"Middle": "Keskikohta",
-"Cell type": "Solun tyyppi",
-"Copy row": "Kopioi rivi",
-"Row properties": "Rivin ominaisuudet",
-"Table properties": "Taulukon ominaisuudet",
-"Bottom": "Alareuna",
-"V Align": "V tasaus",
-"Header": "Otsikko",
-"Right": "Oikea",
-"Insert column after": "Lis\u00e4\u00e4 rivi j\u00e4lkeen",
-"Cols": "Sarakkeet",
-"Insert row after": "Lis\u00e4\u00e4 rivi j\u00e4lkeen",
-"Width": "Leveys",
-"Cell properties": "Solun ominaisuudet",
-"Left": "Vasen",
-"Cut row": "Leikkaa rivi",
-"Delete column": "Poista sarake",
-"Center": "Keskell\u00e4",
-"Merge cells": "Yhdist\u00e4 solut",
-"Insert template": "Lis\u00e4\u00e4 pohja",
-"Templates": "Pohjat",
-"Background color": "Taustan v\u00e4ri",
-"Custom...": "Mukauta...",
-"Custom color": "Mukautettu v\u00e4ri",
-"No color": "Ei v\u00e4ri\u00e4",
-"Text color": "Tekstin v\u00e4ri",
-"Show blocks": "N\u00e4yt\u00e4 lohkot",
-"Show invisible characters": "N\u00e4yt\u00e4 n\u00e4kym\u00e4tt\u00f6m\u00e4t merkit",
-"Words: {0}": "Sanat: {0}",
-"Insert": "Lis\u00e4\u00e4",
-"File": "Tiedosto",
-"Edit": "Muokkaa",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rikastetun tekstin alue. Paina ALT-F9 valikkoon. Paina ALT-F10 ty\u00f6kaluriviin. Paina ALT-0 ohjeeseen.",
-"Tools": "Ty\u00f6kalut",
-"View": "N\u00e4yt\u00e4",
-"Table": "Taulukko",
-"Format": "Muotoilu"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/fo.es5.js b/build/media_source/vendor/tinymce/langs/fo.es5.js
deleted file mode 100644
index ad64ec815c1a4..0000000000000
--- a/build/media_source/vendor/tinymce/langs/fo.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('fo',{
-"Cut": "Klipp",
-"Header 2": "Header 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "T\u00edn kagi hevur ikki beinlei\u00f0is atgongd til setibor\u00f0i\u00f0. Vinarliga br\u00faka CTRL+X\/C\/V snarvegirnar \u00edsta\u00f0in.",
-"Div": "Div",
-"Paste": "L\u00edma",
-"Close": "Lat aftur",
-"Font Family": "Font Family",
-"Pre": "Pre",
-"Align right": "H\u00f8gra stilla",
-"New document": "N\u00fdtt skjal",
-"Blockquote": "Blockquote",
-"Numbered list": "Tal listi",
-"Increase indent": "vaks inndr\u00e1tt",
-"Formats": "Sni\u00f0",
-"Headers": "Headers",
-"Select all": "Vel alt",
-"Header 3": "Header 3",
-"Blocks": "Blocks",
-"Undo": "Angra ger",
-"Strikethrough": "Strika \u00edgj\u00f8gnum",
-"Bullet list": "Punkt listi",
-"Header 1": "Header 1",
-"Superscript": "H\u00e1skrift",
-"Clear formatting": "Strika sni\u00f0",
-"Font Sizes": "Font Sizes",
-"Subscript": "L\u00e1gskrift",
-"Header 6": "Header 6",
-"Redo": "Ger aftur",
-"Paragraph": "Paragraph",
-"Ok": "Ok",
-"Bold": "Feit",
-"Code": "Code",
-"Italic": "Sk\u00e1ktekstur",
-"Align center": "Mi\u00f0set",
-"Header 5": "Header 5",
-"Decrease indent": "Minka inndr\u00e1tt",
-"Header 4": "Header 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
-"Underline": "Undirstrika",
-"Cancel": "\u00d3gilda",
-"Justify": "L\u00edka breddar",
-"Inline": "Inline",
-"Copy": "Avrita",
-"Align left": "Vinstra stilla",
-"Visual aids": "Sj\u00f3nhj\u00e1lp",
-"Lower Greek": "L\u00edti Grikskt",
-"Square": "Fj\u00f3rhyrningur",
-"Default": "Forsettur",
-"Lower Alpha": "L\u00edti Alfa",
-"Circle": "Ringur",
-"Disc": "Skiva",
-"Upper Alpha": "St\u00f3rt Alfa",
-"Upper Roman": "St\u00f3rt R\u00f3mverskt",
-"Lower Roman": "L\u00edti R\u00f3mverskt",
-"Name": "Navn",
-"Anchor": "Akker",
-"You have unsaved changes are you sure you want to navigate away?": "T\u00fa hevur ikki goymdar broytingar. Ert t\u00fa v\u00edsur \u00ed at t\u00fa vilt halda fram?",
-"Restore last draft": "Endurskapa seinasta uppkast",
-"Special character": "Serst\u00f8k tekn",
-"Source code": "keldukoda",
-"Right to left": "H\u00f8gra til vinstra",
-"Left to right": "Vinstra til h\u00f8gra",
-"Emoticons": "Emotikonur",
-"Robots": "Robottar",
-"Document properties": "Skjal eginleikar",
-"Title": "Heiti",
-"Keywords": "Leitior\u00f0",
-"Encoding": "Koding",
-"Description": "L\u00fdsing",
-"Author": "H\u00f8vundur",
-"Fullscreen": "Fullan sk\u00edggja",
-"Horizontal line": "Vatnr\u00f8tt linja",
-"Horizontal space": "Vatnr\u00e6tt fr\u00e1st\u00f8\u00f0a",
-"Insert\/edit image": "Innset\/r\u00e6tta mynd",
-"General": "Vanligt",
-"Advanced": "Framkomi",
-"Source": "Kelda",
-"Border": "Rammi",
-"Constrain proportions": "Var\u00f0veit lutfall",
-"Vertical space": "Loddr\u00e6t fr\u00e1st\u00f8\u00f0a",
-"Image description": "L\u00fdsing av mynd",
-"Style": "St\u00edlur",
-"Dimensions": "St\u00f8dd",
-"Insert image": "Insert image",
-"Insert date\/time": "Innset dag\/t\u00ed\u00f0",
-"Remove link": "Remove link",
-"Url": "Url",
-"Text to display": "Tekstur at v\u00edsa",
-"Anchors": "Anchors",
-"Insert link": "Innset leinkju",
-"New window": "N\u00fdggjan glugga",
-"None": "Eingin",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "M\u00e1l",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "Innset\/r\u00e6tta leinkju",
-"Insert\/edit video": "Innset\/r\u00e6tta kykmynd",
-"Poster": "Uppslag",
-"Alternative source": "Onnur kelda",
-"Paste your embed code below:": "Innset ta\u00f0 kodu, sum skal leggjast inn \u00ed, ni\u00f0anfyri:",
-"Insert video": "Innset kykmynd",
-"Embed": "Legg inn \u00ed",
-"Nonbreaking space": "Hart millumr\u00fam",
-"Page break": "S\u00ed\u00f0uskift",
-"Paste as text": "Paste as text",
-"Preview": "V\u00eds frammanundan",
-"Print": "Prenta",
-"Save": "Goym",
-"Could not find the specified string.": "Kundi ikki finna leititekst",
-"Replace": "Set \u00edsta\u00f0in",
-"Next": "N\u00e6sta",
-"Whole words": "Heil or\u00f0",
-"Find and replace": "Finn og set \u00edsta\u00f0in",
-"Replace with": "Set \u00edsta\u00f0in",
-"Find": "Finn",
-"Replace all": "Set \u00edsta\u00f0in fyri \u00f8ll",
-"Match case": "ST\u00d3RIR og l\u00edtlir b\u00f3kstavir",
-"Prev": "Fyrra",
-"Spellcheck": "R\u00e6ttstavari",
-"Finish": "Enda",
-"Ignore all": "Leyp alt um",
-"Ignore": "Leyp um",
-"Insert row before": "Innset ra\u00f0 \u00e1\u00f0renn",
-"Rows": "R\u00f8\u00f0",
-"Height": "H\u00e6dd",
-"Paste row after": "L\u00edma ra\u00f0 aftan\u00e1",
-"Alignment": "Stilling",
-"Column group": "Teig b\u00f3lkur",
-"Row": "Ra\u00f0",
-"Insert column before": "Innset teig \u00e1\u00f0renn",
-"Split cell": "Syndra puntar",
-"Cell padding": "Punt fylling",
-"Cell spacing": "Punt fr\u00e1st\u00f8\u00f0a",
-"Row type": "Ra\u00f0 slag",
-"Insert table": "Innset talvu",
-"Body": "Likam",
-"Caption": "Tekstur",
-"Footer": "F\u00f3tur",
-"Delete row": "Skrika ra\u00f0",
-"Paste row before": "L\u00edma ra\u00f0 \u00e1\u00f0renn",
-"Scope": "N\u00fdtslu\u00f8ki",
-"Delete table": "Strika talvu",
-"Header cell": "H\u00f8vd puntur",
-"Column": "Teigur",
-"Cell": "Puntur",
-"Header": "H\u00f8vd",
-"Cell type": "Punt slag",
-"Copy row": "Avrita ra\u00f0",
-"Row properties": "Ra\u00f0 eginleikar",
-"Table properties": "Talvu eginleikar",
-"Row group": "Ra\u00f0 b\u00f3lkur",
-"Right": "H\u00f8gra",
-"Insert column after": "Innset teig aftan\u00e1",
-"Cols": "Teigar",
-"Insert row after": "Innset ra\u00f0 aftan\u00e1",
-"Width": "Breidd",
-"Cell properties": "Punt eginleikar",
-"Left": "Vinstra",
-"Cut row": "Klipp ra\u00f0",
-"Delete column": "Strika teig",
-"Center": "Mi\u00f0a",
-"Merge cells": "Fl\u00e6tta puntar",
-"Insert template": "Innset form",
-"Templates": "Formur",
-"Background color": "Bakgrundslitur",
-"Text color": "Tekst litur",
-"Show blocks": "V\u00eds blokkar",
-"Show invisible characters": "V\u00eds \u00f3sj\u00f3nlig tekn",
-"Words: {0}": "Or\u00f0: {0}",
-"Insert": "Innset",
-"File": "F\u00edla",
-"Edit": "Ritstj\u00f3rna",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "R\u00edkt Tekst \u00d8ki. Tr\u00fdst ALT-F9 fyri valmynd. Tr\u00fdst ALT-F10 fyri ambo\u00f0slinju. Tr\u00fdst ALT-0 fyri hj\u00e1lp",
-"Tools": "Ambo\u00f0",
-"View": "V\u00eds",
-"Table": "Talva",
-"Format": "Smi\u00f0"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/fr.es5.js b/build/media_source/vendor/tinymce/langs/fr.es5.js
deleted file mode 100644
index e2733d6761fdf..0000000000000
--- a/build/media_source/vendor/tinymce/langs/fr.es5.js
+++ /dev/null
@@ -1,462 +0,0 @@
-tinymce.addI18n('fr',{
-"Redo": "R\u00e9tablir",
-"Undo": "Annuler",
-"Cut": "Couper",
-"Copy": "Copier",
-"Paste": "Coller",
-"Select all": "S\u00e9lectionner tout",
-"New document": "Nouveau document",
-"Ok": "OK",
-"Cancel": "Annuler",
-"Visual aids": "Aides visuelles",
-"Bold": "Gras",
-"Italic": "Italique",
-"Underline": "Soulign\u00e9",
-"Strikethrough": "Barr\u00e9",
-"Superscript": "Exposant",
-"Subscript": "Indice",
-"Clear formatting": "Effacer la mise en forme",
-"Align left": "Aligner \u00e0 gauche",
-"Align center": "Centrer",
-"Align right": "Aligner \u00e0 droite",
-"Justify": "Justifier",
-"Bullet list": "Liste \u00e0 puces",
-"Numbered list": "Liste num\u00e9rot\u00e9e",
-"Decrease indent": "R\u00e9duire le retrait",
-"Increase indent": "Augmenter le retrait",
-"Close": "Fermer",
-"Formats": "Formats",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Votre navigateur ne supporte pas l\u2019acc\u00e8s direct au presse-papiers. Merci d'utiliser les raccourcis clavier Ctrl+X\/C\/V.",
-"Headers": "En-t\u00eates",
-"Header 1": "En-t\u00eate 1",
-"Header 2": "En-t\u00eate 2",
-"Header 3": "En-t\u00eate 3",
-"Header 4": "En-t\u00eate 4",
-"Header 5": "En-t\u00eate 5",
-"Header 6": "En-t\u00eate 6",
-"Headings": "Titres",
-"Heading 1": "Titre\u00a01",
-"Heading 2": "Titre\u00a02",
-"Heading 3": "Titre\u00a03",
-"Heading 4": "Titre\u00a04",
-"Heading 5": "Titre\u00a05",
-"Heading 6": "Titre\u00a06",
-"Preformatted": "Pr\u00e9format\u00e9",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Code",
-"Paragraph": "Paragraphe",
-"Blockquote": "Blockquote",
-"Inline": "En ligne",
-"Blocks": "Blocs",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Le presse-papiers est maintenant en mode \"texte plein\". Les contenus seront coll\u00e9s sans retenir les formatages jusqu'\u00e0 ce que vous d\u00e9sactiviez cette option.",
-"Fonts": "Polices",
-"Font Sizes": "Tailles de police",
-"Class": "Classe",
-"Browse for an image": "Rechercher une image",
-"OR": "OU",
-"Drop an image here": "D\u00e9poser une image ici",
-"Upload": "T\u00e9l\u00e9charger",
-"Block": "Bloc",
-"Align": "Aligner",
-"Default": "Par d\u00e9faut",
-"Circle": "Cercle",
-"Disc": "Disque",
-"Square": "Carr\u00e9",
-"Lower Alpha": "Alpha minuscule",
-"Lower Greek": "Grec minuscule",
-"Lower Roman": "Romain minuscule",
-"Upper Alpha": "Alpha majuscule",
-"Upper Roman": "Romain majuscule",
-"Anchor...": "Ancre...",
-"Name": "Nom",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "L'Id doit commencer par une lettre suivi par des lettres, nombres, tirets, points, deux-points ou underscores",
-"You have unsaved changes are you sure you want to navigate away?": "Vous avez des modifications non enregistr\u00e9es, \u00eates-vous s\u00fbr de quitter la page?",
-"Restore last draft": "Restaurer le dernier brouillon",
-"Special character...": "Caract\u00e8re sp\u00e9cial...",
-"Source code": "Code source",
-"Insert\/Edit code sample": "Ins\u00e9rer \/ modifier une exemple de code",
-"Language": "Langue",
-"Code sample...": "Exemple de code...",
-"Color Picker": "S\u00e9lecteur de couleurs",
-"R": "R",
-"G": "V",
-"B": "B",
-"Left to right": "Gauche \u00e0 droite",
-"Right to left": "Droite \u00e0 gauche",
-"Emoticons": "Emotic\u00f4nes",
-"Emoticons...": "\u00c9motic\u00f4nes...",
-"Metadata and Document Properties": "M\u00e9tadonn\u00e9es et propri\u00e9t\u00e9s du document",
-"Title": "Titre",
-"Keywords": "Mots-cl\u00e9s",
-"Description": "Description",
-"Robots": "Robots",
-"Author": "Auteur",
-"Encoding": "Encodage",
-"Fullscreen": "Plein \u00e9cran",
-"Action": "Action",
-"Shortcut": "Raccourci",
-"Help": "Aide",
-"Address": "Adresse",
-"Focus to menubar": "Cibler la barre de menu",
-"Focus to toolbar": "Cibler la barre d'outils",
-"Focus to element path": "Cibler le chemin vers l'\u00e9l\u00e9ment",
-"Focus to contextual toolbar": "Cibler la barre d'outils contextuelle",
-"Insert link (if link plugin activated)": "Ins\u00e9rer un lien (si le module link est activ\u00e9)",
-"Save (if save plugin activated)": "Enregistrer (si le module save est activ\u00e9)",
-"Find (if searchreplace plugin activated)": "Rechercher (si le module searchreplace est activ\u00e9)",
-"Plugins installed ({0}):": "Modules install\u00e9s ({0}) : ",
-"Premium plugins:": "Modules premium :",
-"Learn more...": "En savoir plus...",
-"You are using {0}": "Vous utilisez {0}",
-"Plugins": "Plugins",
-"Handy Shortcuts": "Raccourcis utiles",
-"Horizontal line": "Ligne horizontale",
-"Insert\/edit image": "Ins\u00e9rer\/modifier une image",
-"Alternative description": "Description alternative",
-"Accessibility": "Accessibilit\u00e9",
-"Image is decorative": "L'image est d\u00e9corative",
-"Source": "Source",
-"Dimensions": "Dimensions",
-"Constrain proportions": "Conserver les proportions",
-"General": "G\u00e9n\u00e9ral",
-"Advanced": "Avanc\u00e9",
-"Style": "Style",
-"Vertical space": "Espacement vertical",
-"Horizontal space": "Espacement horizontal",
-"Border": "Bordure",
-"Insert image": "Ins\u00e9rer une image",
-"Image...": "Image...",
-"Image list": "Liste d'images",
-"Rotate counterclockwise": "Rotation anti-horaire",
-"Rotate clockwise": "Rotation horaire",
-"Flip vertically": "Retournement vertical",
-"Flip horizontally": "Retournement horizontal",
-"Edit image": "Modifier l'image",
-"Image options": "Options de l'image",
-"Zoom in": "Zoomer",
-"Zoom out": "D\u00e9zoomer",
-"Crop": "Rogner",
-"Resize": "Redimensionner",
-"Orientation": "Orientation",
-"Brightness": "Luminosit\u00e9",
-"Sharpen": "Affiner",
-"Contrast": "Contraste",
-"Color levels": "Niveaux de couleur",
-"Gamma": "Gamma",
-"Invert": "Inverser",
-"Apply": "Appliquer",
-"Back": "Retour",
-"Insert date\/time": "Ins\u00e9rer date\/heure",
-"Date\/time": "Date\/heure",
-"Insert\/edit link": "Ins\u00e9rer\/modifier un lien",
-"Text to display": "Texte \u00e0 afficher",
-"Url": "Url",
-"Open link in...": "Ouvrir le lien dans...",
-"Current window": "Fen\u00eatre active",
-"None": "n\/a",
-"New window": "Nouvelle fen\u00eatre",
-"Open link": "Ouvrir le lien",
-"Remove link": "Enlever le lien",
-"Anchors": "Ancres",
-"Link...": "Lien...",
-"Paste or type a link": "Coller ou taper un lien",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre une adresse e-mail. Voulez-vous ajouter le pr\u00e9fixe mailto: n\u00e9cessaire?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe http:\/\/ n\u00e9cessaire?",
-"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "L'URL que vous avez saisie semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe https:\/\/ requis\u00a0?",
-"Link list": "Liste de liens",
-"Insert video": "Ins\u00e9rer une vid\u00e9o",
-"Insert\/edit video": "Ins\u00e9rer\/modifier une vid\u00e9o",
-"Insert\/edit media": "Ins\u00e9rer\/modifier un m\u00e9dia",
-"Alternative source": "Source alternative",
-"Alternative source URL": "URL de la source alternative",
-"Media poster (Image URL)": "Affiche de m\u00e9dia (URL de l'image)",
-"Paste your embed code below:": "Collez votre code d'int\u00e9gration ci-dessous :",
-"Embed": "Int\u00e9grer",
-"Media...": "M\u00e9dia...",
-"Nonbreaking space": "Espace ins\u00e9cable",
-"Page break": "Saut de page",
-"Paste as text": "Coller comme texte",
-"Preview": "Pr\u00e9visualiser",
-"Print...": "Imprimer...",
-"Save": "Enregistrer",
-"Find": "Chercher",
-"Replace with": "Remplacer par",
-"Replace": "Remplacer",
-"Replace all": "Tout remplacer",
-"Previous": "Pr\u00e9c\u00e9dente",
-"Next": "Suiv",
-"Find and Replace": "Trouver et remplacer",
-"Find and replace...": "Trouver et remplacer...",
-"Could not find the specified string.": "Impossible de trouver la cha\u00eene sp\u00e9cifi\u00e9e.",
-"Match case": "Respecter la casse",
-"Find whole words only": "Mot entier",
-"Find in selection": "Trouver dans la s\u00e9lection",
-"Spellcheck": "V\u00e9rification orthographique",
-"Spellcheck Language": "Langue du correcteur orthographique",
-"No misspellings found.": "Aucune faute d'orthographe trouv\u00e9e.",
-"Ignore": "Ignorer",
-"Ignore all": "Tout ignorer",
-"Finish": "Finie",
-"Add to Dictionary": "Ajouter au dictionnaire",
-"Insert table": "Ins\u00e9rer un tableau",
-"Table properties": "Propri\u00e9t\u00e9s du tableau",
-"Delete table": "Supprimer le tableau",
-"Cell": "Cellule",
-"Row": "Ligne",
-"Column": "Colonne",
-"Cell properties": "Propri\u00e9t\u00e9s de la cellule",
-"Merge cells": "Fusionner les cellules",
-"Split cell": "Diviser la cellule",
-"Insert row before": "Ins\u00e9rer une ligne avant",
-"Insert row after": "Ins\u00e9rer une ligne apr\u00e8s",
-"Delete row": "Effacer la ligne",
-"Row properties": "Propri\u00e9t\u00e9s de la ligne",
-"Cut row": "Couper la ligne",
-"Copy row": "Copier la ligne",
-"Paste row before": "Coller la ligne avant",
-"Paste row after": "Coller la ligne apr\u00e8s",
-"Insert column before": "Ins\u00e9rer une colonne avant",
-"Insert column after": "Ins\u00e9rer une colonne apr\u00e8s",
-"Delete column": "Effacer la colonne",
-"Cols": "Colonnes",
-"Rows": "Lignes",
-"Width": "Largeur",
-"Height": "Hauteur",
-"Cell spacing": "Espacement inter-cellulles",
-"Cell padding": "Espacement interne cellule",
-"Caption": "Titre",
-"Show caption": "Afficher le sous-titrage",
-"Left": "Gauche",
-"Center": "Centr\u00e9",
-"Right": "Droite",
-"Cell type": "Type de cellule",
-"Scope": "Etendue",
-"Alignment": "Alignement",
-"H Align": "Alignement H",
-"V Align": "Alignement V",
-"Top": "Haut",
-"Middle": "Milieu",
-"Bottom": "Bas",
-"Header cell": "Cellule d'en-t\u00eate",
-"Row group": "Groupe de lignes",
-"Column group": "Groupe de colonnes",
-"Row type": "Type de ligne",
-"Header": "En-t\u00eate",
-"Body": "Corps",
-"Footer": "Pied",
-"Border color": "Couleur de la bordure",
-"Insert template...": "Ins\u00e9rer un mod\u00e8le...",
-"Templates": "Th\u00e8mes",
-"Template": "Mod\u00e8le",
-"Text color": "Couleur du texte",
-"Background color": "Couleur d'arri\u00e8re-plan",
-"Custom...": "Personnalis\u00e9...",
-"Custom color": "Couleur personnalis\u00e9e",
-"No color": "Aucune couleur",
-"Remove color": "Supprimer la couleur",
-"Table of Contents": "Table des mati\u00e8res",
-"Show blocks": "Afficher les blocs",
-"Show invisible characters": "Afficher les caract\u00e8res invisibles",
-"Word count": "Nombre de mots",
-"Count": "Total",
-"Document": "Document",
-"Selection": "S\u00e9lection",
-"Words": "Mots",
-"Words: {0}": "Mots : {0}",
-"{0} words": "{0} mots",
-"File": "Fichier",
-"Edit": "Editer",
-"Insert": "Ins\u00e9rer",
-"View": "Voir",
-"Format": "Format",
-"Table": "Tableau",
-"Tools": "Outils",
-"Powered by {0}": "Propuls\u00e9 par {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zone Texte Riche. Appuyer sur ALT-F9 pour le menu. Appuyer sur ALT-F10 pour la barre d'outils. Appuyer sur ALT-0 pour de l'aide.",
-"Image title": "Titre d'image",
-"Border width": "\u00c9paisseur de la bordure",
-"Border style": "Style de la bordure",
-"Error": "Erreur",
-"Warn": "Avertir",
-"Valid": "Valide",
-"To open the popup, press Shift+Enter": "Pour ouvrir la popup, appuyez sur Maj+Entr\u00e9e",
-"Rich Text Area. Press ALT-0 for help.": "Zone de texte riche. Appuyez sur ALT-0 pour l'aide.",
-"System Font": "Police syst\u00e8me",
-"Failed to upload image: {0}": "\u00c9chec d'envoi de l'image\u00a0: {0}",
-"Failed to load plugin: {0} from url {1}": "\u00c9chec de chargement du plug-in\u00a0: {0} \u00e0 partir de l\u2019URL {1}",
-"Failed to load plugin url: {0}": "\u00c9chec de chargement de l'URL du plug-in\u00a0: {0}",
-"Failed to initialize plugin: {0}": "\u00c9chec d'initialisation du plug-in\u00a0: {0}",
-"example": "exemple",
-"Search": "Rechercher",
-"All": "Tout",
-"Currency": "Devise",
-"Text": "Texte",
-"Quotations": "Citations",
-"Mathematical": "Op\u00e9rateurs math\u00e9matiques",
-"Extended Latin": "Latin \u00e9tendu",
-"Symbols": "Symboles",
-"Arrows": "Fl\u00e8ches",
-"User Defined": "D\u00e9fini par l'utilisateur",
-"dollar sign": "Symbole dollar",
-"currency sign": "Symbole devise",
-"euro-currency sign": "Symbole euro",
-"colon sign": "Symbole col\u00f3n",
-"cruzeiro sign": "Symbole cruzeiro",
-"french franc sign": "Symbole franc fran\u00e7ais",
-"lira sign": "Symbole lire",
-"mill sign": "Symbole milli\u00e8me",
-"naira sign": "Symbole naira",
-"peseta sign": "Symbole peseta",
-"rupee sign": "Symbole roupie",
-"won sign": "Symbole won",
-"new sheqel sign": "Symbole nouveau ch\u00e9kel",
-"dong sign": "Symbole dong",
-"kip sign": "Symbole kip",
-"tugrik sign": "Symbole tougrik",
-"drachma sign": "Symbole drachme",
-"german penny symbol": "Symbole pfennig",
-"peso sign": "Symbole peso",
-"guarani sign": "Symbole guarani",
-"austral sign": "Symbole austral",
-"hryvnia sign": "Symbole hryvnia",
-"cedi sign": "Symbole cedi",
-"livre tournois sign": "Symbole livre tournois",
-"spesmilo sign": "Symbole spesmilo",
-"tenge sign": "Symbole tenge",
-"indian rupee sign": "Symbole roupie indienne",
-"turkish lira sign": "Symbole lire turque",
-"nordic mark sign": "Symbole du mark nordique",
-"manat sign": "Symbole manat",
-"ruble sign": "Symbole rouble",
-"yen character": "Sinogramme Yen",
-"yuan character": "Sinogramme Yuan",
-"yuan character, in hong kong and taiwan": "Sinogramme Yuan, Hong Kong et Taiwan",
-"yen\/yuan character variant one": "Sinogramme Yen\/Yuan, premi\u00e8re variante",
-"Loading emoticons...": "Chargement des \u00e9motic\u00f4nes en cours...",
-"Could not load emoticons": "\u00c9chec de chargement des \u00e9motic\u00f4nes",
-"People": "Personnes",
-"Animals and Nature": "Animaux & nature",
-"Food and Drink": "Nourriture & boissons",
-"Activity": "Activit\u00e9",
-"Travel and Places": "Voyages & lieux",
-"Objects": "Objets",
-"Flags": "Drapeaux",
-"Characters": "Caract\u00e8res",
-"Characters (no spaces)": "Caract\u00e8res (espaces non compris)",
-"{0} characters": "{0}\u00a0caract\u00e8res",
-"Error: Form submit field collision.": "Erreur\u00a0: conflit de champs lors de la soumission du formulaire.",
-"Error: No form element found.": "Erreur : aucun \u00e9l\u00e9ment de formulaire trouv\u00e9.",
-"Update": "Mettre \u00e0 jour",
-"Color swatch": "\u00c9chantillon de couleurs",
-"Turquoise": "Turquoise",
-"Green": "Vert",
-"Blue": "Bleu",
-"Purple": "Violet",
-"Navy Blue": "Bleu marine",
-"Dark Turquoise": "Turquoise fonc\u00e9",
-"Dark Green": "Vert fonc\u00e9",
-"Medium Blue": "Bleu moyen",
-"Medium Purple": "Violet moyen",
-"Midnight Blue": "Bleu de minuit",
-"Yellow": "Jaune",
-"Orange": "Orange",
-"Red": "Rouge",
-"Light Gray": "Gris clair",
-"Gray": "Gris",
-"Dark Yellow": "Jaune fonc\u00e9",
-"Dark Orange": "Orange fonc\u00e9",
-"Dark Red": "Rouge fonc\u00e9",
-"Medium Gray": "Gris moyen",
-"Dark Gray": "Gris fonc\u00e9",
-"Light Green": "Vert clair",
-"Light Yellow": "Jaune clair",
-"Light Red": "Rouge clair",
-"Light Purple": "Violet clair",
-"Light Blue": "Bleu clair",
-"Dark Purple": "Violet fonc\u00e9",
-"Dark Blue": "Bleu fonc\u00e9",
-"Black": "Noir",
-"White": "Blanc",
-"Switch to or from fullscreen mode": "Passer en ou quitter le mode plein \u00e9cran",
-"Open help dialog": "Ouvrir la bo\u00eete de dialogue d'aide",
-"history": "historique",
-"styles": "styles",
-"formatting": "mise en forme",
-"alignment": "alignement",
-"indentation": "retrait",
-"Font": "Police",
-"Size": "Taille",
-"More...": "Plus...",
-"Select...": "S\u00e9lectionner...",
-"Preferences": "Pr\u00e9f\u00e9rences",
-"Yes": "Oui",
-"No": "Non",
-"Keyboard Navigation": "Navigation au clavier",
-"Version": "Version",
-"Code view": "Affichage du code",
-"Open popup menu for split buttons": "Ouvrir le menu contextuel pour les boutons partag\u00e9s",
-"List Properties": "Propri\u00e9t\u00e9s de la liste",
-"List properties...": "Lister les propri\u00e9t\u00e9s...",
-"Start list at number": "Liste de d\u00e9part au num\u00e9ro",
-"Line height": "Hauteur de la ligne",
-"comments": "commentaires",
-"Format Painter": "Reproduire la mise en forme",
-"Insert\/edit iframe": "Ins\u00e9rer\/modifier iframe",
-"Capitalization": "Mise en majuscules",
-"lowercase": "minuscule",
-"UPPERCASE": "MAJUSCULE",
-"Title Case": "Casse du titre",
-"permanent pen": "feutre ind\u00e9l\u00e9bile",
-"Permanent Pen Properties": "Propri\u00e9t\u00e9s du feutre ind\u00e9l\u00e9bile",
-"Permanent pen properties...": "Propri\u00e9t\u00e9s du feutre ind\u00e9l\u00e9bile...",
-"case change": "changement de cas",
-"page embed": "int\u00e9gration de page",
-"Advanced sort...": "Tri avanc\u00e9...",
-"Advanced Sort": "Tri avanc\u00e9",
-"Sort table by column ascending": "Trier le tableau par colonne ascendante",
-"Sort table by column descending": "Trier le tableau par colonne en ordre d\u00e9croissant",
-"Sort": "Sorte",
-"Order": "Ordre",
-"Sort by": "Trier par",
-"Ascending": "Ascendant",
-"Descending": "Descendant",
-"Column {0}": "Colonne {0}",
-"Row {0}": "Ligne {0}",
-"Spellcheck...": "V\u00e9rification orthographique...",
-"Misspelled word": "Mot mal orthographi\u00e9",
-"Suggestions": "Suggestions",
-"Change": "Changement",
-"Finding word suggestions": "Trouver des suggestions de mots",
-"Success": "Succ\u00e8s",
-"Repair": "R\u00e9paration",
-"Issue {0} of {1}": " {0} Erreur sur  {1}",
-"Images must be marked as decorative or have an alternative text description": "Les images doivent \u00eatre marqu\u00e9es comme d\u00e9coratives ou avoir une description textuelle alternative",
-"Images must have an alternative text description. Decorative images are not allowed.": "Les images doivent avoir une description textuelle alternative. Les images d\u00e9coratives ne sont pas autoris\u00e9es.",
-"Or provide alternative text:": "Ou fournissez un texte alternatif\u00a0:",
-"Make image decorative:": "Rendre l'image d\u00e9corative\u00a0:",
-"ID attribute must be unique": "L'attribut ID doit \u00eatre unique",
-"Make ID unique": "Rendre l'identifiant unique",
-"Keep this ID and remove all others": "Conservez cet identifiant et supprimez tous les autres",
-"Remove this ID": "Supprimer cet identifiant",
-"Remove all IDs": "Supprimer tous les identifiants",
-"Checklist": "Liste de contr\u00f4le",
-"Anchor": "Ancre",
-"Special character": "Caract\u00e8res sp\u00e9ciaux",
-"Code sample": "Extrait de code",
-"Color": "Couleur",
-"Document properties": "Propri\u00e9t\u00e9 du document",
-"Image description": "Description de l'image",
-"Image": "Image",
-"Insert link": "Ins\u00e9rer un lien",
-"Target": "Cible",
-"Link": "Lien",
-"Poster": "Publier",
-"Media": "M\u00e9dia",
-"Print": "Imprimer",
-"Prev": "Pr\u00e9c ",
-"Find and replace": "Trouver et remplacer",
-"Whole words": "Mots entiers",
-"Insert template": "Ajouter un th\u00e8me"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/ga.es5.js b/build/media_source/vendor/tinymce/langs/ga.es5.js
deleted file mode 100644
index 847877a0827fb..0000000000000
--- a/build/media_source/vendor/tinymce/langs/ga.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('ga',{
-"Cut": "Gearr",
-"Heading 5": "Ceannteideal 5",
-"Header 2": "Ceannt\u00e1sc 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "N\u00ed f\u00e9idir le do bhrabhs\u00e1la\u00ed teacht go d\u00edreach ar an ngearrthaisce. Bain \u00fas\u00e1id as na haicearra\u00ed Ctrl+X\/C\/V. ",
-"Heading 4": "Ceannteideal 4",
-"Div": "Deighilt",
-"Heading 2": "Ceannteideal 2",
-"Paste": "Greamaigh",
-"Close": "D\u00fan",
-"Font Family": "Cl\u00f3fhoireann",
-"Pre": "R\u00e9amh",
-"Align right": "Ail\u00ednigh ar dheis",
-"New document": "C\u00e1ip\u00e9is nua",
-"Blockquote": "Athfhriotal",
-"Numbered list": "Liosta Uimhrithe",
-"Heading 1": "Ceannteideal 1",
-"Headings": "Ceannteidil",
-"Increase indent": "M\u00e9adaigh eang",
-"Formats": "Form\u00e1id\u00ed",
-"Headers": "Ceannt\u00e1sca",
-"Select all": "Roghnaigh uile",
-"Header 3": "Ceannt\u00e1sc 3",
-"Blocks": "Blocanna",
-"Undo": "Cealaigh",
-"Strikethrough": "L\u00edne tr\u00edd",
-"Bullet list": "Liosta Urchar",
-"Header 1": "Ceannt\u00e1sc 1",
-"Superscript": "Forscript",
-"Clear formatting": "Glan form\u00e1idi\u00fa",
-"Font Sizes": "Cl\u00f3mh\u00e9ideanna",
-"Subscript": "Foscript",
-"Header 6": "Ceannt\u00e1sc 6",
-"Redo": "Athdh\u00e9an",
-"Paragraph": "Alt",
-"Ok": "OK",
-"Bold": "Trom",
-"Code": "C\u00f3d",
-"Italic": "Iod\u00e1lach",
-"Align center": "Ail\u00ednigh sa l\u00e1r",
-"Header 5": "Ceannt\u00e1sc 5",
-"Heading 6": "Ceannteideal 6",
-"Heading 3": "Ceannteideal 3",
-"Decrease indent": "Laghdaigh eang",
-"Header 4": "Ceannt\u00e1sc 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Sa m\u00f3d gn\u00e1th-th\u00e9acs anois. Gream\u00f3far \u00e1bhar mar ghn\u00e1th-th\u00e9acs go dt\u00ed go m\u00fachfaidh t\u00fa an rogha seo.",
-"Underline": "Fol\u00edne",
-"Cancel": "Cealaigh",
-"Justify": "Comhfhadaigh",
-"Inline": "Inl\u00edne",
-"Copy": "C\u00f3ipe\u00e1il",
-"Align left": "Ail\u00ednigh ar chl\u00e9",
-"Visual aids": "\u00c1iseanna amhairc",
-"Lower Greek": "Litir Bheag Ghr\u00e9agach",
-"Square": "Cearn\u00f3g",
-"Default": "R\u00e9amhshocr\u00fa",
-"Lower Alpha": "Alfa Beag",
-"Circle": "Ciorcal",
-"Disc": "Diosca",
-"Upper Alpha": "Alfa M\u00f3r",
-"Upper Roman": "Litir Mh\u00f3r R\u00f3mh\u00e1nach",
-"Lower Roman": "Litir Bheag R\u00f3mh\u00e1nach",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "N\u00ed m\u00f3r don aitheantas tos\u00fa le litir, agus gan ach litreacha, uimhreacha, daiseanna, poncanna, idirstadanna, n\u00f3 fostr\u00edoca ina dhiaidh sin.",
-"Name": "Ainm",
-"Anchor": "Ancaire",
-"Id": "Aitheantas",
-"You have unsaved changes are you sure you want to navigate away?": "T\u00e1 athruithe gan s\u00e1bh\u00e1il ann. An bhfuil t\u00fa cinnte gur mhaith leat imeacht amach as seo?",
-"Restore last draft": "Oscail an dr\u00e9acht is d\u00e9ana\u00ed",
-"Special character": "Carachtar speisialta",
-"Source code": "C\u00f3d foinseach",
-"Language": "Teanga",
-"Insert\/Edit code sample": "Cuir sampla c\u00f3id isteach\/in eagar",
-"B": "G",
-"R": "D",
-"G": "U",
-"Color": "Dath",
-"Right to left": "Deas-go-cl\u00e9",
-"Left to right": "Cl\u00e9-go-deas",
-"Emoticons": "Straoiseoga",
-"Robots": "R\u00f3bait",
-"Document properties": "Air\u00edonna na C\u00e1ip\u00e9ise",
-"Title": "Teideal",
-"Keywords": "Lorgfhocail",
-"Encoding": "Ionch\u00f3d\u00fa",
-"Description": "Cur S\u00edos",
-"Author": "\u00dadar",
-"Fullscreen": "L\u00e1nsc\u00e1ile\u00e1n",
-"Horizontal line": "L\u00edne chothrom\u00e1nach",
-"Horizontal space": "Sp\u00e1s cothrom\u00e1nach",
-"Insert\/edit image": "Cuir \u00edomh\u00e1 isteach\/in eagar",
-"General": "Ginear\u00e1lta",
-"Advanced": "Casta",
-"Source": "Foinse",
-"Border": "Iml\u00edne",
-"Constrain proportions": "Comhr\u00e9ir faoi ghlas",
-"Vertical space": "Sp\u00e1s ingearach",
-"Image description": "Cur s\u00edos ar an \u00edomh\u00e1",
-"Style": "St\u00edl",
-"Dimensions": "Tois\u00ed",
-"Insert image": "Cuir \u00edomh\u00e1 isteach",
-"Image": "\u00cdomh\u00e1",
-"Zoom in": "Z\u00fam\u00e1il isteach",
-"Contrast": "Codarsnacht",
-"Back": "Siar",
-"Gamma": "G\u00e1ma",
-"Flip horizontally": "Cas go cothrom\u00e1nach",
-"Resize": "Athraigh m\u00e9id",
-"Sharpen": "G\u00e9araigh",
-"Zoom out": "Z\u00fam\u00e1il amach",
-"Image options": "Roghanna \u00edomh\u00e1",
-"Apply": "Cuir i bhfeidhm",
-"Brightness": "Gile",
-"Rotate clockwise": "Rothlaigh ar deiseal",
-"Rotate counterclockwise": "Rothlaigh ar tuathal",
-"Edit image": "Cuir an \u00edomh\u00e1 in eagar",
-"Color levels": "Leibh\u00e9il datha",
-"Crop": "Bear",
-"Orientation": "Treoshu\u00edomh",
-"Flip vertically": "Cas go hingearach",
-"Invert": "Inbh\u00e9artaigh",
-"Date\/time": "D\u00e1ta\/am",
-"Insert date\/time": "Cuir d\u00e1ta\/am isteach",
-"Remove link": "Bain an nasc",
-"Url": "URL",
-"Text to display": "T\u00e9acs le taispe\u00e1int",
-"Anchors": "Ancair\u00ed",
-"Insert link": "Cuir nasc isteach",
-"Link": "Nasc",
-"New window": "Fuinneog nua",
-"None": "Dada",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Is nasc seachtrach \u00e9 an URL a chuir t\u00fa isteach. An bhfuil fonn ort an r\u00e9im\u00edr riachtanach http:\/\/ a chur leis?",
-"Paste or type a link": "Greamaigh n\u00f3 cl\u00f3scr\u00edobh nasc",
-"Target": "Sprioc",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Is seoladh r\u00edomhphoist \u00e9 an URL a chuir t\u00fa isteach. An bhfuil fonn ort an r\u00e9im\u00edr riachtanach mailto: a chur leis?",
-"Insert\/edit link": "Cuir nasc isteach\/in eagar",
-"Insert\/edit video": "Cuir f\u00edse\u00e1n isteach\/in eagar",
-"Media": "Me\u00e1in",
-"Alternative source": "Foinse mhalartach",
-"Paste your embed code below:": "Greamaigh do ch\u00f3d leabaithe th\u00edos:",
-"Insert video": "Cuir f\u00edse\u00e1n isteach",
-"Poster": "P\u00f3staer",
-"Insert\/edit media": "Cuir me\u00e1n isteach\/in eagar",
-"Embed": "Leabaigh",
-"Nonbreaking space": "Sp\u00e1s neamhbhristeach",
-"Page break": "Briseadh leathanaigh",
-"Paste as text": "Greamaigh mar th\u00e9acs",
-"Preview": "R\u00e9amhamharc",
-"Print": "Priont\u00e1il",
-"Save": "S\u00e1bh\u00e1il",
-"Could not find the specified string.": "N\u00edor aims\u00edodh an teaghr\u00e1n.",
-"Replace": "Ionadaigh",
-"Next": "Ar aghaidh",
-"Whole words": "Focail ioml\u00e1na",
-"Find and replace": "Aimsigh agus ionadaigh",
-"Replace with": "Ionadaigh le",
-"Find": "Aimsigh",
-"Replace all": "Ionadaigh uile",
-"Match case": "C\u00e1s-\u00edogair",
-"Prev": "Siar",
-"Spellcheck": "Seice\u00e1il an litri\u00fa",
-"Finish": "Cr\u00edochnaigh",
-"Ignore all": "D\u00e9an neamhaird orthu go l\u00e9ir",
-"Ignore": "D\u00e9an neamhaird air",
-"Add to Dictionary": "Cuir leis an bhFocl\u00f3ir \u00e9",
-"Insert row before": "Ions\u00e1igh r\u00f3 os a chionn",
-"Rows": "R\u00f3nna",
-"Height": "Airde",
-"Paste row after": "Greamaigh r\u00f3 faoi",
-"Alignment": "Ail\u00edni\u00fa",
-"Border color": "Dath na himl\u00edne",
-"Column group": "Gr\u00fapa col\u00fan",
-"Row": "R\u00f3",
-"Insert column before": "Ions\u00e1igh col\u00fan ar chl\u00e9",
-"Split cell": "Roinn cill",
-"Cell padding": "Stu\u00e1il ceall",
-"Cell spacing": "Sp\u00e1s\u00e1il ceall",
-"Row type": "Cine\u00e1l an r\u00f3",
-"Insert table": "Ions\u00e1igh t\u00e1bla",
-"Body": "Corp",
-"Caption": "Fotheideal",
-"Footer": "Bunt\u00e1sc",
-"Delete row": "Scrios an r\u00f3",
-"Paste row before": "Greamaigh r\u00f3 os a chionn",
-"Scope": "Sc\u00f3ip",
-"Delete table": "Scrios an t\u00e1bla",
-"H Align": "Ail\u00edni\u00fa C.",
-"Top": "Barr",
-"Header cell": "Cill cheannt\u00e1isc",
-"Column": "Col\u00fan",
-"Row group": "Gr\u00fapa r\u00f3nna",
-"Cell": "Cill",
-"Middle": "L\u00e1r",
-"Cell type": "Cine\u00e1l na cille",
-"Copy row": "C\u00f3ipe\u00e1il an r\u00f3",
-"Row properties": "Air\u00edonna an r\u00f3",
-"Table properties": "Air\u00edonna an t\u00e1bla",
-"Bottom": "Bun",
-"V Align": "Ail\u00edni\u00fa I.",
-"Header": "Ceannt\u00e1sc",
-"Right": "Ar Dheis",
-"Insert column after": "Ions\u00e1igh col\u00fan ar dheis",
-"Cols": "Col\u00fain",
-"Insert row after": "Ions\u00e1igh r\u00f3 faoi",
-"Width": "Leithead",
-"Cell properties": "Air\u00edonna na cille",
-"Left": "Ar Chl\u00e9",
-"Cut row": "Gearr an r\u00f3",
-"Delete column": "Scrios an col\u00fan",
-"Center": "Sa L\u00e1r",
-"Merge cells": "Cumaisc cealla",
-"Insert template": "Ions\u00e1igh teimpl\u00e9ad",
-"Templates": "Teimpl\u00e9id",
-"Background color": "Dath an ch\u00falra",
-"Custom...": "Saincheap...",
-"Custom color": "Dath saincheaptha",
-"No color": "Gan dath",
-"Text color": "Dath an t\u00e9acs",
-"Table of Contents": "Cl\u00e1r na n\u00c1bhar",
-"Show blocks": "Taispe\u00e1in blocanna",
-"Show invisible characters": "Taispe\u00e1in carachtair dhofheicthe",
-"Words: {0}": "Focail: {0}",
-"Insert": "Ions\u00e1ig",
-"File": "Comhad",
-"Edit": "Eagar",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Limist\u00e9ar M\u00e9ith-Th\u00e9acs. Br\u00faigh ALT-F9 le haghaidh roghchl\u00e1ir, ALT-F10 le haghaidh barra uirlis\u00ed, agus ALT-0 le c\u00fanamh a fh\u00e1il",
-"Tools": "Uirlis\u00ed",
-"View": "Amharc",
-"Table": "T\u00e1bla",
-"Format": "Form\u00e1id"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/gl.es5.js b/build/media_source/vendor/tinymce/langs/gl.es5.js
deleted file mode 100644
index 2f0365ee4ff80..0000000000000
--- a/build/media_source/vendor/tinymce/langs/gl.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('gl',{
-"Cut": "Cortar",
-"Header 2": "Cabeceira 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "O seu navegador non admite o acceso directo ao portapapeis. Empregue os atallos de teclado Ctrl+X\/C\/V no seu canto.",
-"Div": "Div",
-"Paste": "Pegar",
-"Close": "Pechar",
-"Font Family": "Tipo de letra",
-"Pre": "Pre",
-"Align right": "Ali\u00f1ar \u00e1 dereita",
-"New document": "Novo documento",
-"Blockquote": "Bloque entre comi\u00f1as",
-"Numbered list": "Lista numerada",
-"Increase indent": "Aumentar a sangr\u00eda",
-"Formats": "Formatos",
-"Headers": "Cabeceiras",
-"Select all": "Seleccionar todo",
-"Header 3": "Cabeceira 3",
-"Blocks": "Bloques",
-"Undo": "Desfacer",
-"Strikethrough": "Riscado",
-"Bullet list": "Lista de vi\u00f1etas",
-"Header 1": "Cabeceira 1",
-"Superscript": "Super\u00edndice",
-"Clear formatting": "Limpar o formato",
-"Font Sizes": "Tama\u00f1o da letra",
-"Subscript": "Sub\u00edndice",
-"Header 6": "Cabeceira 6",
-"Redo": "Refacer",
-"Paragraph": "Par\u00e1grafo",
-"Ok": "Aceptar",
-"Bold": "Negra",
-"Code": "C\u00f3digo",
-"Italic": "Cursiva",
-"Align center": "Ali\u00f1ar ao centro",
-"Header 5": "Cabeceira 5",
-"Decrease indent": "Reducir a sangr\u00eda",
-"Header 4": "Cabeceira 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Neste momento o pegado est\u00e1 definido en modo de texto simple. Os contidos p\u00e9garanse como texto sen formato ata que se active esta opci\u00f3n.",
-"Underline": "Subli\u00f1ado",
-"Cancel": "Cancelar",
-"Justify": "Xustificar",
-"Inline": "En li\u00f1a",
-"Copy": "Copiar",
-"Align left": "Ali\u00f1ar \u00e1 esquerda",
-"Visual aids": "Axudas visuais",
-"Lower Greek": "Grega min\u00fascula",
-"Square": "Cadrado",
-"Default": "Predeterminada",
-"Lower Alpha": "Alfa min\u00fascula",
-"Circle": "Circulo",
-"Disc": "Disco",
-"Upper Alpha": "Alfa mai\u00fascula",
-"Upper Roman": "Romana mai\u00fascula",
-"Lower Roman": "Romana min\u00fascula",
-"Name": "Nome",
-"Anchor": "Ancoraxe",
-"You have unsaved changes are you sure you want to navigate away?": "Ten cambios sen gardar. Confirma que quere sa\u00edr?",
-"Restore last draft": "Restaurar o \u00faltimo borrador",
-"Special character": "Car\u00e1cter especial",
-"Source code": "C\u00f3digo fonte",
-"Right to left": "De dereita a esquerda",
-"Left to right": "De esquerda a dereita",
-"Emoticons": "Emoticonas",
-"Robots": "Robots",
-"Document properties": "Propiedades do documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palabras clave",
-"Encoding": "Codificaci\u00f3n",
-"Description": "Descrici\u00f3n",
-"Author": "Autor",
-"Fullscreen": "Pantalla completa",
-"Horizontal line": "Li\u00f1a horizontal",
-"Horizontal space": "Espazo horizontal",
-"Insert\/edit image": "Inserir\/editar imaxe",
-"General": "Xeral",
-"Advanced": "Avanzado",
-"Source": "Orixe",
-"Border": "Bordo",
-"Constrain proportions": "Restrinxir as proporci\u00f3ns",
-"Vertical space": "Espazo vertical",
-"Image description": "Descrici\u00f3n da imaxe",
-"Style": "Estilo",
-"Dimensions": "Dimensi\u00f3ns",
-"Insert image": "Inserir imaxe",
-"Insert date\/time": "Inserir data\/hora",
-"Remove link": "Retirar a ligaz\u00f3n",
-"Url": "URL",
-"Text to display": "Texto que amosar",
-"Anchors": "Ancoraxes",
-"Insert link": "Inserir ligaz\u00f3n",
-"New window": "Nova xanela",
-"None": "Ning\u00fan",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "Destino",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "Inserir\/editar ligaz\u00f3n",
-"Insert\/edit video": "Inserir\/editar v\u00eddeo",
-"Poster": "Cartel",
-"Alternative source": "Orixe alternativa",
-"Paste your embed code below:": "Pegue embaixo o c\u00f3digo integrado:",
-"Insert video": "Inserir v\u00eddeo",
-"Embed": "Integrado",
-"Nonbreaking space": "Espazo irromp\u00edbel",
-"Page break": "Quebra de p\u00e1xina",
-"Paste as text": "Pegar como texto",
-"Preview": "Vista previa",
-"Print": "Imprimir",
-"Save": "Gardar",
-"Could not find the specified string.": "Non foi pos\u00edbel atopar a cadea de texto especificada.",
-"Replace": "Substitu\u00edr",
-"Next": "Seguinte",
-"Whole words": "Palabras completas",
-"Find and replace": "Buscar e substitu\u00edr",
-"Replace with": "Substitu\u00edr con",
-"Find": "Buscar",
-"Replace all": "Substitu\u00edr todo",
-"Match case": "Distinguir mai\u00fasculas",
-"Prev": "Anterior",
-"Spellcheck": "Corrector ortogr\u00e1fico",
-"Finish": "Rematar",
-"Ignore all": "Ignorar todo",
-"Ignore": "Ignorar",
-"Insert row before": "Inserir unha fila enriba",
-"Rows": "Filas",
-"Height": "Alto",
-"Paste row after": "Pegar fila enriba",
-"Alignment": "Ali\u00f1amento",
-"Column group": "Grupo de columnas",
-"Row": "Fila",
-"Insert column before": "Inserir columna \u00e1 esquerda",
-"Split cell": "Dividir celas",
-"Cell padding": "Marxe interior da cela",
-"Cell spacing": "Marxe entre celas",
-"Row type": "Tipo de fila",
-"Insert table": "Inserir t\u00e1boa",
-"Body": "Corpo",
-"Caption": "Subt\u00edtulo",
-"Footer": "Rodap\u00e9",
-"Delete row": "Eliminar fila",
-"Paste row before": "Pegar fila embaixo",
-"Scope": "\u00c1mbito",
-"Delete table": "Eliminar t\u00e1boa",
-"Header cell": "Cela de cabeceira",
-"Column": "Columna",
-"Cell": "Cela",
-"Header": "Cabeceira",
-"Cell type": "Tipo de cela",
-"Copy row": "Copiar fila",
-"Row properties": "Propiedades das filas",
-"Table properties": "Propiedades da t\u00e1boa",
-"Row group": "Grupo de filas",
-"Right": "Dereita",
-"Insert column after": "Inserir columna \u00e1 dereita",
-"Cols": "Cols.",
-"Insert row after": "Inserir unha fila embaixo",
-"Width": "Largo",
-"Cell properties": "Propiedades da cela",
-"Left": "Esquerda",
-"Cut row": "Cortar fila",
-"Delete column": "Eliminar columna",
-"Center": "Centro",
-"Merge cells": "Combinar celas",
-"Insert template": "Inserir modelo",
-"Templates": "Modelos",
-"Background color": "Cor do fondo",
-"Text color": "Cor do texto",
-"Show blocks": "Amosar os bloques",
-"Show invisible characters": "Amosar caracteres invis\u00edbeis",
-"Words: {0}": "Palabras: {0}",
-"Insert": "Inserir",
-"File": "Ficheiro",
-"Edit": "Editar",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto mellorado. Prema ALT-F9 para o men\u00fa. Prema ALT-F10 para a barra de ferramentas. Prema ALT-0 para a axuda",
-"Tools": "Ferramentas",
-"View": "Ver",
-"Table": "T\u00e1boa",
-"Format": "Formato"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/he.es5.js b/build/media_source/vendor/tinymce/langs/he.es5.js
deleted file mode 100644
index 6c0760e65e55f..0000000000000
--- a/build/media_source/vendor/tinymce/langs/he.es5.js
+++ /dev/null
@@ -1,180 +0,0 @@
-tinymce.addI18n('he',{
-"Cut": "\u05d2\u05d6\u05d5\u05e8",
-"Header 2": "\u05db\u05d5\u05ea\u05e8\u05ea 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u05d4\u05d3\u05e4\u05d3\u05e4\u05df \u05e9\u05dc\u05da \u05d0\u05d9\u05e0\u05d5 \u05de\u05d0\u05e4\u05e9\u05e8 \u05d2\u05d9\u05e9\u05d4 \u05d9\u05e9\u05d9\u05e8\u05d4 \u05dc\u05dc\u05d5\u05d7. \u05d0\u05e0\u05d0 \u05d4\u05e9\u05ea\u05de\u05e9 \u05d1\u05e7\u05d9\u05e6\u05d5\u05e8\u05d9 \u05d4\u05de\u05e7\u05dc\u05d3\u05ea Ctrl+X\/C\/V \u05d1\u05de\u05e7\u05d5\u05dd.",
-"Div": "\u05de\u05e7\u05d8\u05e2 \u05e7\u05d5\u05d3 Div",
-"Paste": "\u05d4\u05d3\u05d1\u05e7",
-"Close": "\u05e1\u05d2\u05d5\u05e8",
-"Font Family": "\u05e1\u05d5\u05d2 \u05d2\u05d5\u05e4\u05df",
-"Pre": "\u05e7\u05d8\u05e2 \u05de\u05e7\u05d3\u05d9\u05dd Pre",
-"Align right": "\u05d9\u05d9\u05e9\u05e8 \u05dc\u05e9\u05de\u05d0\u05dc",
-"New document": "\u05de\u05e1\u05de\u05da \u05d7\u05d3\u05e9",
-"Blockquote": "\u05de\u05e7\u05d8\u05e2 \u05e6\u05d9\u05d8\u05d5\u05d8",
-"Numbered list": "\u05e8\u05e9\u05d9\u05de\u05d4 \u05de\u05de\u05d5\u05e1\u05e4\u05e8\u05ea",
-"Increase indent": "\u05d4\u05d2\u05d3\u05dc \u05d4\u05d6\u05d7\u05d4",
-"Formats": "\u05e4\u05d5\u05e8\u05de\u05d8\u05d9\u05dd",
-"Headers": "\u05db\u05d5\u05ea\u05e8\u05d5\u05ea",
-"Select all": "\u05d1\u05d7\u05e8 \u05d4\u05db\u05dc",
-"Header 3": "\u05db\u05d5\u05ea\u05e8\u05ea 3",
-"Blocks": "\u05de\u05d1\u05e0\u05d9\u05dd",
-"Undo": "\u05d1\u05d8\u05dc \u05e4\u05e2\u05d5\u05dc\u05d4",
-"Strikethrough": "\u05e7\u05d5 \u05d7\u05d5\u05e6\u05d4",
-"Bullet list": "\u05e8\u05e9\u05d9\u05de\u05ea \u05ea\u05d1\u05dc\u05d9\u05d8\u05d9\u05dd",
-"Header 1": "\u05db\u05d5\u05ea\u05e8\u05ea 1",
-"Superscript": "\u05db\u05ea\u05d1 \u05e2\u05d9\u05dc\u05d9",
-"Clear formatting": "\u05e0\u05e7\u05d4 \u05e4\u05d5\u05e8\u05de\u05d8\u05d9\u05dd",
-"Font Sizes": "\u05d2\u05d5\u05d3\u05dc \u05d2\u05d5\u05e4\u05df",
-"Subscript": "\u05db\u05ea\u05d1 \u05ea\u05d7\u05ea\u05d9",
-"Header 6": "\u05db\u05d5\u05ea\u05e8\u05ea 6",
-"Redo": "\u05d1\u05e6\u05e2 \u05e9\u05d5\u05d1",
-"Paragraph": "\u05e4\u05d9\u05e1\u05e7\u05d4",
-"Ok": "\u05d0\u05d9\u05e9\u05d5\u05e8",
-"Bold": "\u05de\u05d5\u05d3\u05d2\u05e9",
-"Code": "\u05e7\u05d5\u05d3",
-"Italic": "\u05e0\u05d8\u05d5\u05d9",
-"Align center": "\u05de\u05e8\u05db\u05d6",
-"Header 5": "\u05db\u05d5\u05ea\u05e8\u05ea 5",
-"Decrease indent": "\u05d4\u05e7\u05d8\u05df \u05d4\u05d6\u05d7\u05d4",
-"Header 4": "\u05db\u05d5\u05ea\u05e8\u05ea 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u05d4\u05d3\u05d1\u05e7\u05d4 \u05d1\u05de\u05e6\u05d1 \u05d8\u05e7\u05e1\u05d8 \u05e8\u05d2\u05d9\u05dc. \u05ea\u05db\u05e0\u05d9\u05dd \u05d9\u05d5\u05d3\u05d1\u05e7\u05d5 \u05de\u05e2\u05ea\u05d4 \u05db\u05d8\u05e7\u05e1\u05d8 \u05e8\u05d2\u05d9\u05dc \u05e2\u05d3 \u05e9\u05ea\u05db\u05d1\u05d4 \u05d0\u05e4\u05e9\u05e8\u05d5\u05ea \u05d6\u05d5.",
-"Underline": "\u05e7\u05d5 \u05ea\u05d7\u05ea\u05d9",
-"Cancel": "\u05d1\u05d8\u05dc",
-"Justify": "\u05de\u05ea\u05d7 \u05dc\u05e6\u05d3\u05d3\u05d9\u05dd",
-"Inline": "\u05d1\u05d2\u05d5\u05e3 \u05d4\u05d8\u05e7\u05e1\u05d8",
-"Copy": "\u05d4\u05e2\u05ea\u05e7",
-"Align left": "\u05d9\u05d9\u05e9\u05e8 \u05dc\u05e9\u05de\u05d0\u05dc",
-"Visual aids": "\u05e2\u05d6\u05e8\u05d9\u05dd \u05d7\u05d6\u05d5\u05ea\u05d9\u05d9\u05dd",
-"Lower Greek": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05d9\u05d5\u05d5\u05e0\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
-"Square": "\u05e8\u05d9\u05d1\u05d5\u05e2",
-"Default": "\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc",
-"Lower Alpha": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05d0\u05e0\u05d2\u05dc\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
-"Circle": "\u05e2\u05d9\u05d2\u05d5\u05dc",
-"Disc": "\u05d7\u05d9\u05e9\u05d5\u05e7",
-"Upper Alpha": "\u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05d0\u05e0\u05d2\u05dc\u05d9\u05d5\u05ea \u05d2\u05d3\u05d5\u05dc\u05d5\u05ea",
-"Upper Roman": "\u05e1\u05e4\u05e8\u05d5\u05ea \u05e8\u05d5\u05de\u05d9\u05d5\u05ea \u05d2\u05d3\u05d5\u05dc\u05d5\u05ea",
-"Lower Roman": "\u05e1\u05e4\u05e8\u05d5\u05ea \u05e8\u05d5\u05de\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea",
-"Name": "\u05e9\u05dd",
-"Anchor": "\u05de\u05e7\u05d5\u05dd \u05e2\u05d9\u05d2\u05d5\u05df",
-"You have unsaved changes are you sure you want to navigate away?": "\u05d4\u05e9\u05d9\u05e0\u05d5\u05d9\u05d9\u05dd \u05dc\u05d0 \u05e0\u05e9\u05de\u05e8\u05d5. \u05d1\u05d8\u05d5\u05d7 \u05e9\u05d1\u05e8\u05e6\u05d5\u05e0\u05da \u05dc\u05e6\u05d0\u05ea \u05de\u05d4\u05d3\u05e3?",
-"Restore last draft": "\u05e9\u05d7\u05d6\u05e8 \u05d8\u05d9\u05d5\u05d8\u05d4 \u05d0\u05d7\u05e8\u05d5\u05e0\u05d4",
-"Special character": "\u05ea\u05d5\u05d5\u05d9\u05dd \u05de\u05d9\u05d5\u05d7\u05d3\u05d9\u05dd",
-"Source code": "\u05e7\u05d5\u05d3 \u05de\u05e7\u05d5\u05e8",
-"Right to left": "\u05de\u05d9\u05de\u05d9\u05df \u05dc\u05e9\u05de\u05d0\u05dc",
-"Left to right": "\u05de\u05e9\u05de\u05d0\u05dc \u05dc\u05d9\u05de\u05d9\u05df",
-"Emoticons": "\u05de\u05d7\u05d5\u05d5\u05ea",
-"Robots": "\u05e8\u05d5\u05d1\u05d5\u05d8\u05d9\u05dd",
-"Document properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05de\u05e1\u05de\u05da",
-"Title": "\u05db\u05d5\u05ea\u05e8\u05ea",
-"Keywords": "\u05de\u05d9\u05dc\u05d5\u05ea \u05de\u05e4\u05ea\u05d7",
-"Encoding": "\u05e7\u05d9\u05d3\u05d5\u05d3",
-"Description": "\u05ea\u05d9\u05d0\u05d5\u05e8",
-"Author": "\u05de\u05d7\u05d1\u05e8",
-"Fullscreen": "\u05de\u05e1\u05da \u05de\u05dc\u05d0",
-"Horizontal line": "\u05e7\u05d5 \u05d0\u05d5\u05e4\u05e7\u05d9",
-"Horizontal space": "\u05de\u05e8\u05d5\u05d5\u05d7 \u05d0\u05d5\u05e4\u05e7\u05d9",
-"Insert\/edit image": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05ea\u05de\u05d5\u05e0\u05d4",
-"General": "\u05db\u05dc\u05dc\u05d9",
-"Advanced": "\u05de\u05ea\u05e7\u05d3\u05dd",
-"Source": "\u05de\u05e7\u05d5\u05e8",
-"Border": "\u05de\u05e1\u05d2\u05e8\u05ea",
-"Constrain proportions": "\u05d4\u05d2\u05d1\u05dc\u05ea \u05e4\u05e8\u05d5\u05e4\u05d5\u05e8\u05e6\u05d9\u05d5\u05ea",
-"Vertical space": "\u05de\u05e8\u05d5\u05d5\u05d7 \u05d0\u05e0\u05db\u05d9",
-"Image description": "\u05ea\u05d9\u05d0\u05d5\u05e8 \u05d4\u05ea\u05de\u05d5\u05e0\u05d4",
-"Style": "\u05e1\u05d2\u05e0\u05d5\u05df",
-"Dimensions": "\u05de\u05d9\u05de\u05d3\u05d9\u05dd",
-"Insert image": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05de\u05d5\u05e0\u05d4",
-"Insert date\/time": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05d0\u05e8\u05d9\u05da\/\u05e9\u05e2\u05d4",
-"Remove link": "\u05de\u05d7\u05e7 \u05e7\u05d9\u05e9\u05d5\u05e8",
-"Url": "\u05db\u05ea\u05d5\u05d1\u05ea \u05e7\u05d9\u05e9\u05d5\u05e8",
-"Text to display": "\u05d8\u05e7\u05e1\u05d8 \u05dc\u05d4\u05e6\u05d2\u05d4",
-"Anchors": "\u05e2\u05d5\u05d2\u05e0\u05d9\u05dd",
-"Insert link": "\u05d4\u05db\u05e0\u05e1 \u05e7\u05d9\u05e9\u05d5\u05e8",
-"New window": "\u05d7\u05dc\u05d5\u05df \u05d7\u05d3\u05e9",
-"None": "\u05dc\u05dc\u05d0",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "\u05de\u05d8\u05e8\u05d4",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05e7\u05d9\u05e9\u05d5\u05e8",
-"Insert\/edit video": "\u05d4\u05db\u05e0\u05e1\/\u05e2\u05e8\u05d5\u05da \u05e1\u05e8\u05d8\u05d5\u05df",
-"Poster": "\u05e4\u05d5\u05e1\u05d8\u05e8",
-"Alternative source": "\u05de\u05e7\u05d5\u05e8 \u05de\u05e9\u05e0\u05d9",
-"Paste your embed code below:": "\u05d4\u05d3\u05d1\u05e7 \u05e7\u05d5\u05d3 \u05d4\u05d8\u05de\u05e2\u05d4 \u05de\u05ea\u05d7\u05ea:",
-"Insert video": "\u05d4\u05db\u05e0\u05e1 \u05e1\u05e8\u05d8\u05d5\u05df",
-"Embed": "\u05d4\u05d8\u05de\u05e2",
-"Nonbreaking space": "\u05e8\u05d5\u05d5\u05d7 (\u05dc\u05dc\u05d0 \u05e9\u05d1\u05d9\u05e8\u05ea \u05e9\u05d5\u05e8\u05d4)",
-"Page break": "\u05d3\u05e3 \u05d7\u05d3\u05e9",
-"Paste as text": "\u05d4\u05d3\u05d1\u05e7 \u05db\u05d8\u05e7\u05e1\u05d8",
-"Preview": "\u05ea\u05e6\u05d5\u05d2\u05d4 \u05de\u05e7\u05d3\u05d9\u05de\u05d4",
-"Print": "\u05d4\u05d3\u05e4\u05e1",
-"Save": "\u05e9\u05de\u05d9\u05e8\u05d4",
-"Could not find the specified string.": "\u05de\u05d7\u05e8\u05d5\u05d6\u05ea \u05dc\u05d0 \u05e0\u05de\u05e6\u05d0\u05d4",
-"Replace": "\u05d4\u05d7\u05dc\u05e3",
-"Next": "\u05d4\u05d1\u05d0",
-"Whole words": "\u05de\u05d9\u05dc\u05d4 \u05e9\u05dc\u05de\u05d4",
-"Find and replace": "\u05d7\u05e4\u05e9 \u05d5\u05d4\u05d7\u05dc\u05e3",
-"Replace with": "\u05d4\u05d7\u05dc\u05e3 \u05d1",
-"Find": "\u05d7\u05e4\u05e9",
-"Replace all": "\u05d4\u05d7\u05dc\u05e3 \u05d4\u05db\u05dc",
-"Match case": "\u05d4\u05d1\u05d7\u05df \u05d1\u05d9\u05df \u05d0\u05d5\u05ea\u05d9\u05d5\u05ea \u05e7\u05d8\u05e0\u05d5\u05ea \u05dc\u05d2\u05d3\u05d5\u05dc\u05d5\u05ea",
-"Prev": "\u05e7\u05d5\u05d3\u05dd",
-"Spellcheck": "\u05d1\u05d5\u05d3\u05e7 \u05d0\u05d9\u05d5\u05ea",
-"Finish": "\u05e1\u05d9\u05d9\u05dd",
-"Ignore all": "\u05d4\u05ea\u05e2\u05dc\u05dd \u05de\u05d4\u05db\u05dc",
-"Ignore": "\u05d4\u05ea\u05e2\u05dc\u05dd",
-"Insert row before": "\u05d4\u05d5\u05e1\u05e3 \u05e9\u05d5\u05e8\u05d4 \u05dc\u05e4\u05e0\u05d9",
-"Rows": "\u05e9\u05d5\u05e8\u05d5\u05ea",
-"Height": "\u05d2\u05d5\u05d1\u05d4",
-"Paste row after": "\u05d4\u05e2\u05ea\u05e7 \u05e9\u05d5\u05e8\u05d4 \u05d0\u05d7\u05e8\u05d9",
-"Alignment": "\u05d9\u05d9\u05e9\u05d5\u05e8",
-"Column group": "\u05e7\u05d9\u05d1\u05d5\u05e5 \u05e2\u05de\u05d5\u05d3\u05d5\u05ea",
-"Row": "\u05e9\u05d5\u05e8\u05d4",
-"Insert column before": "\u05d4\u05e2\u05ea\u05e7 \u05e2\u05de\u05d5\u05d3\u05d4 \u05dc\u05e4\u05e0\u05d9",
-"Split cell": "\u05e4\u05e6\u05dc \u05ea\u05d0",
-"Cell padding": "\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05e4\u05e0\u05d9\u05de\u05d9\u05d9\u05dd \u05dc\u05ea\u05d0",
-"Cell spacing": "\u05e9\u05d5\u05dc\u05d9\u05d9\u05dd \u05d7\u05d9\u05e6\u05d5\u05e0\u05d9\u05dd \u05dc\u05ea\u05d0",
-"Row type": "\u05e1\u05d5\u05d2 \u05e9\u05d5\u05e8\u05d4",
-"Insert table": "\u05d4\u05db\u05e0\u05e1 \u05d8\u05d1\u05dc\u05d4",
-"Body": "\u05d2\u05d5\u05e3 \u05d4\u05d8\u05d1\u05dc\u05d0",
-"Caption": "\u05db\u05d9\u05ea\u05d5\u05d1",
-"Footer": "\u05db\u05d5\u05ea\u05e8\u05ea \u05ea\u05d7\u05ea\u05d5\u05e0\u05d4",
-"Delete row": "\u05de\u05d7\u05e7 \u05e9\u05d5\u05e8\u05d4",
-"Paste row before": "\u05d4\u05d3\u05d1\u05e7 \u05e9\u05d5\u05e8\u05d4 \u05dc\u05e4\u05e0\u05d9",
-"Scope": "\u05d4\u05d9\u05e7\u05e3",
-"Delete table": "\u05de\u05d7\u05e7 \u05d8\u05d1\u05dc\u05d4",
-"Header cell": "\u05db\u05d5\u05ea\u05e8\u05ea \u05dc\u05ea\u05d0",
-"Column": "\u05e2\u05de\u05d5\u05d3\u05d4",
-"Cell": "\u05ea\u05d0",
-"Header": "\u05db\u05d5\u05ea\u05e8\u05ea",
-"Cell type": "\u05e1\u05d5\u05d2 \u05ea\u05d0",
-"Copy row": "\u05d4\u05e2\u05ea\u05e7 \u05e9\u05d5\u05e8\u05d4",
-"Row properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05e9\u05d5\u05e8\u05d4",
-"Table properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05d8\u05d1\u05dc\u05d4",
-"Row group": "\u05e7\u05d9\u05d1\u05d5\u05e5 \u05e9\u05d5\u05e8\u05d5\u05ea",
-"Right": "\u05d9\u05de\u05d9\u05df",
-"Insert column after": "\u05d4\u05e2\u05ea\u05e7 \u05e2\u05de\u05d5\u05d3\u05d4 \u05d0\u05d7\u05e8\u05d9",
-"Cols": "\u05e2\u05de\u05d5\u05d3\u05d5\u05ea",
-"Insert row after": "\u05d4\u05d5\u05e1\u05e3 \u05e9\u05d5\u05e8\u05d4 \u05d0\u05d7\u05e8\u05d9",
-"Width": "\u05e8\u05d5\u05d7\u05d1",
-"Cell properties": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9 \u05ea\u05d0",
-"Left": "\u05e9\u05de\u05d0\u05dc",
-"Cut row": "\u05d2\u05d6\u05d5\u05e8 \u05e9\u05d5\u05e8\u05d4",
-"Delete column": "\u05de\u05d7\u05e7 \u05e2\u05de\u05d5\u05d3\u05d4",
-"Center": "\u05de\u05e8\u05db\u05d6",
-"Merge cells": "\u05de\u05d6\u05d2 \u05ea\u05d0\u05d9\u05dd",
-"Insert template": "\u05d4\u05db\u05e0\u05e1 \u05ea\u05d1\u05e0\u05d9\u05ea",
-"Templates": "\u05ea\u05d1\u05e0\u05d9\u05d5\u05ea",
-"Background color": "\u05e6\u05d1\u05e2 \u05e8\u05e7\u05e2",
-"Text color": "\u05e6\u05d1\u05e2 \u05d4\u05db\u05ea\u05d1",
-"Show blocks": "\u05d4\u05e6\u05d2 \u05ea\u05d9\u05d1\u05d5\u05ea",
-"Show invisible characters": "\u05d4\u05e6\u05d2 \u05ea\u05d5\u05d5\u05d9\u05dd \u05dc\u05d0 \u05e0\u05e8\u05d0\u05d9\u05dd",
-"Words: {0}": "\u05de\u05d9\u05dc\u05d9\u05dd: {0}",
-"Insert": "\u05d4\u05d5\u05e1\u05e4\u05d4",
-"File": "\u05e7\u05d5\u05d1\u05e5",
-"Edit": "\u05e2\u05e8\u05d9\u05db\u05d4",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u05ea\u05d9\u05d1\u05ea \u05e2\u05e8\u05d9\u05db\u05d4 \u05d7\u05db\u05de\u05d4. \u05dc\u05d7\u05e5 Alt-F9 \u05dc\u05ea\u05e4\u05e8\u05d9\u05d8. Alt-F10 \u05dc\u05ea\u05e6\u05d5\u05d2\u05ea \u05db\u05e4\u05ea\u05d5\u05e8\u05d9\u05dd, Alt-0 \u05dc\u05e2\u05d6\u05e8\u05d4",
-"Tools": "\u05db\u05dc\u05d9\u05dd",
-"View": "\u05ea\u05e6\u05d5\u05d2\u05d4",
-"Table": "\u05d8\u05d1\u05dc\u05d4",
-"Format": "\u05e4\u05d5\u05e8\u05de\u05d8",
-"_dir": "rtl"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/hr.es5.js b/build/media_source/vendor/tinymce/langs/hr.es5.js
deleted file mode 100644
index 330ac1ac70106..0000000000000
--- a/build/media_source/vendor/tinymce/langs/hr.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('hr',{
-"Cut": "Izre\u017ei",
-"Heading 5": "Naslov 5",
-"Header 2": "Zaglavlje 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Va\u0161 preglednik ne podr\u017eava direktan pristup me\u0111uspremniku. Molimo Vas da umjesto toga koristite tipkovni\u010dke kratice Ctrl+X\/C\/V.",
-"Heading 4": "Naslov 4",
-"Div": "DIV",
-"Heading 2": "Naslov 2",
-"Paste": "Zalijepi",
-"Close": "Zatvori",
-"Font Family": "Obitelj fonta",
-"Pre": "PRE",
-"Align right": "Poravnaj desno",
-"New document": "Novi dokument",
-"Blockquote": "BLOCKQUOTE",
-"Numbered list": "Numerirana lista",
-"Heading 1": "Naslov 1",
-"Headings": "Naslovi",
-"Increase indent": "Pove\u0107aj uvla\u010denje",
-"Formats": "Formati",
-"Headers": "Zaglavlja",
-"Select all": "Ozna\u010di sve",
-"Header 3": "Zaglavlje 3",
-"Blocks": "Blokovi",
-"Undo": "Poni\u0161ti",
-"Strikethrough": "Crta kroz sredinu",
-"Bullet list": "Lista",
-"Header 1": "Zaglavlje 1",
-"Superscript": "Eksponent",
-"Clear formatting": "Ukloni oblikovanje",
-"Font Sizes": "Veli\u010dine fonta",
-"Subscript": "Indeks",
-"Header 6": "Zaglavlje 6",
-"Redo": "Vrati",
-"Paragraph": "Paragraf",
-"Ok": "U redu",
-"Bold": "Podebljano",
-"Code": "CODE oznaka",
-"Italic": "Kurziv",
-"Align center": "Poravnaj po sredini",
-"Header 5": "Zaglavlje 5",
-"Heading 6": "Naslov 6",
-"Heading 3": "Naslov 3",
-"Decrease indent": "Smanji uvla\u010denje",
-"Header 4": "Zaglavlje 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Akcija zalijepi od sada lijepi \u010disti tekst. Sadr\u017eaj \u0107e biti zaljepljen kao \u010disti tekst sve dok ne isklju\u010dite ovu opciju.",
-"Underline": "Crta ispod",
-"Cancel": "Odustani",
-"Justify": "Obostrano poravnanje",
-"Inline": "Unutarnje",
-"Copy": "Kopiraj",
-"Align left": "Poravnaj lijevo",
-"Visual aids": "Vizualna pomo\u0107",
-"Lower Greek": "Mala gr\u010dka slova",
-"Square": "Kvadrat",
-"Default": "Zadano",
-"Lower Alpha": "Mala slova",
-"Circle": "Krug",
-"Disc": "To\u010dka",
-"Upper Alpha": "Velika slova",
-"Upper Roman": "Velika rimska slova",
-"Lower Roman": "Mala rimska slova",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id treba po\u010dinjati slovom, a nakon toga slijede samo slova, brojevi, crtice, to\u010dke, dvoto\u010dke i podvlake.",
-"Name": "Ime",
-"Anchor": "Sidro",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "Postoje ne pohranjene izmjene, jeste li sigurni da \u017eelite oti\u0107i?",
-"Restore last draft": "Vrati posljednju skicu",
-"Special character": "Poseban znak",
-"Source code": "Izvorni kod",
-"Language": "Jezik",
-"Insert\/Edit code sample": "Umetni\/Uredi primjer k\u00f4da",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Boja",
-"Right to left": "S desna na lijevo",
-"Left to right": "S lijeva na desno",
-"Emoticons": "Emotikoni",
-"Robots": "Roboti pretra\u017eiva\u010da",
-"Document properties": "Svojstva dokumenta",
-"Title": "Naslov",
-"Keywords": "Klju\u010dne rije\u010di",
-"Encoding": "Kodna stranica",
-"Description": "Opis",
-"Author": "Autor",
-"Fullscreen": "Cijeli ekran",
-"Horizontal line": "Horizontalna linija",
-"Horizontal space": "Horizontalan razmak",
-"Insert\/edit image": "Umetni\/izmijeni sliku",
-"General": "Op\u0107enito",
-"Advanced": "Napredno",
-"Source": "Izvor",
-"Border": "Rub",
-"Constrain proportions": "Zadr\u017ei proporcije",
-"Vertical space": "Okomit razmak",
-"Image description": "Opis slike",
-"Style": "Stil",
-"Dimensions": "Dimenzije",
-"Insert image": "Umetni sliku",
-"Image": "Slika",
-"Zoom in": "Pove\u0107aj",
-"Contrast": "Kontrast",
-"Back": "Natrag",
-"Gamma": "Gamma",
-"Flip horizontally": "Obrni horizontalno",
-"Resize": "Promjeni veli\u010dinu",
-"Sharpen": "Izo\u0161travanje",
-"Zoom out": "Smanji",
-"Image options": "Opcije slike",
-"Apply": "Primijeni",
-"Brightness": "Svjetlina",
-"Rotate clockwise": "Rotiraj desno",
-"Rotate counterclockwise": "Rotiraj lijevo",
-"Edit image": "Uredi sliku",
-"Color levels": "Razine boje",
-"Crop": "Obre\u017ei",
-"Orientation": "Orijentacija",
-"Flip vertically": "Obrni vertikalno",
-"Invert": "Invertiraj",
-"Date\/time": "Datum\/vrijeme",
-"Insert date\/time": "Umetni datum\/vrijeme",
-"Remove link": "Ukloni poveznicu",
-"Url": "Url",
-"Text to display": "Tekst za prikaz",
-"Anchors": "Kra\u0107e poveznice",
-"Insert link": "Umetni poveznicu",
-"Link": "Link",
-"New window": "Novi prozor",
-"None": "Ni\u0161ta",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Izgleda da je URL koji ste upisali vanjski link. \u017delite li dodati obavezan http:\/\/ prefiks?",
-"Paste or type a link": "Zalijepi ili upi\u0161i link",
-"Target": "Meta",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Izgleda da je URL koji ste upisali e-mail adresa. \u017delite li dodati obavezan mailto: prefiks?",
-"Insert\/edit link": "Umetni\/izmijeni poveznicu",
-"Insert\/edit video": "Umetni\/izmijeni video",
-"Media": "Media",
-"Alternative source": "Alternativni izvor",
-"Paste your embed code below:": "Umetnite va\u0161 kod za ugradnju ispod:",
-"Insert video": "Umetni video",
-"Poster": "Poster",
-"Insert\/edit media": "Umetni\/uredi mediju",
-"Embed": "Ugradi",
-"Nonbreaking space": "Neprekidaju\u0107i razmak",
-"Page break": "Prijelom stranice",
-"Paste as text": "Zalijepi kao tekst",
-"Preview": "Pregled",
-"Print": "Ispis",
-"Save": "Spremi",
-"Could not find the specified string.": "Tra\u017eeni tekst nije prona\u0111en",
-"Replace": "Zamijeni",
-"Next": "Slijede\u0107i",
-"Whole words": "Cijele rije\u010di",
-"Find and replace": "Prona\u0111i i zamijeni",
-"Replace with": "Zamijeni s",
-"Find": "Tra\u017ei",
-"Replace all": "Zamijeni sve",
-"Match case": "Pazi na mala i velika slova",
-"Prev": "Prethodni",
-"Spellcheck": "Provjeri pravopis",
-"Finish": "Zavr\u0161i",
-"Ignore all": "Zanemari sve",
-"Ignore": "Zanemari",
-"Add to Dictionary": "Dodaj u rje\u010dnik",
-"Insert row before": "Umetni redak prije",
-"Rows": "Redci",
-"Height": "Visina",
-"Paste row after": "Zalijepi redak nakon",
-"Alignment": "Poravnanje",
-"Border color": "Boja ruba",
-"Column group": "Grupirani stupci",
-"Row": "Redak",
-"Insert column before": "Umetni stupac prije",
-"Split cell": "Razdvoji polja",
-"Cell padding": "Razmak unutar polja",
-"Cell spacing": "Razmak izme\u0111u polja",
-"Row type": "Vrsta redka",
-"Insert table": "Umetni tablicu",
-"Body": "Sadr\u017eaj",
-"Caption": "Natpis",
-"Footer": "Podno\u017eje",
-"Delete row": "Izbri\u0161i redak",
-"Paste row before": "Zalijepi redak prije",
-"Scope": "Doseg",
-"Delete table": "Izbri\u0161i tablicu",
-"H Align": "H Poravnavanje",
-"Top": "Vrh",
-"Header cell": "Polje zaglavlja",
-"Column": "Stupac",
-"Row group": "Grupirani redci",
-"Cell": "Polje",
-"Middle": "Sredina",
-"Cell type": "Vrsta polja",
-"Copy row": "Kopiraj redak",
-"Row properties": "Svojstva redka",
-"Table properties": "Svojstva tablice",
-"Bottom": "Dno",
-"V Align": "V Poravnavanje",
-"Header": "Zaglavlje",
-"Right": "Desno",
-"Insert column after": "Umetni stupac nakon",
-"Cols": "Stupci",
-"Insert row after": "Umetni redak nakon",
-"Width": "\u0160irina",
-"Cell properties": "Svojstva polja",
-"Left": "Lijevo",
-"Cut row": "Izre\u017ei redak",
-"Delete column": "Izbri\u0161i stupac",
-"Center": "Sredina",
-"Merge cells": "Spoji polja",
-"Insert template": "Umetni predlo\u017eak",
-"Templates": "Predlo\u0161ci",
-"Background color": "Boja pozadine",
-"Custom...": "Prilago\u0111eno...",
-"Custom color": "Prilago\u0111ena boja",
-"No color": "Bez boje",
-"Text color": "Boja teksta",
-"Table of Contents": "Sadr\u017eaj",
-"Show blocks": "Prika\u017ei blokove",
-"Show invisible characters": "Prika\u017ei nevidljive znakove",
-"Words: {0}": "Rije\u010di: {0}",
-"Insert": "Umetni",
-"File": "Datoteka",
-"Edit": "Izmijeni",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Pritisni ALT-F9 za izbornik. Pritisni ALT-F10 za alatnu traku. Pritisni ALT-0 za pomo\u0107",
-"Tools": "Alati",
-"View": "Pogled",
-"Table": "Tablica",
-"Format": "Oblikuj"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/hu.es5.js b/build/media_source/vendor/tinymce/langs/hu.es5.js
deleted file mode 100644
index ae5f9b9a0770c..0000000000000
--- a/build/media_source/vendor/tinymce/langs/hu.es5.js
+++ /dev/null
@@ -1,462 +0,0 @@
-tinymce.addI18n('hu',{
-"Redo": "Ism\u00e9t",
-"Undo": "Visszavon\u00e1s",
-"Cut": "Kiv\u00e1g\u00e1s",
-"Copy": "M\u00e1sol\u00e1s",
-"Paste": "Beilleszt\u00e9s",
-"Select all": "Minden kijel\u00f6l\u00e9se",
-"New document": "\u00daj dokumentum",
-"Ok": "Rendben",
-"Cancel": "M\u00e9gse",
-"Visual aids": "Vizu\u00e1lis seg\u00e9deszk\u00f6z\u00f6k",
-"Bold": "F\u00e9lk\u00f6v\u00e9r",
-"Italic": "D\u0151lt",
-"Underline": "Al\u00e1h\u00fazott",
-"Strikethrough": "\u00c1th\u00fazott",
-"Superscript": "Fels\u0151 index",
-"Subscript": "Als\u00f3 index",
-"Clear formatting": "Form\u00e1z\u00e1s t\u00f6rl\u00e9se",
-"Align left": "Balra igaz\u00edt",
-"Align center": "K\u00f6z\u00e9pre igaz\u00edt",
-"Align right": "Jobbra igaz\u00edt",
-"Justify": "Sorkiz\u00e1rt",
-"Bullet list": "Listajeles lista",
-"Numbered list": "Sz\u00e1mozott lista",
-"Decrease indent": "Beh\u00faz\u00e1s cs\u00f6kkent\u00e9se",
-"Increase indent": "Beh\u00faz\u00e1s n\u00f6vel\u00e9se",
-"Close": "Bez\u00e1r",
-"Formats": "Form\u00e1tumok",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "A b\u00f6ng\u00e9sz\u0151d nem t\u00e1mogatja a k\u00f6zvetlen hozz\u00e1f\u00e9r\u00e9st a v\u00e1g\u00f3laphoz. K\u00e9rlek, haszn\u00e1ld a Ctrl+X\/C\/V billenty\u0171ket.",
-"Headers": "C\u00edmsorok",
-"Header 1": "C\u00edmsor 1",
-"Header 2": "C\u00edmsor 2",
-"Header 3": "C\u00edmsor 3",
-"Header 4": "C\u00edmsor 4",
-"Header 5": "C\u00edmsor 5",
-"Header 6": "C\u00edmsor 6",
-"Headings": "Fejl\u00e9cek",
-"Heading 1": "1. fejl\u00e9c",
-"Heading 2": "2. fejl\u00e9c",
-"Heading 3": "3. fejl\u00e9c",
-"Heading 4": "4. fejl\u00e9c",
-"Heading 5": "5. fejl\u00e9c",
-"Heading 6": "6. fejl\u00e9c",
-"Preformatted": "El\u0151form\u00e1zott",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "K\u00f3d",
-"Paragraph": "Bekezd\u00e9s",
-"Blockquote": "Id\u00e9zetblokk",
-"Inline": "Foly\u00f3 sz\u00f6veg",
-"Blocks": "Blokkok",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Beilleszt\u00e9s mostant\u00f3l egyszer\u0171 sz\u00f6veg m\u00f3dban. A tartalmak mostant\u00f3l egyszer\u0171 sz\u00f6vegk\u00e9nt lesznek beillesztve, am\u00edg nem kapcsolod ki ezt az opci\u00f3t.",
-"Fonts": "Bet\u0171t\u00edpusok",
-"Font Sizes": "Bet\u0171m\u00e9retek",
-"Class": "Oszt\u00e1ly",
-"Browse for an image": "K\u00e9p keres\u00e9se tall\u00f3z\u00e1ssal",
-"OR": "VAGY",
-"Drop an image here": "H\u00fazz ide egy k\u00e9pet",
-"Upload": "Felt\u00f6lt\u00e9s",
-"Block": "Blokk",
-"Align": "Igaz\u00edt\u00e1s",
-"Default": "Alap\u00e9rtelmezett",
-"Circle": "K\u00f6r",
-"Disc": "Pont",
-"Square": "N\u00e9gyzet",
-"Lower Alpha": "Kisbet\u0171",
-"Lower Greek": "Kis g\u00f6r\u00f6g sz\u00e1m",
-"Lower Roman": "Kis r\u00f3mai sz\u00e1m",
-"Upper Alpha": "Nagybet\u0171",
-"Upper Roman": "Nagy r\u00f3mai sz\u00e1m",
-"Anchor...": "Horgony...",
-"Name": "N\u00e9v",
-"Id": "Azonos\u00edt\u00f3",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Az azonos\u00edt\u00f3nak bet\u0171vel kell kezd\u0151dnie, azut\u00e1n csak bet\u0171ket, sz\u00e1mokat, gondolatjeleket, pontokat, kett\u0151spontokat vagy al\u00e1h\u00faz\u00e1st tartalmazhat.",
-"You have unsaved changes are you sure you want to navigate away?": "Nem mentett m\u00f3dos\u00edt\u00e1said vannak, biztos hogy el akarsz navig\u00e1lni?",
-"Restore last draft": "Utols\u00f3 piszkozat vissza\u00e1ll\u00edt\u00e1sa",
-"Special character...": "Speci\u00e1lis karakter...",
-"Source code": "Forr\u00e1sk\u00f3d",
-"Insert\/Edit code sample": "K\u00f3dminta besz\u00far\u00e1sa\/szerkeszt\u00e9se",
-"Language": "Nyelv",
-"Code sample...": "K\u00f3dminta...",
-"Color Picker": "Sz\u00ednv\u00e1laszt\u00f3",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Balr\u00f3l jobbra",
-"Right to left": "Jobbr\u00f3l balra",
-"Emoticons": "Vigyorok",
-"Emoticons...": "Hangulatjelek...",
-"Metadata and Document Properties": "Metaadatok \u00e9s a dokumentum tulajdons\u00e1gai",
-"Title": "C\u00edm",
-"Keywords": "Kulcsszavak",
-"Description": "Le\u00edr\u00e1s",
-"Robots": "Robotok",
-"Author": "Szerz\u0151",
-"Encoding": "K\u00f3dol\u00e1s",
-"Fullscreen": "Teljes k\u00e9perny\u0151",
-"Action": "M\u0171velet",
-"Shortcut": "Parancsikon",
-"Help": "S\u00fag\u00f3",
-"Address": "C\u00edm",
-"Focus to menubar": "F\u00f3kusz a men\u00fcre",
-"Focus to toolbar": "F\u00f3kusz az eszk\u00f6zt\u00e1rra",
-"Focus to element path": "F\u00f3kusz az elemek \u00fatvonal\u00e1ra",
-"Focus to contextual toolbar": "F\u00f3kusz a k\u00f6rnyezetf\u00fcgg\u0151 eszk\u00f6zt\u00e1rra",
-"Insert link (if link plugin activated)": "Hivatkoz\u00e1s besz\u00far\u00e1sa (ha a hivatkoz\u00e1s b\u0151v\u00edtm\u00e9ny enged\u00e9lyezett)",
-"Save (if save plugin activated)": "Ment\u00e9s (ha a ment\u00e9s b\u0151v\u00edtm\u00e9ny enged\u00e9lyezett)",
-"Find (if searchreplace plugin activated)": "Keres\u00e9s (ha a keres\u00e9s \u00e9s csere b\u0151v\u00edtm\u00e9ny enged\u00e9lyezett)",
-"Plugins installed ({0}):": "Telep\u00edtett b\u0151v\u00edtm\u00e9nyek ({0}):",
-"Premium plugins:": "Pr\u00e9mium b\u0151v\u00edtm\u00e9nyek:",
-"Learn more...": "Tudj meg t\u00f6bbet...",
-"You are using {0}": "Haszn\u00e1latban: {0}",
-"Plugins": "Pluginek",
-"Handy Shortcuts": "Hasznos linkek",
-"Horizontal line": "V\u00edzszintes vonal",
-"Insert\/edit image": "K\u00e9p beilleszt\u00e9se\/szerkeszt\u00e9se",
-"Alternative description": "Alternat\u00edv le\u00edr\u00e1s",
-"Accessibility": "Akad\u00e1lymentes\u00edt\u00e9s",
-"Image is decorative": "Dekor\u00e1ci\u00f3s k\u00e9p",
-"Source": "Forr\u00e1s",
-"Dimensions": "M\u00e9retek",
-"Constrain proportions": "M\u00e9retar\u00e1ny",
-"General": "\u00c1ltal\u00e1nos",
-"Advanced": "Halad\u00f3",
-"Style": "St\u00edlus",
-"Vertical space": "Vertik\u00e1lis hely",
-"Horizontal space": "Horizont\u00e1lis hely",
-"Border": "Szeg\u00e9ly",
-"Insert image": "K\u00e9p beilleszt\u00e9se",
-"Image...": "K\u00e9p...",
-"Image list": "K\u00e9p lista",
-"Rotate counterclockwise": "Forgat\u00e1s az \u00f3ramutat\u00f3 j\u00e1r\u00e1s\u00e1val ellent\u00e9tesen",
-"Rotate clockwise": "Forgat\u00e1s az \u00f3ramutat\u00f3 j\u00e1r\u00e1s\u00e1val megegyez\u0151en",
-"Flip vertically": "F\u00fcgg\u0151leges t\u00fckr\u00f6z\u00e9s",
-"Flip horizontally": "V\u00edzszintes t\u00fckr\u00f6z\u00e9s",
-"Edit image": "K\u00e9p szerkeszt\u00e9se",
-"Image options": "K\u00e9p be\u00e1ll\u00edt\u00e1sok",
-"Zoom in": "Nagy\u00edt\u00e1s",
-"Zoom out": "Kicsiny\u00edt\u00e9s",
-"Crop": "K\u00e9p v\u00e1g\u00e1s",
-"Resize": "\u00c1tm\u00e9retez\u00e9s",
-"Orientation": "K\u00e9p t\u00e1jol\u00e1s",
-"Brightness": "F\u00e9nyer\u0151",
-"Sharpen": "\u00c9less\u00e9g",
-"Contrast": "Kontraszt",
-"Color levels": "Sz\u00ednszint",
-"Gamma": "Gamma",
-"Invert": "Inverz k\u00e9p",
-"Apply": "Ment\u00e9s",
-"Back": "Vissza",
-"Insert date\/time": "D\u00e1tum\/id\u0151 beilleszt\u00e9se",
-"Date\/time": "D\u00e1tum\/id\u0151",
-"Insert\/edit link": "Hivatkoz\u00e1s beilleszt\u00e9se\/szerkeszt\u00e9se",
-"Text to display": "Megjelen\u0151 sz\u00f6veg",
-"Url": "Url",
-"Open link in...": "Hivatkoz\u00e1s megnyit\u00e1sa...",
-"Current window": "Jelenlegi ablak",
-"None": "Nincs",
-"New window": "\u00daj ablak",
-"Open link": "Hivatkoz\u00e1s megnyit\u00e1sa",
-"Remove link": "Hivatkoz\u00e1s t\u00f6rl\u00e9se",
-"Anchors": "Horgonyok",
-"Link...": "Hivatkoz\u00e1s...",
-"Paste or type a link": "Hivatkoz\u00e1s be\u00edr\u00e1sa vagy beilleszt\u00e9se",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "A megadott URL email c\u00edmnek t\u0171nik. Szeretn\u00e9d hozz\u00e1adni a sz\u00fcks\u00e9ges mailto: el\u0151tagot?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "A megadott URL k\u00fcls\u0151 c\u00edmnek t\u0171nik. Szeretn\u00e9d hozz\u00e1adni a sz\u00fcks\u00e9ges http:\/\/ el\u0151tagot?",
-"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Az URL amit megadt\u00e1l k\u00fcls\u0151 hivatkoz\u00e1s. Szeretn\u00e9d https:\/\/ el\u0151taggal megnyitni?",
-"Link list": "Hivatkoz\u00e1slista",
-"Insert video": "Vide\u00f3 beilleszt\u00e9se",
-"Insert\/edit video": "Vide\u00f3 beilleszt\u00e9se\/szerkeszt\u00e9se",
-"Insert\/edit media": "M\u00e9dia besz\u00far\u00e1sa\/beilleszt\u00e9se",
-"Alternative source": "Alternat\u00edv forr\u00e1s",
-"Alternative source URL": "Alternat\u00edv forr\u00e1s URL",
-"Media poster (Image URL)": "M\u00e9dia poszter (k\u00e9p URL)",
-"Paste your embed code below:": "Illeszd be a be\u00e1gyaz\u00f3 k\u00f3dot alulra:",
-"Embed": "Be\u00e1gyaz\u00e1s",
-"Media...": "M\u00e9dia...",
-"Nonbreaking space": "Nem t\u00f6rhet\u0151 sz\u00f3k\u00f6z",
-"Page break": "Oldalt\u00f6r\u00e9s",
-"Paste as text": "Beilleszt\u00e9s sz\u00f6vegk\u00e9nt",
-"Preview": "El\u0151n\u00e9zet",
-"Print...": "Nyomtat\u00e1s...",
-"Save": "Ment\u00e9s",
-"Find": "Keres\u00e9s",
-"Replace with": "Csere erre",
-"Replace": "Csere",
-"Replace all": "Az \u00f6sszes cser\u00e9je",
-"Previous": "El\u0151z\u0151",
-"Next": "K\u00f6vetkez\u0151",
-"Find and Replace": "Keres\u00e9s \u00e9s csere",
-"Find and replace...": "Keres\u00e9s \u00e9s csere...",
-"Could not find the specified string.": "A be\u00edrt kifejez\u00e9s nem tal\u00e1lhat\u00f3.",
-"Match case": "Kis \u00e9s nagybet\u0171k megk\u00fcl\u00f6nb\u00f6ztet\u00e9se",
-"Find whole words only": "Csak teljes szavak keres\u00e9se",
-"Find in selection": "Keres\u00e9s a kiv\u00e1laszt\u00e1sban",
-"Spellcheck": "Helyes\u00edr\u00e1s ellen\u0151rz\u00e9s",
-"Spellcheck Language": "Helyes\u00edr\u00e1s-ellen\u0151rz\u00e9s nyelve",
-"No misspellings found.": "Nincsenek el\u00edr\u00e1sok.",
-"Ignore": "Figyelmen k\u00edv\u00fcl hagy",
-"Ignore all": "Mindent figyelmen k\u00edv\u00fcl hagy",
-"Finish": "Befejez\u00e9s",
-"Add to Dictionary": "Sz\u00f3t\u00e1rhoz ad",
-"Insert table": "T\u00e1bl\u00e1zat beilleszt\u00e9se",
-"Table properties": "T\u00e1bl\u00e1zat tulajdons\u00e1gok",
-"Delete table": "T\u00e1bl\u00e1zat t\u00f6rl\u00e9se",
-"Cell": "Cella",
-"Row": "Sor",
-"Column": "Oszlop",
-"Cell properties": "Cella tulajdons\u00e1gok",
-"Merge cells": "Cell\u00e1k egyes\u00edt\u00e9se",
-"Split cell": "Cell\u00e1k sz\u00e9tv\u00e1laszt\u00e1sa",
-"Insert row before": "Sor besz\u00far\u00e1sa el\u00e9",
-"Insert row after": "Sor besz\u00far\u00e1sa m\u00f6g\u00e9",
-"Delete row": "Sor t\u00f6rl\u00e9se",
-"Row properties": "Sor tulajdons\u00e1gai",
-"Cut row": "Sor kiv\u00e1g\u00e1sa",
-"Copy row": "Sor m\u00e1sol\u00e1sa",
-"Paste row before": "Sor beilleszt\u00e9se el\u00e9",
-"Paste row after": "Sor beilleszt\u00e9se m\u00f6g\u00e9",
-"Insert column before": "Oszlop besz\u00far\u00e1sa el\u00e9",
-"Insert column after": "Oszlop besz\u00far\u00e1sa m\u00f6g\u00e9",
-"Delete column": "Oszlop t\u00f6rl\u00e9se",
-"Cols": "Oszlopok",
-"Rows": "Sorok",
-"Width": "Sz\u00e9less\u00e9g",
-"Height": "Magass\u00e1g",
-"Cell spacing": "Cell\u00e1k t\u00e1vols\u00e1ga",
-"Cell padding": "Cella m\u00e9rete",
-"Caption": "Felirat",
-"Show caption": "C\u00edm megjelen\u00edt\u00e9se",
-"Left": "Bal",
-"Center": "K\u00f6z\u00e9p",
-"Right": "Jobb",
-"Cell type": "Cella t\u00edpusa",
-"Scope": "Hat\u00f3k\u00f6r",
-"Alignment": "Igaz\u00edt\u00e1s",
-"H Align": "V\u00edzszintes igaz\u00edt\u00e1s",
-"V Align": "F\u00fcgg\u0151leges igaz\u00edt\u00e1s",
-"Top": "Fel\u00fcl",
-"Middle": "K\u00f6z\u00e9pen",
-"Bottom": "Alul",
-"Header cell": "Fejl\u00e9c cella",
-"Row group": "Sor csoport",
-"Column group": "Oszlop csoport",
-"Row type": "Sor t\u00edpus",
-"Header": "Fejl\u00e9c",
-"Body": "Sz\u00f6vegt\u00f6rzs",
-"Footer": "L\u00e1bl\u00e9c",
-"Border color": "Szeg\u00e9ly sz\u00edne",
-"Insert template...": "Sablon besz\u00far\u00e1sa...",
-"Templates": "Sablonok",
-"Template": "Sablon",
-"Text color": "Sz\u00f6veg sz\u00edne",
-"Background color": "H\u00e1tt\u00e9r sz\u00edn",
-"Custom...": "Egy\u00e9ni...",
-"Custom color": "Egy\u00e9ni sz\u00edn",
-"No color": "Nincs sz\u00edn",
-"Remove color": "Sz\u00edn t\u00f6rl\u00e9se",
-"Table of Contents": "Tartalomjegyz\u00e9k",
-"Show blocks": "Blokkok mutat\u00e1sa",
-"Show invisible characters": "L\u00e1thatatlan karakterek mutat\u00e1sa",
-"Word count": "Szavak sz\u00e1ma",
-"Count": "Sz\u00e1m",
-"Document": "Dokumentum",
-"Selection": "Kiv\u00e1laszt\u00e1s",
-"Words": "Szavak",
-"Words: {0}": "Szavak: {0}",
-"{0} words": "{0} sz\u00f3",
-"File": "F\u00e1jl",
-"Edit": "Szerkeszt\u00e9s",
-"Insert": "Beilleszt\u00e9s",
-"View": "N\u00e9zet",
-"Format": "Form\u00e1tum",
-"Table": "T\u00e1bl\u00e1zat",
-"Tools": "Eszk\u00f6z\u00f6k",
-"Powered by {0}": "\u00dczemelteti: {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text ter\u00fclet. Nyomj ALT-F9-et a men\u00fch\u00f6z. Nyomj ALT-F10-et az eszk\u00f6zt\u00e1rhoz. Nyomj ALT-0-t a s\u00fag\u00f3hoz",
-"Image title": "K\u00e9p c\u00edme",
-"Border width": "Szeg\u00e9ly vastags\u00e1ga",
-"Border style": "Szeg\u00e9ly st\u00edlusa",
-"Error": "Hiba",
-"Warn": "Figyelmeztet\u00e9s",
-"Valid": "\u00c9rv\u00e9nyes",
-"To open the popup, press Shift+Enter": "A felugr\u00f3 ablak megnyit\u00e1s\u00e1hoz nyomja meg a Shift+Enter billenty\u0171t",
-"Rich Text Area. Press ALT-0 for help.": "Vizu\u00e1lis szerkeszt\u0151 ter\u00fclet. Nyomjon ALT-0-t a s\u00fag\u00f3hoz.",
-"System Font": "Rendszer-bet\u0171t\u00edpus",
-"Failed to upload image: {0}": "Nem siker\u00fclt felt\u00f6lteni a k\u00e9pet: {0}",
-"Failed to load plugin: {0} from url {1}": "Nem siker\u00fclt bet\u00f6lteni a be\u00e9p\u00fcl\u0151 modult: {0} err\u0151l a webc\u00edmr\u0151l: {1}",
-"Failed to load plugin url: {0}": "Nem siker\u00fclt bet\u00f6lteni a be\u00e9p\u00fcl\u0151 modul url-\u00e9t: {0}",
-"Failed to initialize plugin: {0}": "Nem siker\u00fclt inicializ\u00e1lni a be\u00e9p\u00fcl\u0151 modult: {0}",
-"example": "p\u00e9lda",
-"Search": "Keres\u00e9s",
-"All": "Minden",
-"Currency": "P\u00e9nznem",
-"Text": "Sz\u00f6veg",
-"Quotations": "Id\u00e9z\u0151jelek",
-"Mathematical": "Matematikai",
-"Extended Latin": "B\u0151v\u00edtett latin",
-"Symbols": "Szimb\u00f3lumok",
-"Arrows": "Nyilak",
-"User Defined": "Felhaszn\u00e1l\u00f3 \u00e1ltal meghat\u00e1rozott",
-"dollar sign": "doll\u00e1r jel",
-"currency sign": "valuta jel",
-"euro-currency sign": "euro-valuta jel",
-"colon sign": "kett\u0151spont",
-"cruzeiro sign": "cruzeiro jel",
-"french franc sign": "francia frank jel",
-"lira sign": "l\u00edra jel",
-"mill sign": "mill jel",
-"naira sign": "naira jel",
-"peseta sign": "peseta jel",
-"rupee sign": "r\u00fapia jel",
-"won sign": "won jel",
-"new sheqel sign": "\u00faj shekel jel",
-"dong sign": "dong jel",
-"kip sign": "kip jel",
-"tugrik sign": "tugrik jel",
-"drachma sign": "drachma jel",
-"german penny symbol": "n\u00e9met penny jel",
-"peso sign": "peso jel",
-"guarani sign": "guarani jel",
-"austral sign": "austral jel",
-"hryvnia sign": "hrivnya jel",
-"cedi sign": "cedi jel",
-"livre tournois sign": "livre tournois jel",
-"spesmilo sign": "spesmilo jel",
-"tenge sign": "tenge jel",
-"indian rupee sign": "r\u00fapel jel",
-"turkish lira sign": "t\u00f6r\u00f6k l\u00edra jel",
-"nordic mark sign": "\u00e9szaki m\u00e1rka jel",
-"manat sign": "manat jel",
-"ruble sign": "rubel jel",
-"yen character": "jen karakter",
-"yuan character": "j\u00fcan karakter",
-"yuan character, in hong kong and taiwan": "hongkongi \u00e9s tajvani j\u00fcan karakter",
-"yen\/yuan character variant one": "jen\/j\u00fcan karaktervari\u00e1ns",
-"Loading emoticons...": "Hangulatjelek bet\u00f6lt\u00e9se...",
-"Could not load emoticons": "Nem siker\u00fclt a hangulatjelek bet\u00f6lt\u00e9se",
-"People": "Emberek",
-"Animals and Nature": "\u00c1llatok \u00e9s term\u00e9szet",
-"Food and Drink": "\u00c9tel, ital",
-"Activity": "Tev\u00e9kenys\u00e9gek",
-"Travel and Places": "Utaz\u00e1s \u00e9s helyek",
-"Objects": "T\u00e1rgyak",
-"Flags": "Z\u00e1szl\u00f3k",
-"Characters": "Karakterek",
-"Characters (no spaces)": "Karakterek (sz\u00f3k\u00f6z\u00f6k n\u00e9lk\u00fcl)",
-"{0} characters": "{0} karakter",
-"Error: Form submit field collision.": "Hiba: \u00dctk\u00f6z\u00e9s t\u00f6rt\u00e9nt az \u0171rlap elk\u00fcld\u00e9sekor.",
-"Error: No form element found.": "Hiba: Nem tal\u00e1lhat\u00f3 \u0171rlap elem.",
-"Update": "Friss\u00edt\u00e9s",
-"Color swatch": "Sz\u00ednpaletta",
-"Turquoise": "T\u00fcrkiz",
-"Green": "Z\u00f6ld",
-"Blue": "K\u00e9k",
-"Purple": "Lila",
-"Navy Blue": "Tengerk\u00e9k",
-"Dark Turquoise": "S\u00f6t\u00e9tt\u00fcrkiz",
-"Dark Green": "S\u00f6t\u00e9tz\u00f6ld",
-"Medium Blue": "Kir\u00e1lyk\u00e9k",
-"Medium Purple": "K\u00f6z\u00e9plila",
-"Midnight Blue": "\u00c9jf\u00e9lk\u00e9k",
-"Yellow": "S\u00e1rga",
-"Orange": "Narancss\u00e1rga",
-"Red": "Piros",
-"Light Gray": "Vil\u00e1gossz\u00fcrke",
-"Gray": "Sz\u00fcrke",
-"Dark Yellow": "S\u00f6t\u00e9ts\u00e1rga",
-"Dark Orange": "S\u00f6t\u00e9t narancss\u00e1rga",
-"Dark Red": "S\u00f6t\u00e9tv\u00f6r\u00f6s",
-"Medium Gray": "K\u00f6z\u00e9psz\u00fcrke",
-"Dark Gray": "S\u00f6t\u00e9tsz\u00fcrke",
-"Light Green": "Vil\u00e1gosz\u00f6ld",
-"Light Yellow": "Vil\u00e1goss\u00e1rga",
-"Light Red": "Vil\u00e1gospiros",
-"Light Purple": "Vil\u00e1goslila",
-"Light Blue": "Vil\u00e1gosk\u00e9k",
-"Dark Purple": "S\u00f6t\u00e9tlila",
-"Dark Blue": "S\u00f6t\u00e9tk\u00e9k",
-"Black": "Fekete",
-"White": "Feh\u00e9r",
-"Switch to or from fullscreen mode": "Teljes vagy norm\u00e1l k\u00e9perny\u0151s m\u00f3dra v\u00e1lt\u00e1s",
-"Open help dialog": "S\u00fag\u00f3ablak megnyit\u00e1sa",
-"history": "el\u0151zm\u00e9nyek",
-"styles": "st\u00edlusok",
-"formatting": "form\u00e1z\u00e1s",
-"alignment": "igaz\u00edt\u00e1s",
-"indentation": "beh\u00faz\u00e1s",
-"Font": "Bet\u0171t\u00edpus",
-"Size": "M\u00e9ret",
-"More...": "Tov\u00e1bbiak...",
-"Select...": "V\u00e1lasszon...",
-"Preferences": "Preferenci\u00e1k",
-"Yes": "Igen",
-"No": "Nem",
-"Keyboard Navigation": "Billenty\u0171zettel val\u00f3 navig\u00e1l\u00e1s",
-"Version": "Verzi\u00f3",
-"Code view": "K\u00f3d n\u00e9zet",
-"Open popup menu for split buttons": "Felugr\u00f3 men\u00fc megnyit\u00e1sa az osztott gombokhoz",
-"List Properties": "Lista tulajdons\u00e1gai",
-"List properties...": "Lista tulajdons\u00e1gai...",
-"Start list at number": "Lista kezd\u00e9se ett\u0151l a sz\u00e1mt\u00f3l",
-"Line height": "Sor magass\u00e1ga",
-"comments": "megjegyz\u00e9sek",
-"Format Painter": "Form\u00e1tumm\u00e1sol\u00f3",
-"Insert\/edit iframe": "iframe besz\u00far\u00e1sa\/szerkeszt\u00e9se",
-"Capitalization": "Nagybet\u0171s \u00edr\u00e1s",
-"lowercase": "kisbet\u0171s",
-"UPPERCASE": "NAGYBET\u0170S",
-"Title Case": "C\u00edm szerinti \u00edr\u00e1sm\u00f3d",
-"permanent pen": "sz\u00f6vegkiemel\u0151",
-"Permanent Pen Properties": "Tart\u00f3s toll tulajdons\u00e1gai",
-"Permanent pen properties...": "Tart\u00f3s toll tulajdons\u00e1gai...",
-"case change": "esetv\u00e1lt\u00e1s",
-"page embed": "oldal be\u00e1gyaz\u00e1s",
-"Advanced sort...": "Speci\u00e1lis rendez\u00e9s... ",
-"Advanced Sort": "Speci\u00e1lis rendez\u00e9s",
-"Sort table by column ascending": "T\u00e1bl\u00e1zat rendez\u00e9se oszlop szerint n\u00f6vekv\u0151 sorrendben",
-"Sort table by column descending": "T\u00e1bl\u00e1zat rendez\u00e9se oszlop szerint cs\u00f6kken\u0151 sorrendben",
-"Sort": "Rendez\u00e9s",
-"Order": "Sorrend",
-"Sort by": "Rendez\u00e9s",
-"Ascending": "N\u00f6vekv\u0151",
-"Descending": "Cs\u00f6kken\u0151",
-"Column {0}": "Oszlop {0}",
-"Row {0}": "Sor {0}",
-"Spellcheck...": "Helyes\u00edr\u00e1s ellen\u0151rz\u00e9s...",
-"Misspelled word": "Helytelen\u00fcl \u00edrt sz\u00f3",
-"Suggestions": "Javaslatok",
-"Change": "V\u00e1ltoz\u00e1s",
-"Finding word suggestions": "Sz\u00f3javaslatok keres\u00e9se",
-"Success": "Siker",
-"Repair": "Jav\u00edt\u00e1s",
-"Issue {0} of {1}": "Probl\u00e9ma {0} - {1}",
-"Images must be marked as decorative or have an alternative text description": "A k\u00e9peket dekor\u00e1ci\u00f3k\u00e9nt kell megjel\u00f6lni, vagy alternat\u00edv sz\u00f6veges le\u00edr\u00e1ssal kell ell\u00e1tni",
-"Images must have an alternative text description. Decorative images are not allowed.": "A k\u00e9peknek alternat\u00edv sz\u00f6veges le\u00edr\u00e1ssal kell rendelkezni\u00fck. Dekor\u00e1ci\u00f3s k\u00e9pek nem megengedettek.",
-"Or provide alternative text:": "Vagy adjon meg alternat\u00edv sz\u00f6veget:",
-"Make image decorative:": "Dekor\u00e1ci\u00f3s k\u00e9p:",
-"ID attribute must be unique": "Az azonos\u00edt\u00f3 attrib\u00fatumnak egyedinek kell lennie",
-"Make ID unique": "Egyedi azonos\u00edt\u00f3 l\u00e9trehoz\u00e1sa",
-"Keep this ID and remove all others": "Ennek kiv\u00e9tel\u00e9vel az \u00f6sszes azonos\u00edt\u00f3 elt\u00e1vol\u00edt\u00e1sa",
-"Remove this ID": "Azonos\u00edt\u00f3 elt\u00e1vol\u00edt\u00e1sa",
-"Remove all IDs": "\u00d6sszes azonos\u00edt\u00f3 elt\u00e1vol\u00edt\u00e1sa",
-"Checklist": "Ellen\u0151rz\u0151 lista",
-"Anchor": "Horgony",
-"Special character": "Speci\u00e1lis karakter",
-"Code sample": "K\u00f3d p\u00e9lda",
-"Color": "Sz\u00edn",
-"Document properties": "Dokumentum tulajdons\u00e1gai",
-"Image description": "K\u00e9p le\u00edr\u00e1sa",
-"Image": "K\u00e9p",
-"Insert link": "Hivatkoz\u00e1s beilleszt\u00e9se",
-"Target": "C\u00e9l",
-"Link": "Hivatkoz\u00e1s",
-"Poster": "El\u0151n\u00e9zeti k\u00e9p",
-"Media": "M\u00e9dia",
-"Print": "Nyomtat\u00e1s",
-"Prev": "El\u0151z\u0151",
-"Find and replace": "Keres\u00e9s \u00e9s csere",
-"Whole words": "Csak ha ez a teljes sz\u00f3",
-"Insert template": "Sablon beilleszt\u00e9se"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/id.es5.js b/build/media_source/vendor/tinymce/langs/id.es5.js
deleted file mode 100644
index c02b821cb38e2..0000000000000
--- a/build/media_source/vendor/tinymce/langs/id.es5.js
+++ /dev/null
@@ -1,219 +0,0 @@
-tinymce.addI18n('id',{
-"Cut": "Penggal",
-"Heading 5": "Judul 5",
-"Header 2": "Judul 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Browser anda tidak mendukung akses langsung ke clipboard. Silahkan gunakan Ctrl+X\/C\/V dari keyboard.",
-"Heading 4": "Judul 4",
-"Div": "Div",
-"Heading 2": "Judul 2",
-"Paste": "Tempel",
-"Close": "Tutup",
-"Font Family": "Jenis Huruf",
-"Pre": "Pre",
-"Align right": "Rata kanan",
-"New document": "Dokumen baru",
-"Blockquote": "Kutipan",
-"Numbered list": "Daftar bernomor",
-"Heading 1": "Judul 1",
-"Headings": "Judul",
-"Increase indent": "Tambah inden",
-"Formats": "Format",
-"Headers": "Judul",
-"Select all": "Pilih semua",
-"Header 3": "Judul 3",
-"Blocks": "Blok",
-"Undo": "Batalkan",
-"Strikethrough": "Coret",
-"Bullet list": "Daftar bersimbol",
-"Header 1": "Judul 1",
-"Superscript": "Superskrip",
-"Clear formatting": "Hapus format",
-"Font Sizes": "Ukuran Huruf",
-"Subscript": "Subskrip",
-"Header 6": "Judul 6",
-"Redo": "Ulangi",
-"Paragraph": "Paragraf",
-"Ok": "Ok",
-"Bold": "Tebal",
-"Code": "Code",
-"Italic": "Miring",
-"Align center": "Rata tengah",
-"Header 5": "Judul 5",
-"Heading 6": "Judul 6",
-"Heading 3": "Judul 3",
-"Decrease indent": "Turunkan inden",
-"Header 4": "Judul 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Penempelan sekarang dalam modus teks biasa. Konten sekarang akan disisipkan sebagai teks biasa sampai Anda mamatikan pilihan ini.",
-"Underline": "Garis bawah",
-"Cancel": "Batal",
-"Justify": "Penuh",
-"Inline" : "Baris",
-"Copy": "Salin",
-"Align left": "Rata kiri",
-"Visual aids": "Alat bantu visual",
-"Lower Greek": "Huruf Kecil Yunani",
-"Square": "Kotak",
-"Default": "Bawaan",
-"Lower Alpha": "Huruf Kecil",
-"Circle": "Lingkaran",
-"Disc": "Cakram",
-"Upper Alpha": "Huruf Besar",
-"Upper Roman": "Huruf Besar Romawi",
-"Lower Roman": "Huruf Kecil Romawi",
-"Name": "Nama",
-"Anchor": "Jangkar",
-"You have unsaved changes are you sure you want to navigate away?": "Anda memiliki perubahan yang belum disimpan, yakin ingin beralih ?",
-"Restore last draft": "Muat kembali draft sebelumnya",
-"Special character": "Karakter khusus",
-"Source code": "Kode sumber",
-"B": "B",
-"R": "M",
-"G": "H",
-"Color": "Warna",
-"Right to left": "Kanan ke kiri",
-"Left to right": "Kiri ke kanan",
-"Emoticons": "Emotikon",
-"Robots": "Robot",
-"Document properties": "Properti dokumwn",
-"Title": "Judul",
-"Keywords": "Kata kunci",
-"Encoding": "Enkoding",
-"Description": "Description",
-"Author": "Penulis",
-"Fullscreen": "Layar penuh",
-"Horizontal line": "Garis horisontal",
-"Horizontal space": "Spasi Horisontal",
-"Insert\/edit image": "Sisip\/sunting gambar",
-"General": "Umum",
-"Advanced": "Lanjutan",
-"Source": "Sumber",
-"Border": "Batas",
-"Constrain proportions": "Samakan proporsi",
-"Vertical space": "Spasi vertikal",
-"Image description": "Deskripsi Gambar",
-"Style": "Gaya",
-"Dimensions": "Dimensi",
-"Insert image": "Sisipkan gambar",
-"Zoom in": "Perbesar",
-"Contrast": "Kontras",
-"Back": "Kembali",
-"Gamma": "Gamma",
-"Flip horizontally": "Balik horisontal",
-"Resize": "Ubah ukuran",
-"Sharpen": "Ketajaman",
-"Zoom out": "Perkecil",
-"Image options": "Opsi Gambar",
-"Apply": "Terapkan",
-"Brightness": "Kecerahan",
-"Rotate clockwise": "Putar searahjarumjam",
-"Rotate counterclockwise": "Putar berlawananjarumjam",
-"Edit image": "Sunting gambar",
-"Color levels": "Tingkat warna",
-"Crop": "Krop",
-"Orientation": "Orientasi",
-"Flip vertically": "Balik vertikal",
-"Invert": "Kebalikan",
-"Insert date\/time": "Sisipkan tanggal\/waktu",
-"Remove link": "Buang tautan",
-"Url": "Tautan",
-"Text to display": "Teks yang ditampilkan",
-"Anchors": "Jangkar",
-"Insert link": "Sisipkan tautan",
-"New window": "Jendela baru",
-"None": "Tdk ada",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Tautan yang anda masukkan sepertinya adalah tautan eksternal. Apakah Anda ingin menambahkan prefiks http:\/\/ yang dibutuhkan?",
-"Target": "Jendela Tujuan",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Tautan yang anda masukkan sepertinya adalah alamat email. Apakah Anda ingin menambahkan prefiks mailto: yang dibutuhkan?",
-"Insert\/edit link": "Sisip\/sunting tautan",
-"Insert\/edit video": "Sisip\/sunting video",
-"Poster": "Penulis",
-"Alternative source": "Sumber Alternatif",
-"Paste your embed code below:": "Tempel kode yang diembed dibawah ini:",
-"Insert video": "Sisipkan video",
-"Embed": "Embed",
-"Nonbreaking space": "Spasi ",
-"Page break": "Baris baru",
-"Paste as text": "Tempel sebagai teks biasa",
-"Preview": "Pratinjau",
-"Print": "Cetak",
-"Save": "Simpan",
-"Could not find the specified string.": "Tidak dapat menemukan string yang dimaksud.",
-"Replace": "Ganti",
-"Next": "Berikutnya",
-"Whole words": "Semua kata",
-"Find and replace": "Cari dan Ganti",
-"Replace with": "Ganti dengan",
-"Find": "Cari",
-"Replace all": "Ganti semua",
-"Match case": "Samakan besar kecil huruf",
-"Prev": "Sebelumnya",
-"Spellcheck": "Spellcheck",
-"Finish": "Selesai",
-"Ignore all": "Abaikan semua",
-"Ignore": "Abaikan",
-"Add to Dictionary": "Tambahkan ke kamus",
-"Insert row before": "Sisipkan baris sebelum",
-"Rows": "Barisan",
-"Height": "Tinggi",
-"Paste row after": "Tempel baris setelah",
-"Alignment": "Penjajaran",
-"Border color": "Warna batas",
-"Column group": "Kelompok kolom",
-"Row": "Baris",
-"Insert column before": "Sisipkan kolom sebelum",
-"Split cell": "Bagi sel",
-"Cell padding": "Lapisan sel",
-"Cell spacing": "Spasi sel",
-"Row type": "Tipe baris",
-"Insert table": "Sisipkan tabel",
-"Body": "Body",
-"Caption": "Caption",
-"Footer": "Footer",
-"Delete row": "Hapus baris",
-"Paste row before": "Tempel baris sebelum",
-"Scope": "Skup",
-"Delete table": "Hapus tabel",
-"H Align": "Rata Samping",
-"Top": "Atas",
-"Header cell": "Sel Header",
-"Column": "Kolom",
-"Row group": "Kelompok baris",
-"Cell": "Sel",
-"Middle": "Tengah",
-"Cell type": "Tipe sel",
-"Copy row": "Salin baris",
-"Row properties": "Properti baris",
-"Table properties": "Properti tabel",
-"Bottom": "bawah",
-"V Align": "Rata Atas",
-"Header": "Header",
-"Right": "Kanan",
-"Insert column after": "Sisipkan kolom setelah",
-"Cols": "Kolom",
-"Insert row after": "Sisipkan baris setelah",
-"Width": "Lebar",
-"Cell properties": "Properti sel",
-"Left": "Kiri",
-"Cut row": "Penggal baris",
-"Delete column": "Hapus kolom",
-"Center": "Tengah",
-"Merge cells": "Gabung sel",
-"Insert template": "Sisipkan templat",
-"Templates": "Templat",
-"Background color": "Warna latar",
-"Custom...": "Atur sendiri...",
-"Custom color": "Warna Sendiri",
-"No color": "Tidak berwarna",
-"Text color": "Warna teks",
-"Show blocks": "Tampilkan blok",
-"Show invisible characters": "Tampilkan karakter tak tampak",
-"Words: {0}": "Kata: {0}",
-"Insert": "Sisip",
-"File": "Berkas",
-"Edit": "Sunting",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Area teks kaya. Tekan ALT-F9 untuk menu. Tekan ALT-F10 untuk toolbar. Tekan ALT-0 untuk bantuan",
-"Tools": "Alat",
-"View": "Tampilan",
-"Table": "Tabel",
-"Format": "Format"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/it.es5.js b/build/media_source/vendor/tinymce/langs/it.es5.js
deleted file mode 100644
index 9e9eb828e728a..0000000000000
--- a/build/media_source/vendor/tinymce/langs/it.es5.js
+++ /dev/null
@@ -1,232 +0,0 @@
-tinymce.addI18n('it',{
-"Cut": "Taglia",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Il tuo browser non supporta l'accesso diretto negli Appunti. Per favore usa i tasti di scelta rapida Ctrl+X\/C\/V.",
-"Paste": "Incolla",
-"Paste as text": "Incolla come testo",
-"Close": "Chiudi",
-"Align right": "Allinea a Destra",
-"New document": "Nuovo Documento",
-"Numbered list": "Elenchi Numerati",
-"Increase indent": "Aumenta rientro",
-"Formats": "Formattazioni",
-"Select all": "Seleziona tutto",
-"Undo": "Annulla",
-"Strikethrough": "Barrato",
-"Bullet list": "Elenchi Puntati",
-"Superscript": "Apice",
-"Clear formatting": "Cancella formattazione",
-"Subscript": "Pedice",
-"Redo": "Ripristina",
-"Ok": "Ok",
-"Bold": "Grassetto",
-"Italic": "Corsivo",
-"Align center": "Allinea al Centro",
-"Decrease indent": "Riduci rientro",
-"Underline": "Sottolineato",
-"Cancel": "Cancella",
-"Justify": "Giustifica",
-"Copy": "Copia",
-"Align left": "Allinea a Sinistra",
-"Visual aids": "Elementi Visivi",
-"Lower Greek": "Minuscolo lettere greche",
-"Square": "Quadrato",
-"Default": "Predefinito",
-"Lower Alpha": "Minuscolo alfanumerico",
-"Circle": "Cerchio",
-"Disc": "Disco",
-"Upper Alpha": "Maiuscolo alfanumerico",
-"Upper Roman": "Maiuscolo lettere romane",
-"Lower Roman": "Minuscolo lettere romane",
-"Name": "Nome",
-"Anchor": "Ancora",
-"Anchors": "Ancora",
-"You have unsaved changes are you sure you want to navigate away?": "Non hai salvato delle modifiche, sei sicuro di andartene?",
-"Restore last draft": "Ripristina l'ultima bozza.",
-"Special character": "Inserisci Carattere Speciale",
-"Source code": "Codice Sorgente",
-"Right to left": "Da Destra a Sinistra",
-"Left to right": "Da Sinistra a Destra",
-"Emoticons": "Faccine",
-"Robots": "Robot",
-"Document properties": "Propriet\u00e0 Documento",
-"Title": "Titolo",
-"Keywords": "Parola Chiave",
-"Encoding": "Codifica",
-"Description": "Descrizione",
-"Author": "Autore",
-"Fullscreen": "Schermo Intero",
-"Horizontal line": "Linea Orizzontale",
-"Horizontal space": "Spazio Orizzontale",
-"Insert\/edit image": "Aggiungi\/Modifica Immagine",
-"General": "Generale",
-"Advanced": "Avanzato",
-"Source": "URL",
-"Border": "Bordo",
-"Constrain proportions": "Mantieni Proporzioni",
-"Vertical space": "Spazio Verticale",
-"Image description": "Descrizione Immagine",
-"Style": "Stile",
-"Dimensions": "Dimensioni",
-"Insert image": "Inserisci immagine",
-"Insert date\/time": "Inserisci Data\/Ora",
-"Remove link": "Rimuovi Link",
-"Url": "Url",
-"Text to display": "Testo da Visualizzare",
-"Insert link": "Inserisci Link",
-"New window": "Nuova Finestra",
-"None": "No",
-"Target": "Target",
-"Insert\/edit link": "Inserisci\/Modifica link",
-"Insert\/edit video": "Inserisci\/Modifica video",
-"Poster": "Anteprima",
-"Alternative source": "Alternativo",
-"Paste your embed code below:": "Incolla qui il codice da incorporare:",
-"Insert video": "Inserisci Video",
-"Embed": "Incorporare",
-"Nonbreaking space": "Spazio unificatore",
-"Preview": "Anteprima",
-"Print": "Stampa",
-"Save": "Salva",
-"Could not find the specified string.": "Impossibile trovare la parola specifica.",
-"Replace": "Sostituisci",
-"Next": "Successivo",
-"Whole words": "Parole intere",
-"Find and replace": "Trova e Sostituisci",
-"Replace with": "Sostituisci con",
-"Find": "Trova",
-"Replace all": "Sostituisci tutto",
-"Match case": "Maiuscole\/Minuscole ",
-"Prev": "Precedente",
-"Spellcheck": "Controllo ortografico",
-"Finish": "Termina",
-"Ignore all": "Ignora tutto",
-"Ignore": "Ignora",
-"Insert row before": "Inserisci una Riga prima",
-"Rows": "Righe",
-"Height": "Altezza",
-"Paste row after": "Incolla una Riga dopo",
-"Alignment": "Allineamento",
-"Column group": "Gruppo di Colonne",
-"Row": "Riga",
-"Insert column before": "Inserisci una Colonna prima",
-"Split cell": "Dividi Cella",
-"Cell padding": "Padding della Cella",
-"Cell spacing": "Spaziatura della Cella",
-"Row type": "Tipo di Riga",
-"Insert table": "Inserisci Tabella",
-"Body": "Body",
-"Caption": "Didascalia",
-"Footer": "Footer",
-"Delete row": "Cancella Riga",
-"Paste row before": "Incolla una Riga prima",
-"Scope": "Campo",
-"Delete table": "Cancella Tabella",
-"Header cell": "cella d'intestazione",
-"Column": "Colonna",
-"Cell": "Cella",
-"Header": "Header",
-"Cell type": "Tipo di Cella",
-"Copy row": "Copia Riga",
-"Row properties": "Propriet\u00e0 della Riga",
-"Table properties": "Propriet\u00e0 della Tabella",
-"Row group": "Gruppo di Righe",
-"Right": "Destra",
-"Insert column after": "Inserisci una Colonna dopo",
-"Cols": "Colonne",
-"Insert row after": "Inserisci una Riga dopo",
-"Width": "Larghezza",
-"Cell properties": "Propriet\u00e0 della Cella",
-"Left": "Sinistra",
-"Cut row": "Taglia Riga",
-"Delete column": "Cancella Colonna",
-"Center": "Centro",
-"Merge cells": "Unisci Cella",
-"Insert template": "Inserisci Template",
-"Templates": "Template",
-"Background color": "Colore Sfondo",
-"Text color": "Colore Testo",
-"Show blocks": "Mostra Blocchi",
-"Show invisible characters": "Mostra Caratteri Invisibili",
-"Words: {0}": "Parole: {0}",
-"Insert": "Inserisci",
-"File": "File",
-"Edit": "Modifica",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Premi ALT-F9 per il men\u00f9. Premi ALT-F10 per la barra degli strumenti. Premi ALT-0 per l'aiuto.",
-"Tools": "Strumenti",
-"View": "Visualizza",
-"Table": "Tabella",
-"Format": "Formato",
-"Inline": "Formato",
-"Blocks": "Blocchi",
-"Zoom in": "Zoom",
-"Contrast": "Contrasto",
-"Back": "Indietro",
-"Gamma": "Gamma",
-"Flip horizontally": "Capovolgi orizzontalmente",
-"Resize": "Ridimensiona",
-"Sharpen": "Affila",
-"Zoom out": "Zoom indietro",
-"Image options": "Opzioni immagine",
-"Apply": "Applica",
-"Brightness": "Luminosit\u00e0",
-"Rotate clockwise": "Ruota in senso orario",
-"Rotate counterclockwise": "Ruota in senso antiorario",
-"Edit image": "Modifica Immagine",
-"Color levels": "Livelli colore",
-"Crop": "Rifila",
-"Orientation": "Orientamento",
-"Flip vertically": "Capovolgi verticalmente",
-"Invert": "Inverti",
-"Font Family": "Famiglia Carattere",
-"Font Sizes": "Grandezza Carattere",
-"Paragraph": "Paragrafo",
-"Address": "Indirizzo",
-"Blockquote": "Citazione",
-"Pre": "Preformattato",
-"Code": "Codice",
-"H Align": "Allineamento orizzontale",
-"V Align": "Allineamento verticale",
-"Top": "Sopra",
-"Middle": "Al centro",
-"Bottom": "Sotto",
-"Headers": "Intestazioni",
-"Header 1": "Intestazione 1",
-"Header 2": "Intestazione 2",
-"Header 3": "Intestazione 3",
-"Header 4": "Intestazione 4",
-"Header 5": "Intestazione 5",
-"Header 6": "Intestazione 6",
-"Headings": "Intestazioni",
-"Heading 1": "Intestazione 1",
-"Heading 2": "Intestazione 2",
-"Heading 3": "Intestazione 3",
-"Heading 4": "Intestazione 4",
-"Heading 5": "Intestazione 5",
-"Heading 6": "Intestazione 6",
-"Preformatted": "Preformattato",
-"Add to Dictionary": "Aggiungi al dizionario",
-"Insert Time": "Inserisci ora",
-"Insert nonbreaking space": "Inserisci uno spazio",
-"Insert\/Edit code sample": "Inserisci\/modifica codice da mostrare",
-"Language": "Linguaggio",
-"Toggle blockquote": "Testo quotato",
-"Border color": "Colore bordo",
-"Color": "Colore",
-"Custom...": "Personalizza...",
-"Custom color": "Personalizza colore",
-"No color": "Nessun colore",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "L'Id dovrebbe iniziare con una lettera, seguita solo da lettere, numeri, trattini, due punti, virgole o underscore.",
-"Insert/Edit code sample": "Inserisci/Modifica codice di esempio",
-"Language": "Lingua",
-"Image": "Immagine",
-"Date/time": "Data/ora",
-"Link": "Link",
-"Paste or type a link": "Incolla o scrivi un link",
-"Insert/Edit Media": "Inserisci/Modifica oggetto multimediale",
-"Media": "Media",
-"Table of Contents": "Tabella di contenuti",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "L'incolla è ora in modalità di testo normale. I contenuti verranno incollati come testo normale fino a quando non disattiverai questa opzione.",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL inserito sembra essere un collegamento esterno. Vuoi aggiungere il prefisso necessario http:\/\/?",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL inserito sembra essere un indirizzo email. Vuoi aggiungere il prefisso necessario mailto:?"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/ja.es5.js b/build/media_source/vendor/tinymce/langs/ja.es5.js
deleted file mode 100644
index b9cc6a2135289..0000000000000
--- a/build/media_source/vendor/tinymce/langs/ja.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('ja',{
-"Cut": "\u5207\u308a\u53d6\u308a",
-"Heading 5": "\u898b\u51fa\u3057 5",
-"Header 2": "\u30d8\u30c3\u30c0\u30fc 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u304a\u4f7f\u3044\u306e\u30d6\u30e9\u30a6\u30b6\u3067\u306f\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u6a5f\u80fd\u3092\u5229\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002\u30ad\u30fc\u30dc\u30fc\u30c9\u306e\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\uff08Ctrl+X, Ctrl+C, Ctrl+V\uff09\u3092\u304a\u4f7f\u3044\u4e0b\u3055\u3044\u3002",
-"Heading 4": "\u898b\u51fa\u3057 4",
-"Div": "Div",
-"Heading 2": "\u898b\u51fa\u3057 2",
-"Paste": "\u8cbc\u308a\u4ed8\u3051",
-"Close": "\u9589\u3058\u308b",
-"Font Family": "\u30d5\u30a9\u30f3\u30c8\u30d5\u30a1\u30df\u30ea\u30fc",
-"Pre": "Pre",
-"Align right": "\u53f3\u5bc4\u305b",
-"New document": "\u65b0\u898f\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8",
-"Blockquote": "\u5f15\u7528",
-"Numbered list": "\u756a\u53f7\u4ed8\u304d\u7b87\u6761\u66f8\u304d",
-"Heading 1": "\u898b\u51fa\u3057 1",
-"Headings": "\u898b\u51fa\u3057",
-"Increase indent": "\u30a4\u30f3\u30c7\u30f3\u30c8\u3092\u5897\u3084\u3059",
-"Formats": "\u66f8\u5f0f",
-"Headers": "\u30d8\u30c3\u30c0\u30fc",
-"Select all": "\u5168\u3066\u3092\u9078\u629e",
-"Header 3": "\u30d8\u30c3\u30c0\u30fc 3",
-"Blocks": "\u30d6\u30ed\u30c3\u30af",
-"Undo": "\u5143\u306b\u623b\u3059",
-"Strikethrough": "\u53d6\u308a\u6d88\u3057\u7dda",
-"Bullet list": "\u7b87\u6761\u66f8\u304d",
-"Header 1": "\u30d8\u30c3\u30c0\u30fc 1",
-"Superscript": "\u4e0a\u4ed8\u304d\u6587\u5b57",
-"Clear formatting": "\u66f8\u5f0f\u3092\u30af\u30ea\u30a2",
-"Font Sizes": "\u30d5\u30a9\u30f3\u30c8\u30b5\u30a4\u30ba",
-"Subscript": "\u4e0b\u4ed8\u304d\u6587\u5b57",
-"Header 6": "\u30d8\u30c3\u30c0\u30fc 6",
-"Redo": "\u3084\u308a\u76f4\u3059",
-"Paragraph": "\u6bb5\u843d",
-"Ok": "OK",
-"Bold": "\u592a\u5b57",
-"Code": "\u30b3\u30fc\u30c9",
-"Italic": "\u659c\u4f53",
-"Align center": "\u4e2d\u592e\u63c3\u3048",
-"Header 5": "\u30d8\u30c3\u30c0\u30fc 5",
-"Heading 6": "\u898b\u51fa\u3057 6",
-"Heading 3": "\u898b\u51fa\u3057 3",
-"Decrease indent": "\u30a4\u30f3\u30c7\u30f3\u30c8\u3092\u6e1b\u3089\u3059",
-"Header 4": "\u30d8\u30c3\u30c0\u30fc 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u8cbc\u308a\u4ed8\u3051\u306f\u73fe\u5728\u30d7\u30ec\u30fc\u30f3\u30c6\u30ad\u30b9\u30c8\u30e2\u30fc\u30c9\u3067\u3059\u3002\u3053\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u30aa\u30d5\u306b\u3057\u306a\u3044\u9650\u308a\u5185\u5bb9\u306f\u30d7\u30ec\u30fc\u30f3\u30c6\u30ad\u30b9\u30c8\u3068\u3057\u3066\u8cbc\u308a\u4ed8\u3051\u3089\u308c\u307e\u3059\u3002",
-"Underline": "\u4e0b\u7dda",
-"Cancel": "\u30ad\u30e3\u30f3\u30bb\u30eb",
-"Justify": "\u4e21\u7aef\u63c3\u3048",
-"Inline": "\u30a4\u30f3\u30e9\u30a4\u30f3",
-"Copy": "\u30b3\u30d4\u30fc",
-"Align left": "\u5de6\u5bc4\u305b",
-"Visual aids": "\u8868\u306e\u67a0\u7dda\u3092\u70b9\u7dda\u3067\u8868\u793a",
-"Lower Greek": "\u5c0f\u6587\u5b57\u306e\u30ae\u30ea\u30b7\u30e3\u6587\u5b57",
-"Square": "\u56db\u89d2",
-"Default": "\u30c7\u30d5\u30a9\u30eb\u30c8",
-"Lower Alpha": "\u5c0f\u6587\u5b57\u306e\u30a2\u30eb\u30d5\u30a1\u30d9\u30c3\u30c8",
-"Circle": "\u5186",
-"Disc": "\u70b9",
-"Upper Alpha": "\u5927\u6587\u5b57\u306e\u30a2\u30eb\u30d5\u30a1\u30d9\u30c3\u30c8",
-"Upper Roman": "\u5927\u6587\u5b57\u306e\u30ed\u30fc\u30de\u6570\u5b57",
-"Lower Roman": "\u5c0f\u6587\u5b57\u306e\u30ed\u30fc\u30de\u6570\u5b57",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID\u306f\u6587\u5b57\u3067\u59cb\u307e\u308a\u3001\u6587\u5b57\u3001\u6570\u5b57\u3001\u30c0\u30c3\u30b7\u30e5\u3001\u30c9\u30c3\u30c8\u3001\u30b3\u30ed\u30f3\u307e\u305f\u306f\u30a2\u30f3\u30c0\u30fc\u30b9\u30b3\u30a2\u3067\u59cb\u307e\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002",
-"Name": "\u30a2\u30f3\u30ab\u30fc\u540d",
-"Anchor": "\u30a2\u30f3\u30ab\u30fc\uff08\u30ea\u30f3\u30af\u306e\u5230\u9054\u70b9\uff09",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "\u307e\u3060\u4fdd\u5b58\u3057\u3066\u3044\u306a\u3044\u5909\u66f4\u304c\u3042\u308a\u307e\u3059\u304c\u3001\u672c\u5f53\u306b\u3053\u306e\u30da\u30fc\u30b8\u3092\u96e2\u308c\u307e\u3059\u304b\uff1f",
-"Restore last draft": "\u524d\u56de\u306e\u4e0b\u66f8\u304d\u3092\u5fa9\u6d3b\u3055\u305b\u308b",
-"Special character": "\u7279\u6b8a\u6587\u5b57",
-"Source code": "\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9",
-"Language": "\u8a00\u8a9e",
-"Insert\/Edit code sample": "\u30b3\u30fc\u30c9\u30b5\u30f3\u30d7\u30eb\u306e\u633f\u5165\u30fb\u7de8\u96c6",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "\u30ab\u30e9\u30fc",
-"Right to left": "\u53f3\u304b\u3089\u5de6",
-"Left to right": "\u5de6\u304b\u3089\u53f3",
-"Emoticons": "\u7d75\u6587\u5b57",
-"Robots": "\u30ed\u30dc\u30c3\u30c4",
-"Document properties": "\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u306e\u30d7\u30ed\u30d1\u30c6\u30a3",
-"Title": "\u30bf\u30a4\u30c8\u30eb",
-"Keywords": "\u30ad\u30fc\u30ef\u30fc\u30c9",
-"Encoding": "\u30a8\u30f3\u30b3\u30fc\u30c7\u30a3\u30f3\u30b0",
-"Description": "\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u5185\u5bb9",
-"Author": "\u8457\u8005",
-"Fullscreen": "\u5168\u753b\u9762\u8868\u793a",
-"Horizontal line": "\u6c34\u5e73\u7f6b\u7dda",
-"Horizontal space": "\u6a2a\u65b9\u5411\u306e\u4f59\u767d",
-"Insert\/edit image": "\u753b\u50cf\u306e\u633f\u5165\u30fb\u7de8\u96c6",
-"General": "\u4e00\u822c",
-"Advanced": "\u8a73\u7d30\u8a2d\u5b9a",
-"Source": "\u753b\u50cf\u306e\u30bd\u30fc\u30b9",
-"Border": "\u67a0\u7dda",
-"Constrain proportions": "\u7e26\u6a2a\u6bd4\u3092\u4fdd\u6301\u3059\u308b",
-"Vertical space": "\u7e26\u65b9\u5411\u306e\u4f59\u767d",
-"Image description": "\u753b\u50cf\u306e\u8aac\u660e\u6587",
-"Style": "\u30b9\u30bf\u30a4\u30eb",
-"Dimensions": "\u753b\u50cf\u30b5\u30a4\u30ba\uff08\u6a2a\u30fb\u7e26\uff09",
-"Insert image": "\u753b\u50cf\u306e\u633f\u5165",
-"Image": "\u753b\u50cf",
-"Zoom in": "\u30ba\u30fc\u30e0\u30a4\u30f3",
-"Contrast": "\u30b3\u30f3\u30c8\u30e9\u30b9\u30c8",
-"Back": "\u623b\u308b",
-"Gamma": "\u30ac\u30f3\u30de",
-"Flip horizontally": "\u6c34\u5e73\u306b\u53cd\u8ee2",
-"Resize": "\u30ea\u30b5\u30a4\u30ba",
-"Sharpen": "\u30b7\u30e3\u30fc\u30d7\u5316",
-"Zoom out": "\u30ba\u30fc\u30e0\u30a2\u30a6\u30c8",
-"Image options": "\u753b\u50cf\u30aa\u30d7\u30b7\u30e7\u30f3",
-"Apply": "\u9069\u7528",
-"Brightness": "\u660e\u308b\u3055",
-"Rotate clockwise": "\u6642\u8a08\u56de\u308a\u306b\u56de\u8ee2",
-"Rotate counterclockwise": "\u53cd\u6642\u8a08\u56de\u308a\u306b\u56de\u8ee2",
-"Edit image": "\u753b\u50cf\u306e\u7de8\u96c6",
-"Color levels": "\u30ab\u30e9\u30fc\u30ec\u30d9\u30eb",
-"Crop": "\u30af\u30ed\u30c3\u30d7",
-"Orientation": "\u5411\u304d",
-"Flip vertically": "\u4e0a\u4e0b\u306b\u53cd\u8ee2",
-"Invert": "\u53cd\u8ee2",
-"Date\/time": "\u65e5\u4ed8\u30fb\u6642\u523b",
-"Insert date\/time": "\u65e5\u4ed8\u30fb\u6642\u523b",
-"Remove link": "\u30ea\u30f3\u30af\u306e\u524a\u9664",
-"Url": "\u30ea\u30f3\u30af\u5148URL",
-"Text to display": "\u30ea\u30f3\u30af\u5143\u30c6\u30ad\u30b9\u30c8",
-"Anchors": "\u30a2\u30f3\u30ab\u30fc\uff08\u30ea\u30f3\u30af\u306e\u5230\u9054\u70b9\uff09",
-"Insert link": "\u30ea\u30f3\u30af",
-"Link": "\u30ea\u30f3\u30af",
-"New window": "\u65b0\u898f\u30a6\u30a3\u30f3\u30c9\u30a6",
-"None": "\u306a\u3057",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u5165\u529b\u3055\u308c\u305fURL\u306f\u5916\u90e8\u30ea\u30f3\u30af\u306e\u3088\u3046\u3067\u3059\u3002\u300chttp:\/\/\u300d\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u304b\uff1f",
-"Paste or type a link": "\u30ea\u30f3\u30af\u3092\u30da\u30fc\u30b9\u30c8\u307e\u305f\u306f\u5165\u529b",
-"Target": "\u30bf\u30fc\u30b2\u30c3\u30c8\u5c5e\u6027",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u5165\u529b\u3055\u308c\u305fURL\u306f\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u306e\u3088\u3046\u3067\u3059\u3002\u300cmailto:\u300d\u30d7\u30ec\u30d5\u30a3\u30c3\u30af\u30b9\u3092\u8ffd\u52a0\u3057\u307e\u3059\u304b\uff1f",
-"Insert\/edit link": "\u30ea\u30f3\u30af\u306e\u633f\u5165\u30fb\u7de8\u96c6",
-"Insert\/edit video": "\u52d5\u753b\u306e\u633f\u5165\u30fb\u7de8\u96c6",
-"Media": "\u30e1\u30c7\u30a3\u30a2",
-"Alternative source": "\u4ee3\u66ff\u52d5\u753b\u306e\u5834\u6240",
-"Paste your embed code below:": "\u57cb\u3081\u8fbc\u307f\u7528\u30b3\u30fc\u30c9\u3092\u4e0b\u8a18\u306b\u8cbc\u308a\u4ed8\u3051\u3066\u304f\u3060\u3055\u3044\u3002",
-"Insert video": "\u52d5\u753b",
-"Poster": "\u4ee3\u66ff\u753b\u50cf\u306e\u5834\u6240",
-"Insert\/edit media": "\u30e1\u30c7\u30a3\u30a2\u306e\u633f\u5165\u30fb\u7de8\u96c6",
-"Embed": "\u57cb\u3081\u8fbc\u307f",
-"Nonbreaking space": "\u56fa\u5b9a\u30b9\u30da\u30fc\u30b9\uff08&nbsp;\uff09",
-"Page break": "\u30da\u30fc\u30b8\u533a\u5207\u308a",
-"Paste as text": "\u30c6\u30ad\u30b9\u30c8\u3068\u3057\u3066\u8cbc\u308a\u4ed8\u3051",
-"Preview": "\u30d7\u30ec\u30d3\u30e5\u30fc",
-"Print": "\u5370\u5237",
-"Save": "\u4fdd\u5b58",
-"Could not find the specified string.": "\u304a\u63a2\u3057\u306e\u6587\u5b57\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f\u3002",
-"Replace": "\u7f6e\u304d\u63db\u3048",
-"Next": "\u6b21",
-"Whole words": "\u5358\u8a9e\u5358\u4f4d\u3067\u691c\u7d22\u3059\u308b",
-"Find and replace": "\u691c\u7d22\u3068\u7f6e\u304d\u63db\u3048",
-"Replace with": "\u7f6e\u304d\u63db\u3048\u308b\u6587\u5b57",
-"Find": "\u691c\u7d22",
-"Replace all": "\u5168\u3066\u3092\u7f6e\u304d\u63db\u3048\u308b",
-"Match case": "\u5927\u6587\u5b57\u30fb\u5c0f\u6587\u5b57\u3092\u533a\u5225\u3059\u308b",
-"Prev": "\u524d",
-"Spellcheck": "\u30b9\u30da\u30eb\u30c1\u30a7\u30c3\u30af",
-"Finish": "\u7d42\u4e86",
-"Ignore all": "\u5168\u3066\u3092\u7121\u8996",
-"Ignore": "\u7121\u8996",
-"Add to Dictionary": "\u8f9e\u66f8\u306b\u8ffd\u52a0",
-"Insert row before": "\u4e0a\u5074\u306b\u884c\u3092\u633f\u5165",
-"Rows": "\u884c\u6570",
-"Height": "\u9ad8\u3055",
-"Paste row after": "\u4e0b\u5074\u306b\u884c\u3092\u8cbc\u308a\u4ed8\u3051",
-"Alignment": "\u914d\u7f6e",
-"Border color": "\u67a0\u7dda\u306e\u8272",
-"Column group": "\u5217\u30b0\u30eb\u30fc\u30d7",
-"Row": "\u884c",
-"Insert column before": "\u5de6\u5074\u306b\u5217\u3092\u633f\u5165",
-"Split cell": "\u30bb\u30eb\u306e\u5206\u5272",
-"Cell padding": "\u30bb\u30eb\u5185\u4f59\u767d\uff08\u30d1\u30c7\u30a3\u30f3\u30b0\uff09",
-"Cell spacing": "\u30bb\u30eb\u306e\u9593\u9694",
-"Row type": "\u884c\u30bf\u30a4\u30d7",
-"Insert table": "\u8868\u306e\u633f\u5165",
-"Body": "\u30dc\u30c7\u30a3\u30fc",
-"Caption": "\u8868\u984c",
-"Footer": "\u30d5\u30c3\u30bf\u30fc",
-"Delete row": "\u884c\u306e\u524a\u9664",
-"Paste row before": "\u4e0a\u5074\u306b\u884c\u3092\u8cbc\u308a\u4ed8\u3051",
-"Scope": "\u30b9\u30b3\u30fc\u30d7",
-"Delete table": "\u8868\u306e\u524a\u9664",
-"H Align": "\u6c34\u5e73\u65b9\u5411\u306e\u914d\u7f6e",
-"Top": "\u4e0a",
-"Header cell": "\u30d8\u30c3\u30c0\u30fc\u30bb\u30eb",
-"Column": "\u5217",
-"Row group": "\u884c\u30b0\u30eb\u30fc\u30d7",
-"Cell": "\u30bb\u30eb",
-"Middle": "\u4e2d\u592e",
-"Cell type": "\u30bb\u30eb\u30bf\u30a4\u30d7",
-"Copy row": "\u884c\u306e\u30b3\u30d4\u30fc",
-"Row properties": "\u884c\u306e\u8a73\u7d30\u8a2d\u5b9a",
-"Table properties": "\u8868\u306e\u8a73\u7d30\u8a2d\u5b9a",
-"Bottom": "\u4e0b",
-"V Align": "\u5782\u76f4\u65b9\u5411\u306e\u914d\u7f6e",
-"Header": "\u30d8\u30c3\u30c0\u30fc",
-"Right": "\u53f3\u5bc4\u305b",
-"Insert column after": "\u53f3\u5074\u306b\u5217\u3092\u633f\u5165",
-"Cols": "\u5217\u6570",
-"Insert row after": "\u4e0b\u5074\u306b\u884c\u3092\u633f\u5165",
-"Width": "\u5e45",
-"Cell properties": "\u30bb\u30eb\u306e\u8a73\u7d30\u8a2d\u5b9a",
-"Left": "\u5de6\u5bc4\u305b",
-"Cut row": "\u884c\u306e\u5207\u308a\u53d6\u308a",
-"Delete column": "\u5217\u306e\u524a\u9664",
-"Center": "\u4e2d\u592e\u63c3\u3048",
-"Merge cells": "\u30bb\u30eb\u306e\u7d50\u5408",
-"Insert template": "\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u306e\u633f\u5165",
-"Templates": "\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u540d",
-"Background color": "\u80cc\u666f\u8272",
-"Custom...": "\u30ab\u30b9\u30bf\u30e0...",
-"Custom color": "\u30ab\u30b9\u30bf\u30e0\u30ab\u30e9\u30fc",
-"No color": "\u30ab\u30e9\u30fc\u306a\u3057",
-"Text color": "\u30c6\u30ad\u30b9\u30c8\u306e\u8272",
-"Table of Contents": "\u76ee\u6b21",
-"Show blocks": "\u6587\u7ae0\u306e\u533a\u5207\u308a\u3092\u70b9\u7dda\u3067\u8868\u793a",
-"Show invisible characters": "\u4e0d\u53ef\u8996\u6587\u5b57\u3092\u8868\u793a",
-"Words: {0}": "\u5358\u8a9e\u6570: {0}",
-"Insert": "\u633f\u5165",
-"File": "\u30d5\u30a1\u30a4\u30eb",
-"Edit": "\u7de8\u96c6",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u66f8\u5f0f\u4ed8\u304d\u30c6\u30ad\u30b9\u30c8\u306e\u7de8\u96c6\u753b\u9762\u3002ALT-F9\u3067\u30e1\u30cb\u30e5\u30fc\u3001ALT-F10\u3067\u30c4\u30fc\u30eb\u30d0\u30fc\u3001ALT-0\u3067\u30d8\u30eb\u30d7\u304c\u8868\u793a\u3055\u308c\u307e\u3059\u3002",
-"Tools": "\u30c4\u30fc\u30eb",
-"View": "\u8868\u793a",
-"Table": "\u8868",
-"Format": "\u66f8\u5f0f"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/ka.es5.js b/build/media_source/vendor/tinymce/langs/ka.es5.js
deleted file mode 100644
index 75881da5eb09d..0000000000000
--- a/build/media_source/vendor/tinymce/langs/ka.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('ka',{
-"Cut": "\u10d0\u10db\u10dd\u10ed\u10e0\u10d0",
-"Heading 5": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 5",
-"Header 2": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u10d7\u10e5\u10d5\u10d4\u10dc \u10d1\u10e0\u10d0\u10e3\u10d6\u10d4\u10e0\u10e1 \u10d0\u10e0 \u10d0\u10e5\u10d5\u10e1 \u10d1\u10e3\u10e4\u10e0\u10e2\u10e8\u10d8 \u10e8\u10d4\u10ee\u10ec\u10d4\u10d5\u10d8\u10e1 \u10db\u10ee\u10d0\u10e0\u10d3\u10d0\u10ed\u10d4\u10e0\u10d0. \u10d2\u10d7\u10ee\u10dd\u10d5\u10d7 \u10e1\u10d0\u10dc\u10d0\u10ea\u10d5\u10da\u10dd\u10d3 \u10d8\u10e1\u10d0\u10e0\u10d2\u10d4\u10d1\u10da\u10dd\u10d7 Ctrl+X\/C\/V \u10db\u10d0\u10da\u10e1\u10d0\u10ee\u10db\u10dd\u10d1\u10d8 \u10d9\u10dd\u10db\u10d1\u10d8\u10dc\u10d0\u10ea\u10d8\u10d4\u10d1\u10d8\u10d7.",
-"Heading 4": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 4",
-"Div": "\u10d2\u10d0\u10dc\u10d0\u10ec\u10d8\u10da\u10d4\u10d1\u10d0",
-"Heading 2": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 2",
-"Paste": "\u10e9\u10d0\u10e1\u10db\u10d0",
-"Close": "\u10d3\u10d0\u10ee\u10e3\u10e0\u10d5\u10d0",
-"Font Family": "\u10e4\u10dd\u10dc\u10e2\u10d8",
-"Pre": "\u10de\u10e0\u10d4\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8",
-"Align right": "\u10d2\u10d0\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d5",
-"New document": "\u10d0\u10ee\u10d0\u10da\u10d8 \u10d3\u10dd\u10d9\u10e3\u10db\u10d4\u10dc\u10e2\u10d8",
-"Blockquote": "\u10d1\u10da\u10dd\u10d9\u10d8\u10e0\u10d4\u10d1\u10e3\u10da\u10d8 \u10ea\u10d8\u10e2\u10d0\u10e2\u10d0",
-"Numbered list": "\u10d3\u10d0\u10dc\u10dd\u10db\u10e0\u10d8\u10da\u10d8 \u10e1\u10d8\u10d0",
-"Heading 1": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 1",
-"Headings": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8",
-"Increase indent": "\u10d0\u10d1\u10d6\u10d0\u10ea\u10d8\u10e1 \u10d2\u10d0\u10d6\u10e0\u10d3\u10d0",
-"Formats": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d4\u10d1\u10d8",
-"Headers": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d4\u10d1\u10d8",
-"Select all": "\u10e7\u10d5\u10d4\u10da\u10d0\u10e1 \u10db\u10dd\u10e6\u10dc\u10d8\u10e8\u10d5\u10dc\u10d0",
-"Header 3": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 3",
-"Blocks": "\u10d1\u10da\u10dd\u10d9\u10d4\u10d1\u10d8",
-"Undo": "\u10d3\u10d0\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
-"Strikethrough": "\u10e8\u10e3\u10d0 \u10ee\u10d0\u10d6\u10d8",
-"Bullet list": "\u10d1\u10e3\u10da\u10d4\u10e2 \u10e1\u10d8\u10d0",
-"Header 1": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 1",
-"Superscript": "\u10d6\u10d4\u10d3\u10d0 \u10d8\u10dc\u10d3\u10d4\u10e5\u10e1\u10d8",
-"Clear formatting": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8\u10e0\u10d4\u10d1\u10d8\u10e1 \u10d2\u10d0\u10e1\u10e3\u10e4\u10d7\u10d0\u10d5\u10d4\u10d1\u10d0",
-"Font Sizes": "\u10e4\u10dd\u10dc\u10e2\u10d8\u10e1 \u10d6\u10dd\u10db\u10d0",
-"Subscript": "\u10e5\u10d5\u10d4\u10d3\u10d0 \u10d8\u10dc\u10d3\u10d4\u10e5\u10e1\u10d8",
-"Header 6": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 6",
-"Redo": "\u10d2\u10d0\u10db\u10d4\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Paragraph": "\u10de\u10d0\u10e0\u10d0\u10d2\u10e0\u10d0\u10e4\u10d8",
-"Ok": "\u10d9\u10d0\u10e0\u10d2\u10d8",
-"Bold": "\u10db\u10d9\u10d5\u10d4\u10d7\u10e0\u10d8",
-"Code": "\u10d9\u10dd\u10d3\u10d8",
-"Italic": "\u10d3\u10d0\u10ee\u10e0\u10d8\u10da\u10d8",
-"Align center": "\u10d2\u10d0\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10ea\u10d4\u10dc\u10e2\u10e0\u10e8\u10d8",
-"Header 5": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 5",
-"Heading 6": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 6",
-"Heading 3": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 3",
-"Decrease indent": "\u10d0\u10d1\u10d6\u10d0\u10ea\u10d8\u10e1 \u10e8\u10d4\u10db\u10ea\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Header 4": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0 \u10e9\u10d5\u10d4\u10e3\u10da\u10d4\u10d1\u10e0\u10d8\u10d5 \u10e0\u10d4\u10df\u10d8\u10db\u10e8\u10d8\u10d0. \u10e2\u10d4\u10e5\u10e1\u10e2\u10d8 \u10e9\u10d0\u10d8\u10e1\u10db\u10d4\u10d5\u10d0 \u10e3\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10dd\u10d7 \u10e1\u10d0\u10dc\u10d0\u10db \u10d0\u10db \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d0\u10e1 \u10d0\u10e0 \u10d2\u10d0\u10d7\u10d8\u10e8\u10d0\u10d5\u10d7.",
-"Underline": "\u10e5\u10d5\u10d4\u10d3\u10d0 \u10ee\u10d0\u10d6\u10d8",
-"Cancel": "\u10d2\u10d0\u10e3\u10e5\u10db\u10d4\u10d1\u10d0",
-"Justify": "\u10d2\u10d0\u10db\u10d0\u10e0\u10d7\u10e3\u10da\u10d8",
-"Inline": "\u10ee\u10d0\u10d6\u10e8\u10d8\u10d3\u10d0",
-"Copy": "\u10d9\u10dd\u10de\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Align left": "\u10d2\u10d0\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d5",
-"Visual aids": "\u10d5\u10d8\u10d6\u10e3\u10d0\u10da\u10d8\u10d6\u10d0\u10ea\u10d8\u10d0",
-"Lower Greek": "\u10d3\u10d0\u10d1\u10d0\u10da\u10d8 \u10d1\u10d4\u10e0\u10eb\u10dc\u10e3\u10da\u10d8",
-"Square": "\u10d9\u10d5\u10d0\u10d3\u10e0\u10d0\u10e2\u10d8",
-"Default": "\u10e1\u10e2\u10d0\u10dc\u10d3\u10d0\u10e0\u10e2\u10e3\u10da\u10d8",
-"Lower Alpha": "\u10d3\u10d0\u10d1\u10d0\u10da\u10d8 \u10d0\u10da\u10e4\u10d0",
-"Circle": "\u10ec\u10e0\u10d4",
-"Disc": "\u10d3\u10d8\u10e1\u10d9\u10d8",
-"Upper Alpha": "\u10db\u10d0\u10e6\u10d0\u10da\u10d8 \u10d0\u10da\u10e4\u10d0",
-"Upper Roman": "\u10db\u10d0\u10e6\u10d0\u10da\u10d8 \u10e0\u10dd\u10db\u10d0\u10e3\u10da\u10d8",
-"Lower Roman": "\u10d3\u10d0\u10d1\u10d0\u10da\u10d8 \u10e0\u10dd\u10db\u10d0\u10e3\u10da\u10d8",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "id \u10e3\u10dc\u10d3\u10d0 \u10d8\u10ec\u10e7\u10d4\u10d1\u10dd\u10d3\u10d4\u10e1 \u10d0\u10e1\u10dd\u10d7\u10d8, \u10e0\u10dd\u10db\u10d4\u10da\u10e1\u10d0\u10ea \u10db\u10dd\u10e7\u10d5\u10d4\u10d1\u10d0 \u10db\u10ee\u10dd\u10da\u10dd\u10d3 \u10d0\u10e1\u10dd\u10d4\u10d1\u10d8, \u10ea\u10d8\u10e4\u10e0\u10d4\u10d1\u10d8, \u10e2\u10d8\u10e0\u10d4, \u10ec\u10d4\u10e0\u10e2\u10d8\u10da\u10d4\u10d1\u10d8, \u10dd\u10e0\u10d8 \u10ec\u10d4\u10e0\u10e2\u10d8\u10da\u10d8 \u10d0\u10dc \u10e5\u10d5\u10d4\u10d3\u10d0 \u10e2\u10d8\u10e0\u10d4. ",
-"Name": "\u10e1\u10d0\u10ee\u10d4\u10da\u10d8",
-"Anchor": "\u10e6\u10e3\u10d6\u10d0",
-"Id": "id",
-"You have unsaved changes are you sure you want to navigate away?": "\u10d7\u10e5\u10d5\u10d4\u10dc \u10d2\u10d0\u10e5\u10d5\u10d7 \u10e8\u10d4\u10e3\u10dc\u10d0\u10ee\u10d0\u10d5\u10d8 \u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d4\u10d1\u10d8, \u10d3\u10d0\u10e0\u10ec\u10db\u10e3\u10dc\u10d4\u10d1\u10e3\u10da\u10d8 \u10ee\u10d0\u10d7 \u10e0\u10dd\u10db \u10e1\u10ee\u10d5\u10d0\u10d2\u10d0\u10dc \u10d2\u10d0\u10d3\u10d0\u10e1\u10d5\u10da\u10d0 \u10d2\u10e1\u10e3\u10e0\u10d7?",
-"Restore last draft": "\u10d1\u10dd\u10da\u10dd\u10e1 \u10e8\u10d4\u10dc\u10d0\u10ee\u10e3\u10da\u10d8\u10e1 \u10d0\u10e6\u10d3\u10d2\u10d4\u10dc\u10d0",
-"Special character": "\u10e1\u10de\u10d4\u10ea\u10d8\u10d0\u10da\u10e3\u10e0\u10d8 \u10e1\u10d8\u10db\u10d1\u10dd\u10da\u10dd",
-"Source code": "\u10ec\u10e7\u10d0\u10e0\u10dd\u10e1 \u10d9\u10dd\u10d3\u10d8",
-"Language": "\u10d4\u10dc\u10d0",
-"Insert\/Edit code sample": "\u10e9\u10d0\u10e1\u10d5\u10d8\/\u10e8\u10d4\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10d9\u10dd\u10d3\u10d8\u10e1 \u10db\u10d0\u10d2\u10d0\u10da\u10d8\u10d7\u10d8",
-"B": "\u10da",
-"R": "\u10ec",
-"G": "\u10db",
-"Color": "\u10e4\u10d4\u10e0\u10d8",
-"Right to left": "\u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d3\u10d0\u10dc \u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d5",
-"Left to right": "\u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d3\u10d0\u10dc \u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d5",
-"Emoticons": "\u10e1\u10db\u10d0\u10d8\u10da\u10d8\u10d9\u10d4\u10d1\u10d8",
-"Robots": "\u10e0\u10dd\u10d1\u10dd\u10d4\u10d1\u10d8",
-"Document properties": "\u10d3\u10dd\u10d9\u10e3\u10db\u10d4\u10dc\u10e2\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
-"Title": "\u10e1\u10d0\u10d7\u10d0\u10e3\u10e0\u10d8",
-"Keywords": "\u10e1\u10d0\u10d9\u10d5\u10d0\u10dc\u10eb\u10dd \u10e1\u10d8\u10e2\u10e7\u10d5\u10d4\u10d1\u10d8",
-"Encoding": "\u10d9\u10dd\u10d3\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Description": "\u10d0\u10ee\u10ec\u10d4\u10e0\u10d0",
-"Author": "\u10d0\u10d5\u10e2\u10dd\u10e0\u10d8",
-"Fullscreen": "\u10e1\u10d0\u10d5\u10e1\u10d4 \u10d4\u10d9\u10e0\u10d0\u10dc\u10d8",
-"Horizontal line": "\u10f0\u10dd\u10e0\u10d8\u10d6\u10dd\u10dc\u10e2\u10d0\u10da\u10e3\u10e0\u10d8 \u10ee\u10d0\u10d6\u10d8",
-"Horizontal space": "\u10f0\u10dd\u10e0\u10d8\u10d6\u10dd\u10dc\u10e2\u10d0\u10da\u10e3\u10e0\u10d8 \u10e1\u10d8\u10d5\u10e0\u10ea\u10d4",
-"Insert\/edit image": "\u10e9\u10d0\u10e1\u10d5\u10d8\/\u10e8\u10d4\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4 \u10e1\u10e3\u10e0\u10d0\u10d7\u10d8",
-"General": "\u10db\u10d7\u10d0\u10d5\u10d0\u10e0\u10d8",
-"Advanced": "\u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d8\u10d7\u10d8",
-"Source": "\u10d1\u10db\u10e3\u10da\u10d8",
-"Border": "\u10e1\u10d0\u10d6\u10e6\u10d5\u10d0\u10e0\u10d8",
-"Constrain proportions": "\u10de\u10e0\u10dd\u10de\u10dd\u10e0\u10ea\u10d8\u10d8\u10e1 \u10d3\u10d0\u10ea\u10d5\u10d0",
-"Vertical space": "\u10d5\u10d4\u10e0\u10e2\u10d8\u10d9\u10d0\u10da\u10e3\u10e0\u10d8 \u10e1\u10d8\u10d5\u10e0\u10ea\u10d4",
-"Image description": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10d3\u10d0\u10ee\u10d0\u10e1\u10d8\u10d0\u10d7\u10d4\u10d1\u10d0",
-"Style": "\u10e1\u10e2\u10d8\u10da\u10d8",
-"Dimensions": "\u10d2\u10d0\u10dc\u10d6\u10dd\u10db\u10d8\u10da\u10d4\u10d1\u10d0",
-"Insert image": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Image": "\u10d2\u10d0\u10db\u10dd\u10e1\u10d0\u10ee\u10e3\u10da\u10d4\u10d1\u10d0",
-"Zoom in": "\u10d2\u10d0\u10d3\u10d8\u10d3\u10d8\u10d4\u10d1\u10d0",
-"Contrast": "\u10d9\u10dd\u10dc\u10e2\u10e0\u10d0\u10e1\u10e2\u10d8",
-"Back": "\u10e3\u10d9\u10d0\u10dc",
-"Gamma": "\u10d2\u10d0\u10db\u10d0",
-"Flip horizontally": "\u10f0\u10dd\u10e0\u10d8\u10d6\u10dd\u10dc\u10e2\u10d0\u10da\u10e3\u10e0\u10d0\u10d3 \u10e8\u10d4\u10e2\u10e0\u10d8\u10d0\u10da\u10d4\u10d1\u10d0",
-"Resize": "\u10d6\u10dd\u10db\u10d8\u10e1 \u10e8\u10d4\u10ea\u10d5\u10da\u10d0",
-"Sharpen": "\u10d2\u10d0\u10da\u10d4\u10e1\u10d5\u10d0",
-"Zoom out": "\u10d3\u10d0\u10de\u10d0\u10e2\u10d0\u10e0\u10d0\u10d5\u10d4\u10d1\u10d0",
-"Image options": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10de\u10d0\u10e0\u10d0\u10db\u10d4\u10e2\u10e0\u10d4\u10d1\u10d8",
-"Apply": "\u10db\u10d8\u10e6\u10d4\u10d1\u10d0",
-"Brightness": "\u10e1\u10d8\u10d9\u10d0\u10e8\u10d9\u10d0\u10e8\u10d4",
-"Rotate clockwise": "\u10e1\u10d0\u10d0\u10d7\u10d8\u10e1 \u10d8\u10e1\u10e0\u10d8\u10e1 \u10db\u10d8\u10db\u10d0\u10e0\u10d7\u10e3\u10da\u10d4\u10d1\u10d8\u10d7 \u10db\u10dd\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
-"Rotate counterclockwise": "\u10e1\u10d0\u10d0\u10d7\u10d8\u10e1 \u10d8\u10e1\u10e0\u10d8\u10e1 \u10db\u10d8\u10db\u10d0\u10e0\u10d7\u10e3\u10da\u10d4\u10d1\u10d8\u10e1 \u10e1\u10d0\u10ec\u10d8\u10dc\u10d0\u10d0\u10e6\u10db\u10d3\u10d4\u10d2\u10dd\u10d2 \u10db\u10dd\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
-"Edit image": "\u10e1\u10e3\u10e0\u10d0\u10d7\u10d8\u10e1 \u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Color levels": "\u10e4\u10d4\u10e0\u10d8\u10e1 \u10d3\u10dd\u10dc\u10d4",
-"Crop": "\u10db\u10dd\u10ed\u10e0\u10d0",
-"Orientation": "\u10dd\u10e0\u10d8\u10d4\u10dc\u10e2\u10d0\u10ea\u10d8\u10d0",
-"Flip vertically": "\u10d5\u10d4\u10e0\u10e2\u10d8\u10d9\u10d0\u10da\u10e3\u10e0\u10d0\u10d3 \u10d0\u10e2\u10e0\u10d8\u10d0\u10da\u10d4\u10d1\u10d0",
-"Invert": "\u10e8\u10d4\u10d1\u10e0\u10e3\u10dc\u10d4\u10d1\u10d0",
-"Date\/time": "\u10d7\u10d0\u10e0\u10d8\u10e6\u10d8\/\u10d3\u10e0\u10dd",
-"Insert date\/time": "\u10d7\u10d0\u10e0\u10d8\u10e6\u10d8\/\u10d3\u10e0\u10dd\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Remove link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"Url": "Url",
-"Text to display": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8",
-"Anchors": "\u10e6\u10e3\u10d6\u10d0",
-"Insert link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Link": "\u10d1\u10db\u10e3\u10da\u10d8",
-"New window": "\u10d0\u10ee\u10d0\u10da \u10e4\u10d0\u10dc\u10ef\u10d0\u10e0\u10d0\u10e8\u10d8",
-"None": "\u10d0\u10e0\u10ea\u10d4\u10e0\u10d7\u10d8",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u10d7\u10e5\u10d5\u10d4\u10dc\u10e1 \u10db\u10d8\u10d4\u10e0 \u10db\u10d8\u10d7\u10d8\u10d7\u10d4\u10d1\u10e3\u10da\u10d8 \u10db\u10d8\u10e1\u10d0\u10db\u10d0\u10e0\u10d7\u10d8 \u10ec\u10d0\u10e0\u10db\u10dd\u10d0\u10d3\u10d2\u10d4\u10dc\u10e1 \u10d2\u10d0\u10e0\u10d4 \u10d1\u10db\u10e3\u10da\u10e1. \u10d2\u10e1\u10e3\u10e0\u10d7, \u10e0\u10dd\u10db \u10db\u10d8\u10d5\u10d0\u10dc\u10d8\u10ed\u10dd http:\/\/ \u10e4\u10e0\u10d4\u10e4\u10d8\u10e5\u10e1\u10d8?",
-"Paste or type a link": "\u10e9\u10d0\u10e1\u10d5\u10d8\u10d7 \u10d0\u10dc \u10e8\u10d4\u10d8\u10e7\u10d5\u10d0\u10dc\u10d4\u10d7 \u10d1\u10db\u10e3\u10da\u10d8",
-"Target": "\u10d2\u10d0\u10ee\u10e1\u10dc\u10d0",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u10d7\u10e5\u10d5\u10d4\u10dc \u10db\u10d8\u10e3\u10d7\u10d8\u10d7\u10d4\u10d7 \u10d4\u10da-\u10e4\u10dd\u10e1\u10e2\u10d8\u10e1 \u10db\u10d8\u10e1\u10d0\u10db\u10d0\u10e0\u10d7\u10d8 \u10dc\u10d0\u10ea\u10d5\u10da\u10d0\u10d3 \u10d5\u10d4\u10d1-\u10d2\u10d5\u10d4\u10e0\u10d3\u10d8\u10e1\u10d0. \u10d2\u10e1\u10e3\u10e0\u10d7, \u10e0\u10dd\u10db \u10db\u10d8\u10d5\u10d0\u10dc\u10d8\u10ed\u10dd mailto: \u10e4\u10e0\u10d4\u10e4\u10d8\u10e5\u10e1\u10d8?",
-"Insert\/edit link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0\/\u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d0",
-"Insert\/edit video": "\u10d5\u10d8\u10d3\u10d4\u10dd\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0\/\u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Media": "\u10db\u10d4\u10d3\u10d8\u10d0",
-"Alternative source": "\u10d0\u10da\u10e2\u10d4\u10e0\u10dc\u10d0\u10e2\u10d8\u10e3\u10da\u10d8 \u10ec\u10e7\u10d0\u10e0\u10dd",
-"Paste your embed code below:": "\u10d0\u10e5 \u10e9\u10d0\u10e1\u10d5\u10d8\u10d7 \u10d7\u10e5\u10d5\u10d4\u10dc\u10d8 \u10d9\u10dd\u10d3\u10d8:",
-"Insert video": "\u10d5\u10d8\u10d3\u10d4\u10dd\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Poster": "\u10de\u10da\u10d0\u10d9\u10d0\u10e2\u10d8",
-"Insert\/edit media": "\u10db\u10d4\u10d3\u10d8\u10d0\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0\/\u10e0\u10d4\u10d3\u10d0\u10e5\u10e2\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Embed": "\u10e9\u10d0\u10e8\u10d4\u10dc\u10d4\u10d1\u10d0",
-"Nonbreaking space": "\u10e3\u10ec\u10e7\u10d5\u10d4\u10e2\u10d8 \u10e1\u10d8\u10d5\u10e0\u10ea\u10d4",
-"Page break": "\u10d2\u10d5\u10d4\u10e0\u10d3\u10d8\u10e1 \u10d2\u10d0\u10ec\u10e7\u10d5\u10d4\u10e2\u10d0",
-"Paste as text": "\u10e9\u10d0\u10e1\u10d5\u10d8\u10d7 \u10e0\u10dd\u10d2\u10dd\u10e0\u10ea \u10e2\u10d4\u10e5\u10e1\u10e2\u10d8",
-"Preview": "\u10ec\u10d8\u10dc\u10d0\u10e1\u10ec\u10d0\u10e0 \u10dc\u10d0\u10ee\u10d5\u10d0",
-"Print": "\u10d0\u10db\u10dd\u10d1\u10d4\u10ed\u10d5\u10d3\u10d0",
-"Save": "\u10e8\u10d4\u10dc\u10d0\u10ee\u10d5\u10d0",
-"Could not find the specified string.": "\u10db\u10dd\u10ea\u10d4\u10db\u10e3\u10da\u10d8 \u10e9\u10d0\u10dc\u10d0\u10ec\u10d4\u10e0\u10d8 \u10d5\u10d4\u10e0 \u10db\u10dd\u10d8\u10eb\u10d4\u10d1\u10dc\u10d0.",
-"Replace": "\u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Next": "\u10e8\u10d4\u10db\u10d3\u10d4\u10d2\u10d8",
-"Whole words": "\u10e1\u10e0\u10e3\u10da\u10d8 \u10e1\u10d8\u10e2\u10e7\u10d5\u10d4\u10d1\u10d8",
-"Find and replace": "\u10db\u10dd\u10eb\u10d4\u10d1\u10dc\u10d4 \u10d3\u10d0 \u10e8\u10d4\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4",
-"Replace with": "\u10e8\u10d4\u10e1\u10d0\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d4\u10da\u10d8 \u10e1\u10d8\u10e2\u10e7\u10d5\u10d0",
-"Find": "\u10eb\u10d4\u10d1\u10dc\u10d0",
-"Replace all": "\u10e7\u10d5\u10d4\u10da\u10d0\u10e1 \u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Match case": "\u10d3\u10d0\u10d0\u10db\u10d7\u10ee\u10d5\u10d8\u10d4 \u10d0\u10e1\u10dd\u10d4\u10d1\u10d8\u10e1 \u10d6\u10dd\u10db\u10d0",
-"Prev": "\u10ec\u10d8\u10dc\u10d0",
-"Spellcheck": "\u10db\u10d0\u10e0\u10d7\u10da\u10ec\u10d4\u10e0\u10d8\u10e1 \u10e8\u10d4\u10db\u10dd\u10ec\u10db\u10d4\u10d1\u10d0",
-"Finish": "\u10d3\u10d0\u10e1\u10d0\u10e1\u10e0\u10e3\u10da\u10d8",
-"Ignore all": "\u10e7\u10d5\u10d4\u10da\u10d0\u10e1 \u10d8\u10d2\u10dc\u10dd\u10e0\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Ignore": "\u10d8\u10d2\u10dc\u10dd\u10e0\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Add to Dictionary": "\u10da\u10d4\u10e5\u10e1\u10d8\u10d9\u10dd\u10dc\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Insert row before": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d7\u10d0\u10d5\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Rows": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d4\u10d1\u10d8",
-"Height": "\u10e1\u10d8\u10db\u10d0\u10e6\u10da\u10d4",
-"Paste row after": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d1\u10dd\u10da\u10dd\u10e8\u10d8 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Alignment": "\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Border color": "\u10e1\u10d0\u10d6\u10d0\u10e0\u10d8\u10e1 \u10e4\u10d4\u10e0\u10d8",
-"Column group": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10ef\u10d2\u10e3\u10e4\u10d8",
-"Row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8",
-"Insert column before": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10d7\u10d0\u10d5\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Split cell": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10d2\u10d0\u10e7\u10dd\u10e4\u10d0",
-"Cell padding": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10e4\u10d0\u10e0\u10d7\u10dd\u10d1\u10d8",
-"Cell spacing": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10d3\u10d0\u10e8\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Row type": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10e2\u10d8\u10de\u10d8",
-"Insert table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Body": "\u10e2\u10d0\u10dc\u10d8",
-"Caption": "\u10ec\u10d0\u10e0\u10ec\u10d4\u10e0\u10d0",
-"Footer": "\u10eb\u10d8\u10e0\u10d8",
-"Delete row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"Paste row before": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d7\u10d0\u10d5\u10e8\u10d8 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Scope": "\u10e9\u10d0\u10e0\u10e9\u10dd",
-"Delete table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"H Align": "H \u10e9\u10d0\u10db\u10ec\u10d9\u10e0\u10d8\u10d5\u10d4\u10d1\u10d0",
-"Top": "\u10db\u10d0\u10e6\u10da\u10d0",
-"Header cell": "\u10d7\u10d0\u10d5\u10d8\u10e1 \u10e3\u10ef\u10e0\u10d0",
-"Column": "\u10e1\u10d5\u10d4\u10e2\u10d8",
-"Row group": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10ef\u10d2\u10e3\u10e4\u10d8",
-"Cell": "\u10e3\u10ef\u10e0\u10d0",
-"Middle": "\u10e8\u10e3\u10d0",
-"Cell type": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10e2\u10d8\u10de\u10d8",
-"Copy row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d9\u10dd\u10de\u10d8\u10e0\u10d4\u10d1\u10d0",
-"Row properties": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
-"Table properties": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
-"Bottom": "\u10e5\u10d5\u10d4\u10d3\u10d0",
-"V Align": "V \u10e9\u10d0\u10db\u10ec\u10d9\u10e0\u10d8\u10d5\u10d4\u10d1\u10d0",
-"Header": "\u10d7\u10d0\u10d5\u10d8",
-"Right": "\u10db\u10d0\u10e0\u10ef\u10d5\u10dc\u10d8\u10d5",
-"Insert column after": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10d1\u10dd\u10da\u10dd\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Cols": "\u10e1\u10d5\u10d4\u10e2\u10d4\u10d1\u10d8",
-"Insert row after": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d1\u10dd\u10da\u10dd\u10e8\u10d8 \u10d3\u10d0\u10db\u10d0\u10e2\u10d4\u10d1\u10d0",
-"Width": "\u10e1\u10d8\u10d2\u10d0\u10dc\u10d4",
-"Cell properties": "\u10e3\u10ef\u10e0\u10d8\u10e1 \u10d7\u10d5\u10d8\u10e1\u10d4\u10d1\u10d4\u10d1\u10d8",
-"Left": "\u10db\u10d0\u10e0\u10ea\u10ee\u10dc\u10d8\u10d5",
-"Cut row": "\u10e1\u10e2\u10e0\u10d8\u10e5\u10dd\u10dc\u10d8\u10e1 \u10d0\u10db\u10dd\u10ed\u10e0\u10d0",
-"Delete column": "\u10e1\u10d5\u10d4\u10e2\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0",
-"Center": "\u10ea\u10d4\u10dc\u10e2\u10e0\u10e8\u10d8",
-"Merge cells": "\u10e3\u10ef\u10e0\u10d4\u10d1\u10d8\u10e1 \u10d2\u10d0\u10d4\u10e0\u10d7\u10d8\u10d0\u10dc\u10d4\u10d1\u10d0",
-"Insert template": "\u10e8\u10d0\u10d1\u10da\u10dd\u10dc\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0",
-"Templates": "\u10e8\u10d0\u10d1\u10da\u10dd\u10dc\u10d4\u10d1\u10d8",
-"Background color": "\u10e3\u10d9\u10d0\u10dc\u10d0 \u10e4\u10d4\u10e0\u10d8",
-"Custom...": "\u10db\u10dd\u10e0\u10d2\u10d4\u10d1\u10e3\u10da\u10d8",
-"Custom color": "\u10db\u10dd\u10e0\u10d2\u10d4\u10d1\u10e3\u10da\u10d8 \u10e4\u10d4\u10e0\u10d8",
-"No color": "\u10e4\u10d4\u10e0\u10d8\u10e1 \u10d2\u10d0\u10e0\u10d4\u10e8\u10d4",
-"Text color": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8\u10e1 \u10e4\u10d4\u10e0\u10d8",
-"Table of Contents": "\u10e1\u10d0\u10e0\u10e9\u10d4\u10d5\u10d8",
-"Show blocks": "\u10d1\u10da\u10dd\u10d9\u10d4\u10d1\u10d8\u10e1 \u10e9\u10d5\u10d4\u10dc\u10d4\u10d1\u10d0",
-"Show invisible characters": "\u10e3\u10ee\u10d8\u10da\u10d0\u10d5\u10d8 \u10e1\u10d8\u10db\u10d1\u10dd\u10da\u10dd\u10d4\u10d1\u10d8\u10e1 \u10e9\u10d5\u10d4\u10dc\u10d4\u10d1\u10d0",
-"Words: {0}": "\u10e1\u10d8\u10e2\u10e7\u10d5\u10d4\u10d1\u10d8: {0}",
-"Insert": "\u10e9\u10d0\u10e1\u10db\u10d0",
-"File": "\u10e4\u10d0\u10d8\u10da\u10d8",
-"Edit": "\u10e8\u10d4\u10e1\u10ec\u10dd\u10e0\u10d4\u10d1\u10d0",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8\u10e1 \u10e4\u10d0\u10e0\u10d7\u10d8. \u10d3\u10d0\u10d0\u10ed\u10d8\u10e0\u10d4\u10d7 ALT-F9\u10e1 \u10db\u10d4\u10dc\u10d8\u10e3\u10e1 \u10d2\u10d0\u10db\u10dd\u10e1\u10d0\u10eb\u10d0\u10ee\u10d4\u10d1\u10da\u10d0\u10d3. \u10d3\u10d0\u10d0\u10ed\u10d8\u10e0\u10d4\u10d7 ALT-F10\u10e1 \u10de\u10d0\u10dc\u10d4\u10da\u10d8\u10e1\u10d7\u10d5\u10d8\u10e1. \u10d3\u10d0\u10d0\u10ed\u10d8\u10e0\u10d4\u10d7 ALT-0\u10e1 \u10d3\u10d0\u10ee\u10db\u10d0\u10e0\u10d4\u10d1\u10d8\u10e1\u10d7\u10d5\u10d8\u10e1",
-"Tools": "\u10d8\u10d0\u10e0\u10d0\u10e6\u10d4\u10d1\u10d8",
-"View": "\u10dc\u10d0\u10ee\u10d5\u10d0",
-"Table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8",
-"Format": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/kk.es5.js b/build/media_source/vendor/tinymce/langs/kk.es5.js
deleted file mode 100644
index 7cec8ab1d3059..0000000000000
--- a/build/media_source/vendor/tinymce/langs/kk.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('kk',{
-"Cut": "\u049a\u0438\u044b\u043f \u0430\u043b\u0443",
-"Heading 5": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f 5",
-"Header 2": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0411\u0440\u0430\u0443\u0437\u0435\u0440\u0456\u04a3\u0456\u0437 \u0430\u043b\u043c\u0430\u0441\u0443 \u0431\u0443\u0444\u0435\u0440\u0456\u043d\u0435 \u0442\u0456\u043a\u0435\u043b\u0435\u0439 \u049b\u0430\u0442\u044b\u043d\u0430\u0439 \u0430\u043b\u043c\u0430\u0439\u0434\u044b. Ctrl+X\/C\/V \u043f\u0435\u0440\u043d\u0435\u043b\u0435\u0440 \u0442\u0456\u0440\u043a\u0435\u0441\u0456\u043c\u0456\u043d \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u044b\u04a3\u044b\u0437.",
-"Heading 4": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f 4",
-"Div": "Div",
-"Heading 2": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f 2",
-"Paste": "\u049a\u043e\u044e",
-"Close": "\u0416\u0430\u0431\u0443",
-"Font Family": "\u049a\u0430\u0440\u0456\u043f\u0442\u0435\u0440 \u0442\u043e\u0431\u044b",
-"Pre": "Pre",
-"Align right": "\u041e\u04a3\u0493\u0430 \u043e\u0440\u043d\u0430\u043b\u0430\u0441\u0442\u044b\u0440\u0443",
-"New document": "\u0416\u0430\u04a3\u0430 \u049b\u04b1\u0436\u0430\u0442",
-"Blockquote": "\u0414\u04d9\u0439\u0435\u043a\u0441\u04e9\u0437",
-"Numbered list": "\u041d\u04e9\u043c\u0456\u0440\u043b\u0435\u043d\u0433\u0435\u043d \u0442\u0456\u0437\u0456\u043c",
-"Heading 1": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f 1",
-"Headings": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f",
-"Increase indent": "\u0428\u0435\u0433\u0456\u043d\u0456\u0441\u0442\u0456 \u0430\u0440\u0442\u0442\u044b\u0440\u0443",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0442\u0430\u0440",
-"Headers": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430",
-"Select all": "\u0411\u0430\u0440\u043b\u044b\u0493\u044b\u043d \u0442\u0430\u04a3\u0434\u0430\u0443",
-"Header 3": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 3",
-"Blocks": "\u0411\u043b\u043e\u043a\u0442\u0435\u043a\u0442\u0435\u0441 (Block)",
-"Undo": "\u0411\u043e\u043b\u0434\u044b\u0440\u043c\u0430\u0443",
-"Strikethrough": "\u0411\u0435\u043b\u0456\u043d\u0435\u043d \u0441\u044b\u0437\u044b\u043b\u0493\u0430\u043d",
-"Bullet list": "\u0422\u0430\u04a3\u0431\u0430\u043b\u0430\u043d\u0493\u0430\u043d \u0442\u0456\u0437\u0456\u043c",
-"Header 1": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 1",
-"Superscript": "\u04ae\u0441\u0442\u0456\u04a3\u0433\u0456 \u0438\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u0424\u043e\u0440\u043c\u0430\u0442\u0442\u0430\u0443\u0434\u0430\u043d \u0442\u0430\u0437\u0430\u0440\u0442\u0443",
-"Font Sizes": "\u049a\u0430\u0440\u0456\u043f\u0442\u0435\u0440 \u04e9\u043b\u0448\u0435\u043c\u0456",
-"Subscript": "\u0410\u0441\u0442\u044b\u04a3\u0493\u044b \u0438\u043d\u0434\u0435\u043a\u0441",
-"Header 6": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 6",
-"Redo": "\u049a\u0430\u0439\u0442\u0430\u0440\u0443",
-"Paragraph": "\u0410\u0431\u0437\u0430\u0446",
-"Ok": "\u041e\u041a",
-"Bold": "\u0416\u0443\u0430\u043d",
-"Code": "\u041a\u043e\u0434",
-"Italic": "\u041a\u04e9\u043b\u0431\u0435\u0443",
-"Align center": "\u041e\u0440\u0442\u0430\u0441\u044b\u043d\u0430 \u043e\u0440\u043d\u0430\u043b\u0430\u0441\u0442\u044b\u0440\u0443",
-"Header 5": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 5",
-"Heading 6": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f 6",
-"Heading 3": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f 3",
-"Decrease indent": "\u0428\u0435\u0433\u0456\u043d\u0456\u0441\u0442\u0456 \u043a\u0435\u043c\u0456\u0442\u0443",
-"Header 4": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u041e\u0441\u044b \u043e\u043f\u0446\u0438\u044f \u04e9\u0448\u0456\u0440\u0456\u043b\u043c\u0435\u0433\u0435\u043d\u0448\u0435, \u0431\u0443\u0444\u0435\u0440\u0434\u0435\u0433\u0456 \u043c\u04d9\u0442\u0456\u043d \u043a\u04d9\u0434\u0456\u043c\u0433\u0456 \u043c\u04d9\u0442\u0456\u043d \u0440\u0435\u0442\u0456\u043d\u0434\u0435 \u049b\u043e\u0439\u044b\u043b\u0430\u0434\u044b.",
-"Underline": "\u0410\u0441\u0442\u044b \u0441\u044b\u0437\u044b\u043b\u0493\u0430\u043d",
-"Cancel": "\u0411\u0430\u0441 \u0442\u0430\u0440\u0442\u0443",
-"Justify": "\u0422\u043e\u043b\u0442\u044b\u0440\u0443",
-"Inline": "\u041a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0456\u043b\u0433\u0435\u043d (Inline)",
-"Copy": "\u041a\u04e9\u0448\u0456\u0440\u0443",
-"Align left": "\u0421\u043e\u043b\u0493\u0430 \u043e\u0440\u043d\u0430\u043b\u0430\u0441\u0442\u044b\u0440\u0443",
-"Visual aids": "\u041a\u04e9\u043c\u0435\u043a\u0448\u0456 \u0431\u0435\u043b\u0433\u0456\u043b\u0435\u0440",
-"Lower Greek": "\u041a\u0456\u0448\u0456 \u0433\u0440\u0435\u043a \u04d9\u0440\u0456\u043f\u0442\u0435\u0440\u0456",
-"Square": "\u0428\u0430\u0440\u0448\u044b",
-"Default": "\u04d8\u0434\u0435\u043f\u043a\u0456",
-"Lower Alpha": "\u041a\u0456\u0448\u0456 \u04d9\u0440\u0456\u043f\u0442\u0435\u0440",
-"Circle": "\u0428\u0435\u04a3\u0431\u0435\u0440",
-"Disc": "\u0414\u0438\u0441\u043a",
-"Upper Alpha": "\u0411\u0430\u0441 \u04d9\u0440\u0456\u043f\u0442\u0435\u0440",
-"Upper Roman": "\u0411\u0430\u0441 \u0440\u0438\u043c \u0446\u0438\u0444\u0440\u043b\u0430\u0440\u044b",
-"Lower Roman": "\u041a\u0456\u0448\u0456 \u0440\u0438\u043c \u0446\u0438\u0444\u0440\u043b\u0430\u0440\u044b",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0442\u0435\u043a \u049b\u0430\u043d\u0430 \u04d9\u0440\u0456\u043f\u0442\u0435\u043d \u0431\u0430\u0441\u0442\u0430\u043b\u044b\u043f, \u04d9\u0440\u0456\u043f\u0442\u0435\u0440, \u0441\u0430\u043d\u0434\u0430\u0440, \u0441\u044b\u0437\u044b\u049b\u0448\u0430\u043b\u0430\u0440, \u043d\u04af\u043a\u0442\u0435\u043b\u0435\u0440 \u0436\u04d9\u043d\u0435 \u0442.\u0431 \u0436\u0430\u043b\u0493\u0430\u0441\u0443\u044b \u0442\u0438\u0456\u0441.",
-"Name": "\u0410\u0442\u044b",
-"Anchor": "\u0411\u0435\u0442\u0431\u0435\u043b\u0433\u0456",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "\u0421\u0430\u049b\u0442\u0430\u043b\u043c\u0430\u0493\u0430\u043d \u04e9\u0437\u0433\u0435\u0440\u0456\u0441\u0442\u0435\u0440 \u0431\u0430\u0440. \u0421\u0456\u0437 \u0448\u044b\u043d\u044b\u043c\u0435\u043d \u0431\u0430\u0441\u049b\u0430 \u0436\u0435\u0440\u0433\u0435 \u043a\u0435\u0442\u0443\u0434\u0456 \u049b\u0430\u043b\u0430\u0439\u0441\u044b\u0437 \u0431\u0430?",
-"Restore last draft": "\u0421\u043e\u04a3\u0493\u044b \u0441\u0430\u049b\u0442\u0430\u043b\u0493\u0430\u043d\u0434\u044b \u049b\u0430\u043b\u043f\u044b\u043d\u0430 \u043a\u0435\u043b\u0442\u0456\u0440\u0443",
-"Special character": "\u0410\u0440\u043d\u0430\u0439\u044b \u0442\u0430\u04a3\u0431\u0430",
-"Source code": "\u0411\u0430\u0441\u0442\u0430\u043f\u049b\u044b \u043a\u043e\u0434",
-"Language": "\u0422\u0456\u043b",
-"Insert\/Edit code sample": "\u041a\u043e\u0434 \u04af\u043b\u0433\u0456\u0441\u0456\u043d \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443\/\u0442\u04af\u0437\u0435\u0442\u0443",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "\u0422\u04af\u0441",
-"Right to left": "\u041e\u04a3\u043d\u0430\u043d \u0441\u043e\u043b\u0493\u0430",
-"Left to right": "\u0421\u043e\u043b\u0434\u0430\u043d \u043e\u04a3\u0493\u0430",
-"Emoticons": "\u0421\u043c\u0430\u0439\u043b\u0438\u043a\u0442\u0430\u0440",
-"Robots": "Meta-robots",
-"Document properties": "\u049a\u04b1\u0436\u0430\u0442 \u0441\u0438\u043f\u0430\u0442\u0442\u0430\u0440\u044b",
-"Title": "\u0410\u0442\u0430\u0443\u044b",
-"Keywords": "Meta-keywords",
-"Encoding": "Meta-charset",
-"Description": "\u0421\u0438\u043f\u0430\u0442\u0442\u0430\u043c\u0430\u0441\u044b",
-"Author": "Meta-author",
-"Fullscreen": "\u0422\u043e\u043b\u044b\u049b \u044d\u043a\u0440\u0430\u043d",
-"Horizontal line": "\u041a\u04e9\u043b\u0434\u0435\u043d\u0435\u04a3 \u0441\u044b\u0437\u044b\u049b",
-"Horizontal space": "\u041a\u04e9\u043b\u0434\u0435\u043d\u0435\u04a3\u0456\u043d\u0435\u043d \u049b\u0430\u043b\u0430\u0442\u044b\u043d \u043e\u0440\u044b\u043d",
-"Insert\/edit image": "\u0421\u0443\u0440\u0435\u0442 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443\/\u0442\u04af\u0437\u0435\u0442\u0443",
-"General": "\u0416\u0430\u043b\u043f\u044b",
-"Advanced": "\u049a\u043e\u0441\u044b\u043c\u0448\u0430",
-"Source": "\u0410\u0434\u0440\u0435\u0441\u0456",
-"Border": "\u0416\u0438\u0435\u0433\u0456",
-"Constrain proportions": "\u041f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u044f\u043b\u0430\u0440\u0434\u044b \u0441\u0430\u049b\u0442\u0430\u0443",
-"Vertical space": "\u0422\u0456\u043a \u043a\u0435\u04a3\u0434\u0456\u0433\u0456",
-"Image description": "\u0421\u0443\u0440\u0435\u0442 \u0441\u0438\u043f\u0430\u0442\u0442\u0430\u043c\u0430\u0441\u044b",
-"Style": "\u0421\u0442\u0438\u043b\u0456",
-"Dimensions": "\u04e8\u043b\u0448\u0435\u043c\u0434\u0435\u0440\u0456",
-"Insert image": "\u0421\u0443\u0440\u0435\u0442 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Image": "\u0421\u0443\u0440\u0435\u0442",
-"Zoom in": "\u0416\u0430\u049b\u044b\u043d\u0434\u0430\u0442\u0443",
-"Contrast": "\u049a\u043e\u044e\u043b\u0430\u0442\u0443",
-"Back": "\u0410\u0440\u0442\u049b\u0430",
-"Gamma": "\u0413\u0430\u043c\u043c\u0430",
-"Flip horizontally": "\u041a\u04e9\u043b\u0434\u0435\u043d\u0435\u04a3\u043d\u0435\u043d \u0430\u0443\u0434\u0430\u0440\u0443",
-"Resize": "\u04e8\u043b\u0448\u0435\u043c\u0456\u043d \u04e9\u0437\u0433\u0435\u0440\u0442\u0443",
-"Sharpen": "\u041d\u0430\u049b\u0442\u044b\u043b\u0430\u0443",
-"Zoom out": "\u0410\u043b\u044b\u0441\u0442\u0430\u0442\u0443",
-"Image options": "\u0421\u0443\u0440\u0435\u0442 \u0431\u0430\u043f\u0442\u0430\u0443\u043b\u0430\u0440\u044b",
-"Apply": "\u0421\u0430\u049b\u0442\u0430\u0443",
-"Brightness": "\u0410\u0448\u044b\u049b\u0442\u0430\u0443",
-"Rotate clockwise": "\u0421\u0430\u0493\u0430\u0442 \u0442\u0456\u043b\u0456\u043d\u0456\u04a3 \u0431\u0430\u0493\u044b\u0442\u044b\u043c\u0435\u043d \u0431\u04b1\u0440\u0443",
-"Rotate counterclockwise": "\u0421\u0430\u0493\u0430\u0442 \u0442\u0456\u043b\u0456\u043d\u0456\u04a3 \u0431\u0430\u0493\u044b\u0442\u044b\u043d\u0430 \u049b\u0430\u0440\u0441\u044b \u0431\u04b1\u0440\u0443",
-"Edit image": "\u0421\u0443\u0440\u0435\u0442\u0442\u0456 \u04e9\u0437\u0433\u0435\u0440\u0442\u0443",
-"Color levels": "\u0422\u04af\u0441 \u0434\u0435\u04a3\u0433\u0435\u0439\u043b\u0435\u0440\u0456",
-"Crop": "\u041a\u0435\u0441\u0443",
-"Orientation": "\u0411\u0430\u0493\u0434\u0430\u0440",
-"Flip vertically": "\u0422\u0456\u0433\u0456\u043d\u0435\u043d \u0430\u0443\u0434\u0430\u0440\u0443",
-"Invert": "\u041a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Date\/time": "\u041a\u04af\u043d\/\u0443\u0430\u049b\u044b\u0442",
-"Insert date\/time": "\u041a\u04af\u043d\/\u0443\u0430\u049b\u044b\u0442 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Remove link": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435\u043d\u0456 \u0430\u043b\u044b\u043f \u0442\u0430\u0441\u0442\u0430\u0443",
-"Url": "URL-\u0430\u0434\u0440\u0435\u0441\u0456",
-"Text to display": "\u041a\u04e9\u0440\u0441\u0435\u0442\u0456\u043b\u0435\u0442\u0456\u043d \u043c\u04d9\u0442\u0456\u043d",
-"Anchors": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435\u043b\u0435\u0440",
-"Insert link": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Link": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435",
-"New window": "\u0416\u0430\u04a3\u0430 \u0442\u0435\u0440\u0435\u0437\u0435",
-"None": "\u0416\u043e\u049b",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0421\u0456\u0437 \u0435\u04a3\u0433\u0456\u0437\u0456\u043f \u0442\u04b1\u0440\u0493\u0430\u043d URL \u0441\u044b\u0440\u0442\u049b\u044b \u0441\u0456\u043b\u0442\u0435\u043c\u0435 \u0431\u043e\u043b\u044b\u043f \u0442\u0430\u0431\u044b\u043b\u0430\u0434\u044b. \u0410\u043b\u0434\u044b\u043d\u0430 http:\/\/ \u043f\u0440\u0435\u0444\u0438\u043a\u0441\u0456\u043d \u049b\u043e\u0441\u0443\u0434\u044b \u049b\u0430\u043b\u0430\u0439\u0441\u044b\u0437 \u0431\u0430?",
-"Paste or type a link": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435\u043d\u0456 \u049b\u043e\u0439\u044b\u04a3\u044b\u0437 \u043d\u0435\u043c\u0435\u0441\u0435 \u0442\u0435\u0440\u0456\u04a3\u0456\u0437",
-"Target": "\u0410\u0448\u044b\u043b\u0430\u0442\u044b\u043d \u0436\u0435\u0440\u0456",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0421\u0456\u0437 \u0435\u04a3\u0433\u0456\u0437\u0456\u043f \u0442\u04b1\u0440\u0493\u0430\u043d URL e-mail \u0430\u0434\u0440\u0435\u0441\u0456 \u0431\u043e\u043b\u044b\u043f \u0442\u0430\u0431\u044b\u043b\u0430\u0434\u044b. \u0410\u043b\u0434\u044b\u043d\u0430 mailto: \u043f\u0440\u0435\u0444\u0438\u043a\u0441\u0456\u043d \u049b\u043e\u0441\u0443\u0434\u044b \u049b\u0430\u043b\u0430\u0439\u0441\u044b\u0437 \u0431\u0430?",
-"Insert\/edit link": "\u0421\u0456\u043b\u0442\u0435\u043c\u0435 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443\/\u0442\u04af\u0437\u0435\u0442\u0443",
-"Insert\/edit video": "\u0412\u0438\u0434\u0435\u043e \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443\/\u0442\u04af\u0437\u0435\u0442\u0443",
-"Media": "\u041c\u0435\u0434\u0438\u0430",
-"Alternative source": "\u049a\u043e\u0441\u044b\u043c\u0448\u0430 \u0430\u0434\u0440\u0435\u0441\u0456",
-"Paste your embed code below:": "\u0422\u04e9\u043c\u0435\u043d\u0434\u0435\u0433\u0456 \u043a\u043e\u0434\u0442\u044b \u043a\u04e9\u0448\u0456\u0440\u0456\u043f \u0430\u043b\u044b\u043f, \u049b\u043e\u0439\u044b\u04a3\u044b\u0437:",
-"Insert video": "\u0412\u0438\u0434\u0435\u043e \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Poster": "\u041f\u043e\u0441\u0442\u0435\u0440\u0456",
-"Insert\/edit media": "\u041c\u0435\u0434\u0438\u0430 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443\/\u0442\u04af\u0437\u0435\u0442\u0443",
-"Embed": "\u0415\u043d\u0434\u0456\u0440\u0443",
-"Nonbreaking space": "\u04ae\u0437\u0434\u0456\u043a\u0441\u0456\u0437 \u0431\u043e\u0441 \u043e\u0440\u044b\u043d",
-"Page break": "\u0411\u0435\u0442 \u04af\u0437\u0456\u043b\u0456\u043c\u0456",
-"Paste as text": "\u041c\u04d9\u0442\u0456\u043d \u0440\u0435\u0442\u0456\u043d\u0434\u0435 \u049b\u043e\u044e",
-"Preview": "\u0410\u043b\u0434\u044b\u043d-\u0430\u043b\u0430 \u049b\u0430\u0440\u0430\u0443",
-"Print": "\u0411\u0430\u0441\u044b\u043f \u0448\u044b\u0493\u0430\u0440\u0443",
-"Save": "\u0421\u0430\u049b\u0442\u0430\u0443",
-"Could not find the specified string.": "\u041a\u04e9\u0440\u0441\u0435\u0442\u0456\u043b\u0433\u0435\u043d \u0436\u043e\u043b \u0442\u0430\u0431\u044b\u043b\u043c\u0430\u0434\u044b.",
-"Replace": "\u0410\u0443\u044b\u0441\u0442\u044b\u0440\u0443",
-"Next": "\u041a\u0435\u043b\u0435\u0441\u0456",
-"Whole words": "\u0422\u04b1\u0442\u0430\u0441 \u0441\u04e9\u0437\u0434\u0435\u0440",
-"Find and replace": "\u0422\u0430\u0431\u0443 \u0436\u04d9\u043d\u0435 \u0430\u0443\u044b\u0441\u0442\u044b\u0440\u0443",
-"Replace with": "\u0410\u0443\u044b\u0441\u0442\u044b\u0440\u0430\u0442\u044b\u043d \u043c\u04d9\u0442\u0456\u043d",
-"Find": "\u0422\u0430\u0431\u044b\u043b\u0430\u0442\u044b\u043d \u043c\u04d9\u0442\u0456\u043d",
-"Replace all": "\u0411\u0430\u0440\u043b\u044b\u0493\u044b\u043d \u0430\u0443\u044b\u0441\u0442\u044b\u0440\u0443",
-"Match case": "\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0434\u0456 \u0435\u0441\u043a\u0435\u0440\u0443",
-"Prev": "\u0410\u043b\u0434\u044b\u04a3\u0493\u044b",
-"Spellcheck": "\u0415\u043c\u043b\u0435 \u0442\u0435\u043a\u0441\u0435\u0440\u0443",
-"Finish": "\u0410\u044f\u049b\u0442\u0430\u0443",
-"Ignore all": "\u0415\u0448\u049b\u0430\u0439\u0441\u044b\u0441\u044b\u043d \u0435\u043b\u0435\u043c\u0435\u0443",
-"Ignore": "\u0415\u043b\u0435\u043c\u0435\u0443",
-"Add to Dictionary": "\u0421\u04e9\u0437\u0434\u0456\u043a\u043a\u0435 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Insert row before": "\u04ae\u0441\u0442\u0456\u043d\u0435 \u0436\u043e\u043b \u049b\u043e\u0441\u0443",
-"Rows": "\u0416\u043e\u043b\u044b",
-"Height": "\u0411\u0438\u0456\u043a\u0442\u0456\u0433\u0456",
-"Paste row after": "\u0416\u043e\u043b\u0434\u044b\u04a3 \u0430\u0441\u0442\u044b\u043d\u0430 \u049b\u043e\u044e",
-"Alignment": "\u041e\u0440\u043d\u0430\u043b\u0430\u0441\u0443\u044b",
-"Border color": "\u0416\u0438\u0435\u043a \u0442\u04af\u0441\u0456",
-"Column group": "\u0411\u0430\u0493\u0430\u043d \u0442\u043e\u0431\u044b",
-"Row": "\u0416\u043e\u043b",
-"Insert column before": "\u0410\u043b\u0434\u044b\u043d\u0430 \u0431\u0430\u0493\u0430\u043d \u049b\u043e\u0441\u0443",
-"Split cell": "\u04b0\u044f\u0448\u044b\u049b\u0442\u044b \u0431\u04e9\u043b\u0443",
-"Cell padding": "\u04b0\u044f\u0448\u044b\u049b \u043a\u0435\u04a3\u0434\u0456\u0433\u0456",
-"Cell spacing": "\u04b0\u044f\u0448\u044b\u049b \u0430\u0440\u0430\u043b\u044b\u0493\u044b",
-"Row type": "\u0416\u043e\u043b \u0442\u0438\u043f\u0456",
-"Insert table": "\u041a\u0435\u0441\u0442\u0435 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Body": "\u041d\u0435\u0433\u0456\u0437\u0433\u0456 \u0431\u04e9\u043b\u0456\u0433\u0456",
-"Caption": "\u0410\u0442\u0430\u0443\u044b",
-"Footer": "\u0410\u044f\u049b \u0436\u0430\u0493\u044b",
-"Delete row": "\u0416\u043e\u043b\u0434\u044b \u0436\u043e\u044e",
-"Paste row before": "\u0416\u043e\u043b\u0434\u044b\u04a3 \u04af\u0441\u0442\u0456\u043d\u0435 \u049b\u043e\u044e",
-"Scope": "\u0410\u0443\u043c\u0430\u0493\u044b",
-"Delete table": "\u041a\u0435\u0441\u0442\u0435\u043d\u0456 \u0436\u043e\u044e",
-"H Align": "\u041a\u04e9\u043b\u0434\u0435\u043d\u0435\u04a3\u043d\u0435\u043d \u0442\u0443\u0440\u0430\u043b\u0430\u0443",
-"Top": "\u04ae\u0441\u0442\u0456",
-"Header cell": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0448\u0430 \u04b1\u044f\u0448\u044b\u049b",
-"Column": "\u0411\u0430\u0493\u0430\u043d",
-"Row group": "\u0416\u043e\u043b \u0442\u043e\u0431\u044b",
-"Cell": "\u04b0\u044f\u0448\u044b\u049b",
-"Middle": "\u041e\u0440\u0442\u0430\u0441\u044b",
-"Cell type": "\u04b0\u044f\u0448\u044b\u049b \u0442\u0438\u043f\u0456",
-"Copy row": "\u0416\u043e\u043b\u0434\u044b \u043a\u04e9\u0448\u0456\u0440\u0443",
-"Row properties": "\u0416\u043e\u043b \u0441\u0438\u043f\u0430\u0442\u0442\u0430\u0440\u044b",
-"Table properties": "\u041a\u0435\u0441\u0442\u0435 \u0441\u0438\u043f\u0430\u0442\u0442\u0430\u0440\u044b",
-"Bottom": "\u0410\u0441\u0442\u044b",
-"V Align": "\u0422\u0456\u0433\u0456\u043d\u0435\u043d \u0442\u0443\u0440\u0430\u043b\u0430\u0443",
-"Header": "\u0411\u0430\u0441 \u0436\u0430\u0493\u044b",
-"Right": "\u041e\u04a3\u0493\u0430",
-"Insert column after": "\u0410\u0440\u0442\u044b\u043d\u0430 \u0431\u0430\u0493\u0430\u043d \u049b\u043e\u0441\u0443",
-"Cols": "\u0411\u0430\u0493\u0430\u043d\u044b",
-"Insert row after": "\u0410\u0441\u0442\u044b\u043d\u0430 \u0436\u043e\u043b \u049b\u043e\u0441\u0443",
-"Width": "\u04b0\u0437\u044b\u043d\u0434\u044b\u0493\u044b",
-"Cell properties": "\u04b0\u044f\u0448\u044b\u049b \u0441\u0438\u043f\u0430\u0442\u0442\u0430\u0440\u044b",
-"Left": "\u0421\u043e\u043b\u0493\u0430",
-"Cut row": "\u0416\u043e\u043b\u0434\u044b \u049b\u0438\u044b\u043f \u0430\u043b\u0443",
-"Delete column": "\u0411\u0430\u0493\u0430\u043d\u0434\u044b \u0436\u043e\u044e",
-"Center": "\u041e\u0440\u0442\u0430\u0441\u044b\u043d\u0430",
-"Merge cells": "\u04b0\u044f\u0448\u044b\u049b\u0442\u0430\u0440\u0434\u044b \u0431\u0456\u0440\u0456\u043a\u0442\u0456\u0440\u0443",
-"Insert template": "\u04ae\u043b\u0433\u0456 \u043a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"Templates": "\u04ae\u043b\u0433\u0456\u043b\u0435\u0440",
-"Background color": "\u04e8\u04a3\u0456\u043d\u0456\u04a3 \u0442\u04af\u0441\u0456",
-"Custom...": "\u04e8\u0437\u0433\u0435\u0440\u0442\u0443",
-"Custom color": "\u0422\u04af\u0441 \u04e9\u0437\u0433\u0435\u0440\u0442\u0443",
-"No color": "\u0422\u04af\u0441\u0441\u0456\u0437",
-"Text color": "\u041c\u04d9\u0442\u0456\u043d \u0442\u04af\u0441\u0456",
-"Table of Contents": "\u041c\u0430\u0437\u043c\u04b1\u043d\u0434\u0430\u0440 \u043a\u0435\u0441\u0442\u0435\u0441\u0456",
-"Show blocks": "\u0411\u043b\u043e\u043a\u0442\u0430\u0440\u0434\u044b \u043a\u04e9\u0440\u0441\u0435\u0442\u0443",
-"Show invisible characters": "\u041a\u04e9\u0440\u0456\u043d\u0431\u0435\u0439\u0442\u0456\u043d \u0442\u0430\u04a3\u0431\u0430\u043b\u0430\u0440\u0434\u044b \u043a\u04e9\u0440\u0441\u0435\u0442\u0443",
-"Words: {0}": "\u0421\u04e9\u0437 \u0441\u0430\u043d\u044b: {0}",
-"Insert": "\u041a\u0456\u0440\u0456\u0441\u0442\u0456\u0440\u0443",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0422\u04af\u0437\u0435\u0442\u0443",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0424\u043e\u0440\u043c\u0430\u0442\u0442\u0430\u043b\u0493\u0430\u043d \u043c\u04d9\u0442\u0456\u043d \u0430\u0443\u043c\u0430\u0493\u044b. \u041c\u0435\u043d\u044e \u043a\u04e9\u0440\u0441\u0435\u0442\u0443 \u04af\u0448\u0456\u043d ALT-F9 \u0431\u0430\u0441\u044b\u04a3\u044b\u0437. \u049a\u04b1\u0440\u0430\u043b\u0434\u0430\u0440 \u043f\u0430\u043d\u0435\u043b\u0456\u043d \u043a\u04e9\u0440\u0441\u0435\u0442\u0443 \u04af\u0448\u0456\u043d ALT-F10 \u0431\u0430\u0441\u044b\u04a3\u044b\u0437. \u041a\u04e9\u043c\u0435\u043a \u0430\u043b\u0443 \u04af\u0448\u0456\u043d ALT-0 \u0431\u0430\u0441\u044b\u04a3\u044b\u0437.",
-"Tools": "\u049a\u04b1\u0440\u0430\u043b\u0434\u0430\u0440",
-"View": "\u041a\u04e9\u0440\u0456\u043d\u0456\u0441",
-"Table": "\u041a\u0435\u0441\u0442\u0435",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/km.es5.js b/build/media_source/vendor/tinymce/langs/km.es5.js
deleted file mode 100644
index 8d456334b1d97..0000000000000
--- a/build/media_source/vendor/tinymce/langs/km.es5.js
+++ /dev/null
@@ -1,219 +0,0 @@
-tinymce.addI18n('km',{
-"Cut": "\u1780\u17b6\u178f\u17cb",
-"Heading 5": "\u1780\u17d2\u1794\u17b6\u179b 5",
-"Header 2": "\u1780\u17d2\u1794\u17b6\u179b 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u1780\u1798\u17d2\u1798\u179c\u17b7\u1792\u17b8\u200b\u17a2\u17ca\u17b8\u1793\u1792\u17ba\u178e\u17b7\u178f\u200b\u179a\u1794\u179f\u17cb\u200b\u17a2\u17d2\u1793\u1780\u200b\u1798\u17b7\u1793\u200b\u17a2\u17b6\u1785\u200b\u1785\u17bc\u179b\u200b\u1795\u17d2\u1791\u17b6\u179b\u17cb\u200b\u1791\u17c5\u200b\u1780\u17b6\u1793\u17cb\u200b\u1780\u17d2\u178a\u17b6\u179a\u200b\u178f\u1798\u17d2\u1794\u17c0\u178f\u200b\u1781\u17d2\u1791\u17b6\u179f\u17cb\u200b\u17a1\u17be\u1799\u17d4 \u179f\u17bc\u1798\u200b\u1794\u17d2\u179a\u17be Ctrl+X\/C\/V \u179b\u17be\u200b\u1780\u17d2\u178a\u17b6\u179a\u200b\u1785\u17bb\u1785\u200b\u1787\u17c6\u1793\u17bd\u179f\u200b\u179c\u17b7\u1789\u17d4",
-"Heading 4": "\u1780\u17d2\u1794\u17b6\u179b 4",
-"Div": "Div",
-"Heading 2": "\u1780\u17d2\u1794\u17b6\u179b 2",
-"Paste": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb",
-"Close": "\u1794\u17b7\u1791",
-"Font Family": "\u1796\u17bb\u1798\u17d2\u1796\u200b\u17a2\u1780\u17d2\u179f\u179a",
-"Pre": "Pre",
-"Align right": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1791\u17c5\u200b\u179f\u17d2\u178a\u17b6\u17c6",
-"New document": "\u17af\u1780\u179f\u17b6\u179a\u200b\u17a2\u178f\u17d2\u1790\u1794\u1791\u200b\u1790\u17d2\u1798\u17b8",
-"Blockquote": "\u1794\u17d2\u179b\u1780\u17cb\u200b\u1796\u17b6\u1780\u17d2\u1799\u200b\u179f\u1798\u17d2\u179a\u1784\u17cb",
-"Numbered list": "\u1794\u1789\u17d2\u1787\u17b8\u200b\u1787\u17b6\u200b\u179b\u17c1\u1781",
-"Heading 1": "\u1780\u17d2\u1794\u17b6\u179b 1",
-"Headings": "\u1780\u17d2\u1794\u17b6\u179b",
-"Increase indent": "\u1781\u17b7\u178f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1785\u17bc\u179b",
-"Formats": "\u1791\u1798\u17d2\u179a\u1784\u17cb",
-"Headers": "\u1780\u17d2\u1794\u17b6\u179b",
-"Select all": "\u1787\u17d2\u179a\u17be\u179f\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a2\u179f\u17cb",
-"Header 3": "\u1780\u17d2\u1794\u17b6\u179b 3",
-"Blocks": "\u1794\u17d2\u179b\u1780\u17cb",
-"Undo": "\u1798\u17b7\u1793\u200b\u1792\u17d2\u179c\u17be\u200b\u179c\u17b7\u1789",
-"Strikethrough": "\u1782\u17bc\u179f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1780\u178e\u17d2\u178a\u17b6\u179b",
-"Bullet list": "\u1794\u1789\u17d2\u1787\u17b8\u200b\u1787\u17b6\u200b\u1785\u17c6\u178e\u17bb\u1785",
-"Header 1": "\u1780\u17d2\u1794\u17b6\u179b 1",
-"Superscript": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17bc\u1785\u200b\u179b\u17be",
-"Clear formatting": "\u179f\u1798\u17d2\u17a2\u17b6\u178f\u200b\u1791\u1798\u17d2\u179a\u1784\u17cb",
-"Font Sizes": "\u1791\u17c6\u17a0\u17c6\u200b\u17a2\u1780\u17d2\u179f\u179a",
-"Subscript": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17bc\u1785\u200b\u1780\u17d2\u179a\u17c4\u1798",
-"Header 6": "\u1780\u17d2\u1794\u17b6\u179b 6",
-"Redo": "\u1792\u17d2\u179c\u17be\u200b\u179c\u17b7\u1789",
-"Paragraph": "\u1780\u178b\u17b6\u1781\u178e\u17d2\u178c",
-"Ok": "\u1796\u17d2\u179a\u1798",
-"Bold": "\u178a\u17b7\u178f",
-"Code": "\u1780\u17bc\u178a",
-"Italic": "\u1791\u17d2\u179a\u17c1\u178f",
-"Align center": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1791\u17c5\u200b\u1780\u178e\u17d2\u178a\u17b6\u179b",
-"Header 5": "\u1780\u17d2\u1794\u17b6\u179b 5",
-"Heading 6": "\u1780\u17d2\u1794\u17b6\u179b 6",
-"Heading 3": "\u1780\u17d2\u1794\u17b6\u179b 3",
-"Decrease indent": "\u1781\u17b7\u178f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1785\u17c1\u1789",
-"Header 4": "\u1780\u17d2\u1794\u17b6\u179b 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u1780\u17b6\u179a\u200b\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1796\u17c1\u179b\u200b\u1793\u17c1\u17c7 \u179f\u17d2\u1790\u17b7\u178f\u200b\u1780\u17d2\u1793\u17bb\u1784\u200b\u1794\u17c2\u1794\u200b\u1795\u17c2\u1793\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1792\u1798\u17d2\u1798\u178f\u17b6\u17d4 \u1794\u1785\u17d2\u1785\u17bb\u1794\u17d2\u1794\u1793\u17d2\u1793\u200b\u1793\u17c1\u17c7 \u1798\u17b6\u178f\u17b7\u1780\u17b6\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a1\u17b6\u1799\u200b\u1793\u17b9\u1784\u200b\u178f\u17d2\u179a\u17bc\u179c\u200b\u1794\u17b6\u1793\u200b\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17b6\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1792\u1798\u17d2\u1798\u178f\u17b6 \u179b\u17bb\u17c7\u178f\u17d2\u179a\u17b6\u200b\u178f\u17c2\u200b\u17a2\u17d2\u1793\u1780\u200b\u1794\u17b7\u1791\u200b\u1787\u1798\u17d2\u179a\u17be\u179f\u200b\u1793\u17c1\u17c7\u17d4",
-"Underline": "\u1782\u17bc\u179f\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1798",
-"Cancel": "\u1794\u17c4\u17c7\u200b\u1794\u1784\u17cb",
-"Justify": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1796\u17c1\u1789",
-"Inline": "\u1780\u17d2\u1793\u17bb\u1784\u200b\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb",
-"Copy": "\u1785\u1798\u17d2\u179b\u1784",
-"Align left": "\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1791\u17c5\u200b\u1786\u17d2\u179c\u17c1\u1784",
-"Visual aids": "\u1791\u17b7\u178a\u17d2\u178b\u1797\u17b6\u1796\u200b\u1787\u17c6\u1793\u17bd\u1799",
-"Lower Greek": "\u179b\u17c1\u1781\u200b\u1780\u17d2\u179a\u17b7\u1780\u200b\u178f\u17bc\u1785",
-"Square": "\u1787\u17d2\u179a\u17bb\u1784",
-"Default": "\u179b\u17c6\u1793\u17b6\u17c6\u200b\u178a\u17be\u1798",
-"Lower Alpha": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17bc\u1785",
-"Circle": "\u1798\u17bc\u179b",
-"Disc": "\u1790\u17b6\u179f",
-"Upper Alpha": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u1792\u17c6",
-"Upper Roman": "\u179b\u17c1\u1781\u200b\u179a\u17c9\u17bc\u1798\u17c9\u17b6\u17c6\u1784\u200b\u1792\u17c6",
-"Lower Roman": "\u179b\u17c1\u1781\u200b\u179a\u17c9\u17bc\u1798\u17c9\u17b6\u17c6\u1784\u200b\u178f\u17bc\u1785",
-"Name": "\u1788\u17d2\u1798\u17c4\u17c7",
-"Anchor": "\u1799\u17bb\u1790\u17d2\u1780\u17b6",
-"You have unsaved changes are you sure you want to navigate away?": "\u1798\u17b6\u1793\u200b\u1794\u1793\u17d2\u179b\u17b6\u179f\u17cb\u200b\u1794\u17d2\u178a\u17bc\u179a\u200b\u1798\u17b7\u1793\u200b\u1791\u17b6\u1793\u17cb\u200b\u1794\u17b6\u1793\u200b\u179a\u1780\u17d2\u179f\u17b6\u200b\u1791\u17bb\u1780\u17d4 \u178f\u17be\u200b\u17a2\u17d2\u1793\u1780\u200b\u1796\u17b7\u178f\u200b\u1787\u17b6\u200b\u1785\u1784\u17cb\u200b\u1785\u17b6\u1780\u200b\u1785\u17c1\u1789\u200b\u1796\u17b8\u1791\u17b8\u1793\u17c1\u17c7\u200b\u1798\u17c2\u1793\u1791\u17c1?",
-"Restore last draft": "\u179f\u17d2\u178a\u17b6\u179a\u200b\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8\u200b\u1796\u17d2\u179a\u17b6\u1784\u200b\u1796\u17b8\u200b\u1798\u17bb\u1793",
-"Special character": "\u178f\u17bd\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1796\u17b7\u179f\u17c1\u179f",
-"Source code": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u1780\u17bc\u178a",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "\u1796\u178e\u17cc",
-"Right to left": "\u179f\u17d2\u178a\u17b6\u17c6\u200b\u1791\u17c5\u200b\u1786\u17d2\u179c\u17c1\u1784",
-"Left to right": "\u1786\u17d2\u179c\u17c1\u1784\u200b\u1791\u17c5\u200b\u179f\u17d2\u178a\u17b6\u17c6",
-"Emoticons": "\u179a\u17bc\u1794\u200b\u179f\u1789\u17d2\u1789\u17b6\u178e\u200b\u17a2\u17b6\u179a\u1798\u17d2\u1798\u178e\u17cd",
-"Robots": "\u179a\u17bc\u1794\u1799\u1793\u17d2\u178f",
-"Document properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u179f\u1798\u17d2\u1794\u178f\u17d2\u178f\u17b7\u200b\u17af\u1780\u179f\u17b6\u179a",
-"Title": "\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
-"Keywords": "\u1796\u17b6\u1780\u17d2\u1799\u200b\u1782\u1793\u17d2\u179b\u17b9\u17c7",
-"Encoding": "\u1780\u17b6\u179a\u200b\u17a2\u17ca\u17b8\u1793\u1780\u17bc\u178a",
-"Description": "\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8\u200b\u17a2\u1792\u17b7\u1794\u17d2\u1794\u17b6\u1799",
-"Author": "\u17a2\u17d2\u1793\u1780\u200b\u1793\u17b7\u1796\u1793\u17d2\u1792",
-"Fullscreen": "\u1796\u17c1\u1789\u200b\u17a2\u17c1\u1780\u17d2\u179a\u1784\u17cb",
-"Horizontal line": "\u1794\u1793\u17d2\u1791\u17b6\u178f\u17cb\u200b\u178a\u17c1\u1780",
-"Horizontal space": "\u179b\u17c6\u17a0\u200b\u1795\u17d2\u178a\u17c1\u1780",
-"Insert\/edit image": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u179a\u17bc\u1794\u200b\u1797\u17b6\u1796",
-"General": "\u1791\u17bc\u1791\u17c5",
-"Advanced": "\u1780\u1798\u17d2\u179a\u17b7\u178f\u200b\u1781\u17d2\u1796\u179f\u17cb",
-"Source": "\u1794\u17d2\u179a\u1797\u1796",
-"Border": "\u179f\u17ca\u17bb\u1798",
-"Constrain proportions": " \u1794\u1784\u17d2\u1781\u17c6\u200b\u17b2\u17d2\u1799\u200b\u1798\u17b6\u1793\u200b\u179f\u1798\u17b6\u1798\u17b6\u178f\u17d2\u179a",
-"Vertical space": "\u179b\u17c6\u17a0\u200b\u1794\u1789\u17d2\u1788\u179a",
-"Image description": "\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8\u200b\u17a2\u1792\u17b7\u1794\u17d2\u1794\u17b6\u1799\u200b\u1796\u17b8\u200b\u179a\u17bc\u1794",
-"Style": "\u179a\u1785\u1793\u17b6\u1794\u1790",
-"Dimensions": "\u179c\u17b7\u1798\u17b6\u178f\u17d2\u179a",
-"Insert image": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u179a\u17bc\u1794\u200b\u1797\u17b6\u1796",
-"Zoom in": "\u1796\u1784\u17d2\u179a\u17b8\u1780",
-"Contrast": "\u1780\u1798\u17d2\u179a\u17b7\u178f\u200b\u1796\u178e\u17cc",
-"Back": "\u1790\u1799\u1780\u17d2\u179a\u17c4\u1799",
-"Gamma": "\u17a0\u17d2\u1782\u17b6\u1798\u17c9\u17b6",
-"Flip horizontally": "\u178f\u17d2\u179a\u17a1\u1794\u17cb\u200b\u1795\u17d2\u178a\u17c1\u1780",
-"Resize": "\u1794\u17d2\u178a\u17bc\u179a\u200b\u1791\u17c6\u17a0\u17c6",
-"Sharpen": "\u1785\u17d2\u1794\u17b6\u179f\u17cb",
-"Zoom out": "\u1794\u1784\u17d2\u179a\u17bd\u1798",
-"Image options": "\u1787\u1798\u17d2\u179a\u17be\u179f\u200b\u179a\u17bc\u1794\u1797\u17b6\u1796",
-"Apply": "\u17a2\u1793\u17bb\u179c\u178f\u17d2\u178f",
-"Brightness": "\u1796\u1793\u17d2\u179b\u17ba",
-"Rotate clockwise": "\u1794\u1784\u17d2\u179c\u17b7\u179b\u200b\u179f\u17d2\u179a\u1794\u200b\u1791\u17d2\u179a\u1793\u17b7\u1785\u200b\u1793\u17b6\u17a1\u17b7\u1780\u17b6",
-"Rotate counterclockwise": "\u1794\u1784\u17d2\u179c\u17b7\u179b\u200b\u1785\u17d2\u179a\u17b6\u179f\u200b\u1791\u17d2\u179a\u1793\u17b7\u1785\u200b\u1793\u17b6\u17a1\u17b7\u1780\u17b6",
-"Edit image": "\u1780\u17c2\u179f\u1798\u17d2\u179a\u17bd\u179b\u200b\u179a\u17bc\u1794\u1797\u17b6\u1796",
-"Color levels": "\u1780\u1798\u17d2\u179a\u17b7\u178f\u200b\u1796\u178e\u17cc",
-"Crop": "\u1785\u17d2\u179a\u17b9\u1794",
-"Orientation": "\u1791\u17b7\u179f",
-"Flip vertically": "\u178f\u17d2\u179a\u17a1\u1794\u17cb\u200b\u1794\u1789\u17d2\u1788\u179a",
-"Invert": "\u178a\u17b6\u1780\u17cb\u200b\u1794\u1789\u17d2\u1785\u17d2\u179a\u17b6\u179f",
-"Insert date\/time": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1780\u17b6\u179b\u200b\u1794\u179a\u17b7\u1785\u17d2\u1786\u17c1\u1791\/\u1798\u17c9\u17c4\u1784",
-"Remove link": "\u178a\u1780\u200b\u178f\u17c6\u178e\u200b\u1785\u17c1\u1789",
-"Url": "Url",
-"Text to display": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17d2\u179a\u17bc\u179c\u200b\u1794\u1784\u17d2\u17a0\u17b6\u1789",
-"Anchors": "\u1799\u17bb\u1790\u17d2\u1780\u17b6",
-"Insert link": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17c6\u178e",
-"New window": "\u1795\u17d2\u1791\u17b6\u17c6\u1784\u200b\u179c\u17b8\u1793\u178a\u17bc\u200b\u1790\u17d2\u1798\u17b8",
-"None": "\u1798\u17b7\u1793\u200b\u1798\u17b6\u1793",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u17a2\u17d2\u1793\u1780\u200b\u1794\u17b6\u1793\u200b\u1794\u1789\u17d2\u1785\u17bc\u179b URL \u178a\u17c2\u179b\u200b\u1787\u17b6\u200b\u178f\u17c6\u178e\u200b\u1791\u17c5\u200b\u1781\u17b6\u1784\u200b\u1780\u17d2\u179a\u17c5\u17d4 \u178f\u17be\u200b\u17a2\u17d2\u1793\u1780\u200b\u1785\u1784\u17cb\u200b\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1794\u17bb\u1796\u17d2\u179c\u1794\u200b\u1791 http:\/\/ \u178a\u17c2\u179a\u200b\u17ac\u1791\u17c1?",
-"Target": "\u1791\u17b7\u179f\u178a\u17c5",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u17a2\u17d2\u1793\u1780\u200b\u1794\u17b6\u1793\u200b\u1794\u1789\u17d2\u1785\u17bc\u179b URL \u178a\u17c2\u179b\u200b\u1798\u17b6\u1793\u200b\u179f\u178e\u17d2\u178b\u17b6\u1793\u200b\u178a\u17bc\u1785\u200b\u17a2\u17b6\u179f\u1799\u178a\u17d2\u178b\u17b6\u1793\u200b\u17a2\u17ca\u17b8\u1798\u17c2\u179b\u17d4 \u178f\u17be\u200b\u17a2\u17d2\u1793\u1780\u200b\u1785\u1784\u17cb\u200b\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1794\u17bb\u1796\u17d2\u179c\u1794\u200b\u1791 mailto: \u178a\u17c2\u179a\u200b\u17ac\u1791\u17c1?",
-"Insert\/edit link": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u178f\u17c6\u178e",
-"Insert\/edit video": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u179c\u17b8\u178a\u17c1\u17a2\u17bc",
-"Poster": "\u17a2\u17d2\u1793\u1780\u200b\u1795\u17d2\u179f\u17b6\u1799",
-"Alternative source": "\u1794\u17d2\u179a\u1797\u1796\u200b\u178a\u1791\u17c3\u200b\u1791\u17c0\u178f",
-"Paste your embed code below:": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1780\u17bc\u178a\u200b\u1794\u1784\u17d2\u1780\u1794\u17cb\u200b\u1793\u17c5\u200b\u1781\u17b6\u1784\u200b\u1780\u17d2\u179a\u17c4\u1798:",
-"Insert video": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u179c\u17b8\u178a\u17c1\u17a2\u17bc",
-"Embed": "\u1794\u1784\u17d2\u1780\u1794\u17cb",
-"Nonbreaking space": "\u178a\u17c6\u178e\u1780\u200b\u1783\u17d2\u179b\u17b6\u200b\u1798\u17b7\u1793\u200b\u1794\u17c6\u1794\u17c2\u1780",
-"Page break": "\u1794\u17c6\u1794\u17c2\u1780\u200b\u1791\u17c6\u1796\u17d0\u179a",
-"Paste as text": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17b6\u200b\u17a2\u1780\u17d2\u179f\u179a",
-"Preview": "\u1798\u17be\u179b\u200b\u1787\u17b6\u200b\u1798\u17bb\u1793",
-"Print": "\u1794\u17c4\u17c7\u200b\u1796\u17bb\u1798\u17d2\u1796",
-"Save": "\u179a\u1780\u17d2\u179f\u17b6\u200b\u1791\u17bb\u1780",
-"Could not find the specified string.": "\u1798\u17b7\u1793\u200b\u17a2\u17b6\u1785\u200b\u179a\u1780\u200b\u1783\u17be\u1789\u200b\u1781\u17d2\u179f\u17c2\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u178a\u17c2\u179b\u200b\u1794\u17b6\u1793\u200b\u1780\u17c6\u178e\u178f\u17cb\u17d4",
-"Replace": "\u1787\u17c6\u1793\u17bd\u179f",
-"Next": "\u1798\u17bb\u1781",
-"Whole words": "\u1796\u17b6\u1780\u17d2\u1799\u200b\u1791\u17b6\u17c6\u1784\u200b\u1798\u17bc\u179b",
-"Find and replace": "\u179f\u17d2\u179c\u17c2\u1784\u200b\u179a\u1780\u200b\u1793\u17b7\u1784\u200b\u1787\u17c6\u1793\u17bd\u179f",
-"Replace with": "\u1787\u17c6\u1793\u17bd\u179f\u200b\u178a\u17c4\u1799",
-"Find": "\u179f\u17d2\u179c\u17c2\u1784\u200b\u179a\u1780",
-"Replace all": "\u1787\u17c6\u1793\u17bd\u179f\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a2\u179f\u17cb",
-"Match case": "\u1780\u179a\u178e\u17b8\u200b\u178a\u17c6\u178e\u17bc\u1785",
-"Prev": "\u1780\u17d2\u179a\u17c4\u1799",
-"Spellcheck": "\u1796\u17b7\u1793\u17b7\u178f\u17d2\u1799\u200b\u17a2\u1780\u17d2\u1781\u179a\u17b6\u179c\u17b7\u179a\u17bb\u1791\u17d2\u1792",
-"Finish": "\u1794\u1789\u17d2\u1785\u1794\u17cb",
-"Ignore all": "\u1798\u17b7\u1793\u200b\u17a2\u17be\u1796\u17be\u200b\u1791\u17b6\u17c6\u1784\u200b\u17a2\u179f\u17cb",
-"Ignore": "\u1798\u17b7\u1793\u200b\u17a2\u17be\u200b\u1796\u17be",
-"Add to Dictionary": "\u1794\u1793\u17d2\u1790\u17c2\u1798\u200b\u1791\u17c5\u200b\u179c\u1785\u1793\u17b6\u1793\u17bb\u1780\u17d2\u179a\u1798",
-"Insert row before": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1788\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1798\u17bb\u1781",
-"Rows": "\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Height": "\u1780\u1798\u17d2\u1796\u179f\u17cb",
-"Paste row after": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1799",
-"Alignment": "\u1780\u17b6\u179a\u200b\u178f\u1798\u17d2\u179a\u17b9\u1798",
-"Border color": "\u1796\u178e\u17cc\u200b\u179f\u17ca\u17bb\u1798",
-"Column group": "\u1780\u17d2\u179a\u17bb\u1798\u200b\u1787\u17bd\u179a\u200b\u1788\u179a",
-"Row": "\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Insert column before": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1787\u17bd\u179a\u200b\u1788\u179a\u200b\u1796\u17b8\u200b\u1798\u17bb\u1781",
-"Split cell": "\u1789\u17c2\u1780\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Cell padding": "\u1785\u1793\u17d2\u179b\u17c4\u17c7\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Cell spacing": "\u1782\u1798\u17d2\u179b\u17b6\u178f\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Row type": "\u1794\u17d2\u179a\u1797\u17c1\u1791\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Insert table": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17b6\u179a\u17b6\u1784",
-"Body": "\u178f\u17bd\u200b\u179f\u17c1\u1785\u1780\u17d2\u178a\u17b8",
-"Caption": "\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
-"Footer": "\u1794\u178b\u1798\u200b\u1780\u1790\u17b6",
-"Delete row": "\u179b\u17bb\u1794\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Paste row before": "\u1794\u17b7\u1791\u200b\u1797\u17d2\u1787\u17b6\u1794\u17cb\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1798\u17bb\u1781",
-"Scope": "\u179c\u17b7\u179f\u17b6\u179b\u200b\u1797\u17b6\u1796",
-"Delete table": "\u179b\u17bb\u1794\u200b\u178f\u17b6\u179a\u17b6\u1784",
-"H Align": "\u1780\u17b6\u179a\u200b\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1795\u17d2\u178a\u17c1\u1780",
-"Top": "\u179b\u17be",
-"Header cell": "\u1780\u17d2\u179a\u17a1\u17b6\u200b\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
-"Column": "\u1787\u17bd\u179a\u200b\u1788\u179a",
-"Row group": "\u1780\u17d2\u179a\u17bb\u1798\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Cell": "\u1780\u17d2\u179a\u17a1\u17b6",
-"Middle": "\u1780\u178e\u17d2\u178a\u17b6\u179b",
-"Cell type": "\u1794\u17d2\u179a\u1797\u17c1\u1791\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Copy row": "\u1785\u1798\u17d2\u179b\u1784\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Row properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Table properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u178f\u17b6\u179a\u17b6\u1784",
-"Bottom": "\u1780\u17d2\u179a\u17c4\u1798",
-"V Align": "\u1780\u17b6\u179a\u200b\u178f\u1798\u17d2\u179a\u17b9\u1798\u200b\u1794\u1789\u17d2\u1788\u179a",
-"Header": "\u1785\u17c6\u178e\u1784\u200b\u1787\u17be\u1784",
-"Right": "\u179f\u17d2\u178a\u17b6\u17c6",
-"Insert column after": "\u1794\u1789\u17d2\u1787\u17bc\u179b\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1799",
-"Cols": "\u1787\u17bd\u179a\u200b\u1788\u179a",
-"Insert row after": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780\u200b\u1796\u17b8\u200b\u1780\u17d2\u179a\u17c4\u1799",
-"Width": "\u1791\u1791\u17b9\u1784",
-"Cell properties": "\u179b\u1780\u17d2\u1781\u178e\u17c8\u200b\u1780\u17d2\u179a\u17a1\u17b6",
-"Left": "\u1786\u17d2\u179c\u17c1\u1784",
-"Cut row": "\u1780\u17b6\u178f\u17cb\u200b\u1787\u17bd\u179a\u200b\u178a\u17c1\u1780",
-"Delete column": "\u179b\u17bb\u1794\u200b\u1787\u17bd\u179a\u200b\u1788\u179a",
-"Center": "\u1780\u178e\u17d2\u178a\u17b6\u179b",
-"Merge cells": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1780\u17d2\u179a\u17a1\u17b6\u200b\u1785\u17bc\u179b\u200b\u1782\u17d2\u1793\u17b6",
-"Insert template": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u1796\u17bb\u1798\u17d2\u1796\u200b\u1782\u1798\u17d2\u179a\u17bc",
-"Templates": "\u1796\u17bb\u1798\u17d2\u1796\u200b\u1782\u1798\u17d2\u179a\u17bc",
-"Background color": "\u1796\u178e\u17cc\u200b\u1795\u17d2\u1791\u17c3\u200b\u1780\u17d2\u179a\u17c4\u1799",
-"Custom...": "\u1795\u17d2\u1791\u17b6\u179b\u17cb\u200b\u1781\u17d2\u179b\u17bd\u1793...",
-"Custom color": "\u1796\u178e\u17cc\u200b\u1795\u17d2\u1791\u17b6\u179b\u17cb\u200b\u1781\u17d2\u179b\u17bd\u1793",
-"No color": "\u1782\u17d2\u1798\u17b6\u1793\u200b\u1796\u178e\u17cc",
-"Text color": "\u1796\u178e\u17cc\u200b\u17a2\u1780\u17d2\u179f\u179a",
-"Show blocks": "\u1794\u1784\u17d2\u17a0\u17b6\u1789\u200b\u1794\u17d2\u179b\u17bb\u1780",
-"Show invisible characters": "\u1794\u1784\u17d2\u17a0\u17b6\u1789\u200b\u178f\u17bd\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u1780\u17c6\u1794\u17b6\u17c6\u1784",
-"Words: {0}": "\u1796\u17b6\u1780\u17d2\u1799: {0}",
-"Insert": "\u1794\u1789\u17d2\u1785\u17bc\u179b",
-"File": "\u17af\u1780\u179f\u17b6\u179a",
-"Edit": "\u1780\u17c2\u1794\u17d2\u179a\u17c2",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u1791\u17b8\u178f\u17b6\u17c6\u1784\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u179f\u17c6\u1794\u17bc\u179a\u1794\u17c2\u1794\u17d4 \u1785\u17bb\u1785 ALT-F9 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u1798\u17c9\u17ba\u1793\u17bb\u1799\u17d4 \u1785\u17bb\u1785 ALT-F10 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u179a\u1794\u17b6\u179a\u200b\u17a7\u1794\u1780\u179a\u178e\u17cd\u17d4 \u1785\u17bb\u1785 ALT-0 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u1787\u17c6\u1793\u17bd\u1799\u17d4",
-"Tools": "\u17a7\u1794\u1780\u179a\u178e\u17cd",
-"View": "\u1791\u17b7\u178a\u17d2\u178b\u1797\u17b6\u1796",
-"Table": "\u178f\u17b6\u179a\u17b6\u1784",
-"Format": "\u1791\u1798\u17d2\u179a\u1784\u17cb"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/ko.es5.js b/build/media_source/vendor/tinymce/langs/ko.es5.js
deleted file mode 100644
index 6e536112fc5b9..0000000000000
--- a/build/media_source/vendor/tinymce/langs/ko.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('ko',{
-"Cut": "\uc798\ub77c\ub0b4\uae30",
-"Header 2": "\uc81c\ubaa9 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\ube0c\ub77c\uc6b0\uc838\uac00 \ud074\ub9bd\ubcf4\ub4dc \uc811\uadfc\uc744 \ud5c8\uc6a9\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. Ctrl+X\/C\/V \ud0a4\ub97c \uc774\uc6a9\ud574 \uc8fc\uc138\uc694.",
-"Div": "\uad6c\ubd84",
-"Paste": "\ubd99\uc5ec\ub123\uae30",
-"Close": "\ub2eb\uae30",
-"Font Family": "Font Family",
-"Pre": "Pre",
-"Align right": "\uc624\ub978\ucabd\uc815\ub82c",
-"New document": "\uc0c8 \ubb38\uc11c",
-"Blockquote": "\uad6c\ud68d",
-"Numbered list": "\uc22b\uc790\ub9ac\uc2a4\ud2b8",
-"Increase indent": "\ub4e4\uc5ec\uc4f0\uae30",
-"Formats": "\ud3ec\ub9f7",
-"Headers": "\uc2a4\ud0c0\uc77c",
-"Select all": "\uc804\uccb4\uc120\ud0dd",
-"Header 3": "\uc81c\ubaa9 3",
-"Blocks": "\ube14\ub85d \uc124\uc815",
-"Undo": "\uc2e4\ud589\ucde8\uc18c",
-"Strikethrough": "\ucde8\uc18c\uc120",
-"Bullet list": "\uc810\ub9ac\uc2a4\ud2b8",
-"Header 1": "\uc81c\ubaa9 1",
-"Superscript": "\uc717\ucca8\uc790",
-"Clear formatting": "\ud3ec\ub9f7\ucd08\uae30\ud654",
-"Font Sizes": "Font Sizes",
-"Subscript": "\uc544\ub798\ucca8\uc790",
-"Header 6": "\uc81c\ubaa9 6",
-"Redo": "\ub2e4\uc2dc\uc2e4\ud589",
-"Paragraph": "\ub2e8\ub77d",
-"Ok": "\ud655\uc778",
-"Bold": "\uad75\uac8c",
-"Code": "\ucf54\ub4dc",
-"Italic": "\uae30\uc6b8\uc784\uaf34",
-"Align center": "\uac00\uc6b4\ub370\uc815\ub82c",
-"Header 5": "\uc81c\ubaa9 5",
-"Decrease indent": "\ub0b4\uc5b4\uc4f0\uae30",
-"Header 4": "\uc81c\ubaa9 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\uc2a4\ud0c0\uc77c\ubcf5\uc0ac \ub044\uae30. \uc774 \uc635\uc158\uc744 \ub044\uae30 \uc804\uc5d0\ub294 \ubcf5\uc0ac \uc2dc, \uc2a4\ud0c0\uc77c\uc774 \ubcf5\uc0ac\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.",
-"Underline": "\ubc11\uc904",
-"Cancel": "\ucde8\uc18c",
-"Justify": "\uc591\ucabd\uc815\ub82c",
-"Inline": "\ub77c\uc778 \uc124\uc815",
-"Copy": "\ubcf5\uc0ac\ud558\uae30",
-"Align left": "\uc67c\ucabd\uc815\ub82c",
-"Visual aids": "\uc2dc\uac01\uad50\uc7ac",
-"Lower Greek": "\uadf8\ub9ac\uc2a4\uc5b4 \uc18c\ubb38\uc790",
-"Square": "\uc0ac\uac01",
-"Default": "\uae30\ubcf8",
-"Lower Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
-"Circle": "\uc6d0",
-"Disc": "\uc6d0\ubc18",
-"Upper Alpha": "\uc54c\ud30c\ubcb3 \uc18c\ubb38\uc790",
-"Upper Roman": "\ub85c\ub9c8\uc790 \ub300\ubb38\uc790",
-"Lower Roman": "\ub85c\ub9c8\uc790 \uc18c\ubb38\uc790",
-"Name": "\uc774\ub984",
-"Anchor": "\uc575\ucee4",
-"You have unsaved changes are you sure you want to navigate away?": "\uc800\uc7a5\ud558\uc9c0 \uc54a\uc740 \uc815\ubcf4\uac00 \uc788\uc2b5\ub2c8\ub2e4. \uc774 \ud398\uc774\uc9c0\ub97c \ubc97\uc5b4\ub098\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
-"Restore last draft": "\ub9c8\uc9c0\ub9c9 \ucd08\uc548 \ubcf5\uc6d0",
-"Special character": "\ud2b9\uc218\ubb38\uc790",
-"Source code": "\uc18c\uc2a4\ucf54\ub4dc",
-"Right to left": "\uc624\ub978\ucabd\uc5d0\uc11c \uc67c\ucabd",
-"Left to right": "\uc67c\ucabd\uc5d0\uc11c \uc624\ub978\ucabd",
-"Emoticons": "\uc774\ubaa8\ud2f0\ucf58",
-"Robots": "\ub85c\ubd07",
-"Document properties": "\ubb38\uc11c \uc18d\uc131",
-"Title": "\uc81c\ubaa9",
-"Keywords": "\ud0a4\uc6cc\ub4dc",
-"Encoding": "\uc778\ucf54\ub529",
-"Description": "\uc124\uba85",
-"Author": "\uc800\uc790",
-"Fullscreen": "\uc804\uccb4\ud654\uba74",
-"Horizontal line": "\uac00\ub85c",
-"Horizontal space": "\uc218\ud3c9 \uacf5\ubc31",
-"Insert\/edit image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785\/\uc218\uc815",
-"General": "\uc77c\ubc18",
-"Advanced": "\uace0\uae09",
-"Source": "\uc18c\uc2a4",
-"Border": "\ud14c\ub450\ub9ac",
-"Constrain proportions": "\uc791\uc5c5 \uc81c\ud55c",
-"Vertical space": "\uc218\uc9c1 \uacf5\ubc31",
-"Image description": "\uc774\ubbf8\uc9c0 \uc124\uba85",
-"Style": "\uc2a4\ud0c0\uc77c",
-"Dimensions": "\ud06c\uae30",
-"Insert image": "\uc774\ubbf8\uc9c0 \uc0bd\uc785",
-"Insert date\/time": "\ub0a0\uc9dc\/\uc2dc\uac04\uc0bd\uc785",
-"Remove link": "\ub9c1\ud06c\uc0ad\uc81c",
-"Url": "\uc8fc\uc18c",
-"Text to display": "\ubcf8\ubb38",
-"Anchors": "\ucc45\uac08\ud53c",
-"Insert link": "\ub9c1\ud06c \uc0bd\uc785 ",
-"New window": "\uc0c8\ucc3d",
-"None": "\uc5c6\uc74c",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "\ub300\uc0c1",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "\ub9c1\ud06c \uc0bd\uc785\/\uc218\uc815",
-"Insert\/edit video": "\ube44\ub514\uc624 \uc0bd\uc785\/\uc218\uc815",
-"Poster": "\ud3ec\uc2a4\ud130",
-"Alternative source": "\ub300\uccb4 \uc18c\uc2a4",
-"Paste your embed code below:": "\uc544\ub798\uc5d0 \ucf54\ub4dc\ub97c \ubd99\uc5ec\ub123\uc73c\uc138\uc694:",
-"Insert video": "\ube44\ub514\uc624 \uc0bd\uc785",
-"Embed": "\uc0bd\uc785",
-"Nonbreaking space": "\ub744\uc5b4\uc4f0\uae30",
-"Page break": "\ud398\uc774\uc9c0 \uad6c\ubd84\uc790",
-"Paste as text": "\ud14d\uc2a4\ud2b8\ub85c \ubd99\uc5ec\ub123\uae30",
-"Preview": "\ubbf8\ub9ac\ubcf4\uae30",
-"Print": "\ucd9c\ub825",
-"Save": "\uc800\uc7a5",
-"Could not find the specified string.": "\ubb38\uc790\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.",
-"Replace": "\uad50\uccb4",
-"Next": "\ub2e4\uc74c",
-"Whole words": "\uc804\uccb4 \ub2e8\uc5b4",
-"Find and replace": "\ucc3e\uc544\uc11c \uad50\uccb4",
-"Replace with": "\uad50\uccb4",
-"Find": "\ucc3e\uae30",
-"Replace all": "\uc804\uccb4 \uad50\uccb4",
-"Match case": "\ub300\uc18c\ubb38\uc790 \uc77c\uce58",
-"Prev": "\uc774\uc804",
-"Spellcheck": "\ubb38\ubc95\uccb4\ud06c",
-"Finish": "\uc644\ub8cc",
-"Ignore all": "\uc804\uccb4\ubb34\uc2dc",
-"Ignore": "\ubb34\uc2dc",
-"Insert row before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
-"Rows": "\ud589",
-"Height": "\ub192\uc774",
-"Paste row after": "\ub2e4\uc74c\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
-"Alignment": "\uc815\ub82c",
-"Column group": "\uc5f4 \uadf8\ub8f9",
-"Row": "\uc5f4",
-"Insert column before": "\uc774\uc804\uc5d0 \ud589 \uc0bd\uc785",
-"Split cell": "\uc140 \ub098\ub204\uae30",
-"Cell padding": "\uc140 \uc548\ucabd \uc5ec\ubc31",
-"Cell spacing": "\uc140 \uac04\uaca9",
-"Row type": "\ud589 \ud0c0\uc785",
-"Insert table": "\ud14c\uc774\ube14 \uc0bd\uc785",
-"Body": "\ubc14\ub514",
-"Caption": "\ucea1\uc158",
-"Footer": "\ud478\ud130",
-"Delete row": "\ud589 \uc9c0\uc6b0\uae30",
-"Paste row before": "\uc774\uc804\uc5d0 \ud589 \ubd99\uc5ec\ub123\uae30",
-"Scope": "\ubc94\uc704",
-"Delete table": "\ud14c\uc774\ube14 \uc0ad\uc81c",
-"Header cell": "\ud5e4\ub354 \uc140",
-"Column": "\ud589",
-"Cell": "\uc140",
-"Header": "\ud5e4\ub354",
-"Cell type": "\uc140 \ud0c0\uc785",
-"Copy row": "\ud589 \ubcf5\uc0ac",
-"Row properties": "\ud589 \uc18d\uc131",
-"Table properties": "\ud14c\uc774\ube14 \uc18d\uc131",
-"Row group": "\ud589 \uadf8\ub8f9",
-"Right": "\uc624\ub978\ucabd",
-"Insert column after": "\ub2e4\uc74c\uc5d0 \uc5f4 \uc0bd\uc785",
-"Cols": "\uc5f4",
-"Insert row after": "\ub2e4\uc74c\uc5d0 \ud589 \uc0bd\uc785",
-"Width": "\ub113\uc774",
-"Cell properties": "\uc140 \uc18d",
-"Left": "\uc67c\ucabd",
-"Cut row": "\ud589 \uc798\ub77c\ub0b4\uae30",
-"Delete column": "\uc5f4 \uc9c0\uc6b0\uae30",
-"Center": "\uac00\uc6b4\ub370",
-"Merge cells": "\uc140 \ud569\uce58\uae30",
-"Insert template": "\ud15c\ud50c\ub9bf \uc0bd\uc785",
-"Templates": "\ud15c\ud50c\ub9bf",
-"Background color": "\ubc30\uacbd\uc0c9",
-"Text color": "\ubb38\uc790 \uc0c9\uae54",
-"Show blocks": "\ube14\ub7ed \ubcf4\uc5ec\uc8fc\uae30",
-"Show invisible characters": "\uc548\ubcf4\uc774\ub294 \ubb38\uc790 \ubcf4\uc774\uae30",
-"Words: {0}": "\ub2e8\uc5b4: {0}",
-"Insert": "\uc0bd\uc785",
-"File": "\ud30c\uc77c",
-"Edit": "\uc218\uc815",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\uc11c\uc2dd \uc788\ub294 \ud14d\uc2a4\ud2b8 \ud3b8\uc9d1\uae30 \uc785\ub2c8\ub2e4. ALT-F9\ub97c \ub204\ub974\uba74 \uba54\ub274, ALT-F10\ub97c \ub204\ub974\uba74 \ud234\ubc14, ALT-0\uc744 \ub204\ub974\uba74 \ub3c4\uc6c0\ub9d0\uc744 \ubcfc \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
-"Tools": "\ub3c4\uad6c",
-"View": "\ubcf4\uae30",
-"Table": "\ud14c\uc774\ube14",
-"Format": "\ud3ec\ub9f7"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/lb.es5.js b/build/media_source/vendor/tinymce/langs/lb.es5.js
deleted file mode 100644
index 53e43ae917134..0000000000000
--- a/build/media_source/vendor/tinymce/langs/lb.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('lb',{
-"Cut": "Ausschneiden",
-"Header 2": "Titel 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "D\u00e4i Web-Browser \u00ebnnerst\u00ebtzt keen direkten Acc\u00e8s op d'Zw\u00ebschenaplag. Benotz w.e.gl. CTRL+C fir den ausgewielten Text ze kop\u00e9ieren an CTRL+V fir en anzepechen.",
-"Div": "DIV",
-"Paste": "Apechen",
-"Close": "Zoumaachen",
-"Font Family": "Schr\u00ebft-Famill",
-"Pre": "PRE",
-"Align right": "Riets align\u00e9iert",
-"New document": "Neit Dokument",
-"Blockquote": "Zitat",
-"Numbered list": "Nummer\u00e9iert L\u00ebscht",
-"Increase indent": "Ident\u00e9ierung vergr\u00e9isseren",
-"Formats": "Formater",
-"Headers": "Titelen",
-"Select all": "Alles auswielen",
-"Header 3": "Titel 3",
-"Blocks": "Bl\u00e9ck",
-"Undo": "R\u00e9ckg\u00e4ngeg maachen",
-"Strikethrough": "Duerchgestrach",
-"Bullet list": "Opzielung",
-"Header 1": "Titel 1",
-"Superscript": "H\u00e9ichgestallt",
-"Clear formatting": "Format\u00e9ierung l\u00e4schen",
-"Font Sizes": "Schr\u00ebft-Gr\u00e9issten",
-"Subscript": "Erofgestallt",
-"Header 6": "Titel 6",
-"Redo": "Widderhuelen",
-"Paragraph": "Paragraph",
-"Ok": "Okee",
-"Bold": "Fett",
-"Code": "CODE",
-"Italic": "Kursiv",
-"Align center": "Zentr\u00e9iert",
-"Header 5": "Titel 5",
-"Decrease indent": "Ident\u00e9ierung verklengeren",
-"Header 4": "Titel 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\"Apechen\" ass elo am Textmodus. Inhalter ginn elo ouni Format\u00e9ierungen agepecht bis du d\u00ebs Optioun ausm\u00e9chs.",
-"Underline": "\u00cbnnerstrach",
-"Cancel": "Ofbriechen",
-"Justify": "Blocksaz",
-"Inline": "Inline",
-"Copy": "Kop\u00e9ieren",
-"Align left": "L\u00e9nks align\u00e9iert",
-"Visual aids": "Visuell H\u00ebllefen",
-"Lower Greek": "Klengt griichescht Alphabet",
-"Square": "Quadrat",
-"Default": "Standard",
-"Lower Alpha": "Klengt Alphabet",
-"Circle": "Krees",
-"Disc": "Scheif",
-"Upper Alpha": "Grousst Alphabet",
-"Upper Roman": "Grousst r\u00e9imescht Alphabet",
-"Lower Roman": "Klengt r\u00e9imescht Alphabet",
-"Name": "Numm",
-"Anchor": "Anker",
-"You have unsaved changes are you sure you want to navigate away?": "Du hues ongesp\u00e4ichert \u00c4nnerungen. W\u00eblls du s\u00e9cher ewechnavig\u00e9ieren?",
-"Restore last draft": "Leschten Entworf er\u00ebm zr\u00e9cksetzen",
-"Special character": "Speziell Zeechen",
-"Source code": "Quelltext",
-"Right to left": "Vu riets no l\u00e9nks",
-"Left to right": "Vu l\u00e9nks no riets",
-"Emoticons": "Smileyen",
-"Robots": "Robotter",
-"Document properties": "Eegeschafte vum Dokument",
-"Title": "Titel",
-"Keywords": "Schl\u00ebsselwierder",
-"Encoding": "Cod\u00e9ierung",
-"Description": "Beschreiwung",
-"Author": "Auteur",
-"Fullscreen": "Vollbildschierm",
-"Horizontal line": "Horizontal Linn",
-"Horizontal space": "Horizontalen Espace",
-"Insert\/edit image": "Bild af\u00fcgen\/\u00e4nneren",
-"General": "Allgemeng",
-"Advanced": "Erweidert",
-"Source": "Quell",
-"Border": "Rand",
-"Constrain proportions": "Proportioune b\u00e4ibehalen",
-"Vertical space": "Vertikalen Espace",
-"Image description": "Bildbeschreiwung",
-"Style": "Stil",
-"Dimensions": "Dimensiounen",
-"Insert image": "Bild af\u00fcgen",
-"Insert date\/time": "Datum\/Z\u00e4it drasetzen",
-"Remove link": "Link l\u00e4schen",
-"Url": "URL",
-"Text to display": "Text deen unzeweisen ass",
-"Anchors": "Ankeren",
-"Insert link": "Link drasetzen",
-"New window": "Nei F\u00ebnster",
-"None": "Keen",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "D'URL d\u00e9i s du aginn hues sch\u00e9ngt en externe Link ze sinn. W\u00eblls du den \"http:\/\/\"-Pr\u00e4fix dob\u00e4isetzen?",
-"Target": "Zil",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "D'URL d\u00e9i s du aginn hues sch\u00e9ngt eng Email-Adress ze sinn. W\u00eblls du de \"mailto:\"-Pr\u00e4fix dob\u00e4isetzen?",
-"Insert\/edit link": "Link drasetzen\/\u00e4nneren",
-"Insert\/edit video": "Video drasetzen\/\u00e4nneren",
-"Poster": "Pouster",
-"Alternative source": "Alternativ Quell",
-"Paste your embed code below:": "Abannungscode hei apechen:",
-"Insert video": "Video drasetzen",
-"Embed": "Abannen",
-"Nonbreaking space": "Net\u00ebmbriechenden Espace",
-"Page break": "S\u00e4iten\u00ebmbroch",
-"Paste as text": "Als Text apechen",
-"Preview": "Kucken",
-"Print": "Dr\u00e9cken",
-"Save": "Sp\u00e4icheren",
-"Could not find the specified string.": "Den Text konnt net fonnt ginn.",
-"Replace": "Ersetzen",
-"Next": "Weider",
-"Whole words": "Ganz Wierder",
-"Find and replace": "Fannen an ersetzen",
-"Replace with": "Ersetze mat",
-"Find": "Fannen",
-"Replace all": "All ersetzen",
-"Match case": "Grouss-\/Klengschreiwung respekt\u00e9ieren",
-"Prev": "Zr\u00e9ck",
-"Spellcheck": "Verbesseren",
-"Finish": "Ofschl\u00e9issen",
-"Ignore all": "All ignor\u00e9ieren",
-"Ignore": "Ignor\u00e9ieren",
-"Insert row before": "Rei virdrun drasetzen",
-"Rows": "Reien",
-"Height": "H\u00e9icht",
-"Paste row after": "Rei herno apechen",
-"Alignment": "Align\u00e9ierung",
-"Column group": "Kolonnegrupp",
-"Row": "Rei",
-"Insert column before": "Kolonn virdrun drasetzen",
-"Split cell": "Zell opspl\u00e9cken",
-"Cell padding": "Zellenopf\u00ebllung",
-"Cell spacing": "Zellenofstand",
-"Row type": "Reientyp",
-"Insert table": "Tabell drasetzen",
-"Body": "Kierper",
-"Caption": "Beschr\u00ebftung",
-"Footer": "Fouss",
-"Delete row": "Rei l\u00e4schen",
-"Paste row before": "Rei virdrun apechen",
-"Scope": "Ber\u00e4ich",
-"Delete table": "Tabell l\u00e4schen",
-"Header cell": "Kappzell",
-"Column": "Kolonn",
-"Cell": "Zell",
-"Header": "Kapp",
-"Cell type": "Zellentyp",
-"Copy row": "Rei kop\u00e9ieren",
-"Row properties": "Eegeschafte vu Reien",
-"Table properties": "Eegeschafte vun Tabellen",
-"Row group": "Reiegrupp",
-"Right": "Riets",
-"Insert column after": "Kolonn herno drasetzen",
-"Cols": "Kolonnen",
-"Insert row after": "Rei herno drasetzen",
-"Width": "Breet",
-"Cell properties": "Eegeschafte vun Zellen",
-"Left": "L\u00e9nks",
-"Cut row": "Rei ausschneiden",
-"Delete column": "Kolonn l\u00e4schen",
-"Center": "M\u00ebtt",
-"Merge cells": "Zelle fusion\u00e9ieren",
-"Insert template": "Virlag drasetzen",
-"Templates": "Virlagen",
-"Background color": "Hanndergrondfaarf",
-"Text color": "Textfaarf",
-"Show blocks": "Bl\u00e9ck weisen",
-"Show invisible characters": "Onsiichtbar Zeeche weisen",
-"Words: {0}": "Wierder: {0}",
-"Insert": "Drasetzen",
-"File": "Fichier",
-"Edit": "\u00c4nneren",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Ber\u00e4ich fir format\u00e9ierten Text. Dr\u00e9ck ALT+F9 fir de Men\u00fc. Dr\u00e9ck ALT+F10 fir d'Geschirleescht. Dr\u00e9ck ALT+0 fir d'H\u00ebllef.",
-"Tools": "Geschir",
-"View": "Kucken",
-"Table": "Tabell",
-"Format": "Format"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/lt.es5.js b/build/media_source/vendor/tinymce/langs/lt.es5.js
deleted file mode 100644
index f13e305fcf464..0000000000000
--- a/build/media_source/vendor/tinymce/langs/lt.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('lt',{
-"Redo": "Gr\u0105\u017einti",
-"Undo": "Atstatyti",
-"Cut": "I\u0161kirpti",
-"Copy": "Kopijuoti",
-"Paste": "\u012ed\u0117ti",
-"Select all": "Pa\u017eym\u0117ti visk\u0105",
-"New document": "Naujas dokumentas",
-"Ok": "Gerai",
-"Cancel": "Atsisakyti",
-"Visual aids": "Vaizdin\u0117s priemon\u0117s",
-"Bold": "Pary\u0161kintas",
-"Italic": "Kursyvinis",
-"Underline": "Pabrauktas",
-"Strikethrough": "Perbrauktas",
-"Superscript": "Vir\u0161utinis indeksas",
-"Subscript": "Apatinis indeksas",
-"Clear formatting": "Naikinti formatavim\u0105",
-"Align left": "Lygiuoti kair\u0117je",
-"Align center": "Centruoti",
-"Align right": "Lygiuoti de\u0161in\u0117je",
-"Justify": "I\u0161d\u0117styti per vis\u0105 plot\u012f",
-"Bullet list": "\u017denklinimo s\u0105ra\u0161as",
-"Numbered list": "Skaitmeninis s\u0105ra\u0161as",
-"Decrease indent": "Ma\u017einti \u012ftrauk\u0105",
-"Increase indent": "Didinti \u012ftrauk\u0105",
-"Close": "U\u017edaryti",
-"Formats": "Formatai",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Nar\u0161ykl\u0117s nustatymai neleid\u017eia redaktoriui tiesiogiai pasiekti laikinosios atminties. Pra\u0161ome naudoti klaviat\u016bros klavi\u0161us Ctrl+X\/C\/V.",
-"Headers": "Antra\u0161t\u0117s",
-"Header 1": "Antra\u0161t\u0117 1",
-"Header 2": "Antra\u0161t\u0117 2",
-"Header 3": "Antra\u0161t\u0117 3",
-"Header 4": "Antra\u0161t\u0117 4",
-"Header 5": "Antra\u0161t\u0117 5",
-"Header 6": "Antra\u0161t\u0117 6",
-"Headings": "Antra\u0161t\u0117s",
-"Heading 1": "Antra\u0161t\u0117 1",
-"Heading 2": "Antra\u0161t\u0117 2",
-"Heading 3": "Antra\u0161t\u0117 3",
-"Heading 4": "Antra\u0161t\u0117 4",
-"Heading 5": "Antra\u0161t\u0117 5",
-"Heading 6": "Antra\u0161t\u0117 6",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kodas",
-"Paragraph": "Paragrafas",
-"Blockquote": "Citata",
-"Inline": "Inline",
-"Blocks": "Blokai",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Dabar \u012fterpiama paprastojo teksto re\u017eimu. Kol \u0161i parinktis \u012fjungta, turinys bus \u012fterptas kaip paprastas tekstas.",
-"Font Family": "\u0160riftas",
-"Font Sizes": "\u0160rifto dyd\u017eiai",
-"Default": "Pagrindinis",
-"Circle": "Apskritimas",
-"Disc": "Diskas",
-"Square": "Kvadratas",
-"Lower Alpha": "Ma\u017eosios raid\u0117s",
-"Lower Greek": "Ma\u017eosios graik\u0173",
-"Lower Roman": "Ma\u017eosios rom\u0117n\u0173",
-"Upper Alpha": "Did\u017eiosios raid\u0117s",
-"Upper Roman": "Did\u017eiosios rom\u0117n\u0173",
-"Anchor": "\u017dym\u0117",
-"Name": "Pavadinimas",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID turi prasid\u0117ti raide, po kurios gali b\u016bti raid\u0117s, skai\u010diai, br\u016bk\u0161niai, ta\u0161kai, kabliata\u0161kiai ar apatiniai pabraukimai.",
-"You have unsaved changes are you sure you want to navigate away?": "Turite nei\u0161saugot\u0173 pakeitim\u0173! Ar tikrai norite i\u0161eiti?",
-"Restore last draft": "Atstatyti paskutin\u012f projekt\u0105",
-"Special character": "Specialus simbolis",
-"Source code": "Pirminis \u0161altinis",
-"Insert\/Edit code sample": "Prid\u0117ti \/ keisti kodo pavyzd\u012f",
-"Language": "Kalba",
-"Color": "Spalva",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "I\u0161 kair\u0117s \u012f de\u0161in\u0119",
-"Right to left": "I\u0161 de\u0161in\u0117s \u012f kair\u0119",
-"Emoticons": "Jaustukai",
-"Document properties": "Dokumento savyb\u0117s",
-"Title": "Pavadinimas",
-"Keywords": "\u017dymos",
-"Description": "Apra\u0161as",
-"Robots": "Robotai",
-"Author": "Autorius",
-"Encoding": "Kodavimas",
-"Fullscreen": "Visas ekranas",
-"Horizontal line": "Horizontali linija",
-"Insert\/edit image": "\u012eterpti|Tvarkyti paveiksl\u0117l\u012f",
-"Image description": "Paveiksl\u0117lio apra\u0161as",
-"Source": "Pirmin\u0117 nuoroda",
-"Dimensions": "Matmenys",
-"Constrain proportions": "Laikytis proporcij\u0173",
-"General": "Bendra",
-"Advanced": "I\u0161pl\u0117stas",
-"Style": "Stilius",
-"Vertical space": "Vertikalus tarpas",
-"Horizontal space": "Horizontalus tarpas",
-"Border": "R\u0117melis",
-"Insert image": "\u012eterpti paveiksl\u0117l\u012f",
-"Image": "Paveiksl\u0117lis",
-"Rotate counterclockwise": "Pasukti prie\u0161 laikrod\u017eio rodykl\u0119",
-"Rotate clockwise": "Pasukti pagal laikrod\u017eio rodykl\u0119",
-"Flip vertically": "Apversti vertikaliai",
-"Flip horizontally": "Apversti horizontaliai",
-"Edit image": "Redaguoti paveiksl\u0117l\u012f",
-"Image options": "Paveiksl\u0117lio nustatymai",
-"Zoom in": "Priartinti",
-"Zoom out": "Atitolinti",
-"Crop": "Atkarpyti",
-"Resize": "Keisti dyd\u012f",
-"Orientation": "Pasukimas",
-"Brightness": "\u0160viesumas",
-"Sharpen": "Ry\u0161kumas",
-"Contrast": "Kontrastas",
-"Color levels": "Spalv\u0173 lygiai",
-"Gamma": "Gama",
-"Invert": "Prie\u0161ingos spalvos",
-"Apply": "Taikyti",
-"Back": "Atgal",
-"Insert date\/time": "\u012eterpti dat\u0105\/laik\u0105",
-"Date\/time": "Data \/ laikas",
-"Insert link": "\u012eterpti nuorod\u0105",
-"Insert\/edit link": "\u012eterpti\/taisyti nuorod\u0105",
-"Text to display": "Rodomas tekstas",
-"Url": "Nuoroda",
-"Target": "Tikslin\u0117 nuoroda",
-"None": "Nieko",
-"New window": "Naujas langas",
-"Remove link": "\u0160alinti nuorod\u0105",
-"Anchors": "\u017dym\u0117",
-"Link": "Nuoroda",
-"Paste or type a link": "\u012eklijuokite arba \u012fra\u0161ykite nuorod\u0105",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Atrodo, kad \u012fvesta nuoroda yra elektroninio pa\u0161to adresas. Ar norite prie\u0161 j\u012f \u012fvesti reikalaujam\u0105 \u201emailto:\u201c?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Atrodo, kad \u012fved\u0117te nuotolin\u0119 nuorod\u0105. Ar norite prie\u0161 j\u0105 \u012fvesti reikalaujam\u0105 \u201ehttp:\/\/\u201c?",
-"Insert video": "\u012eterpti video",
-"Insert\/edit video": "\u012eterpti\/tvarkyti video",
-"Insert\/edit media": "Prid\u0117ti \/ keisti medij\u0105",
-"Alternative source": "Alternatyvus \u0161altinis",
-"Poster": "Plakatas",
-"Paste your embed code below:": "\u012eterpkite kod\u0105 \u017eemiau:",
-"Embed": "\u012eterpti",
-"Media": "Medija",
-"Nonbreaking space": "Nepertraukiamos vietos",
-"Page break": "Puslapio skirtukas",
-"Paste as text": "\u012eklijuoti kaip tekst\u0105",
-"Preview": "Per\u017ei\u016bra",
-"Print": "Spausdinti",
-"Save": "I\u0161saugoti",
-"Find": "Ie\u0161koti",
-"Replace with": "Kuo pakeisti",
-"Replace": "Pakeisti",
-"Replace all": "Pakeisti visk\u0105",
-"Prev": "Ankstesnis",
-"Next": "Sekantis",
-"Find and replace": "Surasti ir pakeisti",
-"Could not find the specified string.": "Nepavyko rasti nurodytos eilut\u0117s.",
-"Match case": "Atitinkamus",
-"Whole words": "Visus \u017eod\u017eius",
-"Spellcheck": "Ra\u0161ybos tikrinimas",
-"Ignore": "Ignoruoti",
-"Ignore all": "Ignoruoti visk\u0105",
-"Finish": "Baigti",
-"Add to Dictionary": "Prid\u0117ti \u012f \u017dodyn\u0105",
-"Insert table": "\u012eterpti lentel\u0119",
-"Table properties": "Lentel\u0117s savyb\u0117s",
-"Delete table": "\u0160alinti lentel\u0119",
-"Cell": "Langeliai",
-"Row": "Eilut\u0117s",
-"Column": "Stulpelis",
-"Cell properties": "Langelio savyb\u0117s",
-"Merge cells": "Sujungti langelius",
-"Split cell": "Skaidyti langelius",
-"Insert row before": "\u012eterpti eilut\u0119 prie\u0161",
-"Insert row after": "\u012eterpti eilut\u0119 po",
-"Delete row": "Naikinti eilut\u0119",
-"Row properties": "Eilut\u0117s savyb\u0117s",
-"Cut row": "I\u0161kirpti eilut\u0119",
-"Copy row": "Kopijuoti eilut\u0119",
-"Paste row before": "\u012ed\u0117ti eilut\u0119 prie\u0161",
-"Paste row after": "\u012ed\u0117ti eilut\u0119 po",
-"Insert column before": "\u012eterpti stulpel\u012f prie\u0161",
-"Insert column after": "\u012eterpti stulpel\u012f po",
-"Delete column": "Naikinti stulpel\u012f",
-"Cols": "Stulpeliai",
-"Rows": "Eilut\u0117s",
-"Width": "Plotis",
-"Height": "Auk\u0161tis",
-"Cell spacing": "Tarpas tarp langeli\u0173",
-"Cell padding": "Tarpas nuo langelio iki teksto",
-"Caption": "Antra\u0161t\u0117",
-"Left": "Kair\u0117",
-"Center": "Centras",
-"Right": "De\u0161in\u0117",
-"Cell type": "Langelio tipas",
-"Scope": "Strukt\u016bra",
-"Alignment": "Lygiavimas",
-"H Align": "H Lygiavimas",
-"V Align": "V Lygiavimas",
-"Top": "Vir\u0161uje",
-"Middle": "Viduryje",
-"Bottom": "Apa\u010dioje",
-"Header cell": "Antra\u0161t\u0117s langelis",
-"Row group": "Eilu\u010di\u0173 grup\u0117",
-"Column group": "Stulpeli\u0173 grup\u0117",
-"Row type": "Eilu\u010di\u0173 tipas",
-"Header": "Antra\u0161t\u0117",
-"Body": "Turinys",
-"Footer": "Apa\u010dia",
-"Border color": "R\u0117melio spalva",
-"Insert template": "\u012eterpti \u0161ablon\u0105",
-"Templates": "\u0160ablonai",
-"Text color": "Teksto spalva",
-"Background color": "Fono spalva",
-"Custom...": "Pasirinktinas...",
-"Custom color": "Pasirinktina spalva",
-"No color": "Jokios spalvos",
-"Table of Contents": "Turinys",
-"Show blocks": "Rodyti blokus",
-"Show invisible characters": "Rodyti nematomus simbolius",
-"Words: {0}": "\u017dod\u017eiai: {0}",
-"File": "Failas",
-"Edit": "Redaguoti",
-"Insert": "\u012eterpti",
-"View": "Per\u017ei\u016bra",
-"Format": "Formatas",
-"Table": "Lentel\u0117",
-"Tools": "\u012erankiai",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Suformatuoto teksto laukas. D\u0117l meniu spauskite ALT-F9. U\u017eduo\u010di\u0173 juostos \u012fjungimui spauskite ALT-F10. Pagalbai - spauskite ALT-0."
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/lv.es5.js b/build/media_source/vendor/tinymce/langs/lv.es5.js
deleted file mode 100644
index 4adc6fe5ca505..0000000000000
--- a/build/media_source/vendor/tinymce/langs/lv.es5.js
+++ /dev/null
@@ -1,197 +0,0 @@
-tinymce.addI18n('lv',{
-"Cut": "Izgriezt",
-"Header 2": "Otr\u0101 l\u012bme\u0146a virsraksts",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "J\u016bsu p\u0101rl\u016bkprogramma neatbalsta piek\u013cuvi starpliktuvei. L\u016bdzu izmantojiet Ctrl+X\/C\/V klaviat\u016bras sa\u012bsnes.",
-"Div": "Div elements",
-"Paste": "Iel\u012bm\u0113t",
-"Close": "Aizv\u0113rt",
-"Font Family": "Font Family",
-"Pre": "Pre elements",
-"Align right": "L\u012bdzin\u0101t pa labi",
-"New document": "Jauns dokuments",
-"Blockquote": "Cit\u0101ts",
-"Numbered list": "Numur\u0113ts saraksts",
-"Increase indent": "Palielin\u0101t atk\u0101pi",
-"Formats": "Form\u0101ti",
-"Headers": "Virsraksti",
-"Select all": "Iez\u012bm\u0113t",
-"Header 3": "Tre\u0161\u0101 l\u012bme\u0146a virsraksts",
-"Blocks": "Bloka elements",
-"Undo": "Atsaukt",
-"Strikethrough": "P\u0101rsv\u012btrot",
-"Bullet list": "Nenumuer\u0113ts saraksts",
-"Header 1": "Pirm\u0101 l\u012bme\u0146a virsraksts",
-"Superscript": "Aug\u0161raksts",
-"Clear formatting": "No\u0146emt format\u0113jumu",
-"Font Sizes": "Font Sizes",
-"Subscript": "Apak\u0161raksts",
-"Header 6": "Sest\u0101 l\u012bme\u0146a virsraksts",
-"Redo": "Atcelt atsauk\u0161anu",
-"Paragraph": "Paragr\u0101fs",
-"Ok": "Labi",
-"Bold": "Treknraksts",
-"Code": "Koda elements",
-"Italic": "Kurs\u012bvs",
-"Align center": "Centr\u0113t",
-"Header 5": "Piekt\u0101 l\u012bme\u0146a virsraksts",
-"Decrease indent": "Samazin\u0101t atk\u0101pi",
-"Header 4": "Ceturt\u0101 l\u012bme\u0146a virsraksts",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Iel\u012bm\u0113\u0161ana tagad ir vienk\u0101r\u0161teksta re\u017e\u012bm\u0101. Saturs tiks iel\u012bm\u0113ts k\u0101 vienk\u0101r\u0161teksts, l\u012bdz \u0161\u012b opcija tiks atsl\u0113gta.",
-"Underline": "Pasv\u012btrot",
-"Cancel": "Atcelt",
-"Justify": "L\u012bdzin\u0101t abas malas",
-"Inline": "Rindi\u0146as elements",
-"Copy": "Kop\u0113t",
-"Align left": "L\u012bdzin\u0101t pa kreisi",
-"Visual aids": "Uzskates l\u012bdzek\u013ci",
-"Lower Greek": "Grie\u0137u mazie burti",
-"Square": "Kvadr\u0101ts",
-"Default": "Noklus\u0113juma",
-"Lower Alpha": "Lat\u012b\u0146u mazie burti",
-"Circle": "Aplis",
-"Disc": "Disks",
-"Upper Alpha": "Lat\u012b\u0146u lielie burti",
-"Upper Roman": "Romie\u0161u lielie burti",
-"Lower Roman": "Romie\u0161u mazie burti",
-"Name": "V\u0101rds",
-"Anchor": "Enkurelements",
-"You have unsaved changes are you sure you want to navigate away?": "Jums ir nesaglab\u0101tas izmai\u0146as, esat dro\u0161s, ka v\u0113laties doties prom",
-"Restore last draft": "Atjaunot p\u0113d\u0113jo melnrakstu",
-"Special character": "\u012apa\u0161ais simbols",
-"Source code": "Pirmkods",
-"Right to left": "No lab\u0101s uz kreiso",
-"Left to right": "No kreis\u0101s uz labo",
-"Emoticons": "Emocijas",
-"Robots": "Programmas",
-"Document properties": "Dokumenta uzst\u0101d\u012bjumi",
-"Title": "Nosaukums",
-"Keywords": "Atsl\u0113gv\u0101rdi",
-"Encoding": "Kod\u0113jums",
-"Description": "Apraksts",
-"Author": "Autors",
-"Fullscreen": "Pilnekr\u0101na re\u017e\u012bms",
-"Horizontal line": "Horizont\u0101la l\u012bnija",
-"Horizontal space": "Horizont\u0101l\u0101 vieta",
-"Insert\/edit image": "Ievietot\/labot att\u0113lu",
-"General": "Visp\u0101r\u012bgi",
-"Advanced": "Papildus",
-"Source": "Avots",
-"Border": "Apmale",
-"Constrain proportions": "Saglab\u0101t malu attiec\u012bbu",
-"Vertical space": "Vertik\u0101l\u0101 vieta",
-"Image description": "Att\u0113la apraksts",
-"Style": "Stils",
-"Dimensions": "Izm\u0113ri",
-"Insert image": "Ievietot att\u0113lu",
-"Insert date\/time": "Ievietot datumu\/laiku",
-"Remove link": "No\u0146emt saiti",
-"Url": "Adrese",
-"Text to display": "Teksts",
-"Anchors": "Enkurelements",
-"Insert link": "Ievietot saiti",
-"New window": "Jauns logs",
-"None": "Nek\u0101",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "M\u0113r\u0137is",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "Ievietot\/labot saiti",
-"Insert\/edit video": "Ievietot\/redi\u0123\u0113t video",
-"Poster": "Att\u0113ls",
-"Alternative source": "Alternat\u012bvs avots",
-"Paste your embed code below:": "Iekop\u0113jiet embed kodu zem\u0101k:",
-"Insert video": "Ievietot video",
-"Embed": "Embed",
-"Nonbreaking space": "L\u012bnij-nedalo\u0161s atstarpes simbols",
-"Page break": "P\u0101rnest jaun\u0101 lap\u0101",
-"Paste as text": "Iel\u012bm\u0113t k\u0101 tekstu",
-"Preview": "Priek\u0161skat\u012bjums",
-"Print": "Print\u0113t",
-"Save": "Saglab\u0101t",
-"Could not find the specified string.": "Mekl\u0113tais teksts netika atrasts",
-"Replace": "Aizvietot",
-"Next": "N\u0101ko\u0161ais",
-"Whole words": "Pilnus v\u0101rdus",
-"Find and replace": "Mekl\u0113t un aizvietot",
-"Replace with": "Aizvietot ar",
-"Find": "Mekl\u0113t",
-"Replace all": "Aizvietot visu",
-"Match case": "Re\u0123istrj\u016bt\u012bgs",
-"Prev": "Iepriek\u0161\u0113jais",
-"Spellcheck": "Pareizrakst\u012bbas p\u0101rbaude",
-"Finish": "Beigt",
-"Ignore all": "Ignor\u0113t visu",
-"Ignore": "Ignor\u0113t",
-"Insert row before": "Ievietot rindu pirms",
-"Rows": "Rindas",
-"Height": "Augstums",
-"Paste row after": "Iel\u012bm\u0113t rindu p\u0113c",
-"Alignment": "L\u012bdzin\u0101jums",
-"Column group": "Kolonnu grupa",
-"Row": "Rinda",
-"Insert column before": "Ievietot kolonu pirms",
-"Split cell": "Sadal\u012bt \u0161\u016bnas",
-"Cell padding": "\u0160\u016bnas atstatumi",
-"Cell spacing": "\u0160\u016bnu atstarpes",
-"Row type": "Rindas tips",
-"Insert table": "Ievietot tabulu",
-"Body": "\u0136ermenis",
-"Caption": "Virsraksts",
-"Footer": "K\u0101jene",
-"Delete row": "Dz\u0113st rindu",
-"Paste row before": "Iel\u012bm\u0113t rindu pirms",
-"Scope": "Apgabals",
-"Delete table": "Dz\u0113st tabulu",
-"Header cell": "Galvenes \u0161\u016bna",
-"Column": "Kolona",
-"Cell": "\u0160\u016bna",
-"Header": "Galvene",
-"Cell type": "\u0160\u016bnas tips",
-"Copy row": "Kop\u0113t rindu",
-"Row properties": "Rindas uzst\u0101d\u012bjumi",
-"Table properties": "Tabulas uzst\u0101d\u012bjumi",
-"Row group": "Rindu grupa",
-"Right": "Pa labi",
-"Insert column after": "Ievietot kolonu p\u0113c",
-"Cols": "Kolonas",
-"Insert row after": "Ievietot rindu p\u0113c",
-"Width": "Platums",
-"Cell properties": "\u0160\u016bnas uzst\u0101d\u012bjumi",
-"Left": "Pa kreisi",
-"Cut row": "Izgriezt rindu",
-"Delete column": "Dz\u0113st kolonu",
-"Center": "Centr\u0113t",
-"Merge cells": "Apvienot \u0161\u016bnas",
-"Insert template": "Ievietot \u0161ablonu",
-"Templates": "\u0160abloni",
-"Background color": "Fona kr\u0101sa",
-"Text color": "Teksta kr\u0101sa",
-"Show blocks": "R\u0101d\u012bt blokus",
-"Show invisible characters": "R\u0101d\u012bt neredzam\u0101s rakstz\u012bmes",
-"Words: {0}": "V\u0101rdi: {0}",
-"Insert": "Ievietot",
-"File": "Fails",
-"Edit": "Labot",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Vizu\u0101li redi\u0123\u0113jama teksta apgabals. Nospiediet ALT-F9 izv\u0113lnei, ALT-F10 r\u012bkjoslai vai ALT-0 pal\u012bdz\u012bbai.",
-"Tools": "R\u012bki",
-"View": "Skat\u012bt",
-"Table": "Tabula",
-"Format": "Form\u0101ts",
-"H Align": "Horizont\u0101lais l\u012bdzin\u0101jums",
-"V Align": "Vertik\u0101lais l\u012bdzin\u0101jums",
-"Top": "Aug\u0161\u0101",
-"Middle": "Vid\u016b",
-"Bottom": "Apak\u0161\u0101",
-"Headings": "Virsraksti",
-"Heading 1": "1. virsraksts",
-"Heading 2": "2. virsraksts",
-"Heading 3": "3. virsraksts",
-"Heading 4": "4. virsraksts",
-"Heading 5": "5. virsraksts",
-"Heading 6": "6. virsraksts",
-"Add to Dictionary": "Pievienot v\u0101rdn\u012bcai",
-"Border color": "Apmales kr\u0101sa",
-"Color": "Kr\u0101sa",
-"Custom...": "Piel\u0101gots...",
-"Custom color": "Nestandarta kr\u0101sa",
-"No color": "Bez kr\u0101sas"
-});
diff --git a/build/media_source/vendor/tinymce/langs/mk.es5.js b/build/media_source/vendor/tinymce/langs/mk.es5.js
deleted file mode 100644
index f5171a1d64eb9..0000000000000
--- a/build/media_source/vendor/tinymce/langs/mk.es5.js
+++ /dev/null
@@ -1,233 +0,0 @@
-tinymce.addI18n('mk',{
-"Cut": "\u0418\u0441\u0435\u0447\u0438",
-"Heading 5": "\u041d\u0430\u0441\u043b\u043e\u0432 5",
-"Header 2": "\u041d\u0430\u0441\u043b\u043e\u0432 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448\u0438\u043e\u0442 \u043f\u0440\u0435\u043b\u0438\u0441\u0442\u0443\u0432\u0430\u0447 \u043d\u0435 \u043f\u043e\u0434\u0434\u0440\u0436\u0443\u0432\u0430 \u0434\u0438\u0440\u0435\u043a\u0442\u0435\u043d \u043f\u0440\u0438\u0441\u0442\u0430\u043f \u0434\u043e \u043c\u0435\u043c\u043e\u0440\u0438\u0458\u0430\u0442\u0430.\u041a\u043e\u0440\u0438\u0441\u0442\u0435\u0442\u0435 \u0433\u0438 Ctrl+X\/C\/V \u043a\u0440\u0430\u0442\u0435\u043d\u043a\u0438\u0442\u0435 \u043d\u0430 \u0442\u0430\u0441\u0442\u0430\u0442\u0443\u0440\u0430\u0442\u0430.",
-"Heading 4": "\u041d\u0430\u0441\u043b\u043e\u0432 4",
-"Div": "DIV",
-"Heading 2": "\u041d\u0430\u0441\u043b\u043e\u0432 2",
-"Paste": "\u0412\u043c\u0435\u0442\u043d\u0438",
-"Close": "\u0417\u0430\u0442\u0432\u043e\u0440\u0438",
-"Font Family": "\u0424\u043e\u043d\u0442 \u0444\u0430\u043c\u0438\u043b\u0438\u0458\u0430",
-"Pre": "PRE",
-"Align right": "\u0414\u0435\u0441\u043d\u043e \u043f\u043e\u0440\u0430\u043c\u043d\u0443\u0432\u0430\u045a\u0435",
-"New document": "\u041d\u043e\u0432 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Blockquote": "\u0426\u0438\u0442\u0430\u0442",
-"Numbered list": "\u041b\u0438\u0441\u0442\u0430 \u0441\u043e \u0431\u0440\u043e\u0458\u043a\u0438",
-"Heading 1": "\u041d\u0430\u0441\u043b\u043e\u0432 1",
-"Headings": "\u041d\u0430\u0441\u043b\u043e\u0432\u0438",
-"Increase indent": "\u0417\u0433\u043e\u043b\u0435\u043c\u0438 \u0432\u043e\u0432\u043b\u0435\u043a\u0443\u0432\u0430\u045a\u0435",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438",
-"Headers": "\u041d\u0430\u0441\u043b\u043e\u0432\u0438",
-"Select all": "\u041e\u0437\u043d\u0430\u0447\u0438 \u0433\u0438 \u0441\u0438\u0442\u0435",
-"Header 3": "\u041d\u0430\u0441\u043b\u043e\u0432 3",
-"Blocks": "\u0411\u043b\u043e\u043a\u043e\u0432\u0438",
-"Undo": "\u0412\u0440\u0430\u0442\u0438",
-"Strikethrough": "\u041f\u0440\u0435\u0446\u0440\u0442\u0430\u043d\u043e",
-"Bullet list": "\u041b\u0438\u0441\u0442\u0430 \u0441\u043e \u0437\u043d\u0430\u0446\u0438",
-"Header 1": "\u041d\u0430\u0441\u043b\u043e\u0432 1",
-"Superscript": "\u041d\u0430\u0442\u0442\u0435\u043a\u0441\u0442",
-"Clear formatting": "\u0418\u0441\u0447\u0438\u0441\u0442\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u045a\u0435",
-"Font Sizes": "\u0424\u043e\u043d\u0442 \u0433\u043e\u043b\u0435\u043c\u0438\u043d\u0430",
-"Subscript": "\u041f\u043e\u0442\u0442\u0435\u043a\u0441\u0442",
-"Header 6": "\u041d\u0430\u0441\u043b\u043e\u0432 6",
-"Redo": "\u041f\u043e\u0432\u0442\u043e\u0440\u0438",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Ok": "\u041e\u041a",
-"Bold": "\u0417\u0434\u0435\u0431\u0435\u043b\u0435\u043d\u043e",
-"Code": "\u041a\u043e\u0434",
-"Italic": "\u041d\u0430\u043a\u043e\u0441\u0435\u043d\u043e",
-"Align center": "\u0426\u0435\u043d\u0442\u0440\u0438\u0440\u0430\u043d\u043e",
-"Header 5": "\u041d\u0430\u0441\u043b\u043e\u0432 5",
-"Heading 6": "\u041d\u0430\u0441\u043b\u043e\u0432 6",
-"Heading 3": "\u041d\u0430\u0441\u043b\u043e\u0432 3",
-"Decrease indent": "\u0421\u043c\u0430\u043b\u0438 \u0432\u043e\u0432\u043b\u0435\u043a\u0443\u0432\u0430\u045a\u0435",
-"Header 4": "\u041d\u0430\u0441\u043b\u043e\u0432 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u043c\u0435\u0442\u043d\u0443\u0432\u0430\u045a\u0435\u0442\u043e \u0435 \u043a\u0430\u043a\u043e \u0447\u0438\u0441\u0442 \u0442\u0435\u043a\u0441\u0442. \u0421\u043e\u0434\u0440\u0436\u0438\u043d\u0430\u0442\u0430 \u045c\u0435 \u0431\u0438\u0434\u0435 \u0432\u043c\u0435\u0442\u043d\u0430\u0442\u0430 \u043a\u0430\u043a\u043e \u0447\u0438\u0441\u0442 \u0442\u0435\u043a\u0441\u0442 \u0441\u00e8 \u0434\u043e\u0434\u0435\u043a\u0430 \u043d\u0435 \u0458\u0430 \u0438\u0441\u043a\u043b\u0443\u0447\u0438\u0442\u0435 \u043e\u0432\u0430\u0430 \u043e\u043f\u0446\u0438\u0458\u0430.",
-"Underline": "\u041f\u043e\u0434\u0432\u043b\u0435\u0447\u0435\u043d\u043e",
-"Cancel": "\u041e\u0442\u043a\u0430\u0436\u0438",
-"Justify": "\u041f\u043e\u0440\u0430\u043c\u043d\u0435\u0442\u043e",
-"Inline": "\u041d\u0430\u0432\u043d\u0430\u0442\u0440\u0435",
-"Copy": "\u041a\u043e\u043f\u0438\u0440\u0430\u0458",
-"Align left": "\u041b\u0435\u0432\u043e \u043f\u043e\u0440\u0430\u043c\u043d\u0443\u0432\u0430\u045a\u0435",
-"Visual aids": "\u0412\u0438\u0437\u0443\u0435\u043b\u043d\u0430 \u043f\u043e\u043c\u043e\u0448",
-"Lower Greek": "\u041c\u0430\u043b\u0438 \u0433\u0440\u0447\u043a\u0438",
-"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442",
-"Default": "\u041f\u043e\u0441\u0442\u0430\u0432\u0435\u043d\u043e",
-"Lower Alpha": "\u041c\u0430\u043b\u0438 \u0430\u043b\u0444\u0430",
-"Circle": "\u041a\u0440\u0443\u0433",
-"Disc": "\u0422\u043e\u0447\u043a\u0430",
-"Upper Alpha": "\u0413\u043e\u043b\u0435\u043c\u0438 \u0430\u043b\u0444\u0430",
-"Upper Roman": "\u0413\u043e\u043b\u0435\u043c\u0438 \u0440\u0438\u043c\u0441\u043a\u0438",
-"Lower Roman": "\u0413\u043e\u043b\u0435\u043c\u0438 \u0440\u0438\u043c\u0441\u043a\u0438",
-"Name": "\u0418\u043c\u0435",
-"Anchor": "\u0421\u0438\u0434\u0440\u043e",
-"You have unsaved changes are you sure you want to navigate away?": "\u0418\u043c\u0430\u0442\u0435 \u043d\u0435\u0437\u0430\u0447\u0443\u0432\u0430\u043d\u0438 \u043f\u0440\u043e\u043c\u0435\u043d\u0438, \u0441\u0438\u0433\u0443\u0440\u043d\u043e \u0441\u0430\u043a\u0430\u0442\u0435 \u0434\u0430 \u0458\u0430 \u043d\u0430\u043f\u0443\u0448\u0442\u0438\u0442\u0435 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430\u0442\u0430?",
-"Restore last draft": "\u0412\u0440\u0430\u0442\u0438 \u0433\u043e \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u043e\u0442 \u043d\u0430\u0446\u0440\u0442",
-"Special character": "\u0421\u043f\u0435\u0446\u0438\u0458\u0430\u043b\u0435\u043d \u043a\u0430\u0440\u0430\u043a\u0442\u0435\u0440",
-"Source code": "\u0418\u0437\u0432\u043e\u0440\u0435\u043d \u043a\u043e\u0434",
-"Color": "\u0411\u043e\u0458\u0430",
-"Right to left": "\u041e\u0434 \u0434\u0435\u0441\u043d\u043e \u043d\u0430 \u043b\u0435\u0432\u043e",
-"Left to right": "\u041e\u0434 \u043b\u0435\u0432\u043e \u043d\u0430 \u0434\u0435\u0441\u043d\u043e",
-"Emoticons": "\u0415\u043c\u043e\u0442\u0438\u043a\u043e\u043d\u0438",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438",
-"Document properties": "\u041f\u043e\u0434\u0430\u0442\u043e\u0446\u0438 \u0437\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u043e\u0442",
-"Title": "\u041d\u0430\u0441\u043b\u043e\u0432",
-"Keywords": "\u041a\u043b\u0443\u0447\u043d\u0438 \u0437\u0431\u043e\u0440\u043e\u0432\u0438",
-"Encoding": "\u041a\u043e\u0434\u0438\u0440\u0430\u045a\u0435",
-"Description": "\u041e\u043f\u0438\u0441",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Fullscreen": "\u0426\u0435\u043b \u0435\u043a\u0440\u0430\u043d",
-"Horizontal line": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u0430 \u043b\u0438\u043d\u0438\u0458\u0430",
-"Horizontal space": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0435\u043d \u043f\u0440\u043e\u0441\u0442\u043e\u0440",
-"Insert\/edit image": "\u0412\u043c\u0435\u0442\u043d\u0438\/\u0421\u043c\u0435\u043d\u0438 \u0441\u043b\u0438\u043a\u0430",
-"General": "\u041e\u043f\u0448\u0442\u043e",
-"Advanced": "\u041d\u0430\u043f\u0440\u0435\u0434\u043d\u043e",
-"Source": "\u0418\u0437\u0432\u043e\u0440",
-"Border": "\u0420\u0430\u043c\u043a\u0430",
-"Constrain proportions": "\u0412\u0440\u0437\u0430\u043d\u0438 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0435\u043d \u043f\u0440\u043e\u0441\u0442\u043e\u0440",
-"Image description": "\u041e\u043f\u0438\u0441 \u043d\u0430 \u0441\u043b\u0438\u043a\u0430",
-"Style": "\u0421\u0442\u0438\u043b",
-"Dimensions": "\u0414\u0438\u043c\u0435\u043d\u0437\u0438\u0438",
-"Insert image": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0441\u043b\u0438\u043a\u0430",
-"Insert date\/time": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0434\u0430\u0442\u0443\u043c\/\u0432\u0440\u0435\u043c\u0435",
-"Remove link": "\u041e\u0442\u0441\u0442\u0440\u0430\u043d\u0438 \u043b\u0438\u043d\u043a",
-"Url": "URL",
-"Text to display": "\u0422\u0435\u043a\u0441\u0442 \u0437\u0430 \u043f\u0440\u0438\u043a\u0430\u0437",
-"Anchors": "\u0421\u0438\u0434\u0440\u0430",
-"Insert link": "\u0412\u043c\u0435\u0442\u043d\u0438 \u043b\u0438\u043d\u043a",
-"New window": "\u041d\u043e\u0432 \u043f\u0440\u043e\u0437\u043e\u0440\u0435\u0446",
-"None": "\u041d\u0438\u0448\u0442\u043e",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL-\u0442\u043e \u043a\u043e\u0435 \u0433\u043e \u0432\u043d\u0435\u0441\u043e\u0432\u0442\u0435 \u0441\u0435 \u0447\u0438\u043d\u0438 \u0434\u0435\u043a\u0430 \u0435 \u043d\u0430\u0434\u0432\u043e\u0440\u0435\u0448\u043d\u0430 \u0432\u0440\u0441\u043a\u0430. \u0414\u0430\u043b\u0438 \u0441\u0430\u043a\u0430\u0442\u0435 \u0434\u0430 \u0441\u0435 \u0434\u043e\u0434\u0430\u0434\u0435 \u0437\u0430\u0434\u043e\u043b\u0436\u0438\u0442\u0435\u043b\u043d\u0438\u043e\u0442 http:\/\/ \u043f\u0440\u0435\u0444\u0438\u043a\u0441?",
-"Target": "\u0426\u0435\u043b",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "UR-\u0442\u043e \u043a\u043e\u0435 \u0433\u043e \u0432\u043d\u0435\u0441\u043e\u0432\u0442\u0435 \u0441\u0435 \u0447\u0438\u043d\u0438 \u0434\u0435\u043a\u0430 \u0435  \u0435-\u043f\u043e\u0448\u0442\u0430. \u0414\u0430\u043b\u0438 \u0441\u0430\u043a\u0430\u0442\u0435 \u0434\u0430 \u0441\u0435 \u0434\u043e\u0434\u0430\u0434\u0435 \u0437\u0430\u0434\u043e\u043b\u0436\u0438\u0442\u0435\u043b\u043d\u0438\u043e\u0442 mailto: \u043f\u0440\u0435\u0444\u0438\u043a\u0441?",
-"Insert\/edit link": "\u0412\u043c\u0435\u0442\u043d\u0438\/\u0441\u043c\u0435\u043d\u0438 \u043b\u0438\u043d\u043a",
-"Insert\/edit video": "\u0412\u043c\u0435\u0442\u043d\u0438\/\u0441\u043c\u0435\u043d\u0438 \u0432\u0438\u0434\u0435\u043e",
-"Poster": "\u041f\u043e\u0441\u0442\u0435\u0440",
-"Alternative source": "\u0410\u043b\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u0435\u043d \u0438\u0437\u0432\u043e\u0440",
-"Paste your embed code below:": "\u0412\u0435\u043c\u0442\u043d\u0438 \u0433\u043e \u043a\u043e\u0434\u043e\u0442 \u0437\u0430 \u0432\u0433\u0440\u0430\u0434\u0435\u043d\u043e \u043f\u043e\u0434\u043e\u043b\u0443:",
-"Insert\/Edit code sample": "\u0412\u043c\u0435\u0442\u043d\u0438\/\u0441\u043c\u0435\u043d\u0438 \u043f\u0440\u0438\u043c\u0435\u0440 \u0437\u0430 \u043a\u043e\u0434",
-"Insert video": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0432\u0438\u0434\u0435\u043e",
-"Embed": "\u0412\u0433\u0440\u0430\u0434\u0435\u043d\u043e",
-"Nonbreaking space": "\u041c\u0435\u0441\u0442\u043e \u0431\u0435\u0437 \u043f\u0440\u0435\u043a\u0440\u0448\u0443\u0432\u0430\u045a\u0435",
-"Page break": "\u041f\u0440\u0435\u043a\u0440\u0448\u0443\u0432\u0430\u045a\u0435",
-"Paste as text": "\u0412\u043c\u0435\u0442\u043d\u0438 \u043a\u0430\u043a\u043e \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u0440\u0435\u0433\u043b\u0435\u0434",
-"Print": "\u041f\u0435\u0447\u0430\u0442\u0438",
-"Save": "\u0417\u0430\u0447\u0443\u0432\u0430\u0458",
-"Could not find the specified string.": "\u041d\u0435\u043c\u043e\u0436\u043d\u043e \u0434\u0430 \u0441\u0435 \u043d\u0430\u0458\u0434\u0435 \u043f\u043e\u0441\u043e\u0447\u0435\u043d\u0438\u043e\u0442 \u043d\u0438\u0437.",
-"Replace": "\u0421\u043c\u0435\u043d\u0438",
-"Next": "\u041f\u043e",
-"Whole words": "\u0426\u0435\u043b\u0438 \u0437\u0431\u043e\u0440\u043e\u0432\u0438",
-"Find and replace": "\u041d\u0430\u0458\u0434\u0438 \u0438 \u0441\u043c\u0435\u043d\u0438",
-"Replace with": "\u0421\u043c\u0435\u043d\u0438 \u0441\u043e",
-"Find": "\u041d\u0430\u0458\u0434\u0438",
-"Replace all": "\u0421\u043c\u0435\u043d\u0438 \u0441\u00e8",
-"Match case": "\u0414\u0430 \u0441\u0435 \u0441\u043e\u0432\u043f\u0430\u0453\u0430",
-"Prev": "\u041f\u0440\u0435\u0434",
-"Spellcheck": "\u041f\u0440\u043e\u0432\u0435\u0440\u043a\u0430 \u043d\u0430 \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441",
-"Finish": "\u041a\u0440\u0430\u0458",
-"Ignore all": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u0458 \u0441\u00e8",
-"Ignore": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u0430\u0458",
-"Add to Dictionary": "\u0414\u043e\u0434\u0430\u0434\u0438 \u0432\u043e \u0440\u0435\u0447\u043d\u0438\u043a",
-"Insert row before": "\u041d\u043e\u0432 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434",
-"Rows": "\u0420\u0435\u0434\u043e\u0432\u0438",
-"Height": "\u0412\u0438\u0441\u0438\u043d\u0430",
-"Paste row after": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0440\u0435\u0434 \u043f\u043e\u0441\u043b\u0435",
-"Border color": "\u0411\u043e\u0458\u0430 \u043d\u0430 \u0440\u0430\u043c\u043a\u0430",
-"Alignment": "\u041f\u043e\u0440\u0430\u043c\u043d\u0443\u0432\u0430\u045a\u0435",
-"Column group": "\u0413\u0440\u0443\u043f\u0430 \u043a\u043e\u043b\u043e\u043d\u0438",
-"Row": "\u0420\u0435\u0434",
-"Insert column before": "\u041d\u043e\u0432\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u043f\u0440\u0435\u0434",
-"Split cell": "\u041f\u043e\u0434\u0435\u043b\u0438 \u045c\u0435\u043b\u0438\u0458\u0430",
-"Cell padding": "\u041f\u0440\u043e\u0441\u0442\u043e\u0440 \u0432\u043e \u045c\u0435\u043b\u0438\u0458\u0430",
-"Cell spacing": "\u041f\u0440\u043e\u0441\u0442\u043e\u0440 \u043c\u0435\u0453\u0443 \u045c\u0435\u043b\u0438\u0438",
-"Row type": "\u0422\u0438\u043f \u043d\u0430 \u0440\u0435\u0434",
-"Insert table": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0442\u0430\u0431\u0435\u043b\u0430",
-"Body": "\u0422\u0435\u043b\u043e",
-"Caption": "\u041d\u0430\u0442\u043f\u0438\u0441",
-"Footer": "\u041f\u043e\u0434\u043d\u043e\u0436\u0458\u0435",
-"Delete row": "\u0418\u0437\u0431\u0440\u0438\u0448\u0438 \u0440\u0435\u0434",
-"Paste row before": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0440\u0435\u0434 \u043f\u0440\u0435\u0434",
-"Scope": "\u041e\u043f\u0441\u0435\u0433",
-"Delete table": "\u0418\u0437\u0431\u0440\u0438\u0448\u0438 \u0442\u0430\u0431\u0435\u043b\u0430",
-"H Align": "\u0425\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e \u043f\u043e\u0440\u0430\u043c\u043d\u0443\u0432\u0430\u045a\u0435",
-"Top": "\u0413\u043e\u0440\u0435",
-"Header cell": "\u041d\u0430\u0441\u043b\u043e\u0432\u043d\u0430 \u045c\u0435\u043b\u0438\u0458\u0430",
-"Column": "\u041a\u043e\u043b\u043e\u043d\u0430",
-"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u0435\u0434\u043e\u0432\u0438",
-"Cell": "\u040c\u0435\u043b\u0438\u0458\u0430",
-"Middle": "\u0421\u0440\u0435\u0434\u0438\u043d\u0430",
-"Cell type": "\u0422\u0438\u043f \u043d\u0430 \u045c\u0435\u043b\u0438\u0458\u0430",
-"Copy row": "\u041a\u043e\u043f\u0438\u0440\u0430\u0458 \u0440\u0435\u0434",
-"Row properties": "\u041a\u0430\u0440\u0430\u043a\u0442\u0435\u0440\u0438\u0441\u0442\u0438\u043a\u0438 \u043d\u0430 \u0440\u0435\u0434",
-"Table properties": "\u041a\u0430\u0440\u0430\u043a\u0442\u0435\u0440\u0438\u0441\u0442\u0438\u043a\u0438 \u043d\u0430 \u0442\u0430\u0431\u0435\u043b\u0430",
-"Bottom": "\u0414\u043e\u043b\u0443",
-"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e \u043f\u043e\u0440\u0430\u043c\u043d\u0443\u0432\u0430\u045a\u0435",
-"Header": "\u041d\u0430\u0441\u043b\u043e\u0432",
-"Right": "\u0414\u0435\u0441\u043d\u043e",
-"Insert column after": "\u041d\u043e\u0432\u0430 \u043a\u043e\u043b\u043e\u043d\u0430 \u043f\u043e",
-"Cols": "\u041a\u043e\u043b\u043e\u043d\u0438",
-"Insert row after": "\u041d\u043e\u0432 \u0440\u0435\u0434 \u043f\u043e",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Cell properties": "\u041a\u0430\u0440\u0430\u043a\u0442\u0435\u0440\u0438\u0441\u0442\u0438\u043a\u0438 \u043d\u0430 \u043a\u043e\u043b\u043e\u043d\u0430",
-"Left": "\u041b\u0435\u0432\u043e",
-"Cut row": "\u041e\u0442\u0441\u0435\u0447\u0438 \u0440\u0435\u0434",
-"Delete column": "\u0418\u0437\u0431\u0440\u0438\u0448\u0438 \u043a\u043e\u043b\u043e\u043d\u0430",
-"Center": "\u0426\u0435\u043d\u0442\u0430\u0440",
-"Merge cells": "\u0421\u043f\u043e\u0438 \u043a\u043e\u043b\u043e\u043d\u0438",
-"Insert template": "\u0412\u043c\u0435\u0442\u043d\u0438 \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
-"Background color": "\u0411\u043e\u0458\u0430 \u043d\u0430 \u043f\u043e\u0437\u0430\u0434\u0438\u043d\u0430",
-"Custom...": "\u041f\u043e \u0436\u0435\u043b\u0431\u0430",
-"Custom color": "\u0411\u043e\u0458\u0430 \u043f\u043e \u0436\u0435\u043b\u0431\u0430",
-"No color": "\u0411\u0435\u0437 \u0431\u043e\u0458\u0430",
-"Text color": "\u0411\u043e\u0458\u0430 \u043d\u0430 \u0442\u0435\u043a\u0441\u0442",
-"Show blocks": "\u041f\u0440\u0438\u043a\u0430\u0436\u0438 \u0431\u043b\u043e\u043a\u043e\u0432\u0438",
-"Show invisible characters": "\u041f\u0440\u0438\u043a\u0430\u0436\u0438 \u043d\u0435\u0432\u0438\u0434\u043b\u0438\u0432\u0438 \u043a\u0430\u0440\u0430\u043a\u0442\u0435\u0440\u0438",
-"Words: {0}": "\u0417\u0431\u043e\u0440\u043e\u0432\u0438:{0}",
-"Insert": "\u0412\u043c\u0435\u0442\u043d\u0438",
-"File": "\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Edit": "\u0423\u0440\u0435\u0434\u0443\u0432\u0430\u045a\u0435",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0417\u0431\u043e\u0433\u0430\u0442\u0435\u043d\u043e \u043f\u043e\u043b\u0435 \u0437\u0430 \u0442\u0435\u043a\u0441\u0442. \u041f\u0440\u0438\u0442\u0438\u0441\u043d\u0435\u0442\u0435 ALT-F9 \u0437\u0430 \u043c\u0435\u043d\u0438.\u041f\u0440\u0438\u0442\u0438\u0441\u043d\u0435\u0442\u0435 ALT-F10 \u0437\u0430 \u043b\u0435\u043d\u0442\u0430 \u0441\u043e \u0430\u043b\u0430\u0442\u043a\u0438.\u041f\u0440\u0438\u0442\u0438\u0441\u043d\u0435\u0442\u0435 ALT-0 \u0437\u0430 \u043f\u043e\u043c\u043e\u0448",
-"Preformatted": "\u041f\u0440\u0435\u0434\u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u0430\u043d\u043e",
-"Tools": "\u0410\u043b\u0430\u0442\u043a\u0438",
-"View": "\u041f\u0440\u0438\u043a\u0430\u0437",
-"Table": "\u0422\u0430\u0431\u0435\u043b\u0430",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442",
-"Color": "\u0411\u043e\u0458\u0430",
-"R": "R",
-"G": "G",
-"B": "B",
-"Rotate counterclockwise": "\u0417\u0430\u0432\u0440\u0442\u0438 \u043e\u0431\u0440\u0430\u0442\u043d\u043e \u043e\u0434 \u0441\u0442\u0440\u0435\u043b\u043a\u0438\u0442\u0435",
-"Rotate clockwise": "\u0417\u0430\u0432\u0440\u0442\u0438 \u0432\u043e \u043f\u0440\u0430\u0432\u0435\u0446 \u043d\u0430 \u0441\u0442\u0440\u0435\u043b\u043a\u0438\u0442\u0435",
-"Flip vertically": "\u041f\u0440\u0435\u0432\u0440\u0442\u0438 \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u043d\u043e",
-"Flip horizontally": "\u041f\u0440\u0435\u0432\u0440\u0442\u0438 \u0445\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u043d\u043e",
-"Edit image": "\u0423\u0440\u0435\u0434\u0438 \u0441\u043b\u0438\u043a\u0430",
-"Image options": "\u041e\u043f\u0446\u0438\u0438 \u0437\u0430 \u0441\u043b\u0438\u043a\u0430",
-"Zoom in": "\u0417\u0433\u043e\u043b\u0435\u043c\u0438",
-"Zoom out": "\u041d\u0430\u043c\u0430\u043b\u0438",
-"Crop": "\u041e\u0442\u0441\u0435\u0447\u0438 \u0434\u0435\u043b",
-"Resize": "\u0420\u0435\u0434\u0438\u043c\u0435\u043d\u0437\u0438\u043e\u043d\u0438\u0440\u0430\u0458",
-"Orientation": "\u041d\u0430\u0441\u043e\u0447\u0435\u043d\u043e\u0441\u0442",
-"Brightness": "\u041e\u0441\u0432\u0435\u0442\u043b\u0443\u0432\u0430\u045a\u0435",
-"Sharpen": "\u041e\u0441\u0442\u0440\u0438\u043d\u0430",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Color levels": "\u041d\u0438\u0432\u043e \u043d\u0430 \u0431\u043e\u0438",
-"Gamma": "\u0413\u0430\u043c\u0430",
-"Invert": "\u0418\u043d\u0432\u0435\u0440\u0437\u043d\u043e",
-"Apply": "\u041f\u0440\u0438\u043c\u0435\u043d\u0438",
-"Back": "\u041d\u0430\u0437\u0430\u0434",
-"Id": "ID",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID \u0442\u0440\u0435\u0431\u0430 \u0434\u0430 \u043f\u043e\u0447\u043d\u0443\u0432\u0430 \u0441\u043e \u0431\u0443\u043a\u0432\u0430, \u0441\u043b\u0435\u0434\u0435\u043d\u0430 \u0441\u0430\u043c\u043e \u043e\u0434 \u0431\u0443\u043a\u0432\u0438, \u0431\u0440\u043e\u0458\u043a\u0438, \u0446\u0440\u0442\u0430, \u0442\u043e\u0447\u043a\u0430, \u0442\u043e\u0447\u043a\u0430-\u0437\u0430\u043f\u0438\u0440\u043a\u0430 \u0438\u043b\u0438 \u043f\u043e\u0434\u0432\u043b\u0435\u0447\u0435\u043d\u043e.",
-"Insert/Edit code sample": "\u0412\u043c\u0435\u0442\u043d\u0438/\u0423\u0440\u0435\u0434\u0438 \u0438\u0441\u0435\u0447\u043e\u043a \u043e\u0434 \u043a\u043e\u0434",
-"Language": "\u0408\u0430\u0437\u0438\u043a",
-"Image": "\u0421\u043b\u0438\u043a\u0430",
-"Date/time": "\u0414\u0430\u0442\u0443\u043c/\u0412\u0440\u0435\u043c\u0435",
-"Link": "\u0412\u0440\u0441\u043a\u0430",
-"Paste or type a link": "\u0412\u043c\u0435\u0442\u043d\u0435\u0442\u0435 \u0458\u0430 \u0438\u043b\u0438 \u0432\u043f\u0438\u0448\u0435\u0442\u0435 \u0458\u0430 \u0432\u0430\u0448\u0430\u0442\u0430 \u0432\u0440\u0441\u043a\u0430",
-"Insert/Edit Media": "\u0412\u043c\u0435\u0442\u043d\u0438/\u0423\u0440\u0435\u0434\u0438 \u043c\u0435\u0434\u0438\u0458",
-"Media": "\u041c\u0435\u0434\u0438\u0430",
-"Table of Contents": "\u0421\u043e\u0434\u0440\u0436\u0438\u043d\u0430"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/ms.es5.js b/build/media_source/vendor/tinymce/langs/ms.es5.js
deleted file mode 100644
index 700fb2ef8d778..0000000000000
--- a/build/media_source/vendor/tinymce/langs/ms.es5.js
+++ /dev/null
@@ -1,176 +0,0 @@
-tinymce.addI18n('ms',{
-"Cut": "Potong",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Pelayar internet anda tidak menyokong akses terus kepada papan klip. Sila gunakan pintasan papan kekunci Ctrl+X\/C\/V.",
-"Paste": "Tampal",
-"Close": "Tutup",
-"Align right": "Alih ke kanan",
-"New document": "Dokumen baru",
-"Numbered list": "Senarai bernombor",
-"Increase indent": "Tingkatkan inden",
-"Formats": "Format",
-"Select all": "Pilih semua",
-"Undo": "Kembali Ke asal",
-"Strikethrough": "Batal",
-"Bullet list": "Senarai bullet",
-"Superscript": "Superskrip",
-"Clear formatting": "Hilangkan format",
-"Subscript": "Subskrip",
-"Redo": "Buat semula",
-"Ok": "Ok",
-"Bold": "Tebalkan",
-"Italic": "Tulisan senget",
-"Align center": "Alih ke tengah",
-"Decrease indent": "Kurangkan inden",
-"Underline": "Garis bawah",
-"Cancel": "Batal",
-"Justify": "Sama ratakan",
-"Copy": "Salin",
-"Align left": "Alihkan ke kiri",
-"Visual aids": "Visual bantuan",
-"Lower Greek": "Greek Kecil",
-"Square": "Petak",
-"Default": "Asal",
-"Lower Alpha": "Alpha Kecil",
-"Circle": "Bulat",
-"Disc": "Cakera",
-"Upper Alpha": "Alpha Besar",
-"Upper Roman": "Roman Besar",
-"Lower Roman": "Roman Kecik",
-"Name": "Nama",
-"Anchor": "Pemberat",
-"You have unsaved changes are you sure you want to navigate away?": "Anda mempunyai perubahan yang belum disimpan, anda pasti mahu keluar?",
-"Restore last draft": "Kembalikan draf lepas",
-"Special character": "Karekter unik",
-"Source code": "Sumber Kod",
-"Right to left": "Kanan Ke kiri",
-"Left to right": "Kiri Ke kanan",
-"Emoticons": "Emotikon",
-"Robots": "Robot",
-"Document properties": "Sifat-sifat dokumen",
-"Title": "Tajuk",
-"Keywords": "Kata kunci",
-"Encoding": "Pengekodan",
-"Description": "Penerangan",
-"Author": "Pengarang",
-"Fullscreen": "Skrin penuh",
-"Horizontal line": "Garis mendatar",
-"Horizontal space": "Ruang mendatar",
-"Insert\/edit image": "Masukkan\/Ubah Gambar",
-"General": "Am",
-"Advanced": "Lanjutan",
-"Source": "Sumber",
-"Border": "Sempadan",
-"Constrain proportions": "Bentuk kekangan",
-"Vertical space": "Ruang menegak",
-"Image description": "Penerangan gambar",
-"Style": "Gaya",
-"Dimensions": "Dimensi",
-"Insert image": "Masukkan gambar",
-"Insert date\/time": "Masukkan tarikh\/masa",
-"Remove link": "Padam pautan",
-"Url": "Url",
-"Text to display": "Teks untuk dipaparkan",
-"Insert link": "Masukkan pautan",
-"New window": "Tetingkap baru",
-"None": "Tiada",
-"Target": "Target",
-"Insert\/edit link": "Masukkan\/Ubah pautan",
-"Insert\/edit video": "Masukkan\/Ubah video",
-"Poster": "Poster",
-"Alternative source": "Sumber alternatif",
-"Paste your embed code below:": "Tampalkan kod embed anda di bawah:",
-"Insert video": "Masukkan video",
-"Embed": "Embed",
-"Nonbreaking space": "Ruang tidak dipisahkan",
-"Preview": "Pratonton",
-"Print": "Cetak",
-"Save": "Simpan",
-"Could not find the specified string.": "Tidak dapat mencari untaian yang dinyatakan.",
-"Replace": "Ganti",
-"Next": "Seterusnya",
-"Whole words": "Keseluruhan perkataan",
-"Find and replace": "Cari dan gantikan",
-"Replace with": "Gantikan dengan",
-"Find": "Cari",
-"Replace all": "Ganti semua",
-"Match case": "Huruf sepadan",
-"Prev": "Kembali",
-"Spellcheck": "Semakan Ejaan",
-"Finish": "Tamat",
-"Ignore all": "Biarkan semua",
-"Ignore": "Biarkan",
-"Insert row before": "Masukkan baris sebelumnya",
-"Rows": "Baris-Baris",
-"Height": "Tinggi",
-"Paste row after": "Tampal baris selepasnya",
-"Alignment": "Penjajaran",
-"Column group": "Kumpulan lajur",
-"Row": "Baris",
-"Insert column before": "Masukkan lajur sebelumnya",
-"Split cell": "Asingkan sel",
-"Cell padding": "Penebalan sel",
-"Cell spacing": "Penjarakkan sel",
-"Row type": "Jenis baris",
-"Insert table": "Masukkan jadual",
-"Body": "Badan",
-"Caption": "Keterangan",
-"Footer": "Pengaki",
-"Delete row": "Padam Baris",
-"Paste row before": "Tampal baris sebelumnya",
-"Scope": "Skop",
-"Delete table": "Padam jadual",
-"Header cell": "Sel pengepala",
-"Column": "Lajur",
-"Cell": "Sel",
-"Header": "Pengepala",
-"Cell type": "Jenis sel",
-"Copy row": "Salin baris",
-"Row properties": "Sifat-sifat baris",
-"Table properties": "Sifat-sifat jadual",
-"Row group": "Kumpulan baris",
-"Right": "Kanan",
-"Insert column after": "Masukkan lajur selepasnya",
-"Cols": "Cols",
-"Insert row after": "Masukkan baris selepasnya",
-"Width": "Lebar",
-"Cell properties": "Sifat-sifat sel",
-"Left": "Kiri",
-"Cut row": "Potong baris",
-"Delete column": "Padam lajur",
-"Center": "Tengah",
-"Merge cells": "Gabung Sel",
-"Insert template": "Masukkan templat",
-"Templates": "Templat",
-"Background color": "Warna latar belakang",
-"Text color": "Warna teks",
-"Show blocks": "Papar blok",
-"Show invisible characters": "Papar karekter tersembunyi",
-"Words: {0}": "Perkataan: {0}",
-"Insert": "Masukkan",
-"File": "Fail",
-"Edit": "Ubah",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Ruangan Teks Luas. Tekan ALT-F9 untuk menu. Tekan ALT-F10 untuk bar perkakasan. Tekan ALT-0 untuk bantuan",
-"Tools": "Peralatan",
-"View": "Pemandangan",
-"Table": "Jadual",
-"Format": "Format",
-"Inline": "Sebaris",
-"Blocks": "Blok-blok",
-"Edit image": "Ubah gambar",
-"Font Family": "Kumpulan fon",
-"Font Sizes": "Saiz fon",
-"Paragraph": "Perenggan",
-"Address": "Alamat",
-"Pre": "Pra",
-"Code": "Kod",
-"Headers": "Pengepala",
-"Header 1": "Pengepala 1",
-"Header 2": "Pengepala 2",
-"Header 3": "Pengepala 3",
-"Header 4": "Pengepala 4",
-"Header 5": "Pengepala 5",
-"Header 6": "Pengepala 6",
-"Insert Time": "Masukkan masa",
-"Insert nonbreaking space": "Masukkan ruang yang tidak dipisahkan",
-"Toggle blockquote": "Togol Ruang Petikan"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/nb.es5.js b/build/media_source/vendor/tinymce/langs/nb.es5.js
deleted file mode 100644
index ff98aa96a9c5b..0000000000000
--- a/build/media_source/vendor/tinymce/langs/nb.es5.js
+++ /dev/null
@@ -1,462 +0,0 @@
-tinymce.addI18n('nb',{
-"Redo": "Gj\u00f8r om",
-"Undo": "Angre",
-"Cut": "Klipp ut",
-"Copy": "Kopier",
-"Paste": "Lim inn",
-"Select all": "Marker alt",
-"New document": "Nytt dokument",
-"Ok": "Ok",
-"Cancel": "Avbryt",
-"Visual aids": "Visuelle hjelpemidler",
-"Bold": "Fet",
-"Italic": "Kursiv",
-"Underline": "Understreking",
-"Strikethrough": "Gjennomstreking",
-"Superscript": "Hevet skrift",
-"Subscript": "Senket skrift",
-"Clear formatting": "Fjern formateringer",
-"Align left": "Venstrejuster",
-"Align center": "Midtstill",
-"Align right": "H\u00f8yrejuster",
-"Justify": "Blokkjuster",
-"Bullet list": "Punktliste",
-"Numbered list": "Nummerliste",
-"Decrease indent": "Reduser innrykk",
-"Increase indent": "\u00d8k innrykk",
-"Close": "Lukk",
-"Formats": "Stiler",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Nettleseren din st\u00f8tter ikke direkte tilgang til utklippsboken. Bruk istedet tastatursnarveiene Ctrl+X\/C\/V.",
-"Headers": "Overskrifter",
-"Header 1": "Overskrift 1",
-"Header 2": "Overskrift 2",
-"Header 3": "Overskrift 3",
-"Header 4": "Overskrift 4",
-"Header 5": "Overskrift 5",
-"Header 6": "Overskrift 6",
-"Headings": "Overskrifter",
-"Heading 1": "Overskrift 1",
-"Heading 2": "Overskrift 2",
-"Heading 3": "Overskrift 3",
-"Heading 4": "Overskrift 4",
-"Heading 5": "Overskrift 5",
-"Heading 6": "Overskrift 6",
-"Preformatted": "Forh\u00e5ndsformatert",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kode",
-"Paragraph": "Avsnitt",
-"Blockquote": "Blockquote",
-"Inline": "Innkapslet",
-"Blocks": "Blokker",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Lim inn er n\u00e5 i ren-tekst modus. Kopiert innhold vil bli limt inn som ren tekst inntil du sl\u00e5r av dette valget.",
-"Fonts": "Fonter",
-"Font Sizes": "Fontst\u00f8rrelser",
-"Class": "Klasse",
-"Browse for an image": "S\u00f8k etter bilde",
-"OR": "OR",
-"Drop an image here": "Slipp et bilde her",
-"Upload": "Last opp",
-"Block": "Blokk",
-"Align": "Juster",
-"Default": "Normal",
-"Circle": "\u00c5pen sirkel",
-"Disc": "Fylt sirkel",
-"Square": "Fylt firkant",
-"Lower Alpha": "Minuskler",
-"Lower Greek": "Greske minuskler",
-"Lower Roman": "Romerske minuskler",
-"Upper Alpha": "Versaler",
-"Upper Roman": "Romerske versaler",
-"Anchor...": "Lenke",
-"Name": "Navn",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id burde starte med en bokstav, bare fulgt av bokstaver, nummer, streker, punktum, koloner eller understreker.",
-"You have unsaved changes are you sure you want to navigate away?": "Du har ikke arkivert endringene. Vil du fortsette uten \u00e5 arkivere?",
-"Restore last draft": "Gjenopprett siste utkast",
-"Special character...": "Spesialtegn...",
-"Source code": "Kildekode",
-"Insert\/Edit code sample": "Sett inn\/endre kodeeksempel",
-"Language": "Spr\u00e5k",
-"Code sample...": "Kodeeksempel",
-"Color Picker": "Fargevelger",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Venstre til h\u00f8yre",
-"Right to left": "H\u00f8yre til venstre",
-"Emoticons": "Hum\u00f8rfjes",
-"Emoticons...": "Emoticons..",
-"Metadata and Document Properties": "Metadata og dokumentverdier",
-"Title": "Tittel",
-"Keywords": "N\u00f8kkelord",
-"Description": "Beskrivelse",
-"Robots": "Roboter",
-"Author": "Forfatter",
-"Encoding": "Tegnkoding",
-"Fullscreen": "Fullskjerm",
-"Action": "Handling",
-"Shortcut": "Snarvei",
-"Help": "Hjelp",
-"Address": "Adresse",
-"Focus to menubar": "Fokus p\u00e5 menylinje",
-"Focus to toolbar": "Fokus p\u00e5 verkt\u00f8ylinje",
-"Focus to element path": "Fokus p\u00e5 elementsti",
-"Focus to contextual toolbar": "Fokus p\u00e5 kontekstuell verkt\u00f8ylinje",
-"Insert link (if link plugin activated)": "Sett inn lenke (dersom lenketillegg er aktivert)",
-"Save (if save plugin activated)": "Lagre (dersom lagretillegg er aktivert)",
-"Find (if searchreplace plugin activated)": "Finn (dersom tillegg for s\u00f8k og erstatt er aktivert)",
-"Plugins installed ({0}):": "Installerte tillegg ({0}):",
-"Premium plugins:": "Premiumtillegg:",
-"Learn more...": "Les mer ...",
-"You are using {0}": "Du bruker {0}",
-"Plugins": "Tillegg",
-"Handy Shortcuts": "Nyttige snarveier",
-"Horizontal line": "Horisontal linje",
-"Insert\/edit image": "Sett inn\/endre bilde",
-"Alternative description": "Alternativ beskrivelse",
-"Accessibility": "Tilgjengelighet",
-"Image is decorative": "Bilde er dekorasjon",
-"Source": "Bildelenke",
-"Dimensions": "Dimensjoner",
-"Constrain proportions": "Behold proporsjoner",
-"General": "Generelt",
-"Advanced": "Avansert",
-"Style": "Stil",
-"Vertical space": "Vertikal marg",
-"Horizontal space": "Horisontal marg",
-"Border": "Ramme",
-"Insert image": "Sett inn bilde",
-"Image...": "Bilde...",
-"Image list": "Bildeliste",
-"Rotate counterclockwise": "Roter mot venstre",
-"Rotate clockwise": "Roter mot h\u00f8yre",
-"Flip vertically": "Speilvend vertikalt",
-"Flip horizontally": "Speilvend horisontalt",
-"Edit image": "Rediger bilde",
-"Image options": "Bilde innstillinger",
-"Zoom in": "Zoom inn",
-"Zoom out": "Zoom ut",
-"Crop": "Beskj\u00e6r",
-"Resize": "Skaler",
-"Orientation": "Orientering",
-"Brightness": "Lysstyrke",
-"Sharpen": "Skarphet",
-"Contrast": "Kontrast",
-"Color levels": "Fargeniv\u00e5",
-"Gamma": "Gamma",
-"Invert": "Inverter",
-"Apply": "Utf\u00f8r",
-"Back": "Tilbake",
-"Insert date\/time": "Sett inn dato\/tid",
-"Date\/time": "Dato\/tid",
-"Insert\/edit link": "Sett inn\/endre lenke",
-"Text to display": "Tekst som skal vises",
-"Url": "Url",
-"Open link in...": "\u00c5pne lenke i..",
-"Current window": "N\u00e5v\u00e6rende vindu",
-"None": "Ingen",
-"New window": "Nytt vindu",
-"Open link": "\u00c5pne lenke",
-"Remove link": "Fjern lenke",
-"Anchors": "Anker",
-"Link...": "Lenke...",
-"Paste or type a link": "Lim inn eller skriv en lenke",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Oppgitte URL ser ut til \u00e5 v\u00e6re en epost-adresse. \u00d8nsker du \u00e5 sette inn p\u00e5krevet mailto: prefiks forran epost-adressen?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Oppgitt URL ser ut til \u00e5 v\u00e6re en e-postadresse. \u00d8nsker du \u00e5 sette inn p\u00e5krevd mailto:-prefiks foran e-postadressen?",
-"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Nettadressen du fylte inn ser ut til \u00e5 v\u00e6re en ekstern. \u00d8nsker du \u00e5 legge til p\u00e5krevd 'https:\/\/'-prefiks?",
-"Link list": "Lenkeliste",
-"Insert video": "Sett inn video",
-"Insert\/edit video": "Sett inn\/rediger video",
-"Insert\/edit media": "Sett inn\/endre media",
-"Alternative source": "Alternativ kilde",
-"Alternative source URL": "Alternativ kilde URL",
-"Media poster (Image URL)": "Mediaposter (bilde-URL)",
-"Paste your embed code below:": "Lim inn  inkluderings-koden nedenfor",
-"Embed": "Inkluder",
-"Media...": "Media..",
-"Nonbreaking space": "Hardt mellomrom",
-"Page break": "Sideskifte",
-"Paste as text": "Lim inn som tekst",
-"Preview": "Forh\u00e5ndsvisning",
-"Print...": "Skriv ut...",
-"Save": "Arkiver",
-"Find": "Finn",
-"Replace with": "Erstatt med",
-"Replace": "Erstatt",
-"Replace all": "Erstatt alle",
-"Previous": "Forrige",
-"Next": "Neste",
-"Find and Replace": "Finn og erstatt",
-"Find and replace...": "Finn og erstatt...",
-"Could not find the specified string.": "Kunne ikke finne den spesifiserte teksten",
-"Match case": "Match store og sm\u00e5 bokstaver",
-"Find whole words only": "Finn kun hele ord",
-"Find in selection": "Finn i utvalg",
-"Spellcheck": "Stavekontroll",
-"Spellcheck Language": "Stavekontroller spr\u00e5k",
-"No misspellings found.": "Ingen feilstaving funnet",
-"Ignore": "Ignorer",
-"Ignore all": "Ignorer alle",
-"Finish": "Avslutt",
-"Add to Dictionary": "Legg til i ordliste",
-"Insert table": "Sett inn tabell",
-"Table properties": "Tabell egenskaper",
-"Delete table": "Slett tabell",
-"Cell": "Celle",
-"Row": "Rad",
-"Column": "Kolonne",
-"Cell properties": "Celle egenskaper",
-"Merge cells": "Sl\u00e5 sammen celler",
-"Split cell": "Splitt celle",
-"Insert row before": "Sett inn rad f\u00f8r",
-"Insert row after": "Sett in rad etter",
-"Delete row": "Slett rad",
-"Row properties": "Rad egenskaper",
-"Cut row": "Klipp ut rad",
-"Copy row": "Kopier rad",
-"Paste row before": "Lim inn rad f\u00f8r",
-"Paste row after": "Lim inn rad etter",
-"Insert column before": "Sett inn kolonne f\u00f8r",
-"Insert column after": "Sett inn kolonne etter",
-"Delete column": "Slett kolonne",
-"Cols": "Kolonner",
-"Rows": "Rader",
-"Width": "Bredde",
-"Height": "H\u00f8yde",
-"Cell spacing": "Celleavstand",
-"Cell padding": "Cellemarg",
-"Caption": "Tittel",
-"Show caption": "Vis bildetekst",
-"Left": "Venstre",
-"Center": "Midtstilt",
-"Right": "H\u00f8yre",
-"Cell type": "Celletype",
-"Scope": "Omfang",
-"Alignment": "Justering",
-"H Align": "H Justering",
-"V Align": "V Justering",
-"Top": "Topp",
-"Middle": "Midten",
-"Bottom": "Bunn",
-"Header cell": "Topptekst-celle",
-"Row group": "Radgruppe",
-"Column group": "Kolonnegruppe",
-"Row type": "Rad-type",
-"Header": "Topptekst",
-"Body": "Br\u00f8dtekst",
-"Footer": "Bunntekst",
-"Border color": "Rammefarge",
-"Insert template...": "Sett inn mal..",
-"Templates": "Maler",
-"Template": "Mal",
-"Text color": "Tekstfarge",
-"Background color": "Bakgrunnsfarge",
-"Custom...": "Tilpass...",
-"Custom color": "Tilpasset farge",
-"No color": "Ingen farge",
-"Remove color": "Fjern farge",
-"Table of Contents": "Innholdsfortegnelse",
-"Show blocks": "Vis blokker",
-"Show invisible characters": "Vis skjulte tegn",
-"Word count": "Ordtelling",
-"Count": "Opptelling",
-"Document": "Dokument",
-"Selection": "Utvalg",
-"Words": "Ord",
-"Words: {0}": "Antall ord: {0}",
-"{0} words": "{0} ord",
-"File": "Arkiv",
-"Edit": "Rediger",
-"Insert": "Sett inn",
-"View": "Vis",
-"Format": "Format",
-"Table": "Tabell",
-"Tools": "Verkt\u00f8y",
-"Powered by {0}": "Redigert med {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Tekstredigering. Tast ALT-F9 for meny. Tast ALT-F10 for verkt\u00f8ys-rader. Tast ALT-0 for hjelp.",
-"Image title": "Bildetittel",
-"Border width": "Bordbredde",
-"Border style": "Bordstil",
-"Error": "Feil",
-"Warn": "Advarsel",
-"Valid": "Gyldig",
-"To open the popup, press Shift+Enter": "For \u00e5 \u00e5pne popup, trykk Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "Rik-tekstomr\u00e5de. Trykk ALT-0 for hjelp.",
-"System Font": "Systemfont",
-"Failed to upload image: {0}": "Opplasting av bilde feilet: {0}",
-"Failed to load plugin: {0} from url {1}": "Kunne ikke laste tillegg: {0} from url {1}",
-"Failed to load plugin url: {0}": "Kunne ikke laste tillegg url: {0}",
-"Failed to initialize plugin: {0}": "Kunne ikke initialisere tillegg: {0}",
-"example": "eksempel",
-"Search": "S\u00f8k",
-"All": "Alle",
-"Currency": "Valuta",
-"Text": "Tekst",
-"Quotations": "Sitater",
-"Mathematical": "Matematisk",
-"Extended Latin": "Utvidet latin",
-"Symbols": "Symboler",
-"Arrows": "Piler",
-"User Defined": "Brukerdefinert",
-"dollar sign": "dollartegn",
-"currency sign": "valutasymbol",
-"euro-currency sign": "Euro-valutasymbol",
-"colon sign": "kolon-symbol",
-"cruzeiro sign": "cruzeiro-symbol",
-"french franc sign": "franske franc-symbol",
-"lira sign": "lire-symbol",
-"mill sign": "mill-symbol",
-"naira sign": "naira-symbol",
-"peseta sign": "peseta-symbol",
-"rupee sign": "rupee-symbol",
-"won sign": "won-symbol",
-"new sheqel sign": "Ny sheqel-symbol",
-"dong sign": "dong-symbol",
-"kip sign": "kip-symbol",
-"tugrik sign": "tugrik-symbol",
-"drachma sign": "drachma-symbol",
-"german penny symbol": "tysk penny-symbol",
-"peso sign": "peso-symbol",
-"guarani sign": "quarani-symbol",
-"austral sign": "austral-symbol",
-"hryvnia sign": "hryvina-symbol",
-"cedi sign": "credi-symbol",
-"livre tournois sign": "livre tournois-symbol",
-"spesmilo sign": "spesmilo-symbol",
-"tenge sign": "tenge-symbol",
-"indian rupee sign": "indisk rupee-symbol",
-"turkish lira sign": "tyrkisk lire-symbol",
-"nordic mark sign": "nordisk mark-symbol",
-"manat sign": "manat-symbol",
-"ruble sign": "ruble-symbol",
-"yen character": "yen-symbol",
-"yuan character": "yuan-symbol",
-"yuan character, in hong kong and taiwan": "yuan-symbol, i Hongkong og Taiwan",
-"yen\/yuan character variant one": "yen\/yuan-symbol variant en",
-"Loading emoticons...": "Laster emoticons..",
-"Could not load emoticons": "Kunne ikke laste emoticons",
-"People": "Mennesker",
-"Animals and Nature": "Dyr og natur",
-"Food and Drink": "Mat og drikke",
-"Activity": "Aktivitet",
-"Travel and Places": "Reise og steder",
-"Objects": "Objekter",
-"Flags": "Flagg",
-"Characters": "Tegn",
-"Characters (no spaces)": "Tegn (uten mellomrom)",
-"{0} characters": "{0} tegn",
-"Error: Form submit field collision.": "Feil: Skjemafelt innsendingskollisjon.",
-"Error: No form element found.": "Feil: Intet skjemafelt funnet.",
-"Update": "Oppdater",
-"Color swatch": "Fargepalett",
-"Turquoise": "Turkis",
-"Green": "Gr\u00f8nn",
-"Blue": "Bl\u00e5",
-"Purple": "Lilla",
-"Navy Blue": "Marinebl\u00e5",
-"Dark Turquoise": "M\u00f8rk turkis",
-"Dark Green": "M\u00f8rkegr\u00f8nn",
-"Medium Blue": "Mellombl\u00e5",
-"Medium Purple": "Medium lilla",
-"Midnight Blue": "Midnattbl\u00e5",
-"Yellow": "Gul",
-"Orange": "Oransje",
-"Red": "R\u00f8d",
-"Light Gray": "Lys gr\u00e5",
-"Gray": "Gr\u00e5",
-"Dark Yellow": "M\u00f8rk gul",
-"Dark Orange": "M\u00f8rk oransje",
-"Dark Red": "M\u00f8rker\u00f8d",
-"Medium Gray": "Medium gr\u00e5",
-"Dark Gray": "M\u00f8rk gr\u00e5",
-"Light Green": "Lys gr\u00f8nn",
-"Light Yellow": "Lys gul",
-"Light Red": "Lys r\u00f8d",
-"Light Purple": "Lys lilla",
-"Light Blue": "Lys bl\u00e5",
-"Dark Purple": "M\u00f8rk lilla",
-"Dark Blue": "M\u00f8rk bl\u00e5",
-"Black": "Svart",
-"White": "Hvit",
-"Switch to or from fullscreen mode": "Bytt til eller fra fullskjermmodus",
-"Open help dialog": "\u00c5pne hjelp-dialog",
-"history": "historikk",
-"styles": "stiler",
-"formatting": "formatering",
-"alignment": "justering",
-"indentation": "innrykk",
-"Font": "Skrift",
-"Size": "St\u00f8rrelse",
-"More...": "Mer...",
-"Select...": "Velg...",
-"Preferences": "Innstillinger",
-"Yes": "Ja",
-"No": "Nei",
-"Keyboard Navigation": "Navigering med tastaturet",
-"Version": "Versjon",
-"Code view": "Kodevisning",
-"Open popup menu for split buttons": "\u00c5pne sprettoppmeny for splitt-knapper",
-"List Properties": "Listeegenskaper",
-"List properties...": "Listeegenskaper ...",
-"Start list at number": "Start liste p\u00e5 nummer",
-"Line height": "Linjeh\u00f8yde",
-"comments": "kommentarer",
-"Format Painter": "Kopier format",
-"Insert\/edit iframe": "Sett inn \/ rediger iframe",
-"Capitalization": "Store\/sm\u00e5 bokstaver",
-"lowercase": "sm\u00e5 bokstaver",
-"UPPERCASE": "STORE BOKSTAVER",
-"Title Case": "Tittelbokstav",
-"permanent pen": "permanent penn",
-"Permanent Pen Properties": "Permanente egenskaper for penn",
-"Permanent pen properties...": "Permanente egenskaper for penn...",
-"case change": "st\u00f8rrelseendring",
-"page embed": "sideinnebygging",
-"Advanced sort...": "Avansert sortering ...",
-"Advanced Sort": "Avansert sortering",
-"Sort table by column ascending": "Sorter tabell etter kolonne stigende",
-"Sort table by column descending": "Sorter tabell etter kolonne synkende",
-"Sort": "Sorter",
-"Order": "Rekkef\u00f8lge",
-"Sort by": "Sorter etter",
-"Ascending": "Stigende",
-"Descending": "Synkende",
-"Column {0}": "Kolonne {0}",
-"Row {0}": "Rad {0}",
-"Spellcheck...": "Stavekontroll ...",
-"Misspelled word": "Feilstavet ord",
-"Suggestions": "Forslag",
-"Change": "Endre",
-"Finding word suggestions": "Finner ordforslag",
-"Success": "Vellykket",
-"Repair": "Reparer",
-"Issue {0} of {1}": "Problem {0} av {1}",
-"Images must be marked as decorative or have an alternative text description": "Bilder m\u00e5 markeres som dekorasjon eller ha en alternativ tekstbeskrivelse",
-"Images must have an alternative text description. Decorative images are not allowed.": "Bilder m\u00e5 ha en alternativ tekstbeskrivelse. Dekorasjonbilder er ikke tillatt.",
-"Or provide alternative text:": "Eller fyll inn en alternative tekst:",
-"Make image decorative:": "Marker bilde som dekorasjon:",
-"ID attribute must be unique": "'ID'-attributtet m\u00e5 v\u00e6re unikt",
-"Make ID unique": "Gj\u00f8r 'ID' unik",
-"Keep this ID and remove all others": "Behold denne 'ID'-en og fjern alle andre",
-"Remove this ID": "Fjern denne 'ID'",
-"Remove all IDs": "Fjern alle 'ID'-er",
-"Checklist": "Avkryssingsliste",
-"Anchor": "Anker",
-"Special character": "Spesialtegn",
-"Code sample": "Kodeeksempel",
-"Color": "Farge",
-"Document properties": "Dokumentegenskaper",
-"Image description": "Bildebeskrivelse",
-"Image": "Bilde",
-"Insert link": "Sett inn lenke",
-"Target": "M\u00e5l",
-"Link": "Lenke",
-"Poster": "Plakatbilde",
-"Media": "Media",
-"Print": "Skriv ut",
-"Prev": "Forrige",
-"Find and replace": "Finn og erstatt",
-"Whole words": "Hele ord",
-"Insert template": "Sett inn mal"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/nl.es5.js b/build/media_source/vendor/tinymce/langs/nl.es5.js
deleted file mode 100644
index 239b32dabbbe4..0000000000000
--- a/build/media_source/vendor/tinymce/langs/nl.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('nl',{
-"Add to Dictionary": "Toevoegen aan woordenlijst",
-"Advanced": "Geavanceerd",
-"Align center": "Centreren",
-"Align left": "Links uitlijnen",
-"Align right": "Rechts uitlijnen",
-"Alignment": "Uitlijning",
-"Alternative source": "Alternatieve bron",
-"Anchor": "Anker",
-"Anchors": "Anker",
-"Apply": "Toepassen",
-"Author": "Auteur",
-"B": "Blauw",
-"Back": "Terug",
-"Background color": "Achtergrondkleur",
-"Blockquote": "Citaat",
-"Blocks": "Blokken",
-"Body": "Inhoud",
-"Bold": "Vet",
-"Border color": "Randkleur",
-"Border": "Rand",
-"Bottom": "Onder",
-"Brightness": "Helderheid",
-"Bullet list": "Opsommingsteken",
-"Cancel": "Annuleren",
-"Caption": "Onderschrift",
-"Cell padding": "Celpadding",
-"Cell properties": "Celeigenschappen",
-"Cell spacing": "Celruimte",
-"Cell type": "Celtype",
-"Cell": "Cel",
-"Center": "Centreren",
-"Circle": "Cirkel",
-"Clear formatting": "Opmaak wissen",
-"Close": "Sluiten",
-"Code": "Codering",
-"Color levels": "Kleurniveau's",
-"Color": "Kleur",
-"Cols": "Kolommen",
-"Column group": "Kolomgroep",
-"Column": "Kolom",
-"Constrain proportions": "Verhoudingen behouden",
-"Contrast": "Contrast",
-"Copy row": "Kopieer rij",
-"Copy": "Kopi\u00ebren",
-"Could not find the specified string.": "Geen resultaten gevonden",
-"Crop": "Uitsnijden",
-"Custom color": "Aangepaste kleur",
-"Custom...": "Aangepaste...",
-"Cut row": "Rij knippen",
-"Cut": "Knippen",
-"Date\/time": "Datum\/tijd",
-"Decrease indent": "Inspringen verkleinen",
-"Default": "Standaard",
-"Delete column": "Verwijder kolom",
-"Delete row": "Verwijder rij",
-"Delete table": "Verwijder tabel",
-"Description": "Omschrijving",
-"Dimensions": "Afmetingen",
-"Disc": "Bolletje",
-"Div": "Div",
-"Document properties": "Documenteigenschappen",
-"Edit image": "Bewerk afbeelding",
-"Edit": "Bewerken",
-"Embed": "Insluiten",
-"Emoticons": "Emoticons",
-"Encoding": "Codering",
-"File": "Bestand",
-"Find and replace": "Zoek en vervang",
-"Find": "Zoeken",
-"Finish": "Einde",
-"Flip horizontally": "Horizontaal spiegelen",
-"Flip vertically": "Verticaal spiegelen",
-"Font Family": "Lettertype",
-"Font Sizes": "Tekengrootte",
-"Footer": "Voettekst",
-"Format": "Opmaak",
-"Formats": "Opmaak",
-"Fullscreen": "Volledig scherm",
-"G": "Groen",
-"Gamma": "Gamma",
-"General": "Algemeen",
-"H Align": "Horizontaal uitlijnen",
-"Header 1": "Kop 1",
-"Header 2": "Kop 2",
-"Header 3": "Kop 3",
-"Header 4": "Kop 4",
-"Header 5": "Kop 5",
-"Header 6": "Kop 6",
-"Header cell": "Kopcel",
-"Header": "Koptekst",
-"Headers": "Kopteksten",
-"Heading 1": "Kop 1",
-"Heading 2": "Kop 2",
-"Heading 3": "Kop 3",
-"Heading 4": "Kop 4",
-"Heading 5": "Kop 5",
-"Heading 6": "Kop 6",
-"Headings": "Koppen",
-"Height": "Hoogte",
-"Horizontal line": "Horizontale lijn",
-"Horizontal space": "Horizontale ruimte",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID moet beginnen met een letter, alleen gevolgd door letters, nummers, streepjes, punten, dubbele punten of underscores.",
-"Id": "ID",
-"Ignore all": "Alles negeren",
-"Ignore": "Negeren",
-"Image description": "Afbeeldingsomschrijving",
-"Image options": "Afbeeldingsopties",
-"Image": "Afbeelding",
-"Increase indent": "Inspringen vergroten",
-"Inline": "Inlijn",
-"Insert column after": "Voeg kolom in na",
-"Insert column before": "Voeg kolom in voor",
-"Insert date\/time": "Voeg datum\/tijd in",
-"Insert image": "Afbeelding invoegen",
-"Insert link": "Hyperlink invoegen",
-"Insert row after": "Voeg rij toe na",
-"Insert row before": "Voeg rij toe voor",
-"Insert table": "Tabel invoegen",
-"Insert template": "Template invoegen",
-"Insert video": "Video invoegen",
-"Insert": "Invoegen",
-"Insert\/Edit code sample": "Codevoorbeeld invoegen\/bewerken",
-"Insert\/edit image": "Afbeelding invoegen\/bewerken",
-"Insert\/edit link": "Hyperlink invoegen\/bewerken",
-"Insert\/edit media": "Media invoegen\/bewerken",
-"Insert\/edit video": "Video invoegen\/bewerken",
-"Invert": "Omkeren",
-"Italic": "Cursief",
-"Justify": "Uitvullen",
-"Keywords": "Trefwoorden",
-"Language": "Taal",
-"Left to right": "Links naar rechts",
-"Left": "Links",
-"Link": "Link",
-"Lower Alpha": "Kleine letters",
-"Lower Greek": "Griekse letters (klein)",
-"Lower Roman": "Romeinse cijfers (klein)",
-"Match case": "Identieke hoofd\/kleine letters",
-"Media": "Media",
-"Merge cells": "Cellen samenvoegen",
-"Middle": "Centreren",
-"Name": "Naam",
-"New document": "Nieuw document",
-"New window": "Nieuw venster",
-"Next": "Volgende",
-"No color": "Geen kleur",
-"Nonbreaking space": "Vaste spatie invoegen",
-"None": "Geen",
-"Numbered list": "Nummering",
-"Ok": "Ok",
-"Orientation": "Ori\u00ebntatie",
-"Page break": "Nieuwe pagina",
-"Paragraph": "Paragraaf",
-"Paste as text": "Plakken als tekst",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Plakken gebeurt nu als platte tekst. Tekst wordt nu ingevoegd zonder opmaak tot deze optie uitgeschakeld wordt.",
-"Paste or type a link": "Plak of typ een link",
-"Paste row after": "Plak rij na",
-"Paste row before": "Plak rij voor",
-"Paste your embed code below:": "Plak uw in te sluiten code hieronder:",
-"Paste": "Plakken",
-"Poster": "Poster",
-"Pre": "Pre",
-"Prev": "Vorige",
-"Preview": "Voorbeeld",
-"Print": "Afdrukken",
-"R": "Rood",
-"Redo": "Opnieuw",
-"Remove link": "Link verwijderen",
-"Replace all": "Alles vervangen",
-"Replace with": "Vervangen door",
-"Replace": "Vervangen",
-"Resize": "Formaat aanpassen",
-"Restore last draft": "Herstellen naar vorig concept",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Opgemaakte tekstgebied. Druk op ALT-F9 voor het menu. Druk op ALT-F10 voor de werkbalk. Druk op ALT-0 voor de help.",
-"Right to left": "Rechts naar links",
-"Right": "Rechts",
-"Robots": "Robots",
-"Rotate clockwise": "Rechtsom draaien",
-"Rotate counterclockwise": "Linksom draaien",
-"Row group": "Rijgroep",
-"Row properties": "Rij-eigenschappen",
-"Row type": "Rijtype",
-"Row": "Rij",
-"Rows": "Rijen",
-"Save": "Opslaan",
-"Scope": "Bereik",
-"Select all": "Alles selecteren",
-"Sharpen": "Scherper",
-"Show blocks": "Blokken tonen",
-"Show invisible characters": "Verborgen tekens tonen",
-"Source code": "Broncode",
-"Source": "Bron",
-"Special character": "Speciale tekens",
-"Spellcheck": "Spellingscontrole",
-"Split cell": "Cel splitsen",
-"Square": "Vierkant",
-"Strikethrough": "Doorhalen",
-"Style": "Stijl",
-"Subscript": "Subscript",
-"Superscript": "Superscript",
-"Table of Contents": "Inhoudsopgave",
-"Table properties": "Tabeleigenschappen",
-"Table": "Tabel",
-"Target": "Doel",
-"Templates": "Templates",
-"Text color": "Tekstkleur",
-"Text to display": "Tekst om weer te geven",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "De ingegeven URL lijkt op een e-mailadres. Wilt u er \"mailto:\" aan toevoegen?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "De ingegeven URL lijkt op een externe link. Wilt u er \"http:\/\/\" aan toevoegen?",
-"Title": "Titel",
-"Tools": "Gereedschap",
-"Top": "Bovenaan",
-"Underline": "Onderstreept",
-"Undo": "Ongedaan maken",
-"Upper Alpha": "Hoofdletters alfabetisch",
-"Upper Roman": "Hoofdletters Romeinse cijfers",
-"Url": "URL",
-"V Align": "Verticaal uitlijnen",
-"Vertical space": "Verticale ruimte",
-"View": "Weergave",
-"Visual aids": "Hulpmiddelen",
-"Whole words": "Hele woorden",
-"Width": "Breedte",
-"Words: {0}": "Woorden: {0}",
-"You have unsaved changes are you sure you want to navigate away?": "U heeft niet alles opgeslagen weet u zeker dat u de pagina wil verlaten?",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Uw browser ondersteunt geen toegang tot het klemboord. Gelieve de ctrl+X\/C\/V sneltoetsen gebruiken.",
-"Zoom in": "Inzoomen",
-"Zoom out": "Uitzoomen"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/pl.es5.js b/build/media_source/vendor/tinymce/langs/pl.es5.js
deleted file mode 100644
index 80f390994953c..0000000000000
--- a/build/media_source/vendor/tinymce/langs/pl.es5.js
+++ /dev/null
@@ -1,462 +0,0 @@
-tinymce.addI18n('pl',{
-"Redo": "Powt\u00f3rz",
-"Undo": "Cofnij",
-"Cut": "Wytnij",
-"Copy": "Kopiuj",
-"Paste": "Wklej",
-"Select all": "Zaznacz wszystko",
-"New document": "Nowy dokument",
-"Ok": "Ok",
-"Cancel": "Anuluj",
-"Visual aids": "Pomoce wizualne",
-"Bold": "Pogrubienie",
-"Italic": "Kursywa",
-"Underline": "Podkre\u015blenie",
-"Strikethrough": "Przekre\u015blenie",
-"Superscript": "Indeks g\u00f3rny",
-"Subscript": "Indeks dolny",
-"Clear formatting": "Wyczy\u015b\u0107 formatowanie",
-"Align left": "Wyr\u00f3wnaj do lewej",
-"Align center": "Wyr\u00f3wnaj do \u015brodka",
-"Align right": "Wyr\u00f3wnaj do prawej",
-"Justify": "Wyjustuj",
-"Bullet list": "Lista wypunktowana",
-"Numbered list": "Lista numerowana",
-"Decrease indent": "Zmniejsz wci\u0119cie",
-"Increase indent": "Zwi\u0119ksz wci\u0119cie",
-"Close": "Zamknij",
-"Formats": "Formaty",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Twoja przegl\u0105darka nie obs\u0142uguje bezpo\u015bredniego dost\u0119pu do schowka. U\u017cyj zamiast tego kombinacji klawiszy Ctrl+X\/C\/V.",
-"Headers": "Nag\u0142\u00f3wki",
-"Header 1": "Nag\u0142\u00f3wek 1",
-"Header 2": "Nag\u0142\u00f3wek 2",
-"Header 3": "Nag\u0142\u00f3wek 3",
-"Header 4": "Nag\u0142\u00f3wek 4",
-"Header 5": "Nag\u0142\u00f3wek 5",
-"Header 6": "Nag\u0142\u00f3wek 6",
-"Headings": "Nag\u0142\u00f3wki",
-"Heading 1": "Nag\u0142\u00f3wek 1",
-"Heading 2": "Nag\u0142\u00f3wek 2",
-"Heading 3": "Nag\u0142\u00f3wek 3",
-"Heading 4": "Nag\u0142\u00f3wek 4",
-"Heading 5": "Nag\u0142\u00f3wek 5",
-"Heading 6": "Nag\u0142\u00f3wek 6",
-"Preformatted": "Wst\u0119pne formatowanie",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Kod",
-"Paragraph": "Akapit",
-"Blockquote": "Blok cytatu",
-"Inline": "W tek\u015bcie",
-"Blocks": "Bloki",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Wklejanie jest w trybie tekstowym. Zawarto\u015b\u0107 zostanie wklejona jako zwyk\u0142y tekst dop\u00f3ki nie wy\u0142\u0105czysz tej opcji.",
-"Fonts": "Fonty",
-"Font Sizes": "Rozmiar fontu",
-"Class": "Klasa",
-"Browse for an image": "Przegl\u0105daj za zdj\u0119ciem",
-"OR": "LUB",
-"Drop an image here": "Upu\u015b\u0107 obraz tutaj",
-"Upload": "Prze\u015blij",
-"Block": "Zablokuj",
-"Align": "Wyr\u00f3wnaj",
-"Default": "Domy\u015blne",
-"Circle": "K\u00f3\u0142ko",
-"Disc": "Dysk",
-"Square": "Kwadrat",
-"Lower Alpha": "Ma\u0142e litery",
-"Lower Greek": "Ma\u0142e greckie",
-"Lower Roman": "Ma\u0142e rzymskie",
-"Upper Alpha": "Wielkie litery",
-"Upper Roman": "Wielkie rzymskie",
-"Anchor...": "Kotwica...",
-"Name": "Nazwa",
-"Id": "Identyfikator",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Identyfikator powinien zaczyna\u0107 si\u0119 liter\u0105, dozwolone s\u0105 tylko litery, numery, uko\u015bniki, kropki, dwukropki i podkre\u015blniki - tzw. pod\u0142ogi",
-"You have unsaved changes are you sure you want to navigate away?": "Masz niezapisane zmiany. Czy na pewno chcesz opu\u015bci\u0107 stron\u0119?",
-"Restore last draft": "Przywr\u00f3\u0107 ostatni szkic",
-"Special character...": "Znak specjalny...",
-"Source code": "Kod \u017ar\u00f3d\u0142owy",
-"Insert\/Edit code sample": "Dodaj\/Edytuj przyk\u0142adowy kod",
-"Language": "J\u0119zyk",
-"Code sample...": "Przyk\u0142ad kodu...",
-"Color Picker": "Selektor kolor\u00f3w",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Od lewej do prawej",
-"Right to left": "Od prawej do lewej",
-"Emoticons": "Ikony emocji",
-"Emoticons...": "Emotikony...",
-"Metadata and Document Properties": "Metadane i w\u0142a\u015bciwo\u015bci dokumentu",
-"Title": "Tytu\u0142",
-"Keywords": "S\u0142owa kluczowe",
-"Description": "Opis",
-"Robots": "Roboty",
-"Author": "Autor",
-"Encoding": "Kodowanie",
-"Fullscreen": "Pe\u0142ny ekran",
-"Action": "Akcja",
-"Shortcut": "Skr\u00f3t",
-"Help": "Pomoc",
-"Address": "Adres",
-"Focus to menubar": "Skup si\u0119 na pasku menu",
-"Focus to toolbar": "Skupi\u0107 si\u0119 na pasku",
-"Focus to element path": "Skup si\u0119 na \u015bcie\u017cce elementu",
-"Focus to contextual toolbar": "Skupi\u0107 si\u0119 na pasku narz\u0119dzi kontekstowych",
-"Insert link (if link plugin activated)": "Wstaw \u0142\u0105cze (je\u015bli w\u0142\u0105czysz wtyczk\u0119 link\u00f3w)",
-"Save (if save plugin activated)": "Zapisz (je\u015bli aktywowana jest wtyczka do zapisu)",
-"Find (if searchreplace plugin activated)": "Znajd\u017a (je\u015bli w\u0142\u0105czysz wtyczk\u0119 do wyszukiwania)",
-"Plugins installed ({0}):": "Zainstalowane wtyczki ({0}):",
-"Premium plugins:": "Wtyczki Premium:",
-"Learn more...": "Dowiedz si\u0119 wi\u0119cej...",
-"You are using {0}": "U\u017cywasz {0}",
-"Plugins": "Pluginy",
-"Handy Shortcuts": "Przydatne skr\u00f3ty",
-"Horizontal line": "Pozioma linia",
-"Insert\/edit image": "Wstaw\/edytuj obrazek",
-"Alternative description": "Alternatywny opis",
-"Accessibility": "Dost\u0119pno\u015b\u0107",
-"Image is decorative": "Obraz jest dekoracyjny",
-"Source": "\u0179r\u00f3d\u0142o",
-"Dimensions": "Wymiary",
-"Constrain proportions": "Zachowaj proporcje",
-"General": "Og\u00f3lne",
-"Advanced": "Zaawansowane",
-"Style": "Styl",
-"Vertical space": "Odst\u0119p pionowy",
-"Horizontal space": "Odst\u0119p poziomy",
-"Border": "Ramka",
-"Insert image": "Wstaw obrazek",
-"Image...": "Obraz...",
-"Image list": "Lista obrazk\u00f3w",
-"Rotate counterclockwise": "Obr\u00f3\u0107 w lewo",
-"Rotate clockwise": "Obr\u00f3\u0107 w prawo",
-"Flip vertically": "Przerzu\u0107 w pionie",
-"Flip horizontally": "Przerzu\u0107 w poziomie",
-"Edit image": "Edytuj obrazek",
-"Image options": "Opcje obrazu",
-"Zoom in": "Powi\u0119ksz",
-"Zoom out": "Pomniejsz",
-"Crop": "Przytnij",
-"Resize": "Zmiana rozmiaru",
-"Orientation": "Orientacja",
-"Brightness": "Jasno\u015b\u0107",
-"Sharpen": "Wyostrz",
-"Contrast": "Kontrast",
-"Color levels": "Poziom koloru",
-"Gamma": "Gamma",
-"Invert": "Odwr\u00f3\u0107",
-"Apply": "Zaakceptuj",
-"Back": "Cofnij",
-"Insert date\/time": "Wstaw dat\u0119\/czas",
-"Date\/time": "Data\/Czas",
-"Insert\/edit link": "Wstaw\/edytuj \u0142\u0105cze",
-"Text to display": "Tekst do wy\u015bwietlenia",
-"Url": "URL",
-"Open link in...": "Otw\u00f3rz \u0142\u0105cze w...",
-"Current window": "Bie\u017c\u0105ce okno",
-"None": "\u017baden",
-"New window": "Nowe okno",
-"Open link": "Otw\u00f3rz \u0142\u0105cze",
-"Remove link": "Usu\u0144 \u0142\u0105cze",
-"Anchors": "Kotwice",
-"Link...": "\u0141\u0105cze...",
-"Paste or type a link": "Wklej lub wpisz adres \u0142\u0105cza",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL, kt\u00f3ry wprowadzi\u0142e\u015b wygl\u0105da na adres e-mail. Czy chcesz doda\u0107 mailto: jako prefiks?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL, kt\u00f3ry wprowadzi\u0142e\u015b wygl\u0105da na link zewn\u0119trzny. Czy chcesz doda\u0107 http:\/\/ jako prefiks?",
-"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Wprowadzony przez Ciebie adres URL wydaje si\u0119 by\u0107 \u0142\u0105czem zewn\u0119trznym. Czy chcesz doda\u0107 wymagany prefiks https:\/\/?",
-"Link list": "Lista link\u00f3w",
-"Insert video": "Wstaw wideo",
-"Insert\/edit video": "Wstaw\/edytuj wideo",
-"Insert\/edit media": "Wstaw\/Edytuj media",
-"Alternative source": "Alternatywne \u017ar\u00f3d\u0142o",
-"Alternative source URL": "Alternatywny URL \u017ar\u00f3d\u0142a",
-"Media poster (Image URL)": "Plakat (URL obrazu)",
-"Paste your embed code below:": "Wklej tutaj kod do osadzenia:",
-"Embed": "Osad\u017a",
-"Media...": "Multimedia...",
-"Nonbreaking space": "Nie\u0142amliwa spacja",
-"Page break": "Podzia\u0142 strony",
-"Paste as text": "Wklej jako zwyk\u0142y tekst",
-"Preview": "Podgl\u0105d",
-"Print...": "Drukuj...",
-"Save": "Zapisz",
-"Find": "Znajd\u017a",
-"Replace with": "Zamie\u0144 na",
-"Replace": "Zamie\u0144",
-"Replace all": "Zamie\u0144 wszystko",
-"Previous": "Poprzedni",
-"Next": "Nast.",
-"Find and Replace": "Znajd\u017a i Zamie\u0144",
-"Find and replace...": "Znajd\u017a i zamie\u0144...",
-"Could not find the specified string.": "Nie znaleziono szukanego tekstu.",
-"Match case": "Dopasuj wielko\u015b\u0107 liter",
-"Find whole words only": "Znajd\u017a tylko ca\u0142e wyrazy",
-"Find in selection": "Znajd\u017a w zaznaczeniu",
-"Spellcheck": "Sprawdzanie pisowni",
-"Spellcheck Language": "J\u0119zyk sprawdzania pisowni",
-"No misspellings found.": "Brak b\u0142\u0119d\u00f3w pisowni",
-"Ignore": "Ignoruj",
-"Ignore all": "Ignoruj wszystko",
-"Finish": "Zako\u0144cz",
-"Add to Dictionary": "Dodaj do s\u0142ownika",
-"Insert table": "Wstaw tabel\u0119",
-"Table properties": "W\u0142a\u015bciwo\u015bci tabeli",
-"Delete table": "Usu\u0144 tabel\u0119",
-"Cell": "Kom\u00f3rka",
-"Row": "Wiersz",
-"Column": "Kolumna",
-"Cell properties": "W\u0142a\u015bciwo\u015bci kom\u00f3rki",
-"Merge cells": "\u0141\u0105cz kom\u00f3rki",
-"Split cell": "Podziel kom\u00f3rk\u0119",
-"Insert row before": "Wstaw wiersz przed",
-"Insert row after": "Wstaw wiersz po",
-"Delete row": "Usu\u0144 wiersz",
-"Row properties": "W\u0142a\u015bciwo\u015bci wiersza",
-"Cut row": "Wytnij wiersz",
-"Copy row": "Kopiuj wiersz",
-"Paste row before": "Wklej wiersz przed",
-"Paste row after": "Wklej wiersz po",
-"Insert column before": "Wstaw kolumn\u0119 przed",
-"Insert column after": "Wstaw kolumn\u0119 po",
-"Delete column": "Usu\u0144 kolumn\u0119",
-"Cols": "Kol.",
-"Rows": "Wiersz.",
-"Width": "Szeroko\u015b\u0107",
-"Height": "Wysoko\u015b\u0107",
-"Cell spacing": "Odst\u0119py kom\u00f3rek",
-"Cell padding": "Dope\u0142nienie kom\u00f3rki",
-"Caption": "Tytu\u0142",
-"Show caption": "Poka\u017c podpis",
-"Left": "Lewo",
-"Center": "\u015arodek",
-"Right": "Prawo",
-"Cell type": "Typ kom\u00f3rki",
-"Scope": "Kontekst",
-"Alignment": "Wyr\u00f3wnanie",
-"H Align": "Wyr\u00f3wnanie w pionie",
-"V Align": "Wyr\u00f3wnanie w poziomie",
-"Top": "G\u00f3ra",
-"Middle": "\u015arodek",
-"Bottom": "D\u00f3\u0142",
-"Header cell": "Kom\u00f3rka nag\u0142\u00f3wka",
-"Row group": "Grupa wierszy",
-"Column group": "Grupa kolumn",
-"Row type": "Typ wiersza",
-"Header": "Nag\u0142\u00f3wek",
-"Body": "Tre\u015b\u0107",
-"Footer": "Stopka",
-"Border color": "Kolor ramki",
-"Insert template...": "Wstaw szablon...",
-"Templates": "Szablony",
-"Template": "Szablon",
-"Text color": "Kolor tekstu",
-"Background color": "Kolor t\u0142a",
-"Custom...": "Niestandardowy...",
-"Custom color": "Kolor niestandardowy",
-"No color": "Bez koloru",
-"Remove color": "Usu\u0144 kolor",
-"Table of Contents": "Spis tre\u015bci",
-"Show blocks": "Poka\u017c bloki",
-"Show invisible characters": "Poka\u017c niewidoczne znaki",
-"Word count": "Liczba s\u0142\u00f3w",
-"Count": "Liczba",
-"Document": "Dokument",
-"Selection": "Zaznaczenie",
-"Words": "S\u0142owa",
-"Words: {0}": "S\u0142\u00f3w: {0}",
-"{0} words": "{0} s\u0142\u00f3w",
-"File": "Plik",
-"Edit": "Edycja",
-"Insert": "Wstaw",
-"View": "Widok",
-"Format": "Format",
-"Table": "Tabela",
-"Tools": "Narz\u0119dzia",
-"Powered by {0}": "Powered by {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Obszar Edycji. ALT-F9 - menu. ALT-F10 - pasek narz\u0119dzi. ALT-0 - pomoc",
-"Image title": "Tytu\u0142 obrazu",
-"Border width": "Grubo\u015b\u0107 ramki",
-"Border style": "Styl ramki",
-"Error": "B\u0142\u0105d",
-"Warn": "Ostrze\u017cenie",
-"Valid": "Prawid\u0142owe",
-"To open the popup, press Shift+Enter": "Aby otworzy\u0107 okienko, naci\u015bnij Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "Obszar tekstu sformatowanego. Naci\u015bnij ALT-0, aby uzyska\u0107 pomoc.",
-"System Font": "Font systemowy",
-"Failed to upload image: {0}": "Nie uda\u0142o si\u0119 przes\u0142a\u0107 obrazu: {0}",
-"Failed to load plugin: {0} from url {1}": "Nie uda\u0142o si\u0119 za\u0142adowa\u0107 dodatku: {0} spod adresu url {1}",
-"Failed to load plugin url: {0}": "Nie uda\u0142o si\u0119 za\u0142adowa\u0107 adresu url dodatku: {0}",
-"Failed to initialize plugin: {0}": "Nie mo\u017cna zainicjowa\u0107 dodatku: {0}",
-"example": "przyk\u0142ad",
-"Search": "Wyszukaj",
-"All": "Wszystkie",
-"Currency": "Waluta",
-"Text": "Tekst",
-"Quotations": "Cudzys\u0142owy",
-"Mathematical": "Matematyczne",
-"Extended Latin": "Rozszerzony \u0142aci\u0144ski",
-"Symbols": "Symbole",
-"Arrows": "Strza\u0142ki",
-"User Defined": "W\u0142asny",
-"dollar sign": "znak dolara",
-"currency sign": "znak waluty",
-"euro-currency sign": "znak euro",
-"colon sign": "znak colon",
-"cruzeiro sign": "znak cruzeiro",
-"french franc sign": "znak franka francuskiego",
-"lira sign": "znak liry",
-"mill sign": "znak mill",
-"naira sign": "znak nairy",
-"peseta sign": "znak pesety",
-"rupee sign": "znak rupii",
-"won sign": "znak wona",
-"new sheqel sign": "znak nowego szekla",
-"dong sign": "znak donga",
-"kip sign": "znak kipa",
-"tugrik sign": "znak tugrika",
-"drachma sign": "znak drachmy",
-"german penny symbol": "znak feniga",
-"peso sign": "znak peso",
-"guarani sign": "znak guarani",
-"austral sign": "znak australa",
-"hryvnia sign": "znak hrywny",
-"cedi sign": "znak cedi",
-"livre tournois sign": "znak livre tournois",
-"spesmilo sign": "znak spesmilo",
-"tenge sign": "znak tenge",
-"indian rupee sign": "znak rupii indyjskiej",
-"turkish lira sign": "znak liry tureckiej",
-"nordic mark sign": "znak nordic mark",
-"manat sign": "znak manata",
-"ruble sign": "znak rubla",
-"yen character": "znak jena",
-"yuan character": "znak juana",
-"yuan character, in hong kong and taiwan": "znak juana w Hongkongu i na Tajwanie",
-"yen\/yuan character variant one": "jen\/juan, wariant pierwszy",
-"Loading emoticons...": "\u0141adowanie emotikon\u00f3w...",
-"Could not load emoticons": "Nie mo\u017cna za\u0142adowa\u0107 emotikon\u00f3w",
-"People": "Ludzie",
-"Animals and Nature": "Zwierz\u0119ta i natura",
-"Food and Drink": "Jedzenie i picie",
-"Activity": "Aktywno\u015b\u0107",
-"Travel and Places": "Podr\u00f3\u017ce i miejsca",
-"Objects": "Obiekty",
-"Flags": "Flagi",
-"Characters": "Znaki",
-"Characters (no spaces)": "Znaki (bez spacji)",
-"{0} characters": "{0} znak\u00f3w",
-"Error: Form submit field collision.": "B\u0142\u0105d: kolizja pola przesy\u0142ania formularza.",
-"Error: No form element found.": "B\u0142\u0105d: nie znaleziono elementu formularza.",
-"Update": "Aktualizuj",
-"Color swatch": "Pr\u00f3bka koloru",
-"Turquoise": "Turkusowy",
-"Green": "Zielony",
-"Blue": "Niebieski",
-"Purple": "Purpurowy",
-"Navy Blue": "Ciemnoniebieski",
-"Dark Turquoise": "Ciemnoturkusowy",
-"Dark Green": "Ciemnozielony",
-"Medium Blue": "\u015arednioniebieski",
-"Medium Purple": "\u015aredniopurpurowy",
-"Midnight Blue": "Nocny b\u0142\u0119kit",
-"Yellow": "\u017b\u00f3\u0142ty",
-"Orange": "Pomara\u0144czowy",
-"Red": "Czerwony",
-"Light Gray": "Jasnoszary",
-"Gray": "Szary",
-"Dark Yellow": "Ciemno\u017c\u00f3\u0142ty",
-"Dark Orange": "Ciemnopomara\u0144czowy",
-"Dark Red": "Ciemnoczerwony",
-"Medium Gray": "\u015arednioszary",
-"Dark Gray": "Ciemnoszary",
-"Light Green": "Jasnozielony",
-"Light Yellow": "Jasno\u017c\u00f3\u0142ty",
-"Light Red": "Jasnoczerwony",
-"Light Purple": "Jasnopurpurowy",
-"Light Blue": "Jasnoniebieski",
-"Dark Purple": "Ciemnopurpurowy",
-"Dark Blue": "Ciemnoniebieski",
-"Black": "Czarny",
-"White": "Bia\u0142y",
-"Switch to or from fullscreen mode": "W\u0142\u0105cz lub wy\u0142\u0105cz tryb pe\u0142noekranowy",
-"Open help dialog": "Otw\u00f3rz okno dialogowe pomocy",
-"history": "historia",
-"styles": "style",
-"formatting": "formatowanie",
-"alignment": "wyr\u00f3wnanie",
-"indentation": "wci\u0119cie",
-"Font": "Font",
-"Size": "Rozmiar",
-"More...": "Wi\u0119cej...",
-"Select...": "Wybierz...",
-"Preferences": "Ustawienia",
-"Yes": "Tak",
-"No": "Nie",
-"Keyboard Navigation": "Nawigacja za pomoc\u0105 klawiatury",
-"Version": "Wersja",
-"Code view": "Widok kodu",
-"Open popup menu for split buttons": "Otw\u00f3rz menu podr\u0119czne dla przycisk\u00f3w",
-"List Properties": "Ustawienia Listy",
-"List properties...": "Ustawienia listy...",
-"Start list at number": "Rozpocznij numeracj\u0119 od",
-"Line height": "Wysoko\u015b\u0107 Linii",
-"comments": "komentarze",
-"Format Painter": "Malarz format\u00f3w",
-"Insert\/edit iframe": "Wstaw\/edytuj iframe",
-"Capitalization": "Jak w zdaniu",
-"lowercase": "ma\u0142e litery",
-"UPPERCASE": "WIELKIE LITERY",
-"Title Case": "Jak Nazwy W\u0142asne",
-"permanent pen": "marker",
-"Permanent Pen Properties": "W\u0142a\u015bciwo\u015bci markera",
-"Permanent pen properties...": "W\u0142a\u015bciwo\u015bci markera...",
-"case change": "Zmie\u0144 wielko\u015b\u0107",
-"page embed": "strona osadzona",
-"Advanced sort...": "Sortowanie zaawansowane...",
-"Advanced Sort": "Sortowanie Zaawansowane",
-"Sort table by column ascending": "Sortuj tabel\u0119 po kolumnie rosn\u0105co",
-"Sort table by column descending": "Sortuj tabel\u0119 po kolumnie malej\u0105co",
-"Sort": "Sortuj",
-"Order": "Kolejno\u015b\u0107",
-"Sort by": "Sortuj wed\u0142ug",
-"Ascending": "Rosn\u0105co",
-"Descending": "Malej\u0105co",
-"Column {0}": "Kolumna {0}",
-"Row {0}": "Wiersz {0}",
-"Spellcheck...": "Sprawd\u017a pisowni\u0119...",
-"Misspelled word": "B\u0142\u0119dna pisownia",
-"Suggestions": "Sugestie",
-"Change": "Zmie\u0144",
-"Finding word suggestions": "Wyszukiwanie propozycji s\u0142\u00f3w",
-"Success": "Sukces",
-"Repair": "Napraw",
-"Issue {0} of {1}": "Problem {0} z {1}",
-"Images must be marked as decorative or have an alternative text description": "Obrazy musz\u0105 by\u0107 oznaczone jako dekoracyjne lub posiada\u0107 alternatywny opis tekstowy.",
-"Images must have an alternative text description. Decorative images are not allowed.": "Obrazki musz\u0105 mie\u0107 tekst alternatywny. Dekoracyjne obrazy nie s\u0105 dozwolone.",
-"Or provide alternative text:": "lub dodaj tekst alternatywny:",
-"Make image decorative:": "Uczy\u0144 obraz dekoracyjnym:",
-"ID attribute must be unique": "ID atrybutu musi by\u0107 unikalny",
-"Make ID unique": "Utw\u00f3rz unikalny ID",
-"Keep this ID and remove all others": "Zachowaj to ID oraz usu\u0144 inne",
-"Remove this ID": "Usu\u0144 to ID",
-"Remove all IDs": "Usu\u0144 wszystkie ID",
-"Checklist": "Checklista",
-"Anchor": "Kotwica",
-"Special character": "Znak specjalny",
-"Code sample": "Przyk\u0142ad kodu \u017ar\u00f3d\u0142owego",
-"Color": "Kolor",
-"Document properties": "W\u0142a\u015bciwo\u015bci dokumentu",
-"Image description": "Opis obrazka",
-"Image": "Obraz",
-"Insert link": "Wstaw \u0142\u0105cze",
-"Target": "Cel",
-"Link": "Adres \u0142\u0105cza",
-"Poster": "Plakat",
-"Media": "Media",
-"Print": "Drukuj",
-"Prev": "Poprz.",
-"Find and replace": "Znajd\u017a i zamie\u0144",
-"Whole words": "Ca\u0142e s\u0142owa",
-"Insert template": "Wstaw szablon"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/pt-BR.es5.js b/build/media_source/vendor/tinymce/langs/pt-BR.es5.js
deleted file mode 100644
index f8c21680402ff..0000000000000
--- a/build/media_source/vendor/tinymce/langs/pt-BR.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('pt-BR',{
-"Cut": "Recortar",
-"Heading 5": "Cabe\u00e7alho 5",
-"Header 2": "Cabe\u00e7alho 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Seu navegador n\u00e3o suporta acesso direto \u00e0 \u00e1rea de transfer\u00eancia. Por favor use os atalhos Ctrl+X - C - V do teclado",
-"Heading 4": "Cabe\u00e7alho 4",
-"Div": "Div",
-"Heading 2": "Cabe\u00e7alho 2",
-"Paste": "Colar",
-"Close": "Fechar",
-"Font Family": "Fonte",
-"Pre": "Pre",
-"Align right": "Alinhar \u00e0 direita",
-"New document": "Novo documento",
-"Blockquote": "Aspas",
-"Numbered list": "Lista ordenada",
-"Heading 1": "Cabe\u00e7alho 1",
-"Headings": "Cabe\u00e7alhos",
-"Increase indent": "Aumentar recuo",
-"Formats": "Formatos",
-"Headers": "Cabe\u00e7alhos",
-"Select all": "Selecionar tudo",
-"Header 3": "Cabe\u00e7alho 3",
-"Blocks": "Blocos",
-"Undo": "Desfazer",
-"Strikethrough": "Riscar",
-"Bullet list": "Lista n\u00e3o ordenada",
-"Header 1": "Cabe\u00e7alho 1",
-"Superscript": "Sobrescrito",
-"Clear formatting": "Limpar formata\u00e7\u00e3o",
-"Font Sizes": "Tamanho",
-"Subscript": "Subscrever",
-"Header 6": "Cabe\u00e7alho 6",
-"Redo": "Refazer",
-"Paragraph": "Par\u00e1grafo",
-"Ok": "Ok",
-"Bold": "Negrito",
-"Code": "C\u00f3digo",
-"Italic": "It\u00e1lico",
-"Align center": "Centralizar",
-"Header 5": "Cabe\u00e7alho 5",
-"Heading 6": "Cabe\u00e7alho 6",
-"Heading 3": "Cabe\u00e7alho 3",
-"Decrease indent": "Diminuir recuo",
-"Header 4": "Cabe\u00e7alho 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "O comando colar est\u00e1 agora em modo texto plano. O conte\u00fado ser\u00e1 colado como texto plano at\u00e9 voc\u00ea desligar esta op\u00e7\u00e3o.",
-"Underline": "Sublinhar",
-"Cancel": "Cancelar",
-"Justify": "Justificar",
-"Inline": "Em linha",
-"Copy": "Copiar",
-"Align left": "Alinhar \u00e0 esquerda",
-"Visual aids": "Ajuda visual",
-"Lower Greek": "\u03b1. \u03b2. \u03b3. ...",
-"Square": "Quadrado",
-"Default": "Padr\u00e3o",
-"Lower Alpha": "a. b. c. ...",
-"Circle": "C\u00edrculo",
-"Disc": "Disco",
-"Upper Alpha": "A. B. C. ...",
-"Upper Roman": "I. II. III. ...",
-"Lower Roman": "i. ii. iii. ...",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id deve come\u00e7ar com uma letra, seguido apenas por letras, n\u00fameros, tra\u00e7os, pontos, dois pontos ou sublinhados.",
-"Name": "Nome",
-"Anchor": "\u00c2ncora",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "Voc\u00ea tem mudan\u00e7as n\u00e3o salvas. Voc\u00ea tem certeza que deseja sair?",
-"Restore last draft": "Restaurar \u00faltimo rascunho",
-"Special character": "Caracteres especiais",
-"Source code": "C\u00f3digo fonte",
-"Language": "Idioma",
-"Insert\/Edit code sample": "Inserir\/Editar c\u00f3digo de exemplo",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Cor",
-"Right to left": "Da direita para a esquerda",
-"Left to right": "Da esquerda para a direita",
-"Emoticons": "Emoticons",
-"Robots": "Rob\u00f4s",
-"Document properties": "Propriedades do documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palavras-chave",
-"Encoding": "Codifica\u00e7\u00e3o",
-"Description": "Descri\u00e7\u00e3o",
-"Author": "Autor",
-"Fullscreen": "Tela cheia",
-"Horizontal line": "Linha horizontal",
-"Horizontal space": "Espa\u00e7amento horizontal",
-"Insert\/edit image": "Inserir\/editar imagem",
-"General": "Geral",
-"Advanced": "Avan\u00e7ado",
-"Source": "Endere\u00e7o da imagem",
-"Border": "Borda",
-"Constrain proportions": "Manter propor\u00e7\u00f5es",
-"Vertical space": "Espa\u00e7amento vertical",
-"Image description": "Inserir descri\u00e7\u00e3o",
-"Style": "Estilo",
-"Dimensions": "Dimens\u00f5es",
-"Insert image": "Inserir imagem",
-"Image": "Imagem",
-"Zoom in": "Aumentar zoom",
-"Contrast": "Contraste",
-"Back": "Voltar",
-"Gamma": "Gama",
-"Flip horizontally": "Virar horizontalmente",
-"Resize": "Redimensionar",
-"Sharpen": "Aumentar nitidez",
-"Zoom out": "Diminuir zoom",
-"Image options": "Op\u00e7\u00f5es de Imagem",
-"Apply": "Aplicar",
-"Brightness": "Brilho",
-"Rotate clockwise": "Girar em sentido anti-hor\u00e1rio",
-"Rotate counterclockwise": "Girar em sentido hor\u00e1rio",
-"Edit image": "Editar imagem",
-"Color levels": "N\u00edveis de cor",
-"Crop": "Cortar",
-"Orientation": "Orienta\u00e7\u00e3o",
-"Flip vertically": "Virar verticalmente",
-"Invert": "Inverter",
-"Date\/time": "data\/hora",
-"Insert date\/time": "Inserir data\/hora",
-"Remove link": "Remover link",
-"Url": "Url",
-"Text to display": "Texto para mostrar",
-"Anchors": "\u00c2ncoras",
-"Insert link": "Inserir link",
-"Link": "Link",
-"New window": "Nova janela",
-"None": "Nenhum",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "A URL que voc\u00ea informou parece ser um link externo. Deseja incluir o prefixo http:\/\/?",
-"Paste or type a link": "Cole ou digite um Link",
-"Target": "Alvo",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "Inserir\/editar link",
-"Insert\/edit video": "Inserir\/editar v\u00eddeo",
-"Media": "imagem",
-"Alternative source": "Fonte alternativa",
-"Paste your embed code below:": "Insira o c\u00f3digo de incorpora\u00e7\u00e3o abaixo:",
-"Insert video": "Inserir v\u00eddeo",
-"Poster": "Autor",
-"Insert\/edit media": "Inserir\/editar imagem",
-"Embed": "Incorporar",
-"Nonbreaking space": "Espa\u00e7o n\u00e3o separ\u00e1vel",
-"Page break": "Quebra de p\u00e1gina",
-"Paste as text": "Colar como texto",
-"Preview": "Pr\u00e9-visualizar",
-"Print": "Imprimir",
-"Save": "Salvar",
-"Could not find the specified string.": "N\u00e3o foi poss\u00edvel encontrar o termo especificado",
-"Replace": "Substituir",
-"Next": "Pr\u00f3ximo",
-"Whole words": "Palavras inteiras",
-"Find and replace": "Localizar e substituir",
-"Replace with": "Substituir por",
-"Find": "Localizar",
-"Replace all": "Substituir tudo",
-"Match case": "Diferenciar mai\u00fasculas e min\u00fasculas",
-"Prev": "Anterior",
-"Spellcheck": "Corretor ortogr\u00e1fico",
-"Finish": "Finalizar",
-"Ignore all": "Ignorar tudo",
-"Ignore": "Ignorar",
-"Add to Dictionary": "Adicionar ao Dicion\u00e1rio",
-"Insert row before": "Inserir linha antes",
-"Rows": "Linhas",
-"Height": "Altura",
-"Paste row after": "Colar linha depois",
-"Alignment": "Alinhamento",
-"Border color": "Cor da borda",
-"Column group": "Agrupar coluna",
-"Row": "Linha",
-"Insert column before": "Inserir coluna antes",
-"Split cell": "Dividir c\u00e9lula",
-"Cell padding": "Espa\u00e7amento interno da c\u00e9lula",
-"Cell spacing": "Espa\u00e7amento da c\u00e9lula",
-"Row type": "Tipo de linha",
-"Insert table": "Inserir tabela",
-"Body": "Corpo",
-"Caption": "Legenda",
-"Footer": "Rodap\u00e9",
-"Delete row": "Excluir linha",
-"Paste row before": "Colar linha antes",
-"Scope": "Escopo",
-"Delete table": "Excluir tabela",
-"H Align": "Alinhamento H",
-"Top": "Superior",
-"Header cell": "C\u00e9lula cabe\u00e7alho",
-"Column": "Coluna",
-"Row group": "Agrupar linha",
-"Cell": "C\u00e9lula",
-"Middle": "Meio",
-"Cell type": "Tipo de c\u00e9lula",
-"Copy row": "Copiar linha",
-"Row properties": "Propriedades da linha",
-"Table properties": "Propriedades da tabela",
-"Bottom": "Inferior",
-"V Align": "Alinhamento V",
-"Header": "Cabe\u00e7alho",
-"Right": "Direita",
-"Insert column after": "Inserir coluna depois",
-"Cols": "Colunas",
-"Insert row after": "Inserir linha depois",
-"Width": "Largura",
-"Cell properties": "Propriedades da c\u00e9lula",
-"Left": "Esquerdo",
-"Cut row": "Recortar linha",
-"Delete column": "Excluir coluna",
-"Center": "Centro",
-"Merge cells": "Agrupar c\u00e9lulas",
-"Insert template": "Inserir modelo",
-"Templates": "Modelos",
-"Background color": "Cor do fundo",
-"Custom...": "Personalizado...",
-"Custom color": "Cor personalizada",
-"No color": "Nenhuma cor",
-"Text color": "Cor do texto",
-"Table of Contents": "\u00edndice de Conte\u00fado",
-"Show blocks": "Mostrar blocos",
-"Show invisible characters": "Exibir caracteres invis\u00edveis",
-"Words: {0}": "Palavras: {0}",
-"Insert": "Inserir",
-"File": "Arquivo",
-"Edit": "Editar",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto formatado. Pressione ALT-F9 para exibir o menu, ALT-F10 para exibir a barra de ferramentas ou ALT-0 para exibir a ajuda",
-"Tools": "Ferramentas",
-"View": "Visualizar",
-"Table": "Tabela",
-"Format": "Formatar"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/pt-PT.es5.js b/build/media_source/vendor/tinymce/langs/pt-PT.es5.js
deleted file mode 100644
index 6f73db03ae06d..0000000000000
--- a/build/media_source/vendor/tinymce/langs/pt-PT.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('pt-PT',{
-"Cut": "Cortar",
-"Heading 5": "T\u00edtulo 5",
-"Header 2": "Cabe\u00e7alho 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "O seu navegador n\u00e3o suporta acesso direto \u00e0 \u00e1rea de transfer\u00eancia. Por favor use os atalhos Ctrl+X\/C\/V do seu teclado.",
-"Heading 4": "T\u00edtulo 4",
-"Div": "Div",
-"Heading 2": "T\u00edtulo 2",
-"Paste": "Colar",
-"Close": "Fechar",
-"Font Family": "Fonte",
-"Pre": "Pre",
-"Align right": "Alinhar \u00e0 direita",
-"New document": "Novo documento",
-"Blockquote": "Cita\u00e7\u00e3o em bloco",
-"Numbered list": "Lista numerada",
-"Heading 1": "T\u00edtulo 1",
-"Headings": "T\u00edtulos",
-"Increase indent": "Aumentar avan\u00e7o",
-"Formats": "Formatos",
-"Headers": "Cabe\u00e7alhos",
-"Select all": "Selecionar tudo",
-"Header 3": "Cabe\u00e7alho 3",
-"Blocks": "Blocos",
-"Undo": "Desfazer",
-"Strikethrough": "Rasurado",
-"Bullet list": "Lista com marcadores",
-"Header 1": "Cabe\u00e7alho 1",
-"Superscript": "Superior \u00e0 linha",
-"Clear formatting": "Limpar formata\u00e7\u00e3o",
-"Font Sizes": "Tamanhos",
-"Subscript": "Inferior \u00e0 linha",
-"Header 6": "Cabe\u00e7alho 6",
-"Redo": "Refazer",
-"Paragraph": "Par\u00e1grafo",
-"Ok": "Ok",
-"Bold": "Negrito",
-"Code": "C\u00f3digo",
-"Italic": "It\u00e1lico",
-"Align center": "Alinhar ao centro",
-"Header 5": "Cabe\u00e7alho 5",
-"Heading 6": "T\u00edtulo 6",
-"Heading 3": "T\u00edtulo 3",
-"Decrease indent": "Diminuir avan\u00e7o",
-"Header 4": "Cabe\u00e7alho 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "O comando colar est\u00e1 em modo de texto simples. O conte\u00fado ser\u00e1 colado como texto simples at\u00e9 desativar esta op\u00e7\u00e3o.",
-"Underline": "Sublinhado",
-"Cancel": "Cancelar",
-"Justify": "Justificado",
-"Inline": "Na linha",
-"Copy": "Copiar",
-"Align left": "Alinhar \u00e0 esquerda",
-"Visual aids": "Ajuda visual",
-"Lower Greek": "\\u03b1. \\u03b2. \\u03b3. ...",
-"Square": "Quadrado",
-"Default": "Padr\u00e3o",
-"Lower Alpha": "a. b. c. ...",
-"Circle": "C\u00edrculo",
-"Disc": "Disco",
-"Upper Alpha": "A. B. C. ...",
-"Upper Roman": "I. II. III. ...",
-"Lower Roman": "i. ii. iii. ...",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "O ID deve come\u00e7ar com uma letra, seguido por letras, n\u00fameros, tra\u00e7os, pontos, dois pontos ou sobtra\u00e7os.",
-"Name": "Nome",
-"Anchor": "\u00c2ncora",
-"Id": "ID",
-"You have unsaved changes are you sure you want to navigate away?": "Existem altera\u00e7\u00f5es que ainda n\u00e3o foram guardadas. Tem a certeza que pretende sair?",
-"Restore last draft": "Restaurar o \u00faltimo rascunho",
-"Special character": "Car\u00e1cter especial",
-"Source code": "C\u00f3digo fonte",
-"Language": "Idioma",
-"Insert\/Edit code sample": "Inserir\/editar amostra de c\u00f3digo",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Cor",
-"Right to left": "Da direita para a esquerda",
-"Left to right": "Da esquerda para a direita",
-"Emoticons": "Emo\u00e7\u00f5es",
-"Robots": "Rob\u00f4s",
-"Document properties": "Propriedades do documento",
-"Title": "T\u00edtulo",
-"Keywords": "Palavras-chave",
-"Encoding": "Codifica\u00e7\u00e3o",
-"Description": "Descri\u00e7\u00e3o",
-"Author": "Autor",
-"Fullscreen": "Ecr\u00e3 completo",
-"Horizontal line": "Linha horizontal",
-"Horizontal space": "Espa\u00e7amento horizontal",
-"Insert\/edit image": "Inserir\/editar imagem",
-"General": "Geral",
-"Advanced": "Avan\u00e7ado",
-"Source": "Localiza\u00e7\u00e3o",
-"Border": "Contorno",
-"Constrain proportions": "Manter propor\u00e7\u00f5es",
-"Vertical space": "Espa\u00e7amento vertical",
-"Image description": "Descri\u00e7\u00e3o da imagem",
-"Style": "Estilo",
-"Dimensions": "Dimens\u00f5es",
-"Insert image": "Inserir imagem",
-"Image": "Imagem",
-"Zoom in": "Mais zoom",
-"Contrast": "Contraste",
-"Back": "Voltar",
-"Gamma": "Gama",
-"Flip horizontally": "Inverter horizontalmente",
-"Resize": "Redimensionar",
-"Sharpen": "Mais nitidez",
-"Zoom out": "Menos zoom",
-"Image options": "Op\u00e7\u00f5es de imagem",
-"Apply": "Aplicar",
-"Brightness": "Brilho",
-"Rotate clockwise": "Rota\u00e7\u00e3o hor\u00e1ria",
-"Rotate counterclockwise": "Rota\u00e7\u00e3o anti-hor\u00e1ria",
-"Edit image": "Editar imagem",
-"Color levels": "N\u00edveis de cor",
-"Crop": "Recortar",
-"Orientation": "Orienta\u00e7\u00e3o",
-"Flip vertically": "Inverter verticalmente",
-"Invert": "Inverter",
-"Date\/time": "Data\/hora",
-"Insert date\/time": "Inserir data\/hora",
-"Remove link": "Remover liga\u00e7\u00e3o",
-"Url": "URL",
-"Text to display": "Texto a exibir",
-"Anchors": "\u00c2ncora",
-"Insert link": "Inserir liga\u00e7\u00e3o",
-"Link": "Liga\u00e7\u00e3o",
-"New window": "Nova janela",
-"None": "Nenhum",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "O URL que indicou parece ser um endere\u00e7o web. Quer adicionar o prefixo http:\/\/ tal como necess\u00e1rio?",
-"Paste or type a link": "Copiar ou escrever uma hiperliga\u00e7\u00e3o",
-"Target": "Alvo",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "O URL que indicou parece ser um endere\u00e7o de email. Quer adicionar o prefixo mailto: tal como necess\u00e1rio?",
-"Insert\/edit link": "Inserir\/editar liga\u00e7\u00e3o",
-"Insert\/edit video": "Inserir\/editar v\u00eddeo",
-"Media": "Media",
-"Alternative source": "Localiza\u00e7\u00e3o alternativa",
-"Paste your embed code below:": "Colar c\u00f3digo para embeber:",
-"Insert video": "Inserir v\u00eddeo",
-"Poster": "Autor",
-"Insert\/edit media": "Inserir\/editar media",
-"Embed": "Embeber",
-"Nonbreaking space": "Espa\u00e7o n\u00e3o quebr\u00e1vel",
-"Page break": "Quebra de p\u00e1gina",
-"Paste as text": "Colar como texto",
-"Preview": "Pr\u00e9-visualizar",
-"Print": "Imprimir",
-"Save": "Guardar",
-"Could not find the specified string.": "N\u00e3o foi poss\u00edvel localizar o termo especificado.",
-"Replace": "Substituir",
-"Next": "Pr\u00f3ximo",
-"Whole words": "Palavras completas",
-"Find and replace": "Pesquisar e substituir",
-"Replace with": "Substituir por",
-"Find": "Pesquisar",
-"Replace all": "Substituir tudo",
-"Match case": "Diferenciar mai\u00fasculas e min\u00fasculas",
-"Prev": "Anterior",
-"Spellcheck": "Corretor ortogr\u00e1fico",
-"Finish": "Concluir",
-"Ignore all": "Ignorar tudo",
-"Ignore": "Ignorar",
-"Add to Dictionary": "Adicionar ao dicion\u00e1rio",
-"Insert row before": "Inserir linha antes",
-"Rows": "Linhas",
-"Height": "Altura",
-"Paste row after": "Colar linha depois",
-"Alignment": "Alinhamento",
-"Border color": "Cor de contorno",
-"Column group": "Agrupar coluna",
-"Row": "Linha",
-"Insert column before": "Inserir coluna antes",
-"Split cell": "Dividir c\u00e9lula",
-"Cell padding": "Espa\u00e7amento interno da c\u00e9lula",
-"Cell spacing": "Espa\u00e7amento entre c\u00e9lulas",
-"Row type": "Tipo de linha",
-"Insert table": "Inserir tabela",
-"Body": "Corpo",
-"Caption": "Legenda",
-"Footer": "Rodap\u00e9",
-"Delete row": "Eliminar linha",
-"Paste row before": "Colar linha antes",
-"Scope": "Escopo",
-"Delete table": "Eliminar tabela",
-"H Align": "Alinhamento H",
-"Top": "Superior",
-"Header cell": "C\u00e9lula de cabe\u00e7alho",
-"Column": "Coluna",
-"Row group": "Agrupar linha",
-"Cell": "C\u00e9lula",
-"Middle": "Meio",
-"Cell type": "Tipo de c\u00e9lula",
-"Copy row": "Copiar linha",
-"Row properties": "Propriedades da linha",
-"Table properties": "Propriedades da tabela",
-"Bottom": "Inferior",
-"V Align": "Alinhamento V",
-"Header": "Cabe\u00e7alho",
-"Right": "Direita",
-"Insert column after": "Inserir coluna depois",
-"Cols": "Colunas",
-"Insert row after": "Inserir linha depois",
-"Width": "Largura",
-"Cell properties": "Propriedades da c\u00e9lula",
-"Left": "Esquerda",
-"Cut row": "Cortar linha",
-"Delete column": "Eliminar coluna",
-"Center": "Centro",
-"Merge cells": "Unir c\u00e9lulas",
-"Insert template": "Inserir modelo",
-"Templates": "Modelos",
-"Background color": "Cor de fundo",
-"Custom...": "Personalizada...",
-"Custom color": "Cor personalizada",
-"No color": "Sem cor",
-"Text color": "Cor do texto",
-"Table of Contents": "\u00cdndice",
-"Show blocks": "Mostrar blocos",
-"Show invisible characters": "Mostrar caracteres invis\u00edveis",
-"Words: {0}": "Palavras: {0}",
-"Insert": "Inserir",
-"File": "Ficheiro",
-"Edit": "Editar",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Caixa de texto formatado. Pressione ALT-F9 para exibir o menu. Pressione ALT-F10 para exibir a barra de ferramentas. Pressione ALT-0 para exibir a ajuda",
-"Tools": "Ferramentas",
-"View": "Ver",
-"Table": "Tabela",
-"Format": "Formatar"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/readme.md b/build/media_source/vendor/tinymce/langs/readme.md
deleted file mode 100644
index a52bf03f9a3ae..0000000000000
--- a/build/media_source/vendor/tinymce/langs/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-This is where language files should be placed.
-
-Please DO NOT translate these directly use this service: https://www.transifex.com/projects/p/tinymce/
diff --git a/build/media_source/vendor/tinymce/langs/ro.es5.js b/build/media_source/vendor/tinymce/langs/ro.es5.js
deleted file mode 100644
index 367b3e2554b69..0000000000000
--- a/build/media_source/vendor/tinymce/langs/ro.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('ro',{
-"Cut": "Decupeaz\u0103",
-"Header 2": "Antet 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Browserul dumneavoastr\u0103 nu support\u0103 acces direct la clipboard. Folosi\u0163i combina\u0163ile de tastatur\u0103 Ctrl+X\/C\/V.",
-"Div": "Div",
-"Paste": "Lipe\u015fte",
-"Close": "\u00cenchide",
-"Font Family": "Font",
-"Pre": "Pre",
-"Align right": "Aliniere la dreapta",
-"New document": "Document nou",
-"Blockquote": "Men\u0163iune bloc",
-"Numbered list": "List\u0103 ordonat\u0103",
-"Increase indent": "Indenteaz\u0103",
-"Formats": "Formate",
-"Headers": "Antete",
-"Select all": "Selecteaz\u0103 tot",
-"Header 3": "Antet 3",
-"Blocks": "Blocuri",
-"Undo": "Reexecut\u0103",
-"Strikethrough": "T\u0103iat",
-"Bullet list": "List\u0103 neordonat\u0103",
-"Header 1": "Antet 1",
-"Superscript": "Superscript",
-"Clear formatting": "\u015eterge format\u0103rile",
-"Font Sizes": "Dimensiune font",
-"Subscript": "Subscript",
-"Header 6": "Antet 6",
-"Redo": "Dezexecut\u0103",
-"Paragraph": "Paragraf",
-"Ok": "Ok",
-"Bold": "\u00cengro\u015fat",
-"Code": "Cod",
-"Italic": "Italic",
-"Align center": "Centrare",
-"Header 5": "Antet 5",
-"Decrease indent": "De-indenteaz\u0103",
-"Header 4": "Antet 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Functia \"lipe\u015fte\" este acum \u00een modul text simplu. Continutul va fi acum inserat ca text simplu p\u00e2n\u0103 c\u00e2nd aceast\u0103 op\u021biune va fi dezactivat.",
-"Underline": "Subliniat",
-"Cancel": "Anuleaz\u0103",
-"Justify": "Aliniere pe toat\u0103 l\u0103\u021bimea",
-"Inline": "Inline",
-"Copy": "Copiaz\u0103",
-"Align left": "Aliniere la st\u00e2nga",
-"Visual aids": "Ajutor vizual",
-"Lower Greek": "Minuscule Grecesti",
-"Square": "P\u0103trat",
-"Default": "Implicit",
-"Lower Alpha": "Minuscule Alfanumerice",
-"Circle": "Cerc",
-"Disc": "Disc",
-"Upper Alpha": "Majuscule Alfanumerice",
-"Upper Roman": "Majuscule Romane",
-"Lower Roman": "Minuscule Romane",
-"Name": "Nume",
-"Anchor": "Ancor\u0103",
-"You have unsaved changes are you sure you want to navigate away?": "Ave\u021bi modific\u0103ri nesalvate! Sunte\u0163i sigur c\u0103 dori\u0163i s\u0103 ie\u015fiti?",
-"Restore last draft": "Restaurare la ultima salvare",
-"Special character": "Caractere speciale",
-"Source code": "Codul surs\u0103",
-"Right to left": "Dreapta la st\u00e2nga",
-"Left to right": "St\u00e2nga la dreapta",
-"Emoticons": "Emoticoane",
-"Robots": "Robo\u021bi",
-"Document properties": "Propriet\u0103\u021bi document",
-"Title": "Titlu",
-"Keywords": "Cuvinte cheie",
-"Encoding": "Codare",
-"Description": "Descriere",
-"Author": "Autor",
-"Fullscreen": "Pe tot ecranul",
-"Horizontal line": "Linie orizontal\u0103",
-"Horizontal space": "Spa\u021biul orizontal",
-"Insert\/edit image": "Inserare\/editarea imaginilor",
-"General": "General",
-"Advanced": "Avansat",
-"Source": "Surs\u0103",
-"Border": "Bordur\u0103",
-"Constrain proportions": "Constr\u00e2nge propor\u021biile",
-"Vertical space": "Spa\u021biul vertical",
-"Image description": "Descrierea imaginii",
-"Style": "Stil",
-"Dimensions": "Dimensiuni",
-"Insert image": "Inserare imagine",
-"Insert date\/time": "Insereaz\u0103 data\/ora",
-"Remove link": "\u0218terge link-ul",
-"Url": "Url",
-"Text to display": "Text de afi\u0219at",
-"Anchors": "Ancor\u0103",
-"Insert link": "Inserare link",
-"New window": "Fereastr\u0103 nou\u0103",
-"None": "Nici unul",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "\u021aint\u0103",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "Inserare\/editare link",
-"Insert\/edit video": "Inserare\/editare video",
-"Poster": "Poster",
-"Alternative source": "Surs\u0103 alternativ\u0103",
-"Paste your embed code below:": "Insera\u021bi codul:",
-"Insert video": "Inserare video",
-"Embed": "Embed",
-"Nonbreaking space": "Spa\u021biu neseparator",
-"Page break": "\u00centrerupere de pagin\u0103",
-"Paste as text": "Lipe\u015fte ca text",
-"Preview": "Previzualizare",
-"Print": "Tip\u0103re\u0219te",
-"Save": "Salveaz\u0103",
-"Could not find the specified string.": "Nu am putut g\u0103si \u0219irul specificat.",
-"Replace": "\u00cenlocuie\u015fte",
-"Next": "Precedent",
-"Whole words": "Doar cuv\u00eentul \u00eentreg",
-"Find and replace": "Caut\u0103 \u015fi \u00eenlocuie\u015fte",
-"Replace with": "\u00cenlocuie\u015fte cu",
-"Find": "Caut\u0103",
-"Replace all": "\u00cenlocuie\u015fte toate",
-"Match case": "Distinge majuscule\/minuscule",
-"Prev": "Anterior",
-"Spellcheck": "Verificarea ortografic\u0103",
-"Finish": "Finalizeaz\u0103",
-"Ignore all": "Ignor\u0103 toate",
-"Ignore": "Ignor\u0103",
-"Insert row before": "Insereaz\u0103 \u00eenainte de linie",
-"Rows": "Linii",
-"Height": "\u00cen\u0103l\u0163ime",
-"Paste row after": "Lipe\u015fte linie dup\u0103",
-"Alignment": "Aliniament",
-"Column group": "Grup de coloane",
-"Row": "Linie",
-"Insert column before": "Insereaza \u00eenainte de coloan\u0103",
-"Split cell": "\u00cemp\u0103r\u021birea celulelor",
-"Cell padding": "Spa\u021biere",
-"Cell spacing": "Spa\u021biere celule",
-"Row type": "Tip de linie",
-"Insert table": "Insereaz\u0103 tabel\u0103",
-"Body": "Corp",
-"Caption": "Titlu",
-"Footer": "Subsol",
-"Delete row": "\u0218terge linia",
-"Paste row before": "Lipe\u015fte \u00eenainte de linie",
-"Scope": "Domeniu",
-"Delete table": "\u0218terge tabel\u0103",
-"Header cell": "Antet celul\u0103",
-"Column": "Coloan\u0103",
-"Cell": "Celul\u0103",
-"Header": "Antet",
-"Cell type": "Tip celul\u0103",
-"Copy row": "Copiaz\u0103 linie",
-"Row properties": "Propriet\u0103\u021bi linie",
-"Table properties": "Propriet\u0103\u021bi tabel\u0103",
-"Row group": "Grup de linii",
-"Right": "Dreapta",
-"Insert column after": "Insereaza dup\u0103 coloan\u0103",
-"Cols": "Coloane",
-"Insert row after": "Insereaz\u0103 dup\u0103 linie",
-"Width": "L\u0103\u0163ime",
-"Cell properties": "Propriet\u0103\u021bi celul\u0103",
-"Left": "St\u00e2nga",
-"Cut row": "Taie linie",
-"Delete column": "\u0218terge coloana",
-"Center": "Centru",
-"Merge cells": "\u00cembinarea celulelor",
-"Insert template": "Insereaz\u0103 \u0219ablon",
-"Templates": "\u015eabloane",
-"Background color": "Culoare fundal",
-"Text color": "Culoare text",
-"Show blocks": "Afi\u0219are blocuri",
-"Show invisible characters": "Afi\u0219are caractere invizibile",
-"Words: {0}": "Cuvinte: {0}",
-"Insert": "Insereaz\u0103",
-"File": "Fil\u0103",
-"Edit": "Editeaz\u0103",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zon\u0103 cu Rich Text. Apas\u0103 ALT-F9 pentru meniu. Apas\u0103 ALT-F10 pentru bara de unelte. Apas\u0103 ALT-0 pentru ajutor",
-"Tools": "Unelte",
-"View": "Vezi",
-"Table": "Tabel\u0103",
-"Format": "Formateaz\u0103"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/ru.es5.js b/build/media_source/vendor/tinymce/langs/ru.es5.js
deleted file mode 100644
index 3975187969bd6..0000000000000
--- a/build/media_source/vendor/tinymce/langs/ru.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('ru',{
-"Cut": "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c",
-"Heading 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Header 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u043f\u0440\u044f\u043c\u043e\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u0431\u0443\u0444\u0435\u0440\u0443 \u043e\u0431\u043c\u0435\u043d\u0430. \u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u044f \u043a\u043b\u0430\u0432\u0438\u0448: Ctrl+X\/C\/V.",
-"Heading 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Div": "\u0411\u043b\u043e\u043a",
-"Heading 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Paste": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c",
-"Close": "\u0417\u0430\u043a\u0440\u044b\u0442\u044c",
-"Font Family": "\u0428\u0440\u0438\u0444\u0442",
-"Pre": "\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0444\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435",
-"Align right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"New document": "\u041d\u043e\u0432\u044b\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Blockquote": "\u0426\u0438\u0442\u0430\u0442\u0430",
-"Numbered list": "\u041d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Heading 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Headings": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
-"Increase indent": "\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c \u043e\u0442\u0441\u0442\u0443\u043f",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442",
-"Headers": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0438",
-"Select all": "\u0412\u044b\u0434\u0435\u043b\u0438\u0442\u044c \u0432\u0441\u0435",
-"Header 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Blocks": "\u0411\u043b\u043e\u043a\u0438",
-"Undo": "\u0412\u0435\u0440\u043d\u0443\u0442\u044c",
-"Strikethrough": "\u0417\u0430\u0447\u0435\u0440\u043a\u043d\u0443\u0442\u044b\u0439",
-"Bullet list": "\u041c\u0430\u0440\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Header 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0438\u0439 \u0438\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u0444\u043e\u0440\u043c\u0430\u0442",
-"Font Sizes": "\u0420\u0430\u0437\u043c\u0435\u0440 \u0448\u0440\u0438\u0444\u0442\u0430",
-"Subscript": "\u041d\u0438\u0436\u043d\u0438\u0439 \u0438\u043d\u0434\u0435\u043a\u0441",
-"Header 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Redo": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Ok": "\u041e\u043a",
-"Bold": "\u041f\u043e\u043b\u0443\u0436\u0438\u0440\u043d\u044b\u0439",
-"Code": "\u041a\u043e\u0434",
-"Italic": "\u041a\u0443\u0440\u0441\u0438\u0432",
-"Align center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Header 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Heading 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Heading 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Decrease indent": "\u0423\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c \u043e\u0442\u0441\u0442\u0443\u043f",
-"Header 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u0441\u0442\u0430\u0432\u043a\u0430 \u043e\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0432 \u0432\u0438\u0434\u0435 \u043f\u0440\u043e\u0441\u0442\u043e\u0433\u043e \u0442\u0435\u043a\u0441\u0442\u0430, \u043f\u043e\u043a\u0430 \u043d\u0435 \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0434\u0430\u043d\u043d\u0443\u044e \u043e\u043f\u0446\u0438\u044e.",
-"Underline": "\u041f\u043e\u0434\u0447\u0435\u0440\u043a\u043d\u0443\u0442\u044b\u0439",
-"Cancel": "\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c",
-"Justify": "\u041f\u043e \u0448\u0438\u0440\u0438\u043d\u0435",
-"Inline": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0435",
-"Copy": "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
-"Align left": "\u041f\u043e \u043b\u0435\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Visual aids": "\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043a\u043e\u043d\u0442\u0443\u0440\u044b",
-"Lower Greek": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0435 \u0433\u0440\u0435\u0447\u0435\u0441\u043a\u0438\u0435 \u0431\u0443\u043a\u0432\u044b",
-"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u044b",
-"Default": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b\u0439",
-"Lower Alpha": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0435 \u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438\u0435 \u0431\u0443\u043a\u0432\u044b",
-"Circle": "\u041e\u043a\u0440\u0443\u0436\u043d\u043e\u0441\u0442\u0438",
-"Disc": "\u041a\u0440\u0443\u0433\u0438",
-"Upper Alpha": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u044b\u0435 \u043b\u0430\u0442\u0438\u043d\u0441\u043a\u0438\u0435 \u0431\u0443\u043a\u0432\u044b",
-"Upper Roman": "\u0417\u0430\u0433\u043b\u0430\u0432\u043d\u044b\u0435 \u0440\u0438\u043c\u0441\u043a\u0438\u0435 \u0446\u0438\u0444\u0440\u044b",
-"Lower Roman": "\u0421\u0442\u0440\u043e\u0447\u043d\u044b\u0435 \u0440\u0438\u043c\u0441\u043a\u0438\u0435 \u0446\u0438\u0444\u0440\u044b",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0434\u043e\u043b\u0436\u0435\u043d \u043d\u0430\u0447\u0438\u043d\u0430\u0442\u044c\u0441\u044f \u0441 \u0431\u0443\u043a\u0432\u044b, \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0441 \u0431\u0443\u043a\u0432\u044b, \u0446\u0438\u0444\u0440\u044b, \u0442\u0438\u0440\u0435, \u0442\u043e\u0447\u043a\u0438, \u0434\u0432\u043e\u0435\u0442\u043e\u0447\u0438\u044f \u0438\u043b\u0438 \u043f\u043e\u0434\u0447\u0435\u0440\u043a\u0438\u0432\u0430\u043d\u0438\u044f.",
-"Name": "\u0418\u043c\u044f",
-"Anchor": "\u042f\u043a\u043e\u0440\u044c",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u043d\u0435 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f. \u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0439\u0442\u0438?",
-"Restore last draft": "\u0412\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0430",
-"Special character": "\u0421\u043f\u0435\u0446\u0438\u0430\u043b\u044c\u043d\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b",
-"Source code": "\u0418\u0441\u0445\u043e\u0434\u043d\u044b\u0439 \u043a\u043e\u0434",
-"Language": "\u042f\u0437\u044b\u043a",
-"Insert\/Edit code sample": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c\/\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0440\u0438\u043c\u0435\u0440 \u043a\u043e\u0434\u0430",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "\u0426\u0432\u0435\u0442",
-"Right to left": "\u041d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u043e",
-"Left to right": "\u041d\u0430\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u043b\u0435\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043e",
-"Emoticons": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u043c\u0430\u0439\u043b",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u044b",
-"Document properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Keywords": "\u041a\u043b\u044e\u0447\u0438\u0432\u044b\u0435 \u0441\u043b\u043e\u0432\u0430",
-"Encoding": "\u041a\u043e\u0434\u0438\u0440\u043e\u0432\u043a\u0430",
-"Description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Fullscreen": "\u041f\u043e\u043b\u043d\u043e\u044d\u043a\u0440\u0430\u043d\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c",
-"Horizontal line": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0430\u044f \u043b\u0438\u043d\u0438\u044f",
-"Horizontal space": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u044b\u0439 \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Insert\/edit image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"General": "\u041e\u0431\u0449\u0435\u0435",
-"Advanced": "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0435",
-"Source": "\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a",
-"Border": "\u0420\u0430\u043c\u043a\u0430",
-"Constrain proportions": "\u0421\u043e\u0445\u0440\u0430\u043d\u044f\u0442\u044c \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0438\u0438",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0438\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Image description": "\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
-"Style": "\u0421\u0442\u0438\u043b\u044c",
-"Dimensions": "\u0420\u0430\u0437\u043c\u0435\u0440",
-"Insert image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"Image": "\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
-"Zoom in": "\u041f\u0440\u0438\u0431\u043b\u0438\u0437\u0438\u0442\u044c",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Back": "\u041d\u0430\u0437\u0430\u0434",
-"Gamma": "\u0413\u0430\u043c\u043c\u0430",
-"Flip horizontally": "\u041e\u0442\u0440\u0430\u0437\u0438\u0442\u044c \u043f\u043e \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0438",
-"Resize": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0430\u0437\u043c\u0435\u0440",
-"Sharpen": "\u0427\u0435\u0442\u043a\u043e\u0441\u0442\u044c",
-"Zoom out": "\u041e\u0442\u0434\u0430\u043b\u0438\u0442\u044c",
-"Image options": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f",
-"Apply": "\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c",
-"Brightness": "\u042f\u0440\u043a\u043e\u0441\u0442\u044c",
-"Rotate clockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u044c \u043f\u043e \u0447\u0430\u0441\u043e\u0432\u043e\u0439 \u0441\u0442\u0440\u0435\u043b\u043a\u0435",
-"Rotate counterclockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u044c \u043f\u0440\u043e\u0442\u0438\u0432 \u0447\u0430\u0441\u043e\u0432\u043e\u0439 \u0441\u0442\u0440\u0435\u043b\u043a\u0438",
-"Edit image": "\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0438\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"Color levels": "\u0426\u0432\u0435\u0442\u043e\u0432\u044b\u0435 \u0443\u0440\u043e\u0432\u043d\u0438",
-"Crop": "\u041e\u0431\u0440\u0435\u0437\u0430\u0442\u044c",
-"Orientation": "\u041e\u0440\u0438\u0435\u043d\u0442\u0430\u0446\u0438\u044f",
-"Flip vertically": "\u041e\u0442\u0440\u0430\u0437\u0438\u0442\u044c \u043f\u043e \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0438",
-"Invert": "\u0418\u043d\u0432\u0435\u0440\u0441\u0438\u044f",
-"Date\/time": "\u0414\u0430\u0442\u0430\/\u0432\u0440\u0435\u043c\u044f",
-"Insert date\/time": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0434\u0430\u0442\u0443\/\u0432\u0440\u0435\u043c\u044f",
-"Remove link": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
-"Url": "\u0410\u0434\u0440\u0435\u0441 \u0441\u0441\u044b\u043b\u043a\u0438",
-"Text to display": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u044b\u0439 \u0442\u0435\u043a\u0441\u0442",
-"Anchors": "\u042f\u043a\u043e\u0440\u044f",
-"Insert link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
-"Link": "\u0421\u0441\u044b\u043b\u043a\u0430",
-"New window": "\u0412 \u043d\u043e\u0432\u043e\u043c \u043e\u043a\u043d\u0435",
-"None": "\u041d\u0435\u0442",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0412\u0432\u0435\u0434\u0451\u043d\u043d\u044b\u0439 URL \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0432\u043d\u0435\u0448\u043d\u0435\u0439 \u0441\u0441\u044b\u043b\u043a\u043e\u0439. \u0412\u044b \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u00abhttp:\/\/\u00bb?",
-"Paste or type a link": "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043b\u0438 \u0432\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u0441\u0441\u044b\u043b\u043a\u0443",
-"Target": "\u041e\u0442\u043a\u0440\u044b\u0432\u0430\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0412\u0432\u0435\u0434\u0451\u043d\u043d\u044b\u0439 URL \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u043c \u0430\u0434\u0440\u0435\u0441\u043e\u043c \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b. \u0412\u044b \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u00abmailto:\u00bb?",
-"Insert\/edit link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
-"Insert\/edit video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0438\u0434\u0435\u043e",
-"Media": "\u0412\u0438\u0434\u0435\u043e",
-"Alternative source": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u044b\u0439 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a",
-"Paste your embed code below:": "\u0412\u0441\u0442\u0430\u0432\u044c\u0442\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0438\u0436\u0435:",
-"Insert video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0432\u0438\u0434\u0435\u043e",
-"Poster": "\u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435",
-"Insert\/edit media": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0438\u0434\u0435\u043e",
-"Embed": "\u041a\u043e\u0434 \u0434\u043b\u044f \u0432\u0441\u0442\u0430\u0432\u043a\u0438",
-"Nonbreaking space": "\u041d\u0435\u0440\u0430\u0437\u0440\u044b\u0432\u043d\u044b\u0439 \u043f\u0440\u043e\u0431\u0435\u043b",
-"Page break": "\u0420\u0430\u0437\u0440\u044b\u0432 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b",
-"Paste as text": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043a\u0430\u043a \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u0440\u0435\u0434\u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440",
-"Print": "\u041f\u0435\u0447\u0430\u0442\u044c",
-"Save": "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c",
-"Could not find the specified string.": "\u0417\u0430\u0434\u0430\u043d\u043d\u0430\u044f \u0441\u0442\u0440\u043e\u043a\u0430 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430",
-"Replace": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c",
-"Next": "\u0412\u043d\u0438\u0437",
-"Whole words": "\u0421\u043b\u043e\u0432\u043e \u0446\u0435\u043b\u0438\u043a\u043e\u043c",
-"Find and replace": "\u041f\u043e\u0438\u0441\u043a \u0438 \u0437\u0430\u043c\u0435\u043d\u0430",
-"Replace with": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u043d\u0430",
-"Find": "\u041d\u0430\u0439\u0442\u0438",
-"Replace all": "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0441\u0435",
-"Match case": "\u0423\u0447\u0438\u0442\u044b\u0432\u0430\u0442\u044c \u0440\u0435\u0433\u0438\u0441\u0442\u0440",
-"Prev": "\u0412\u0432\u0435\u0440\u0445",
-"Spellcheck": "\u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u043e\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
-"Finish": "\u0417\u0430\u043a\u043e\u043d\u0447\u0438\u0442\u044c",
-"Ignore all": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0441\u0435",
-"Ignore": "\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c",
-"Add to Dictionary": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0441\u043b\u043e\u0432\u0430\u0440\u044c",
-"Insert row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043f\u0443\u0441\u0442\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u0432\u0435\u0440\u0445\u0443",
-"Rows": "\u0421\u0442\u0440\u043e\u043a\u0438",
-"Height": "\u0412\u044b\u0441\u043e\u0442\u0430",
-"Paste row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u043d\u0438\u0437\u0443",
-"Alignment": "\u0412\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
-"Border color": "\u0426\u0432\u0435\u0442 \u0440\u0430\u043c\u043a\u0438",
-"Column group": "\u0413\u0440\u0443\u043f\u043f\u0430 \u043a\u043e\u043b\u043e\u043d\u043e\u043a",
-"Row": "\u0421\u0442\u0440\u043e\u043a\u0430",
-"Insert column before": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0435\u0446 \u0441\u043b\u0435\u0432\u0430",
-"Split cell": "\u0420\u0430\u0437\u0431\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0443",
-"Cell padding": "\u0412\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0438\u0439 \u043e\u0442\u0441\u0442\u0443\u043f",
-"Cell spacing": "\u0412\u043d\u0435\u0448\u043d\u0438\u0439 \u043e\u0442\u0441\u0442\u0443\u043f",
-"Row type": "\u0422\u0438\u043f \u0441\u0442\u0440\u043e\u043a\u0438",
-"Insert table": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0442\u0430\u0431\u043b\u0438\u0446\u0443",
-"Body": "\u0422\u0435\u043b\u043e",
-"Caption": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Footer": "\u041d\u0438\u0437",
-"Delete row": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",
-"Paste row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u0432\u0435\u0440\u0445\u0443",
-"Scope": "Scope",
-"Delete table": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0430\u0431\u043b\u0438\u0446\u0443",
-"H Align": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
-"Top": "\u041f\u043e \u0432\u0435\u0440\u0445\u0443",
-"Header cell": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Column": "\u0421\u0442\u043e\u043b\u0431\u0435\u0446",
-"Row group": "\u0413\u0440\u0443\u043f\u043f\u0430 \u0441\u0442\u0440\u043e\u043a",
-"Cell": "\u042f\u0447\u0435\u0439\u043a\u0430",
-"Middle": "\u041f\u043e \u0441\u0435\u0440\u0435\u0434\u0438\u043d\u0435",
-"Cell type": "\u0422\u0438\u043f \u044f\u0447\u0435\u0439\u043a\u0438",
-"Copy row": "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",
-"Row properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0441\u0442\u0440\u043e\u043a\u0438",
-"Table properties": "\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0442\u0430\u0431\u043b\u0438\u0446\u044b",
-"Bottom": "\u041f\u043e \u043d\u0438\u0437\u0443",
-"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0432\u043d\u0438\u0432\u0430\u043d\u0438\u0435",
-"Header": "\u0428\u0430\u043f\u043a\u0430",
-"Right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Insert column after": "\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0435\u0446 \u0441\u043f\u0440\u0430\u0432\u0430",
-"Cols": "\u0421\u0442\u043e\u043b\u0431\u0446\u044b",
-"Insert row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u043f\u0443\u0441\u0442\u0443\u044e \u0441\u0442\u0440\u043e\u043a\u0443 \u0441\u043d\u0438\u0437\u0443",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Cell properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u044f\u0447\u0435\u0439\u043a\u0438",
-"Left": "\u041f\u043e \u043b\u0435\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Cut row": "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c \u0441\u0442\u0440\u043e\u043a\u0443",
-"Delete column": "\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0442\u043e\u043b\u0431\u0435\u0446",
-"Center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Merge cells": "\u041e\u0431\u044a\u0435\u0434\u0438\u043d\u0438\u0442\u044c \u044f\u0447\u0435\u0439\u043a\u0438",
-"Insert template": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u044b",
-"Background color": "\u0426\u0432\u0435\u0442 \u0444\u043e\u043d\u0430",
-"Custom...": "\u0412\u044b\u0431\u0440\u0430\u0442\u044c\u2026",
-"Custom color": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u0446\u0432\u0435\u0442",
-"No color": "\u0411\u0435\u0437 \u0446\u0432\u0435\u0442\u0430",
-"Text color": "\u0426\u0432\u0435\u0442 \u0442\u0435\u043a\u0441\u0442\u0430",
-"Table of Contents": "\u0421\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435",
-"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u0431\u043b\u043e\u043a\u0438",
-"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b",
-"Words: {0}": "\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0441\u043b\u043e\u0432: {0}",
-"Insert": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u043e\u0435 \u043f\u043e\u043b\u0435. \u041d\u0430\u0436\u043c\u0438\u0442\u0435 ALT-F9 \u0447\u0442\u043e\u0431\u044b \u0432\u044b\u0437\u0432\u0430\u0442\u044c \u043c\u0435\u043d\u044e, ALT-F10 \u043f\u0430\u043d\u0435\u043b\u044c \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432, ALT-0 \u0434\u043b\u044f \u0432\u044b\u0437\u043e\u0432\u0430 \u043f\u043e\u043c\u043e\u0449\u0438.",
-"Tools": "\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u044b",
-"View": "\u0412\u0438\u0434",
-"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442"
-});
diff --git a/build/media_source/vendor/tinymce/langs/si-LK.es5.js b/build/media_source/vendor/tinymce/langs/si-LK.es5.js
deleted file mode 100644
index 3f37cb8b58cb1..0000000000000
--- a/build/media_source/vendor/tinymce/langs/si-LK.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('si-LK',{
-"Cut": "\u0d9a\u0db4\u0db1\u0dca\u0db1",
-"Header 2": "Header 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0d9c\u0dca\u200d\u0dbb\u0dcf\u0dc4\u0d9a \u0db4\u0dd4\u0dc0\u0dbb\u0dd4\u0dc0\u0da7 \u0d8d\u0da2\u0dd4 \u0db4\u0dca\u200d\u0dbb\u0dc0\u0dda\u0dc1\u0dba\u0d9a\u0dca \u0dbd\u0db6\u0dcf\u0daf\u0dd3\u0db8\u0da7 \u0d94\u0db6\u0d9c\u0dda \u0db6\u0dca\u200d\u0dbb\u0dc0\u0dd4\u0dc3\u0dbb\u0dba \u0dc3\u0dc4\u0dba\u0d9a\u0dca \u0db1\u0ddc\u0daf\u0d9a\u0dca\u0dc0\u0dba\u0dd3. \u0d9a\u0dbb\u0dd4\u0dab\u0dcf\u0d9a\u0dbb \u0d92\u0dc0\u0dd9\u0db1\u0dd4\u0dc0\u0da7 Ctrl+X\/C\/V \u0dba\u0db1 \u0dba\u0dad\u0dd4\u0dbb\u0dd4\u0db4\u0dd4\u0dc0\u0dbb\u0dd4 \u0d9a\u0dd9\u0da7\u0dd2\u0db8\u0d9f \u0db7\u0dcf\u0dc0\u0dd2\u0dad\u0dcf \u0d9a\u0dbb\u0db1\u0dca\u0db1.",
-"Div": "Div",
-"Paste": "\u0d85\u0dbd\u0dc0\u0db1\u0dca\u0db1",
-"Close": "\u0dc0\u0dc3\u0db1\u0dca\u0db1",
-"Font Family": "Font Family",
-"Pre": "Pre",
-"Align right": "\u0daf\u0d9a\u0dd4\u0dab\u0dd4\u0db4\u0dc3\u0da7 \u0db4\u0dd9\u0dc5\u0d9c\u0dc3\u0dca\u0dc0\u0db1\u0dca\u0db1",
-"New document": "\u0db1\u0dc0 \u0dbd\u0dda\u0d9b\u0db1\u0dba\u0d9a\u0dca",
-"Blockquote": "Blockquote",
-"Numbered list": "\u0d85\u0d82\u0d9a\u0db1\u0dba \u0d9a\u0dbd \u0dbd\u0dd0\u0dba\u0dd2\u0dc3\u0dca\u0dad\u0dd4\u0dc0",
-"Increase indent": "\u0dc0\u0dd0\u0da9\u0dd2\u0dc0\u0db1 \u0d91\u0db6\u0dd4\u0db8",
-"Formats": "\u0d86\u0d9a\u0dd8\u0dad\u0dd2",
-"Headers": "Headers",
-"Select all": "\u0dc3\u0dd2\u0dba\u0dbd\u0dca\u0dbd \u0dad\u0ddd\u0dbb\u0db1\u0dca\u0db1",
-"Header 3": "Header 3",
-"Blocks": "Blocks",
-"Undo": "\u0db1\u0dd2\u0dc2\u0dca\u0db4\u0dca\u200d\u0dbb\u0db7\u0dcf \u0d9a\u0dbb\u0db1\u0dc0\u0dcf",
-"Strikethrough": "\u0db8\u0dd0\u0daf\u0dd2 \u0d89\u0dbb\u0dd0\u0dad\u0dd2",
-"Bullet list": "\u0dbd\u0dd0\u0dba\u0dd2\u0dc3\u0dca\u0dad\u0dd4\u0dc0",
-"Header 1": "Header 1",
-"Superscript": "\u0d8b\u0da9\u0dd4\u0dbd\u0d9a\u0dd4\u0dab\u0dd4",
-"Clear formatting": "\u0db4\u0dd0\u0dc4\u0dd0\u0daf\u0dd2\u0dbd\u0dd2 \u0d86\u0d9a\u0dd8\u0dad\u0dd2\u0d9a\u0dbb\u0dab\u0dba",
-"Font Sizes": "Font Sizes",
-"Subscript": "\u0dba\u0da7\u0dd2\u0dbd\u0d9a\u0dd4\u0dab\u0dd4",
-"Header 6": "Header 6",
-"Redo": "\t\u0db1\u0dd0\u0dc0\u0dad \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Paragraph": "Paragraph",
-"Ok": "\u0d85\u0db1\u0dd4\u0db8\u0dad \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Bold": "\u0db4\u0dd0\u0dc4\u0dd0\u0daf\u0dd2\u0dbd\u0dd2 \u0dc3\u0dda \u0db4\u0dd9\u0db1\u0dd9\u0db1",
-"Code": "Code",
-"Italic": "\u0d87\u0dbd\u0d9a\u0dd4\u0dbb\u0dd4",
-"Align center": "\u0db8\u0dd0\u0daf\u0dd2 \u0d9a\u0ddc\u0da7 \u0db4\u0dd9\u0dc5\u0d9c\u0dc3\u0dca\u0dc0\u0db1\u0dca\u0db1",
-"Header 5": "Header 5",
-"Decrease indent": "\u0d85\u0da9\u0dd4\u0dc0\u0db1 \u0d91\u0db6\u0dd4\u0db8",
-"Header 4": "Header 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.",
-"Underline": "\u0dba\u0da7\u0dd2\u0db1\u0dca \u0d89\u0dbb\u0d9a\u0dca \u0d85\u0db3\u0dd2\u0db1\u0dca\u0db1",
-"Cancel": "\u0d85\u0dc4\u0ddd\u0dc3\u0dd2 \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Justify": "\u0dc3\u0db8\u0dc0 \u0db4\u0dd9\u0dc5\u0d9c\u0dc3\u0dca\u0dc0\u0db1\u0dca\u0db1",
-"Inline": "Inline",
-"Copy": "\u0db4\u0dd2\u0da7\u0db4\u0dad\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Align left": "\u0dc0\u0db8\u0dca\u0db4\u0dc3\u0da7 \u0db4\u0dd9\u0dc5\u0d9c\u0dc3\u0dca\u0dc0\u0db1\u0dca\u0db1",
-"Visual aids": "\u0daf\u0dd8\u0dc1\u0dca\u200d\u0dba\u0dcf\u0db0\u0dcf\u0dbb",
-"Lower Greek": "\u0d9a\u0dd4\u0da9\u0dcf \u0d9c\u0dca\u200d\u0dbb\u0dd3\u0d9a ",
-"Square": "\u0d9a\u0ddc\u0da7\u0dd4\u0dc0",
-"Default": "\u0db4\u0dd9\u0dbb\u0db1\u0dd2\u0db8\u0dd2\u0dba ",
-"Lower Alpha": "\u0d9a\u0dd4\u0da9\u0dcf \u0d87\u0dbd\u0dca\u0dc6\u0dcf ",
-"Circle": "\u0dc0\u0d9a\u0dca\u200d\u0dbb\u0dba",
-"Disc": "\u0dad\u0dd0\u0da7\u0dd2\u0dba ",
-"Upper Alpha": "\u0dc0\u0dd2\u0dc1\u0dcf\u0dbd \u0d87\u0dbd\u0dca\u0dc6\u0dcf ",
-"Upper Roman": "\u0dc0\u0dd2\u0dc1\u0dcf\u0dbd \u0dbb\u0ddd\u0db8\u0dcf\u0db1\u0dd4 ",
-"Lower Roman": "\u0d9a\u0dd4\u0da9\u0dcf \u0dbb\u0ddd\u0db8\u0dcf\u0db1\u0dd4 ",
-"Name": "\u0db1\u0dcf\u0db8\u0dba ",
-"Anchor": "\u0d87\u0db1\u0dca\u0d9a\u0dbb\u0dba",
-"You have unsaved changes are you sure you want to navigate away?": "\u0d94\u0db6\u0d9c\u0dda \u0dc3\u0dd4\u0dbb\u0d9a\u0dd2\u0db1 \u0db1\u0ddc\u0dbd\u0daf \u0dc0\u0dd9\u0db1\u0dc3\u0dca\u0d9a\u0dd2\u0dbb\u0dd3\u0db8\u0dca \u0d87\u0dad,\u0d94\u0db6\u0da7 \u0dc0\u0dd2\u0dc1\u0dca\u0dc0\u0dcf\u0dc3\u0daf \u0d89\u0dc0\u0dad\u0da7 \u0dba\u0dcf\u0dba\u0dd4\u0dad\u0dd4\u0dba\u0dd2 \u0d9a\u0dd2\u0dba\u0dcf?",
-"Restore last draft": "\u0d85\u0dc0\u0dc3\u0dcf\u0db1\u0dba\u0da7 \u0db7\u0dcf\u0dc0\u0dd2\u0dad\u0dcf\u0d9a\u0dc5 \u0d9a\u0dd9\u0da7\u0dd4\u0db8\u0dca\u0db4\u0dad \u0db4\u0dd2\u0dc5\u0dd2\u0db1\u0d9c\u0db1\u0dca\u0db1 ",
-"Special character": "\u0dc0\u0dd2\u0dc1\u0dda\u0dc2 \u0d85\u0db1\u0dd4\u0dbd\u0d9a\u0dd4\u0dab ",
-"Source code": "\u0db8\u0dd6\u0dbd \u0d9a\u0dda\u0dad\u0dba ",
-"Right to left": "\u0daf\u0d9a\u0dd4\u0dab\u0dd4\u0db4\u0dc3 \u0dc3\u0dd2\u0da7 \u0dc0\u0db8\u0dca\u0db4\u0dc3\u0da7 ",
-"Left to right": "\u0dc0\u0db8\u0dca\u0db4\u0dc3 \u0dc3\u0dd2\u0da7 \u0daf\u0d9a\u0dd4\u0db1\u0dd4\u0db4\u0dc3\u0da7 ",
-"Emoticons": "\u0db7\u0dcf\u0dc0 \u0db1\u0dd2\u0dbb\u0dd4\u0db4\u0d9a",
-"Robots": "\u0dbb\u0ddc\u0db6\u0ddd",
-"Document properties": "\u0dbd\u0dda\u0d9b\u0db1\u0dba\u0dda \u0d9c\u0dd4\u0dab\u0dcf\u0d82\u0d9c ",
-"Title": "\u0db8\u0dcf\u0dad\u0dd8\u0d9a\u0dcf\u0dc0",
-"Keywords": "\u0db8\u0dd6\u0dbd \u0db4\u0daf\u0dba ",
-"Encoding": "\u0d9a\u0dda\u0dad\u0db1\u0dba",
-"Description": "\u0dc0\u0dd2\u0dc3\u0dca\u0dad\u0dbb\u0dba ",
-"Author": "\u0d9a\u0dad\u0dd8 ",
-"Fullscreen": "\u0db4\u0dd6\u0dbb\u0dca\u0dab \u0dad\u0dd2\u0dbb\u0dba ",
-"Horizontal line": "\u0dad\u0dd2\u0dbb\u0dc3\u0dca \u0d89\u0dbb  ",
-"Horizontal space": "\u0dad\u0dd2\u0dbb\u0dc3\u0dca \u0dc4\u0dd2\u0dc3\u0dca \u0d89\u0da9",
-"Insert\/edit image": "\u0db4\u0dd2\u0db1\u0dca\u0dad\u0dd4\u0dbb\u0dba \u0d87\u0dad\u0dd4\u0dbd\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1 \/ \u0dc3\u0d9a\u0dc3\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1 ",
-"General": "\u0db4\u0ddc\u0daf\u0dd4",
-"Advanced": "\u0db4\u0dca\u200d\u0dbb\u0d9c\u0dad",
-"Source": "\u0db8\u0dd6\u0dbd\u0dba  ",
-"Border": "\u0dc3\u0dd3\u0db8\u0dcf\u0dc0 ",
-"Constrain proportions": "\u0dc3\u0d82\u0dbb\u0ddd\u0daf\u0d9a \u0db4\u0dca\u200d\u0dbb\u0db8\u0dcf\u0dab\u0db1",
-"Vertical space": "\u0dc3\u0dd2\u0dbb\u0dc3\u0dca \u0dc4\u0dd2\u0dc3\u0dca \u0d89\u0da9",
-"Image description": "\u0db4\u0dd2\u0db1\u0dca\u0dad\u0dd4\u0dbb\u0dba\u0dda \u0dc0\u0dd2\u0dc3\u0dca\u0dad\u0dbb\u0dba ",
-"Style": "\u0dc0\u0dd2\u0dbd\u0dcf\u0dc3\u0dba",
-"Dimensions": "\u0db8\u0dcf\u0db1",
-"Insert image": "Insert image",
-"Insert date\/time": "\u0daf\u0dd2\u0db1\u0dba \/ \u0dc0\u0dda\u0dbd\u0dcf\u0dc0 \u0d87\u0dad\u0dd4\u0dbd\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Remove link": "Remove link",
-"Url": "Url",
-"Text to display": "\u0db4\u0dd9\u0dc5 - \u0dc3\u0d82\u0daf\u0dbb\u0dca\u0dc1\u0d9a\u0dba",
-"Anchors": "Anchors",
-"Insert link": "\u0dc3\u0db6\u0dd0\u0db3\u0dd2\u0dba \u0d87\u0dad\u0dd4\u0dbd\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"New window": "\u0db1\u0dc0 \u0d9a\u0dc0\u0dd4\u0dc5\u0dd4\u0dc0\u0d9a\u0dca",
-"None": "\u0d9a\u0dd2\u0dc3\u0dd2\u0dc0\u0d9a\u0dca \u0db1\u0dd0\u0dad",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "\u0d89\u0dbd\u0d9a\u0dca\u0d9a\u0dba",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "\u0dc3\u0db6\u0dd0\u0db3\u0dd2\u0dba \u0d87\u0dad\u0dd4\u0dbd\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1 \/ \u0dc0\u0dd9\u0db1\u0dc3\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Insert\/edit video": "\u0dc0\u0dd3\u0da9\u0dd2\u0dba\u0ddd\u0dc0 \u0d87\u0dad\u0dd4\u0dbd\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1 \/ \u0dc0\u0dd9\u0db1\u0dc3\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Poster": "\u0db4\u0ddd\u0dc3\u0dca\u0da7\u0dbb\u0dba",
-"Alternative source": "\u0dc0\u0dd2\u0d9a\u0dbd\u0dca\u0db4 \u0db8\u0dd6\u0dbd\u0dba",
-"Paste your embed code below:": "\u0d94\u0db6\u0d9c\u0dda \u0d9a\u0dcf\u0dc0\u0dd0\u0daf\u0dca\u0daf\u0dd6 \u0d9a\u0dda\u0dad\u0dba \u0db4\u0dc4\u0dad\u0dd2\u0db1\u0dca \u0daf\u0db8\u0db1\u0dca\u0db1",
-"Insert video": "\u0dc0\u0dd3\u0da9\u0dd2\u0dba\u0ddd\u0dc0 \u0d87\u0dad\u0dd4\u0dbd\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Embed": "\u0d9a\u0dcf\u0dc0\u0daf\u0dca\u0daf\u0db1\u0dca\u0db1",
-"Nonbreaking space": "\u0db1\u0ddc\u0d9a\u0dd0\u0da9\u0dd4\u0dab\u0dd4 \u0dc4\u0dd2\u0dc3\u0dca \u0d89\u0dbb",
-"Page break": "\u0db4\u0dd2\u0da7\u0dd4 \u0d9a\u0da9\u0db1\u0dba",
-"Paste as text": "Paste as text",
-"Preview": "\u0db4\u0dd9\u0dbb\u0daf\u0dc3\u0dd4\u0db1",
-"Print": "\u0db8\u0dd4\u0daf\u0dca\u200d\u0dbb\u0dab\u0dba \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Save": "\u0dc3\u0dd4\u0dbb\u0d9a\u0dd2\u0db1\u0dca\u0db1",
-"Could not find the specified string.": "\u0db1\u0dd2\u0dbb\u0dd6\u0db4\u0dd2\u0dad \u0d85\u0db1\u0dd4\u0dbd\u0d9a\u0dd4\u0dab\u0dd4 \u0dc0\u0dd0\u0dbd \u0dc3\u0ddc\u0dba\u0dcf \u0d9c\u0dad \u0db1\u0ddc\u0dc4\u0dd0\u0d9a\u0dd2 \u0dc0\u0dd2\u0dba",
-"Replace": "\u0db4\u0dca\u200d\u0dbb\u0dad\u0dd2\u0dc3\u0dca\u0dae\u0dcf\u0db4\u0db1\u0dba \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Next": "\u0db4\u0dc3\u0dd4",
-"Whole words": "\u0dc3\u0db8\u0dc3\u0dca\u0dad \u0db4\u0daf",
-"Find and replace": "\u0dc3\u0ddc\u0dba\u0dcf \u0db4\u0dc3\u0dd4\u0dc0 \u0db4\u0dca\u200d\u0dbb\u0dad\u0dd2\u0dc3\u0dca\u0dae\u0dcf\u0db4\u0db1\u0dba \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Replace with": "\u0db8\u0dd9\u0dba \u0dc3\u0db8\u0d9f \u0db4\u0dca\u200d\u0dbb\u0dad\u0dd2\u0dc3\u0dca\u0dae\u0dcf\u0db4\u0db1\u0dba \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Find": "\u0dc3\u0ddc\u0dba\u0db1\u0dca\u0db1",
-"Replace all": "\u0dc3\u0dd2\u0dba\u0dbd\u0dca\u0dbd\u0db8 \u0db4\u0dca\u200d\u0dbb\u0dad\u0dd2\u0dc3\u0dca\u0dae\u0dcf\u0db4\u0db1\u0dba \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Match case": "\u0d9a\u0dcf\u0dbb\u0dab\u0dba \u0d9c\u0dbd\u0db4\u0db1\u0dca\u0db1",
-"Prev": "\u0db4\u0dd9\u0dbb",
-"Spellcheck": "\u0d85\u0d9a\u0dca\u0dc2\u0dbb \u0dc0\u0dd2\u0db1\u0dca\u200d\u0dba\u0dcf\u0dc3\u0dba \u0db4\u0dbb\u0dd3\u0d9a\u0dca\u0dc2\u0dcf \u0d9a\u0dbb \u0db6\u0dd0\u0dbd\u0dd3\u0db8",
-"Finish": "\u0d85\u0dc0\u0dc3\u0db1\u0dca",
-"Ignore all": "\u0dc3\u0dd2\u0dba\u0dbd\u0dca\u0dbd\u0db8 \u0db1\u0ddc\u0dc3\u0dbd\u0d9a\u0dcf \u0dc4\u0dbb\u0dd2\u0db1\u0dca\u0db1",
-"Ignore": "\u0db1\u0ddc\u0dc3\u0dbd\u0d9a\u0dcf \u0dc4\u0dd0\u0dbb\u0dd3\u0db8",
-"Insert row before": "\u0db8\u0dda \u0dad\u0dd0\u0db1\u0da7 \u0db4\u0dd9\u0dbb \u0db4\u0dda\u0dc5\u0dd2\u0dba\u0d9a\u0dca \u0d91\u0d9a\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Rows": "\u0db4\u0dda\u0dc5\u0dd2",
-"Height": "\u0d8b\u0dc3 ",
-"Paste row after": "\u0db8\u0dda \u0dad\u0dd0\u0db1\u0da7 \u0db4\u0dc3\u0dd4 \u0db4\u0dda\u0dc5\u0dd2\u0dba \u0d85\u0db8\u0dd4\u0dab\u0db1\u0dca\u0db1 ",
-"Alignment": "\u0db4\u0dd9\u0dc5 \u0d9c\u0dd0\u0dc3\u0dd4\u0db8",
-"Column group": "\u0dad\u0dd3\u0dbb\u0dd4 \u0d9a\u0dcf\u0dab\u0dca\u0da9\u0dba",
-"Row": "\u0db4\u0dda\u0dc5\u0dd2\u0dba ",
-"Insert column before": "\u0db8\u0dda \u0dad\u0dd0\u0db1\u0da7 \u0db4\u0dd9\u0dbb \u0dad\u0dd3\u0dbb\u0dd4\u0dc0 \u0d91\u0d9a\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Split cell": "\u0d9a\u0ddc\u0da7\u0dd4 \u0dc0\u0dd9\u0db1\u0dca\u0d9a\u0dbb\u0db1\u0dca\u0db1 ",
-"Cell padding": "\u0d9a\u0ddc\u0da7\u0dd4\u0dc0\u0dd9\u0dc4\u0dd2 \u0db4\u0dd2\u0dbb\u0dc0\u0dd4\u0db8",
-"Cell spacing": "\u0d9a\u0ddc\u0da7\u0dd4\u0dc0\u0dd9\u0dc4\u0dd2 \u0d89\u0da9 \u0dc3\u0dd3\u0db8\u0dcf\u0dc0 ",
-"Row type": "\u0db4\u0dda\u0dc5\u0dd2\u0dba\u0dd9\u0dc4\u0dd2 \u0dc0\u0dbb\u0dca\u0d9c\u0dba",
-"Insert table": "\u0dc0\u0d9c\u0dd4\u0dc0\u0da7 \u0d87\u0dad\u0dd4\u0dbd\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1 ",
-"Body": "\u0db4\u0dca\u200d\u0dbb\u0db0\u0dcf\u0db1 \u0d9a\u0ddc\u0da7\u0dc3",
-"Caption": "\u0dba\u0da7\u0dd2 \u0dbd\u0dd2\u0dba\u0db8\u0db1 ",
-"Footer": "\u0db4\u0dcf\u0daf\u0d9a\u0dba",
-"Delete row": "\u0db4\u0dda\u0dc5\u0dd2\u0dba \u0db8\u0d9a\u0db1\u0dca\u0db1 ",
-"Paste row before": "\u0db8\u0dda \u0dad\u0dd0\u0db1\u0da7 \u0db4\u0dd9\u0dbb \u0db4\u0dda\u0dc5\u0dd2\u0dba \u0d85\u0db8\u0dd4\u0dab\u0db1\u0dca\u0db1 ",
-"Scope": "\u0dc0\u0dd2\u0dc2\u0dba\u0db4\u0dae\u0dba",
-"Delete table": "\u0dc0\u0d9c\u0dd4\u0dc0 \u0db8\u0d9a\u0db1\u0dca\u0db1 ",
-"Header cell": "\u0dc1\u0dd3\u0dbb\u0dca\u0dc2 \u0d9a\u0ddc\u0da7\u0dd4\u0dc0",
-"Column": "\u0dad\u0dd3\u0dbb\u0dd4\u0dc0",
-"Cell": "\u0d9a\u0ddc\u0da7\u0dd4\u0dc0 ",
-"Header": "\u0dc1\u0dd3\u0dbb\u0dca\u0dc2\u0d9a\u0dba",
-"Cell type": "\u0d9a\u0ddc\u0da7\u0dd4\u0dc0\u0dd9\u0dc4\u0dd2 \u0dc0\u0dbb\u0dca\u0d9c\u0dba",
-"Copy row": "\u0db4\u0dda\u0dc5\u0dd2\u0dba \u0db4\u0dd2\u0da7\u0db4\u0dad\u0dca \u0d9a\u0dbb\u0d9c\u0db1\u0dca\u0db1 ",
-"Row properties": "\u0db4\u0dda\u0dc5\u0dd2\u0dba\u0dd9\u0dc4\u0dd2 \u0d9c\u0dd4\u0dab\u0dcf\u0d82\u0d9c ",
-"Table properties": "\u0dc0\u0d9c\u0dd4\u0dc0\u0dd9\u0dc4\u0dd2 \u0d9c\u0dd4\u0dab\u0dcf\u0d82\u0d9c ",
-"Row group": "\u0db4\u0dda\u0dc5\u0dd2 \u0d9a\u0dcf\u0dab\u0dca\u0da9\u0dba",
-"Right": "\u0daf\u0d9a\u0dd4\u0dab",
-"Insert column after": "\u0db8\u0dda \u0dad\u0dd0\u0db1\u0da7 \u0db4\u0dc3\u0dd4 \u0dad\u0dd3\u0dbb\u0dd4\u0dc0 \u0d91\u0d9a\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1 ",
-"Cols": "\u0dad\u0dd3\u0dbb\u0dd4 ",
-"Insert row after": "\u0db8\u0dda \u0dad\u0dd0\u0db1\u0da7 \u0db4\u0dc3\u0dd4 \u0db4\u0dda\u0dc5\u0dd2\u0dba\u0d9a\u0dca \u0d91\u0d9a\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1 ",
-"Width": "\u0db4\u0dc5\u0dbd",
-"Cell properties": "\u0d9a\u0ddc\u0da7\u0dd4\u0dc0\u0dd9\u0dc4\u0dd2 \u0d9c\u0dd4\u0dab\u0dcf\u0d82\u0d9c ",
-"Left": "\u0dc0\u0db8",
-"Cut row": "\u0db4\u0dda\u0dc5\u0dd2\u0dba \u0d9a\u0db4\u0dcf\u0d9c\u0db1\u0dca\u0db1 ",
-"Delete column": "\u0dad\u0dd3\u0dbb\u0dd4\u0dc0 \u0db8\u0d9a\u0db1\u0dca\u0db1 ",
-"Center": "\u0db8\u0dd0\u0daf",
-"Merge cells": "\u0d9a\u0ddc\u0da7\u0dd4 \u0d91\u0d9a\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1 ",
-"Insert template": "\u0d85\u0da0\u0dca\u0da0\u0dd4\u0dc0 \u0d87\u0dad\u0dd4\u0dbd\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"Templates": "\u0d85\u0da0\u0dca\u0da0\u0dd4",
-"Background color": "\u0db4\u0dc3\u0dd4\u0db6\u0dd2\u0db8\u0dd9\u0dc4\u0dd2 \u0dc0\u0dbb\u0dca\u0dab\u0dba",
-"Text color": "\u0db4\u0dd9\u0dc5 \u0dc3\u0da7\u0dc4\u0db1\u0dda \u0dc0\u0dbb\u0dca\u0dab\u0dba",
-"Show blocks": "\u0d9a\u0ddc\u0da7\u0dc3\u0dca \u0db4\u0dd9\u0db1\u0dca\u0dc0\u0db1\u0dca\u0db1",
-"Show invisible characters": "\u0db1\u0ddc\u0db4\u0dd9\u0db1\u0dd9\u0db1 \u0d85\u0db1\u0dd4\u0dbd\u0d9a\u0dd4\u0dab\u0dd4 \u0db4\u0dd9\u0db1\u0dca\u0dc0\u0db1\u0dca\u0db1",
-"Words: {0}": "\u0dc0\u0da0\u0db1: {0}",
-"Insert": "\u0d91\u0d9a\u0dca \u0d9a\u0dbb\u0db1\u0dca\u0db1",
-"File": "\u0d9c\u0ddc\u0db1\u0dd4\u0dc0",
-"Edit": "\u0dc3\u0d9a\u0dc3\u0db1\u0dca\u0db1",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0db4\u0dd9\u0dc5 \u0dc3\u0da7\u0dc4\u0db1\u0dca \u0db6\u0dc4\u0dd4\u0dbd \u0db4\u0dca\u200d\u0dbb\u0daf\u0dda\u0dc1\u0dba. \u0db8\u0dd9\u0db1\u0dd4\u0dc0 \u0dc3\u0db3\u0dc4\u0dcf ALT-F9  \u0d94\u0db6\u0db1\u0dca\u0db1. \u0db8\u0dd9\u0dc0\u0dbd\u0db8\u0dca \u0dad\u0dd3\u0dbb\u0dd4\u0dc0 \u0dc3\u0db3\u0dc4\u0dcf ALT-F10  \u0d94\u0db6\u0db1\u0dca\u0db1. \u0dc3\u0dc4\u0dba \u0dbd\u0db6\u0dcf\u0d9c\u0dd0\u0db1\u0dd3\u0db8 \u0dc3\u0db3\u0dc4\u0dcf ALT-0  \u0d94\u0db6\u0db1\u0dca\u0db1.",
-"Tools": "\u0db8\u0dd9\u0dc0\u0dbd\u0db8\u0dca",
-"View": "\u0db4\u0dd9\u0db1\u0dca\u0dc0\u0db1\u0dca\u0db1",
-"Table": "\u0dc0\u0d9c\u0dd4\u0dc0",
-"Format": "\u0dc4\u0dd0\u0da9\u0dad\u0dbd\u0dba"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/sk.es5.js b/build/media_source/vendor/tinymce/langs/sk.es5.js
deleted file mode 100644
index 148e7383b62c2..0000000000000
--- a/build/media_source/vendor/tinymce/langs/sk.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('sk',{
-"Cut": "Vystrihn\u00fa\u0165",
-"Heading 5": "Nadpis 5",
-"Header 2": "Nadpis 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "V\u00e1\u0161 prehliada\u010d nepodporuje priamy pr\u00edstup do schr\u00e1nky. Pou\u017eite kl\u00e1vesov\u00e9 skratky Ctrl+X\/C\/V.",
-"Heading 4": "Nadpis 4",
-"Div": "Blok",
-"Heading 2": "Nadpis 2",
-"Paste": "Vlo\u017ei\u0165",
-"Close": "Zatvori\u0165",
-"Font Family": "P\u00edsmo",
-"Pre": "Preform\u00e1tovan\u00fd",
-"Align right": "Zarovna\u0165 vpravo",
-"New document": "Nov\u00fd dokument",
-"Blockquote": "Cit\u00e1cia",
-"Numbered list": "\u010c\u00edslovan\u00fd zoznam",
-"Heading 1": "Nadpis 1",
-"Headings": "Nadpisy",
-"Increase indent": "Zv\u00e4\u010d\u0161i\u0165 odsadenie",
-"Formats": "Form\u00e1ty",
-"Headers": "Nadpisy",
-"Select all": "Ozna\u010di\u0165 v\u0161etko",
-"Header 3": "Nadpis 3",
-"Blocks": "Bloky",
-"Undo": "Vr\u00e1ti\u0165",
-"Strikethrough": "Pre\u010diarknut\u00e9",
-"Bullet list": "Odr\u00e1\u017eky",
-"Header 1": "Nadpis 1",
-"Superscript": "Horn\u00fd index",
-"Clear formatting": "Vymaza\u0165 form\u00e1tovanie",
-"Font Sizes": "Ve\u013ekos\u0165 p\u00edsma",
-"Subscript": "Spodn\u00fd index",
-"Header 6": "Nadpis 6",
-"Redo": "Znova",
-"Paragraph": "Odsek",
-"Ok": "Ok",
-"Bold": "Tu\u010dn\u00e9",
-"Code": "K\u00f3d",
-"Italic": "Kurz\u00edva",
-"Align center": "Zarovna\u0165 na stred",
-"Header 5": "Nadpis 5",
-"Heading 6": "Nadpis 6",
-"Heading 3": "Nadpis 3",
-"Decrease indent": "Zmen\u0161i\u0165 odsadenie",
-"Header 4": "Nadpis 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Vkladanie je v m\u00f3de neform\u00e1tovan\u00e9ho textu. Vkladan\u00fd obsah bude vlo\u017een\u00fd ako neform\u00e1tovan\u00fd, a\u017e pok\u00fdm t\u00fato mo\u017enos\u0165 nevypnete.",
-"Underline": "Pod\u010diarknut\u00e9",
-"Cancel": "Zru\u0161i\u0165",
-"Justify": "Zarovna\u0165",
-"Inline": "\u0160t\u00fdly",
-"Copy": "Kop\u00edrova\u0165",
-"Align left": "Zarovna\u0165 v\u013eavo",
-"Visual aids": "Vizu\u00e1lne pom\u00f4cky",
-"Lower Greek": "Mal\u00e9 gr\u00e9cke p\u00edsmen\u00e1",
-"Square": "\u0160tvorec",
-"Default": "V\u00fdchodzie",
-"Lower Alpha": "Mal\u00e9 p\u00edsmen\u00e1",
-"Circle": "Kruh",
-"Disc": "Disk",
-"Upper Alpha": "Ve\u013ek\u00e9 p\u00edsmen\u00e1",
-"Upper Roman": "Ve\u013ek\u00e9 r\u00edmske \u010d\u00edslice",
-"Lower Roman": "Mal\u00e9 r\u00edmske \u010d\u00edslice",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id by malo za\u010d\u00edna\u0165 p\u00edsmenom, nasledovan\u00e9 p\u00edsmenami, \u010d\u00edslami, pom\u013a\u010dkami, bodkami, dvojbodkami alebo podtr\u017en\u00edkmi.",
-"Name": "N\u00e1zov",
-"Anchor": "Odkaz",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "M\u00e1te neulo\u017een\u00e9 zmeny, naozaj chcete opusti\u0165 str\u00e1nku?",
-"Restore last draft": "Obnovi\u0165 posledn\u00fd koncept",
-"Special character": "\u0160peci\u00e1lny znak",
-"Source code": "Zdrojov\u00fd k\u00f3d",
-"Language": "Jazyk",
-"Insert\/Edit code sample": "Vlo\u017ei\u0165\/upravi\u0165 vzorku k\u00f3du",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Farba",
-"Right to left": "Sprava do\u013eava",
-"Left to right": "Z\u013eava doprava",
-"Emoticons": "Smajl\u00edci",
-"Robots": "Preh\u013ead\u00e1vacie roboty",
-"Document properties": "Vlastnosti dokumentu",
-"Title": "Nadpis",
-"Keywords": "K\u013e\u00fa\u010dov\u00e9 slov\u00e1",
-"Encoding": "K\u00f3dovanie",
-"Description": "Popis",
-"Author": "Autor",
-"Fullscreen": "Na cel\u00fa obrazovku",
-"Horizontal line": "Horizont\u00e1lna \u010diara",
-"Horizontal space": "Horizont\u00e1lny priestor",
-"Insert\/edit image": "Vlo\u017ei\u0165\/upravi\u0165 obr\u00e1zok",
-"General": "Hlavn\u00e9",
-"Advanced": "Pokro\u010dil\u00e9",
-"Source": "Zdroj",
-"Border": "Or\u00e1movanie",
-"Constrain proportions": "Vymedzen\u00e9 proporcie",
-"Vertical space": "Vertik\u00e1lny priestor",
-"Image description": "Popis obr\u00e1zku",
-"Style": "\u0160t\u00fdl",
-"Dimensions": "Rozmery",
-"Insert image": "Vlo\u017ei\u0165 obr\u00e1zok",
-"Image": "Obr\u00e1zok",
-"Zoom in": "Pribl\u00ed\u017ei\u0165",
-"Contrast": "Kontrast",
-"Back": "Sp\u00e4\u0165",
-"Gamma": "Gama",
-"Flip horizontally": "Preklopi\u0165 horizont\u00e1lne",
-"Resize": "Zmeni\u0165 ve\u013ekos\u0165",
-"Sharpen": "Zaostri\u0165",
-"Zoom out": "Oddiali\u0165",
-"Image options": "Mo\u017enosti obr\u00e1zku",
-"Apply": "Pou\u017ei\u0165",
-"Brightness": "Jas",
-"Rotate clockwise": "Oto\u010di\u0165 v smere hodinov\u00fdch ru\u010di\u010diek",
-"Rotate counterclockwise": "Oto\u010di\u0165 proti smeru hodinov\u00fdch ru\u010di\u010diek",
-"Edit image": "Upravi\u0165 obr\u00e1zok",
-"Color levels": "\u00darovne farieb",
-"Crop": "Vyreza\u0165",
-"Orientation": "Orient\u00e1cia",
-"Flip vertically": "Preklopi\u0165 vertik\u00e1lne",
-"Invert": "Invertova\u0165",
-"Date\/time": "D\u00e1tum\/\u010das",
-"Insert date\/time": "Vlo\u017ei\u0165 d\u00e1tum\/\u010das",
-"Remove link": "Odstr\u00e1ni\u0165 odkaz",
-"Url": "Url",
-"Text to display": "Zobrazen\u00fd text",
-"Anchors": "Kotvy",
-"Insert link": "Vlo\u017ei\u0165 odkaz",
-"Link": "Odkaz",
-"New window": "Nov\u00e9 okno",
-"None": "\u017diadne",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL adresa ktor\u00fa ste zadali vyzer\u00e1 ako extern\u00fd odkaz. Chcete prida\u0165 vy\u017eadovan\u00fa http:\/\/ predponu?",
-"Paste or type a link": "Prilepte alebo nap\u00ed\u0161te odkaz",
-"Target": "Cie\u013e",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL, ktor\u00fa ste vlo\u017eili je pravdepodobne emailov\u00e1 adresa. \u017del\u00e1te si prida\u0165 vy\u017eadovan\u00fa mailto: predponu?",
-"Insert\/edit link": "Vlo\u017ei\u0165\/upravi\u0165 odkaz",
-"Insert\/edit video": "Vlo\u017ei\u0165\/upravi\u0165 video",
-"Media": "M\u00e9di\u00e1",
-"Alternative source": "Alternat\u00edvny zdroj",
-"Paste your embed code below:": "Vlo\u017ete k\u00f3d pre vlo\u017eenie na str\u00e1nku:",
-"Insert video": "Vlo\u017ei\u0165 video",
-"Poster": "Uk\u00e1\u017eka",
-"Insert\/edit media": "Vlo\u017ei\u0165\/upravi\u0165 m\u00e9di\u00e1",
-"Embed": "Vlo\u017een\u00e9",
-"Nonbreaking space": "Nedelite\u013en\u00e1 medzera",
-"Page break": "Zalomenie str\u00e1nky",
-"Paste as text": "Vlo\u017ei\u0165 ako text",
-"Preview": "N\u00e1h\u013ead",
-"Print": "Tla\u010di\u0165",
-"Save": "Ulo\u017ei\u0165",
-"Could not find the specified string.": "Zadan\u00fd re\u0165azec sa nena\u0161iel.",
-"Replace": "Nahradi\u0165",
-"Next": "Nasleduj\u00face",
-"Whole words": "Cel\u00e9 slov\u00e1",
-"Find and replace": "Vyh\u013eada\u0165 a nahradi\u0165",
-"Replace with": "Nahradi\u0165 za",
-"Find": "H\u013eada\u0165",
-"Replace all": "Nahradi\u0165 v\u0161etko",
-"Match case": "Rozli\u0161ova\u0165 ve\u013ek\u00e9\/mal\u00e9",
-"Prev": "Predch\u00e1dzaj\u00face",
-"Spellcheck": "Kontrola pravopisu",
-"Finish": "Dokon\u010di\u0165",
-"Ignore all": "Ignorova\u0165 v\u0161etko",
-"Ignore": "Ignorova\u0165",
-"Add to Dictionary": "Prida\u0165 do slovn\u00edka",
-"Insert row before": "Vlo\u017ei\u0165 nov\u00fd riadok pred",
-"Rows": "Riadky",
-"Height": "V\u00fd\u0161ka",
-"Paste row after": "Vlo\u017ei\u0165 riadok za",
-"Alignment": "Zarovnanie",
-"Border color": "Farba or\u00e1movania",
-"Column group": "Skupina st\u013apcov",
-"Row": "Riadok",
-"Insert column before": "Prida\u0165 nov\u00fd st\u013apec pred",
-"Split cell": "Rozdeli\u0165 bunku",
-"Cell padding": "Odsadenie v bunk\u00e1ch",
-"Cell spacing": "Priestor medzi bunkami",
-"Row type": "Typ riadku",
-"Insert table": "Vlo\u017ei\u0165 tabu\u013eku",
-"Body": "Telo",
-"Caption": "Popisok",
-"Footer": "P\u00e4ti\u010dka",
-"Delete row": "Zmaza\u0165 riadok",
-"Paste row before": "Vlo\u017ei\u0165 riadok pred",
-"Scope": "Oblas\u0165",
-"Delete table": "Zmaza\u0165 tabu\u013eku",
-"H Align": "Horizont\u00e1lne zarovnanie",
-"Top": "Vrch",
-"Header cell": "Bunka z\u00e1hlavia",
-"Column": "St\u013apec",
-"Row group": "Skupina riadkov",
-"Cell": "Bunka",
-"Middle": "Stred",
-"Cell type": "Typ bunky",
-"Copy row": "Kop\u00edrova\u0165 riadok",
-"Row properties": "Vlastnosti riadku",
-"Table properties": "Nastavenia tabu\u013eky",
-"Bottom": "Spodok",
-"V Align": "Vertik\u00e1lne zarovnanie",
-"Header": "Z\u00e1hlavie",
-"Right": "Vpravo",
-"Insert column after": "Prida\u0165 nov\u00fd st\u013apec za",
-"Cols": "St\u013apce",
-"Insert row after": "Vlo\u017ei\u0165 nov\u00fd riadok za",
-"Width": "\u0160\u00edrka",
-"Cell properties": "Vlastnosti bunky",
-"Left": "V\u013eavo",
-"Cut row": "Vystrihn\u00fa\u0165 riadok",
-"Delete column": "Vymaza\u0165 st\u013apec",
-"Center": "Na stred",
-"Merge cells": "Spoji\u0165 bunky",
-"Insert template": "Vlo\u017ei\u0165 \u0161abl\u00f3nu",
-"Templates": "\u0160abl\u00f3ny",
-"Background color": "Farba pozadia",
-"Custom...": "Vlastn\u00e1...",
-"Custom color": "Vlastn\u00e1 farba",
-"No color": "Bez farby",
-"Text color": "Farba textu",
-"Table of Contents": "Obsah",
-"Show blocks": "Zobrazi\u0165 bloky",
-"Show invisible characters": "Zobrazi\u0165 skryt\u00e9 znaky",
-"Words: {0}": "Slov: {0}",
-"Insert": "Vlo\u017ei\u0165",
-"File": "S\u00fabor",
-"Edit": "Upravi\u0165",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Textov\u00e9 pole. Stla\u010dte ALT-F9 pre zobrazenie menu, ALT-F10 pre zobrazenie panela n\u00e1strojov, ALT-0 pre n\u00e1povedu.",
-"Tools": "N\u00e1stroje",
-"View": "Zobrazi\u0165",
-"Table": "Tabu\u013eka",
-"Format": "Form\u00e1t"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/sl.es5.js b/build/media_source/vendor/tinymce/langs/sl.es5.js
deleted file mode 100644
index 3a4bb342472b7..0000000000000
--- a/build/media_source/vendor/tinymce/langs/sl.es5.js
+++ /dev/null
@@ -1,445 +0,0 @@
-tinymce.addI18n('sl',{
-"Redo": "Ponovno uveljavi",
-"Undo": "Razveljavi",
-"Cut": "Izre\u017ei",
-"Copy": "Kopiraj",
-"Paste": "Prilepi",
-"Select all": "Izberi vse",
-"New document": "Nov dokument",
-"Ok": "V redu",
-"Cancel": "Prekli\u010di",
-"Visual aids": "Vizualni pripomo\u010dki",
-"Bold": "Krepko",
-"Italic": "Po\u0161evno",
-"Underline": "Pod\u010drtano",
-"Strikethrough": "Pre\u010drtano",
-"Superscript": "Nadpisano",
-"Subscript": "Podpisano",
-"Clear formatting": "Odstrani oblikovanje",
-"Align left": "Leva poravnava",
-"Align center": "Sredinska poravnava",
-"Align right": "Desna poravnava",
-"Justify": "Obojestranska poravnava",
-"Bullet list": "Ozna\u010den seznam",
-"Numbered list": "O\u0161tevil\u010den seznam",
-"Decrease indent": "Zmanj\u0161aj zamik",
-"Increase indent": "Pove\u010daj zamik",
-"Close": "Zapri",
-"Formats": "Oblika",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Varnostne nastavitve brskalnika ne dopu\u0161\u010dajo direktnega dostopa do odlo\u017ei\u0161\u010da. Uporabite kombinacijo tipk Ctrl + X\/C\/V na tipkovnici.",
-"Headers": "Naslovi",
-"Header 1": "Naslov 1",
-"Header 2": "Naslov 2",
-"Header 3": "Naslov 3",
-"Header 4": "Naslov 4",
-"Header 5": "Naslov 5",
-"Header 6": "Naslov 6",
-"Headings": "Naslovi",
-"Heading 1": "Naslov 1",
-"Heading 2": "Naslov 2",
-"Heading 3": "Naslov 3",
-"Heading 4": "Naslov 4",
-"Heading 5": "Naslov 5",
-"Heading 6": "Naslov 6",
-"Preformatted": "Predformatirano",
-"Div": "Div",
-"Pre": "Pre",
-"Code": "Koda",
-"Paragraph": "Odstavek",
-"Blockquote": "Blockquote",
-"Inline": "Med besedilom",
-"Blocks": "Bloki",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Odlagali\u0161\u010de je sedaj v tekstovnem na\u010dinu. Vsebina bo preslikana kot besedilo, dokler te mo\u017enosti ne izklju\u010dite.",
-"Fonts": "Pisave",
-"Font Sizes": "Velikosti pisave",
-"Class": "Razred",
-"Browse for an image": "Prebrskaj za sliko",
-"OR": "ALI",
-"Drop an image here": "Spusti sliko sem",
-"Upload": "Nalo\u017ei",
-"Block": "Blok",
-"Align": "Poravnava",
-"Default": "Privzeto",
-"Circle": "Krog",
-"Disc": "Disk",
-"Square": "Kvadrat",
-"Lower Alpha": "Mala alfa",
-"Lower Greek": "Male gr\u0161ke \u010drke",
-"Lower Roman": "Male rimske \u0161tevilke",
-"Upper Alpha": "Velika alfa",
-"Upper Roman": "Velike rimske \u0161tevilke",
-"Anchor...": "Sidro ...",
-"Name": "Naziv",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id se mora za\u010deti s \u010drko, sledijo samo \u010drke, \u0161tevilke, pomi\u0161ljaji, pike, dvopi\u010dja ali pod\u010drtaji.",
-"You have unsaved changes are you sure you want to navigate away?": "Imate neshranjene spremembe. Ste prepri\u010dati, da \u017eelite zapustiti stran?",
-"Restore last draft": "Obnovi zadnji osnutek",
-"Special character...": "Poseben znak ...",
-"Source code": "Izvorna koda",
-"Insert\/Edit code sample": "Vstavi\/Uredi vzor\u010dno kodo",
-"Language": "Jezik",
-"Code sample...": "Vzor\u010dna koda ...",
-"Color Picker": "Izbirnik barve",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "Od leve proti desni",
-"Right to left": "Od desne proti levi",
-"Emoticons": "\u010custveni simboli",
-"Emoticons...": "\u010custveni simboli ...",
-"Metadata and Document Properties": "Metapodatki in lastnosti dokumenta",
-"Title": "Naslov",
-"Keywords": "Klju\u010dne besede",
-"Description": "Opis",
-"Robots": "Robotki",
-"Author": "Avtor",
-"Encoding": "Kodiranje",
-"Fullscreen": "\u010cez cel zaslon",
-"Action": "Dejanje",
-"Shortcut": "Bli\u017enjica",
-"Help": "Pomo\u010d",
-"Address": "Naslov",
-"Focus to menubar": "Poudarek na menijski vrstici",
-"Focus to toolbar": "Poudarek na orodni vrstici",
-"Focus to element path": "Poudarek na poti elementa",
-"Focus to contextual toolbar": "Poudarek na kontekstualni orodni vrstici",
-"Insert link (if link plugin activated)": "Vstavi povezavo (\u010de je aktiviran vti\u010dnik za povezavo)",
-"Save (if save plugin activated)": "Shrani (\u010de je aktiviran vti\u010dnik za shranjevanje)",
-"Find (if searchreplace plugin activated)": "I\u0161\u010di (\u010de je aktiviran vti\u010dnik za iskanje\/zamenjavo)",
-"Plugins installed ({0}):": "Name\u0161\u010deni vti\u010dniki ({0}):",
-"Premium plugins:": "Premium vti\u010dniki:",
-"Learn more...": "Ve\u010d ...",
-"You are using {0}": "Uporabljate {0}",
-"Plugins": "Vti\u010dniki",
-"Handy Shortcuts": "Uporabne bli\u017enjice",
-"Horizontal line": "Vodoravna \u010drta",
-"Insert\/edit image": "Vstavi\/uredi sliko",
-"Alternative description": "Nadomestni opis",
-"Accessibility": "Dostopnost",
-"Image is decorative": "Slika je okrasna",
-"Source": "Pot",
-"Dimensions": "Dimenzije",
-"Constrain proportions": "Obdr\u017ei razmerje",
-"General": "Splo\u0161no",
-"Advanced": "Napredno",
-"Style": "Slog",
-"Vertical space": "Navpi\u010dni prostor",
-"Horizontal space": "Vodoravni prostor",
-"Border": "Meja",
-"Insert image": "Vnesi sliko",
-"Image...": "Slika ...",
-"Image list": "Seznam slik",
-"Rotate counterclockwise": "Zavrti v nasprotni smeri urnega kazalca",
-"Rotate clockwise": "Zavrti v smeri urnega kazalca",
-"Flip vertically": "Obrni navpi\u010dno",
-"Flip horizontally": "Obrni vodoravno",
-"Edit image": "Uredi sliko",
-"Image options": "Mo\u017enosti slike",
-"Zoom in": "Pove\u010daj",
-"Zoom out": "Pomanj\u0161aj",
-"Crop": "Obre\u017ei",
-"Resize": "Spremeni velikost",
-"Orientation": "Usmerjenost",
-"Brightness": "Svetlost",
-"Sharpen": "Izostri",
-"Contrast": "Kontrast",
-"Color levels": "Barvni nivo",
-"Gamma": "Gama",
-"Invert": "Obrni",
-"Apply": "Uporabi",
-"Back": "Nazaj",
-"Insert date\/time": "Vstavi datum\/\u010das",
-"Date\/time": "Datum\/\u010das",
-"Insert\/edit link": "Vstavi\/uredi povezavo",
-"Text to display": "Besedilo za prikaz",
-"Url": "Povezava",
-"Open link in...": "Odpri povezavo v ...",
-"Current window": "Trenutno okno",
-"None": "Brez",
-"New window": "Novo okno",
-"Open link": "Odpri povezavo",
-"Remove link": "Odstrani povezavo",
-"Anchors": "Sidra",
-"Link...": "Povezava ...",
-"Paste or type a link": "Prilepite ali vnesite povezavo",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Vneseni URL predstavlja e-po\u0161tni naslov. Ali \u017eelite dodati potrebno predpono \"mailto:\"?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Vneseni URL predstavlja zunanjo povezavo. Ali \u017eelite dodati predpono \"http:\/\/\"?",
-"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Vneseni URL naslov predstavlja zunanjo povezavo. Ali mu \u017eelite dodati predpono https:\/\/ ?",
-"Link list": "Seznam povezav",
-"Insert video": "Vstavi video",
-"Insert\/edit video": "Vstavi\/uredi video",
-"Insert\/edit media": "Vstavi\/uredi medij",
-"Alternative source": "Nadomestni vir",
-"Alternative source URL": "Nadomestni vir URL",
-"Media poster (Image URL)": "Medijski poster (URL slike)",
-"Paste your embed code below:": "Spodaj prilepite kodo za vdelavo:",
-"Embed": "Vdelaj",
-"Media...": "Mediji ...",
-"Nonbreaking space": "Nedeljivi presledek",
-"Page break": "Prelom strani",
-"Paste as text": "Vnesi kot besedilo",
-"Preview": "Predogled",
-"Print...": "Natisni ...",
-"Save": "Shrani",
-"Find": "Najdi",
-"Replace with": "Zamenjaj z",
-"Replace": "Zamenjaj",
-"Replace all": "Zamenjaj vse",
-"Previous": "Prej\u0161nja",
-"Next": "Naslednja",
-"Find and Replace": "Najdi in zamenjaj",
-"Find and replace...": "Najdi in zamenjaj ...",
-"Could not find the specified string.": "Iskanje ni vrnilo rezultatov.",
-"Match case": "Ujemanje malih in velikih \u010drk",
-"Find whole words only": "I\u0161\u010di samo cele besede",
-"Find in selection": "I\u0161\u010di v izboru",
-"Spellcheck": "\u010crkovalnik",
-"Spellcheck Language": "Jezik \u010drkovalnika",
-"No misspellings found.": "Ni najdenih napak v \u010drkovanju.",
-"Ignore": "Prezri",
-"Ignore all": "Prezri vse",
-"Finish": "Zaklju\u010di",
-"Add to Dictionary": "Dodaj v slovar",
-"Insert table": "Vstavi tabelo",
-"Table properties": "Lastnosti tabele",
-"Delete table": "Izbri\u0161i tabelo",
-"Cell": "Celica",
-"Row": "Vrstica",
-"Column": "Stolpec",
-"Cell properties": "Lastnosti celice",
-"Merge cells": "Zdru\u017ei celice",
-"Split cell": "Razdeli celico",
-"Insert row before": "Vstavi vrstico pred",
-"Insert row after": "Vstavi vrstico za",
-"Delete row": "Izbri\u0161i vrstico",
-"Row properties": "Lastnosti vrstice",
-"Cut row": "Izre\u017ei vrstico",
-"Copy row": "Kopiraj vrstico",
-"Paste row before": "Prilepi vrstico pred",
-"Paste row after": "Prilepi vrstico za",
-"Insert column before": "Vstavi stolpec pred",
-"Insert column after": "Vstavi stolpec za",
-"Delete column": "Izbri\u0161i stolpec",
-"Cols": "Stolpci",
-"Rows": "Vrstice",
-"Width": "\u0160irina",
-"Height": "Vi\u0161ina",
-"Cell spacing": "Razmik med celicami",
-"Cell padding": "Polnilo med celicami",
-"Caption": "Naslov",
-"Show caption": "Poka\u017ei napis",
-"Left": "Leva",
-"Center": "Sredinska",
-"Right": "Desna",
-"Cell type": "Tip celice",
-"Scope": "Obseg",
-"Alignment": "Poravnava",
-"H Align": "Vodoravna poravnava",
-"V Align": "Navpi\u010dna poravnava",
-"Top": "Vrh",
-"Middle": "Sredina",
-"Bottom": "Dno",
-"Header cell": "Celica glave",
-"Row group": "Grupiranje vrstic",
-"Column group": "Grupiranje stolpcev",
-"Row type": "Tip vrstice",
-"Header": "Header",
-"Body": "Vsebina",
-"Footer": "Footer",
-"Border color": "Barva obrobe",
-"Insert template...": "Vstavi predlogo ...",
-"Templates": "Predloge",
-"Template": "Predloga",
-"Text color": "Barva besedila",
-"Background color": "Barva ozadja",
-"Custom...": "Po meri ...",
-"Custom color": "Barva po meri",
-"No color": "Brezbarvno",
-"Remove color": "Odstrani barvo",
-"Table of Contents": "Kazalo",
-"Show blocks": "Prika\u017ei bloke",
-"Show invisible characters": "Prika\u017ei skrite znake",
-"Word count": "\u0160tevilo besed",
-"Count": "\u0160tevilo",
-"Document": "Dokument",
-"Selection": "Izbor",
-"Words": "Besede",
-"Words: {0}": "Besed: {0}",
-"{0} words": "{0} besed",
-"File": "Datoteka",
-"Edit": "Uredi",
-"Insert": "Vstavi",
-"View": "Pogled",
-"Format": "Oblika",
-"Table": "Tabela",
-"Tools": "Orodja",
-"Powered by {0}": "Uporablja tehnologijo {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Bogato besedilo. Pritisnite ALT-F9 za meni. Pritisnite ALT-F10 za orodno vrstico. Pritisnite ALT-0 za pomo\u010d",
-"Image title": "Naslov slike",
-"Border width": "\u0160irina obrobe",
-"Border style": "Slog obrobe",
-"Error": "Napaka",
-"Warn": "Opozorilo",
-"Valid": "Veljavno",
-"To open the popup, press Shift+Enter": "Za odpiranje pojavnega okna pritisnite Shift + Enter.",
-"Rich Text Area. Press ALT-0 for help.": "Bogato besedilo. Pritisnite ALT-0 za pomo\u010d.",
-"System Font": "Sistemska pisava",
-"Failed to upload image: {0}": "Napaka nalaganja slike: {0}",
-"Failed to load plugin: {0} from url {1}": "Napaka nalaganja vti\u010dnika: {0} z url {1}",
-"Failed to load plugin url: {0}": "Napaka nalaganja url: {0}",
-"Failed to initialize plugin: {0}": "Napaka inicializacije vti\u010dnika: {0}",
-"example": "primer",
-"Search": "Iskanje",
-"All": "Vse",
-"Currency": "Valuta",
-"Text": "Besedilo",
-"Quotations": "Citati",
-"Mathematical": "Matemati\u010dno",
-"Extended Latin": "Raz\u0161irjena latinica",
-"Symbols": "Simboli",
-"Arrows": "Pu\u0161\u010dice",
-"User Defined": "Uporabnik dolo\u010den",
-"dollar sign": "znak za dolar",
-"currency sign": "znak za valuto",
-"euro-currency sign": "znak za evro",
-"colon sign": "znak za dvopi\u010dje",
-"cruzeiro sign": "znak za cruzeiro",
-"french franc sign": "znak za francoski frank",
-"lira sign": "znak za liro",
-"mill sign": "znak za mill",
-"naira sign": "znak za nairo",
-"peseta sign": "znak za peseto",
-"rupee sign": "znak za rupijo",
-"won sign": "znak za won",
-"new sheqel sign": "znak za novi \u0161ekl",
-"dong sign": "znak za dong",
-"kip sign": "znak za kip",
-"tugrik sign": "znak za tugrik",
-"drachma sign": "znak za drahmo",
-"german penny symbol": "znak za nem\u0161ki peni",
-"peso sign": "znak za peso",
-"guarani sign": "znak za guarani",
-"austral sign": "znak za austral",
-"hryvnia sign": "znak za hrivnijo",
-"cedi sign": "znak za cedi",
-"livre tournois sign": "znak za livre tournois",
-"spesmilo sign": "znak za spesmilo",
-"tenge sign": "znak za tenge",
-"indian rupee sign": "znak za indijsko rupijo",
-"turkish lira sign": "znak za tur\u0161ko liro",
-"nordic mark sign": "znak za nordijsko marko",
-"manat sign": "znak za manat",
-"ruble sign": "znak za rubelj",
-"yen character": "znak za jen",
-"yuan character": "znak za yuan",
-"yuan character, in hong kong and taiwan": "znak za yuan, v Hongkongu in na Tajvanu",
-"yen\/yuan character variant one": "znak za jen\/yuan, prva razli\u010dica",
-"Loading emoticons...": "Nalaganje \u010dustvenih simbolov ...",
-"Could not load emoticons": "\u010custvenih simbolov ni mogo\u010de nalo\u017eiti.",
-"People": "Ljudje",
-"Animals and Nature": "\u017divali in narava",
-"Food and Drink": "Hrana in pija\u010da",
-"Activity": "Dejavnost",
-"Travel and Places": "Potovanja in kraji",
-"Objects": "Predmeti",
-"Flags": "Zastave",
-"Characters": "Znaki",
-"Characters (no spaces)": "Znaki (brez presledkov)",
-"{0} characters": "{0} znakov",
-"Error: Form submit field collision.": "Napaka: navzkri\u017eje polja za oddajo obrazca",
-"Error: No form element found.": "Napaka: elementa oblike ni mogo\u010de najti",
-"Update": "Posodobitev",
-"Color swatch": "Vzorec barv",
-"Turquoise": "Turkizna",
-"Green": "Zelena",
-"Blue": "Modra",
-"Purple": "\u0160krlatna",
-"Navy Blue": "Mornarsko modra",
-"Dark Turquoise": "Temno turkizna",
-"Dark Green": "Temno zelena",
-"Medium Blue": "Srednje modra",
-"Medium Purple": "Srednje \u0161krlatna",
-"Midnight Blue": "Polno\u010dno modra",
-"Yellow": "Rumena",
-"Orange": "Oran\u017ena",
-"Red": "Rde\u010da",
-"Light Gray": "Svetlo siva",
-"Gray": "Siva",
-"Dark Yellow": "Temno rumena",
-"Dark Orange": "Temno oran\u017ena",
-"Dark Red": "Temno rde\u010da",
-"Medium Gray": "Srednje siva",
-"Dark Gray": "Temno siva",
-"Light Green": "Svetlo zelena",
-"Light Yellow": "Svetlo rumena",
-"Light Red": "Svetlo rde\u010da",
-"Light Purple": "Svetlo vijoli\u010dna",
-"Light Blue": "Svetlo modra",
-"Dark Purple": "Temno vijoli\u010dna",
-"Dark Blue": "Temno modra",
-"Black": "\u010crna",
-"White": "Bela",
-"Switch to or from fullscreen mode": "Preklopi v ali iz celozaslonskega na\u010dina",
-"Open help dialog": "Odpri pogovorno okno za pomo\u010d",
-"history": "zgodovina",
-"styles": "slogi",
-"formatting": "oblikovanje",
-"alignment": "poravnava",
-"indentation": "zamik",
-"Font": "Pisava",
-"Size": "Velikost",
-"More...": "Ve\u010d ...",
-"Select...": "Izberi ...",
-"Preferences": "Preference",
-"Yes": "Da",
-"No": "Ne",
-"Keyboard Navigation": "Krmarjenje s tipkovnico",
-"Version": "Razli\u010dica",
-"Code view": "Prikaz kode",
-"Open popup menu for split buttons": "Odpri pojavni meni za razdeljene gumbe",
-"List Properties": "Lastnosti seznama",
-"List properties...": "Lastnosti seznama...",
-"Start list at number": "Za\u010dni seznam s \u0161tevilko",
-"Line height": "Vi\u0161ina vrstice",
-"comments": "komentarji",
-"Format Painter": "Preslikovalnik Oblik",
-"Insert\/edit iframe": "Vstavi\/uredi iFrame",
-"Capitalization": "Velika za\u010detnica",
-"lowercase": "male \u010drke",
-"UPPERCASE": "VELIKE \u010cRKE",
-"Title Case": "Velike za\u010detnice naslovov",
-"permanent pen": "permanentno pisalo",
-"Permanent Pen Properties": "Lastnosti permanentnega pisala",
-"Permanent pen properties...": "Lastnosti permanentnega pisala ...",
-"case change": "sprememba male\/velike \u010drke",
-"page embed": "vstavi stran",
-"Advanced sort...": "Napredno razvr\u0161\u010danje",
-"Advanced Sort": "Napredno razvr\u0161\u010danje...",
-"Sort table by column ascending": "Razvrsti tabelo po stolpcu nara\u0161\u010dajo\u010de",
-"Sort table by column descending": "Razvrsti tabelo po stolpcu padajo\u010de",
-"Sort": "Razvrsti",
-"Order": "Vrstni red",
-"Sort by": "Razvrsti po",
-"Ascending": "Nara\u0161\u010dajo\u010de",
-"Descending": "Padajo\u010de",
-"Column {0}": "Stolpec {0}",
-"Row {0}": "Vrstica {0}",
-"Spellcheck...": "\u010crkovalnik...",
-"Misspelled word": "\u00b8Nepravilno \u010drkovana beseda",
-"Suggestions": "Predlogi",
-"Change": "Spremeni",
-"Finding word suggestions": "Iskanje predlogov besed",
-"Success": "Uspe\u0161no",
-"Repair": "Popravi",
-"Issue {0} of {1}": "Te\u017eava {0} od {1}",
-"Images must be marked as decorative or have an alternative text description": "Slike morajo biti ozna\u010dene kot okrasne ali morajo imeti nadomestni opis v obliki besedila",
-"Images must have an alternative text description. Decorative images are not allowed.": "Slike morajo imeti nadomestni opis v obliki besedila.  Okrasne slike niso dovoljene.",
-"Or provide alternative text:": "Ali podajte nadomestno besedilo:",
-"Make image decorative:": "Dolo\u010di sliko kot okrasno:",
-"ID attribute must be unique": "ID atribut mora biti edinstven",
-"Make ID unique": "Ustvari edinstven ID",
-"Keep this ID and remove all others": "Obdr\u017ei ta ID in odstrani vse ostale",
-"Remove this ID": "Odstrani ta ID",
-"Remove all IDs": "Odstrani vse IDje",
-"Checklist": "Seznam preverjanj"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/sr.es5.js b/build/media_source/vendor/tinymce/langs/sr.es5.js
deleted file mode 100644
index ef72404532444..0000000000000
--- a/build/media_source/vendor/tinymce/langs/sr.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('sr',{
-"Cut": "Iseci",
-"Header 2": "Zaglavlje 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Va\u0161 pretra\u017eiva\u010d nepodr\u017eava direktan pristup prenosu.Koristite Ctrl+X\/C\/V pre\u010dice na tastaturi",
-"Div": "Div",
-"Paste": "Nalepi",
-"Close": "Zatvori",
-"Font Family": "Vrsta fonta",
-"Pre": "Pre",
-"Align right": "Poravnano  desno",
-"New document": "Novi dokument",
-"Blockquote": "Navodnici",
-"Numbered list": "Numerisana lista",
-"Increase indent": "Pove\u0107aj uvla\u010denje",
-"Formats": "Formatiraj",
-"Headers": "Zaglavlje",
-"Select all": "Obele\u017ei sve",
-"Header 3": "Zaglavlje 3",
-"Blocks": "Blokovi",
-"Undo": "Nazad",
-"Strikethrough": "Precrtan",
-"Bullet list": "Lista nabrajanja",
-"Header 1": "Zaglavlje 1",
-"Superscript": "Natpis",
-"Clear formatting": "Brisanje formatiranja",
-"Font Sizes": "Veli\u010dine fontova",
-"Subscript": "Potpisan",
-"Header 6": "Zaglavlje 6",
-"Redo": "Napred",
-"Paragraph": "Paragraf",
-"Ok": "Ok",
-"Bold": "Podebljan",
-"Code": "Kod",
-"Italic": "isko\u0161en",
-"Align center": "Poravnano centar",
-"Header 5": "Zaglavlje 5",
-"Decrease indent": "Smanji uvla\u010denje",
-"Header 4": "Zaglavlje 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Nalepiti je sada u obi\u010dnom text modu.Sadr\u017eaj \u0107e biti nalepljen kao obi\u010dan tekst dok ne ugasite ovu opciju.",
-"Underline": "Podvu\u010den",
-"Cancel": "Opozovi",
-"Justify": "Poravnanje",
-"Inline": "U liniji",
-"Copy": "Kopiraj",
-"Align left": "Poravnano levo",
-"Visual aids": "Vizuelna pomagala",
-"Lower Greek": "Ni\u017ei gr\u010dki",
-"Square": "Kvadrat",
-"Default": "Podrazumevano",
-"Lower Alpha": "Donja Alpha",
-"Circle": "Krug",
-"Disc": "Disk",
-"Upper Alpha": "Gornji Alpha",
-"Upper Roman": "Gornji Roman",
-"Lower Roman": "Donji Roman",
-"Name": "Ime",
-"Anchor": "Sidro",
-"You have unsaved changes are you sure you want to navigate away?": "Imate nesa\u010duvane promene dali ste sigurni da \u017eelite da iza\u0111ete?",
-"Restore last draft": "Vrati  poslednji nacrt",
-"Special character": "Specijalni karakter",
-"Source code": "Izvorni kod",
-"Right to left": "Sa desne na levu",
-"Left to right": "Sa leve na desnu",
-"Emoticons": "Smajliji",
-"Robots": "Roboti",
-"Document properties": "Postavke dokumenta",
-"Title": "Naslov",
-"Keywords": "Klju\u010dne re\u010di",
-"Encoding": "Kodiranje",
-"Description": "Opis",
-"Author": "Autor",
-"Fullscreen": "Pun ekran",
-"Horizontal line": "Horizontalna linija",
-"Horizontal space": "Horizontalni razmak",
-"Insert\/edit image": "Ubaci\/Promeni sliku",
-"General": "Op\u0161te",
-"Advanced": "Napredno",
-"Source": "Izvor",
-"Border": "Okvir",
-"Constrain proportions": "Ograni\u010dene proporcije",
-"Vertical space": "Vertikalni razmak",
-"Image description": "Opis slike",
-"Style": "Stil",
-"Dimensions": "Dimenzije",
-"Insert image": "Ubaci sliku",
-"Insert date\/time": "Ubaci datum\/vreme",
-"Remove link": "Ukloni link",
-"Url": "Url",
-"Text to display": "Tekst za prikaz",
-"Anchors": "sidro",
-"Insert link": "Ubaci vezu",
-"New window": "Novi prozor",
-"None": "Ni\u0161ta",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "Meta",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "Ubaci\/promeni vezu",
-"Insert\/edit video": "Ubaci\/promeni video",
-"Poster": "Poster",
-"Alternative source": "Alternativni izvor",
-"Paste your embed code below:": "Nalepite ugra\u0111eni kod ispod:",
-"Insert video": "Ubaci video",
-"Embed": "Ugra\u0111eno",
-"Nonbreaking space": "bez ramaka",
-"Page break": "Lomljenje stranice",
-"Paste as text": "Nalepi kao tekst",
-"Preview": "Pregled",
-"Print": "\u0160tampanje",
-"Save": "Sa\u010duvati",
-"Could not find the specified string.": "Nije mogu\u0107e prona\u0107i navedeni niz.",
-"Replace": "Zameni",
-"Next": "Slede\u0107i",
-"Whole words": "Cele re\u010di",
-"Find and replace": "Na\u0111i i zameni",
-"Replace with": "Zameni sa",
-"Find": "Na\u0111i",
-"Replace all": "Zameni sve",
-"Match case": "Predmet za upore\u0111ivanje",
-"Prev": "Prethodni",
-"Spellcheck": "Provera pravopisa",
-"Finish": "Kraj",
-"Ignore all": "Ignori\u0161i sve",
-"Ignore": "ignori\u0161i",
-"Insert row before": "Ubaci red pre",
-"Rows": "Redovi",
-"Height": "Visina",
-"Paste row after": "Nalepi red posle",
-"Alignment": "Svrstavanje",
-"Column group": "Grupa kolone",
-"Row": "Red",
-"Insert column before": "Ubaci kolonu pre",
-"Split cell": "Razdvoji \u0107elije",
-"Cell padding": "Razmak \u0107elije",
-"Cell spacing": "Prostor \u0107elije",
-"Row type": "Tip reda",
-"Insert table": "ubaci tabelu",
-"Body": "Telo",
-"Caption": "Natpis",
-"Footer": "Podno\u017eje",
-"Delete row": "Obri\u0161i red",
-"Paste row before": "Nalepi red pre",
-"Scope": "Obim",
-"Delete table": "Obri\u0161i tabelu",
-"Header cell": "Visina \u0107elije",
-"Column": "Kolona",
-"Cell": "\u0106elija",
-"Header": "Zaglavlje",
-"Cell type": "Tip \u0107elije",
-"Copy row": "Kopiraj red",
-"Row properties": "Postavke reda",
-"Table properties": "Postavke tabele",
-"Row group": "Grupa reda",
-"Right": "Desno",
-"Insert column after": "Ubaci kolonu posle",
-"Cols": "Kolone",
-"Insert row after": "Ubaci red posle",
-"Width": "\u0160irina",
-"Cell properties": "Postavke \u0107elije",
-"Left": "Levo",
-"Cut row": "Iseci red",
-"Delete column": "Obri\u0161i kolonu",
-"Center": "Centar",
-"Merge cells": "Spoji \u0107elije",
-"Insert template": "Ubaci \u0161ablon",
-"Templates": "\u0160abloni",
-"Background color": "Boja pozadine",
-"Text color": "Boja tekst",
-"Show blocks": "Prikaz blokova",
-"Show invisible characters": "Prika\u017ei nevidljive karaktere",
-"Words: {0}": "Re\u010di:{0}",
-"Insert": "Umetni",
-"File": "Datoteka",
-"Edit": "Ure\u0111ivanje",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Oboga\u0107en tekst. Pritisni te ALT-F9 za meni.Pritisnite ALT-F10 za traku sa alatkama.Pritisnite ALT-0 za pomo\u0107",
-"Tools": "Alatke",
-"View": "Prikaz",
-"Table": "Tabela",
-"Format": "Format"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/sv.es5.js b/build/media_source/vendor/tinymce/langs/sv.es5.js
deleted file mode 100644
index 68531d5377e60..0000000000000
--- a/build/media_source/vendor/tinymce/langs/sv.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('sv',{
-"Cut": "Klipp ut",
-"Heading 5": "Rubrik 5",
-"Header 2": "Rubrik 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Din webbl\u00e4sare st\u00f6djer inte direkt \u00e5tkomst till urklipp. V\u00e4nligen anv\u00e4nd kortkommandona Ctrl+X\/C\/V i st\u00e4llet.",
-"Heading 4": "Rubrik 4",
-"Div": "Div",
-"Heading 2": "Rubrik 2",
-"Paste": "Klistra in",
-"Close": "St\u00e4ng",
-"Font Family": "Teckensnitt",
-"Pre": "F\u00f6rformaterad",
-"Align right": "H\u00f6gerst\u00e4ll",
-"New document": "Nytt dokument",
-"Blockquote": "Blockcitat",
-"Numbered list": "Nummerlista",
-"Heading 1": "Rubrik 1",
-"Headings": "Rubriker",
-"Increase indent": "\u00d6ka indrag",
-"Formats": "Format",
-"Headers": "Rubriker",
-"Select all": "Markera allt",
-"Header 3": "Rubrik 3",
-"Blocks": "Block",
-"Undo": "\u00c5ngra",
-"Strikethrough": "Genomstruken",
-"Bullet list": "Punktlista",
-"Header 1": "Rubrik 1",
-"Superscript": "Upph\u00f6jd text",
-"Clear formatting": "Ta bort format",
-"Font Sizes": "Storlek",
-"Subscript": "Neds\u00e4nkt text",
-"Header 6": "Rubrik 6",
-"Redo": "G\u00f6r om",
-"Paragraph": "Br\u00f6dtext",
-"Ok": "OK",
-"Bold": "Fetstil",
-"Code": "Kod",
-"Italic": "Kursiv stil",
-"Align center": "Centrera",
-"Header 5": "Rubrik 5",
-"Heading 6": "Rubrik 6",
-"Heading 3": "Rubrik 3",
-"Decrease indent": "Minska indrag",
-"Header 4": "Rubrik 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Klistra in \u00e4r nu i textl\u00e4ge. Inneh\u00e5ll kommer att konverteras till text tills du sl\u00e5r av detta l\u00e4ge.",
-"Underline": "Understruken",
-"Cancel": "Avbryt",
-"Justify": "Justera",
-"Inline": "P\u00e5 rad",
-"Copy": "Kopiera",
-"Align left": "V\u00e4nsterst\u00e4ll",
-"Visual aids": "Visuella hj\u00e4lpmedel",
-"Lower Greek": "Grekiska gemener",
-"Square": "Fyrkant",
-"Default": "Original",
-"Lower Alpha": "Gemener",
-"Circle": "Cirkel",
-"Disc": "Disk",
-"Upper Alpha": "Versaler",
-"Upper Roman": "Romerska versaler",
-"Lower Roman": "Romerska gemener",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "ID skall b\u00f6rja med en boktav och endast f\u00f6ljas av bokst\u00c4ver a-z, siffror, bindestreck, punkt, kolon eller understreck.",
-"Name": "Namn",
-"Anchor": "Ankare",
-"Id": "ID",
-"You have unsaved changes are you sure you want to navigate away?": "Du har f\u00f6r\u00e4ndringar som du inte har sparat. \u00c4r du s\u00e4ker p\u00e5 att du vill navigera vidare?",
-"Restore last draft": "\u00c5terst\u00e4ll senaste utkast",
-"Special character": "Specialtecken",
-"Source code": "K\u00e4llkod",
-"Language": "Spr\u00e5k",
-"Insert\/Edit code sample": "Infoga\/\u00e4ndra kodexempel",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "F\u00e4rg",
-"Right to left": "H\u00f6ger till v\u00e4nster",
-"Left to right": "V\u00e4nster till h\u00f6ger",
-"Emoticons": "Emoticons",
-"Robots": "Robotar",
-"Document properties": "Dokumentegenskaper",
-"Title": "Titel",
-"Keywords": "Nyckelord",
-"Encoding": "Kodning",
-"Description": "Beskrivning",
-"Author": "F\u00f6rfattare",
-"Fullscreen": "Fullsk\u00e4rm",
-"Horizontal line": "Horisontell linje",
-"Horizontal space": "Horisontellt utrymme",
-"Insert\/edit image": "Infoga\/redigera bild",
-"General": "Generella",
-"Advanced": "Avancerat",
-"Source": "K\u00e4lla",
-"Border": "Ram",
-"Constrain proportions": "Begr\u00e4nsa proportioner",
-"Vertical space": "Vertikaltutrymme",
-"Image description": "Bildbeskrivning",
-"Style": "Stil",
-"Dimensions": "Dimensioner",
-"Insert image": "Infoga bild",
-"Image": "Bild",
-"Zoom in": "Zooma in",
-"Contrast": "Kontrast",
-"Back": "Tillbaka",
-"Gamma": "Gamma",
-"Flip horizontally": "V\u00e4nd horsontellt",
-"Resize": "Skala om",
-"Sharpen": "Sk\u00e4rpa",
-"Zoom out": "Zooma ut",
-"Image options": "Bildalternativ",
-"Apply": "Verst\u00e4ll",
-"Brightness": "Ljusstyrka",
-"Rotate clockwise": "Rotera medurs",
-"Rotate counterclockwise": "Rotera moturs",
-"Edit image": "\u00c4ndra bild",
-"Color levels": "F\u00e4rgniv\u00e5er",
-"Crop": "Besk\u00e4r",
-"Orientation": "Riktning",
-"Flip vertically": "V\u00e4nd vertikalt",
-"Invert": "Invertera",
-"Date\/time": "Datum\/tid",
-"Insert date\/time": "Infoga datum\/tid",
-"Remove link": "Ta bort l\u00e4nk",
-"Url": "Url",
-"Text to display": "Text att visa",
-"Anchors": "Bokm\u00e4rken",
-"Insert link": "Infoga l\u00e4nk",
-"Link": "L\u00e4nk",
-"New window": "Nytt f\u00f6nster",
-"None": "Ingen",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Urlen du angav verkar vara en extern l\u00e4nk. Vill du l\u00e4gga till http:\/\/ prefixet?",
-"Paste or type a link": "Klistra in eller ange en l\u00e4nk",
-"Target": "M\u00e5l",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Urlen du angav verkar vara en epost adress. Vill du l\u00e4gga till ett mailto: prefix?",
-"Insert\/edit link": "Infoga\/redigera l\u00e4nk",
-"Insert\/edit video": "Infoga\/redigera video",
-"Poster": "Affish",
-"Alternative source": "Alternativ k\u00e4lla",
-"Paste your embed code below:": "Klistra in din inb\u00e4ddningskod nedan:",
-"Insert video": "Infoga video",
-"Poster": "Affish",
-"Insert\/edit media": "Infoga\/\u00e4ndra media",
-"Embed": "Inb\u00e4ddning",
-"Nonbreaking space": "Avbrottsfritt mellanrum",
-"Page break": "Sydbrytning",
-"Paste as text": "Klistra in som text",
-"Preview": "F\u00f6rhandsgranska",
-"Print": "Skriv ut",
-"Save": "Spara",
-"Could not find the specified string.": "Kunde inte hitta den specifierade st\u00e4ngen.",
-"Replace": "Ers\u00e4tt",
-"Next": "N\u00e4sta",
-"Whole words": "Hela ord",
-"Find and replace": "S\u00f6k och ers\u00e4tt",
-"Replace with": "Ers\u00e4tt med",
-"Find": "S\u00f6k",
-"Replace all": "Ers\u00e4tt alla",
-"Match case": "Matcha gemener\/versaler",
-"Prev": "F\u00f6reg\u00e5ende",
-"Spellcheck": "R\u00e4ttstava",
-"Finish": "Avsluta",
-"Ignore all": "Ignorera alla",
-"Ignore": "Ignorera",
-"Add to Dictionary": "L\u00e4gg till i ordlista",
-"Insert row before": "Infoga rad f\u00f6re",
-"Rows": "Rader",
-"Height": "H\u00f6jd",
-"Paste row after": "Klistra in rad efter",
-"Alignment": "Justering",
-"Border color": "Ramf\u00e4rg",
-"Column group": "Kolumngrupp",
-"Row": "Rad",
-"Insert column before": "Infoga kollumn f\u00f6re",
-"Split cell": "Bryt is\u00e4r celler",
-"Cell padding": "Cellpaddning",
-"Cell spacing": "Cellmellanrum",
-"Row type": "Radtyp",
-"Insert table": "Infoga tabell",
-"Body": "Kropp",
-"Caption": "Rubrik",
-"Footer": "Fot",
-"Delete row": "Radera rad",
-"Paste row before": "Klista in rad f\u00f6re",
-"Scope": "Omf\u00e5ng",
-"Delete table": "Radera tabell",
-"H Align": "H-justering",
-"Top": "Toppen",
-"Header cell": "Huvudcell",
-"Column": "Kolumn",
-"Row group": "Radgrupp",
-"Cell": "Cell",
-"Middle": "Mitten",
-"Cell type": "Celltyp",
-"Copy row": "Kopiera rad",
-"Row properties": "Radegenskaper",
-"Table properties": "Tabellegenskaper",
-"Bottom": "Botten",
-"V Align": "V-justering",
-"Header": "Huvud",
-"Right": "H\u00f6ger",
-"Insert column after": "Infoga kolumn efter",
-"Cols": "Kolumner",
-"Insert row after": "Infoga rad efter",
-"Width": "Bredd",
-"Cell properties": "Cellegenskaper",
-"Left": "V\u00e4nster",
-"Cut row": "Klipp ut rad",
-"Delete column": "Radera kolumn",
-"Center": "Centrum",
-"Merge cells": "Sammanfoga celler",
-"Insert template": "Infoga mall",
-"Templates": "Mallar",
-"Background color": "Bakgrundsf\u00e4rg",
-"Custom...": "Anpassad...",
-"Custom color": "Anpassad f\u00e4rg",
-"No color": "Ingen f\u00e4rg",
-"Text color": "Textf\u00e4rg",
-"Table of Contents": "Inneh\u00e5llsf\u00f6rteckning",
-"Show blocks": "Visa block",
-"Show invisible characters": "Visa onsynliga tecken",
-"Words: {0}": "Ord: {0}",
-"Insert": "Infoga",
-"File": "Fil",
-"Edit": "Redigera",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Textredigerare. Tryck ALT-F9 f\u00f6r menyn. Tryck ALT-F10 f\u00f6r verktygsrader. Tryck ALT-0 f\u00f6r hj\u00e4lp.",
-"Tools": "Verktyg",
-"View": "Visa",
-"Table": "Tabell",
-"Format": "Format"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/sw.es5.js b/build/media_source/vendor/tinymce/langs/sw.es5.js
deleted file mode 100644
index f3e959ce9cb22..0000000000000
--- a/build/media_source/vendor/tinymce/langs/sw.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('sw',{
-"Cut": "Kata",
-"Heading 5": "Kichwa 5",
-"Header 2": "Kijajuu 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Kisakuzi chako hakiauniwi kufika kwa clipboard moja kwa moja. Tafadhali tumia njia fupi ya kinanda taipu, kama Ctrl+X\/C\/V.",
-"Heading 4": "Kichwa 4",
-"Div": "Div",
-"Heading 2": "Kichwa 2",
-"Paste": "Bandika",
-"Close": "Funga",
-"Font Family": "Jamii ya fonti",
-"Pre": "Iliofomatiwa",
-"Align right": "Panga kulia",
-"New document": "Waraka mpya",
-"Blockquote": "Nukuu",
-"Numbered list": "Orodha ya nambari",
-"Heading 1": "Kichwa 1",
-"Headings": "Vichwa",
-"Increase indent": "Ongeza jongezo",
-"Formats": "Fomati",
-"Headers": "Vijajuu",
-"Select all": "Chagua zote",
-"Header 3": "Kijajuu 3",
-"Blocks": "Matofali",
-"Undo": "Tengua",
-"Strikethrough": "Mkato ulalo",
-"Bullet list": "Orodha ya tobo",
-"Header 1": "Kijajuu 1",
-"Superscript": "Hati juu",
-"Clear formatting": "Safisha fomati",
-"Font Sizes": "Ukubwa wa fonti",
-"Subscript": "Hati chini",
-"Header 6": "Kijajuu 6",
-"Redo": "Rudia",
-"Paragraph": "Aya",
-"Ok": "Ok",
-"Bold": "Nene",
-"Code": "Kodi",
-"Italic": "Italiki",
-"Align center": "Panga katikati",
-"Header 5": "Kijajuu 5",
-"Heading 6": "Kichwa 6",
-"Heading 3": "Kichwa 3",
-"Decrease indent": "Punguza jongezo",
-"Header 4": "Kijajuu 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Bandika sasa iko katika modi ya matini ghafi. Yaliyomo yatabandikwa kama matini ghafi mpaka utakapo zima chaguo hili.",
-"Underline": "Pigia mstari",
-"Cancel": "Ghairi",
-"Justify": "Sawazisha",
-"Inline": "Inline",
-"Copy": "Nakili",
-"Align left": "Panga kushoto",
-"Visual aids": "Misaada ya kuona",
-"Lower Greek": "Herufi ndogo za kigiriki",
-"Square": "Mraba",
-"Default": "Difoti",
-"Lower Alpha": "Herufi ndogo",
-"Circle": "Duara",
-"Disc": "Nukta",
-"Upper Alpha": "Herufi kubwa",
-"Upper Roman": "Herufi kubwa za kirumi",
-"Lower Roman": "Herufi ndogo za kirumi",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Kitambulisho kinapaswa kuanza na herufi kufwatiwa na maherufi, manambari, madeshi, vitone, minukta pacha au vistari chini pekee.",
-"Name": "Jina",
-"Anchor": "Nanga",
-"Id": "Kitambulisho",
-"You have unsaved changes are you sure you want to navigate away?": "Uko na mabadilisho ambayo hujayahifadhi. Una hakika unataka kuwacha?",
-"Restore last draft": "Rejesha mswadajaribio wa mwisho",
-"Special character": "Kikambo maalum",
-"Source code": "Chanzo",
-"Language": "Lugha",
-"Insert\/Edit code sample": "Ingiza\/hariri mfano wa kodi",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "Rangi",
-"Right to left": "Kulia-kushoto",
-"Left to right": "Kushoto-kulia",
-"Emoticons": "Emoticons",
-"Robots": "Roboti",
-"Document properties": "Sifa za waraka",
-"Title": "Kichwa",
-"Keywords": "Maneno misingi",
-"Encoding": "Usimbaji",
-"Description": "Fafanuo",
-"Author": "Mwandishi",
-"Fullscreen": "Skrini kamili",
-"Horizontal line": "Mstari mlalo",
-"Horizontal space": "Nafasi mlalo",
-"Insert\/edit image": "Ingiza\/hariri picha",
-"General": "Ujumla",
-"Advanced": "Hali ya juu",
-"Source": "Kodi ya chanzo",
-"Border": "Mkingo",
-"Constrain proportions": "Lazimisha uwiano",
-"Vertical space": "Nafasi wima",
-"Image description": "Fafanuo la picha",
-"Style": "Mtindo",
-"Dimensions": "Kipimo",
-"Insert image": "Ingiza picha",
-"Image": "Picha",
-"Zoom in": "Kuza zaidi",
-"Contrast": "Ulinganuzi",
-"Back": "Nyuma",
-"Gamma": "Gamma",
-"Flip horizontally": "Geuza mlalo",
-"Resize": "Badilisha ukubwa",
-"Sharpen": "Chonga",
-"Zoom out": "Fifiza",
-"Image options": "Machaguo ya picha",
-"Apply": "Omba",
-"Brightness": "Mwangaza",
-"Rotate clockwise": "Zungusha mwelekeo saa",
-"Rotate counterclockwise": "Zungusha mwelekeo kinyume cha saa",
-"Edit image": "Hariri",
-"Color levels": "Viwango vya rangi",
-"Crop": "Puna",
-"Orientation": "Uelekeo",
-"Flip vertically": "Geuza wima",
-"Invert": "Pindua",
-"Date\/time": "Tarehe\/saa",
-"Insert date\/time": "Ingiza tarehe\/saa",
-"Remove link": "Ondoa kiungo",
-"Url": "URL",
-"Text to display": "Matini ya kuonyesha",
-"Anchors": "Mananga",
-"Insert link": "Ingiza kiungo",
-"Link": "Kiungo",
-"New window": "Dirisha jipya",
-"None": "Hakuna",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL ulioingiza unaonekana ni kama kiungo cha nje. Unataka kuongeza prefix inayohitajika, ambayo ni http:\/\/ ?",
-"Paste or type a link": "Bandika au kuchapa kiungo",
-"Target": "Lengo",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL ulioingiza unaonekana ni kama anwani ya barua pepe. Unataka kuongeza prefix inayohitajika, ambayo ni mailto: ?",
-"Insert\/edit link": "Ingiza\/hariri kiungo",
-"Insert\/edit video": "Ingiza\/hariri video",
-"Media": "Midia",
-"Alternative source": "Chanzo cha mbadala",
-"Paste your embed code below:": "Bandika kodi yako ya kupachika hapo chini:",
-"Insert video": "Ingiza video",
-"Poster": "Bando",
-"Insert\/edit media": "Ingiza\/hariri midia",
-"Embed": "Pachika",
-"Nonbreaking space": "Nafasi fungamanishi",
-"Page break": "Kigawa kurasa",
-"Paste as text": "Bandika kama matini",
-"Preview": "Hakikisho",
-"Print": "Chapisha",
-"Save": "Hifadhi",
-"Could not find the specified string.": "Haikuweza kupata tungo lililoelezwa.",
-"Replace": "Badilisha",
-"Next": "Ifuatayo",
-"Whole words": "Maneno kamili",
-"Find and replace": "Tafuta na badilisha",
-"Replace with": "Badilisha na",
-"Find": "Tafuta",
-"Replace all": "Badilisha zote",
-"Match case": "Tahadhari herufi ndogo\/kubwa",
-"Prev": "Iliopita",
-"Spellcheck": "Ukaguzi tahajia",
-"Finish": "Maliza",
-"Ignore all": "Puuza zote",
-"Ignore": "Puuza",
-"Add to Dictionary": "Ongeza kwa kamusi",
-"Insert row before": "Ingiza safumlalo kabla",
-"Rows": "Masafumlalo",
-"Height": "Urefu",
-"Paste row after": "Bandika safumlalo baada",
-"Alignment": "Mpangilio",
-"Border color": "Rangi ya mkingo",
-"Column group": "Kikundi cha safuwima",
-"Row": "Safumlalo",
-"Insert column before": "Ingiza safuwima kabla",
-"Split cell": "Bainisha seli",
-"Cell padding": "Pedi ya seli",
-"Cell spacing": "Nafasi ya seli",
-"Row type": "Aina ya safumlalo",
-"Insert table": "Ingiza jedwali",
-"Body": "Mwili",
-"Caption": "Manukuu",
-"Footer": "Kijachini",
-"Delete row": "Futa safumlalo",
-"Paste row before": "Bandika safumlalo kabla",
-"Scope": "Wigo",
-"Delete table": "Futa jedwali",
-"H Align": "Pangilia mlalo",
-"Top": "Juu",
-"Header cell": "Seli ya kijajuu",
-"Column": "Safuwima",
-"Row group": "Kikundi cha safumlalo",
-"Cell": "Seli",
-"Middle": "Katikati",
-"Cell type": "Aina ya seli",
-"Copy row": "Nakili safumlalo",
-"Row properties": "Mali ya safumlalo",
-"Table properties": "Masifa ya jedwali",
-"Bottom": "Chini",
-"V Align": "Pangilia wima",
-"Header": "Kijajuu",
-"Right": "Kulia",
-"Insert column after": "Ingiza safuwima baada",
-"Cols": "Masafuwima",
-"Insert row after": "Ingiza safumlalo baada",
-"Width": "Upana",
-"Cell properties": "Mali ya seli",
-"Left": "Kushoto",
-"Cut row": "Kata safumlalo",
-"Delete column": "Futa safuwima",
-"Center": "Katikati",
-"Merge cells": "Unganisha maseli",
-"Insert template": "Ingiza templeti",
-"Templates": "Templeti",
-"Background color": "Rangi ya usuli",
-"Custom...": "Desturi...",
-"Custom color": "Rangi ya desturi",
-"No color": "Hakuna rangi",
-"Text color": "Rangi ya matini",
-"Table of Contents": "Jedwali la yaliyomo",
-"Show blocks": "Onyesha matofali",
-"Show invisible characters": "Onyesha vibambo visivyoonekana",
-"Words: {0}": "Maneno: {0}",
-"Insert": "Ingiza",
-"File": "Faili",
-"Edit": "Hariri picha",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Eneo la matini tondoti. Bofya ALT-F9 kwa menyu. Bofya ALT-F10 kwa upauzana. Bofya ALT-0 kwa usaidizi",
-"Tools": "Zana",
-"View": "Mtazamo",
-"Table": "Jedwali",
-"Format": "Fomati",
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/sy.es5.js b/build/media_source/vendor/tinymce/langs/sy.es5.js
deleted file mode 100644
index 70520dd467891..0000000000000
--- a/build/media_source/vendor/tinymce/langs/sy.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('sy',{
-"Cut": "\u0729\u0718\u0728",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0721\u0713\u0712\u0717 Ctrl+X\/C\/V \u0712\u072a\u0718\u0723\u072a \u0715\u071d\u0718\u071f\u0742 \u0720\u0710 \u071d\u0720\u0717 \u0721\u072c\u0725\u0715\u072a\u0722\u0710 \u071a\u0715\u072a\u072b\u0710 \u0720\u0725\u0712\u0742\u072a\u0710 \u0720\u071b\u0712\u0742\u0720\u071d\u072c \u0729\u071d\u0728\u072c\u0710. \u0710\u0722 \u0712\u0723\u0721\u0710 \u0720\u0718\u071f\u0742 \u0721\u0726\u0720\u071a \u0713\u0715\u071d\u0721\u0718\u072c \u0729\u0726\u0720\u0710",
-"Paste": "\u0715\u0712\u072b",
-"Close": "\u0715\u0712\u0742\u0718\u072a",
-"Align right": "\u0721\u0723\u0715\u072a\u072c\u0710 \u0720\u071d\u0721\u071d\u0722\u0710",
-"New document": "\u0722\u0718\u0717\u072a\u0710 \u071a\u0715\u072c\u0710",
-"Numbered list": "\u0729\u071d\u0721\u072c\u0710 \u0721\u072a\u0718\u0729\u0721\u072c\u0710",
-"Increase indent": "\u0721\u0719\u071d\u0715 \u0723\u0726\u071d\u0729\u0718\u072c\u0710 \u0715\u072b\u0718\u072a\u071d\u0710 \u0715\u0723\u072a\u071b\u0710",
-"Formats": "\u0710\u0723\u071f\u071d\u0721\u0308\u0710",
-"Select all": "\u0726\u072a\u0718\u072b \u0720\u071f\u0720",
-"Undo": "\u0720\u0710 \u0725\u0712\u0742\u0718\u0715",
-"Strikethrough": "\u0723\u072a\u071b\u0710 \u0721\u0713\u0718",
-"Bullet list": "\u0729\u071d\u0721\u072c\u0710 \u0715\u071f\u0726\u071d\u072c\u0308\u0710",
-"Superscript": "\u072a\u0712 \u0723\u072a\u071b\u0710",
-"Clear formatting": "\u072b\u071d\u0718\u0726 \u0720\u0710\u0723\u071f\u071d\u0721\u0308\u0710",
-"Subscript": "\u0726\u0725\u0718\u072c \u0723\u072a\u071b\u0710",
-"Redo": "\u0721\u071b\u071d\u0712\u0742\u0710",
-"Ok": "\u071b\u0712\u0742\u0710",
-"Bold": "\u071a\u0720\u071d\u0721\u0710",
-"Italic": "\u0713\u0722\u071d\u0710",
-"Align center": "\u0721\u0723\u0715\u072a\u072c\u0710 \u0712\u0726\u0720\u0713\u0710",
-"Decrease indent": "\u0721\u0712\u0728\u072a \u0723\u0726\u071d\u0729\u0718\u072c \u0715\u072b\u0718\u072a\u071d\u0710 \u0715\u0723\u072a\u071b\u0710",
-"Underline": "\u072c\u071a\u0718\u072c \u0713\u0330\u072a\u0713\u0710",
-"Cancel": "\u0721\u0712\u071b\u0720",
-"Justify": "\u0721\u0719\u0715\u0715\u0729\u0722\u0718\u072c\u0710",
-"Copy": "\u0722\u0723\u0718\u071f\u073c",
-"Align left": "\u0721\u0723\u0715\u072a\u072c\u0710 \u0720\u0723\u0721\u0720\u0710",
-"Visual aids": "\u0725\u0718\u0715\u072a\u0308\u0722\u0710 \u0721\u072c\u071a\u0719\u071d\u0722\u0308\u0710",
-"Lower Greek": "\u071d\u0718\u0722\u0722\u071d\u0710 \u072c\u071a\u072c\u071d\u0710",
-"Square": "\u0721\u072a\u0712\u0725\u0710",
-"Default": "\u0726\u072a\u071d\u072b\u0710",
-"Lower Alpha": "\u0710\u0720\u0726\u0712\u071d\u072c \u072c\u071a\u072c\u071d\u0308\u0710",
-"Circle": "\u071a\u0718\u0715\u072a\u0710",
-"Disc": "\u0729\u0712\u0742\u0722\u0710",
-"Upper Alpha": "\u0710\u0720\u0726\u0712\u071d\u072c \u0725\u0720\u071d\u072c\u0710",
-"Upper Roman": "\u072a\u0718\u0721\u0722 \u0725\u0720\u071d\u072c\u0710",
-"Lower Roman": "\u072a\u0718\u0721\u0722 \u072c\u071a\u072c\u071d\u072c\u0710",
-"Name": "\u072b\u0721\u0710",
-"Anchor": "\u0721\u072a\u0723\u0710",
-"You have unsaved changes are you sure you want to navigate away?": "\u0720\u0710 \u071d\u0718\u072c \u071a\u0718\u0721\u071d\u0710 \u0720\u072b\u0718\u071a\u0720\u0726\u0308\u0710\u060c \u071d\u0718\u072c \u071a\u072c\u071d\u072c\u0710 \u0715\u0712\u0725\u072c \u0726\u0720\u071b\u072c\u061f",
-"Restore last draft": "\u071a\u0721\u071d \u0720\u0721\u0718\u071f\u0721\u072c\u0710 \u071a\u072a\u071d\u072c\u0710",
-"Special character": "\u0710\u072c\u0718\u072c\u0710 \u0715\u071d\u0720\u0722\u071d\u072c\u0710",
-"Source code": "\u071f\u0718\u0715\u0710 \u0715\u0721\u0712\u0718\u0725\u0710",
-"Right to left": "\u071d\u0721\u071d\u0722\u0710 \u0720\u0723\u0721\u0720\u0710",
-"Left to right": "\u0723\u0721\u0720\u0710 \u0720\u071d\u0721\u071d\u0722\u0710",
-"Emoticons": "\u072a\u0308\u0721\u0719\u0710 \u0722\u0712\u0742\u0717\u071d\u0308\u0710",
-"Robots": "\u072a\u0718\u0712\u0718\u072c\u0308\u0710",
-"Document properties": "\u0715\u071d\u0720\u071d\u072c\u0308\u0710 \u0715\u0710\u072b\u071b\u072a\u0308\u0710",
-"Title": "\u0721\u0718\u0722\u0725\u0710",
-"Keywords": "\u071a\u0712\u072a\u0308\u0710 \u0715\u0729\u0715\u071d\u0720\u0710",
-"Encoding": "\u0721\u072c\u072a\u0721\u0719\u0718\u072c\u0710",
-"Description": "\u0710\u072a\u071d\u071f\u0742\u0718\u072c\u0710",
-"Author": "\u0723\u071d\u0718\u0721\u0710",
-"Fullscreen": "\u072b\u072b\u072c\u0710 \u0721\u0720\u071d\u072c\u0710",
-"Horizontal line": "\u0723\u072a\u071b\u0710 \u0710\u0718\u0726\u0729\u071d\u0710",
-"Horizontal space": "\u0723\u0726\u071d\u0729\u0718\u072c\u0710 \u0710\u0718\u0726\u0729\u071d\u072c\u0710",
-"Insert\/edit image": "\u0721\u0725\u0712\u0742\u072a\/\u072b\u071a\u0720\u0726 \u0720\u0728\u0718\u072a\u072c\u0710",
-"General": "\u0713\u0718\u0722\u071d\u0710",
-"Advanced": "\u0721\u072b\u0718\u072b\u071b\u0710",
-"Source": "URL",
-"Border": "\u072c\u071a\u0718\u0721\u0308\u0710",
-"Constrain proportions": "\u0712\u071d\u072c\u071d\u0718\u072c\u0710 \u0715\u0721\u0729\u0718\u0715\u0722\u0718\u072c\u0710",
-"Vertical space": "\u0723\u0726\u071d\u0729\u0718\u072c\u0710 \u0725\u0721\u0718\u0715\u071d\u072c\u0710",
-"Image description": "\u0710\u072a\u071d\u071f\u0742\u0718\u072c\u0710 \u0715\u0728\u0718\u072a\u072c\u0710",
-"Style": "\u0710\u0723\u071f\u071d\u0721\u0710",
-"Dimensions": "\u072a\u071a\u0729\u0718\u072c\u0710",
-"Insert image": "\u0721\u0725\u0712\u0742\u072a \u0728\u0718\u072a\u072c\u0710",
-"Insert date\/time": "\u0721\u0725\u0712\u0742\u072a \u0723\u071d\u0729\u0718\u0721\u0710\/\u0725\u0715\u0722\u0710",
-"Remove link": "\u072b\u071d\u0718\u0726 \u0720\u0710\u0723\u072a\u0710",
-"Url": "Url",
-"Text to display": "\u0728\u071a\u071a\u0710 \u0720\u0721\u071a\u0719\u0718\u071d\u0710",
-"Insert link": "\u0721\u0725\u0712\u0742\u072a \u0710\u0723\u072a\u0710",
-"New window": "\u0718\u071d\u0722\u0715\u0718\u0719 \u071a\u0715\u072c\u072c\u0710",
-"None": "\u0717\u071d\u071f\u0330 \u071a\u0715",
-"Target": "\u0722\u071d\u072b\u0710",
-"Insert\/edit link": "\u0721\u0725\u0712\u0742\u072a\/\u0723\u071d\u0721\u072c\u0710 \u0715\u0710\u0723\u072a\u0710",
-"Insert\/edit video": "\u0721\u0725\u0712\u0742\u072a\/\u0723\u071d\u0721\u072c\u0710 \u0715\u0712\u0742\u071d\u0715\u071d\u0718",
-"Poster": "\u072b\u0718\u072c\u0726\u071d\u072c\u0308\u0710",
-"Alternative source": "\u0721\u0712\u0718\u0725\u0710 \u072c\u071a\u0720\u0718\u0726\u0710",
-"Paste your embed code below:": "\u0715\u0712\u072b \u071f\u0718\u0715\u0710 \u071a\u0712\u0742\u071d\u072b\u0710 \u0712\u0710\u0720\u072c\u071a\u072c:",
-"Insert video": "\u0721\u0725\u0712\u0742\u072a \u0712\u0742\u071d\u0715\u071d\u0718",
-"Embed": "\u071a\u0712\u0742\u0718\u072b",
-"Nonbreaking space": "\u0720\u071d\u072c \u0729\u071b\u0725\u072c\u0710 \u0715\u0723\u0726\u071d\u0729\u0718\u072c\u0710",
-"Preview": "\u071a\u071d\u072a\u072c\u0710",
-"Print": "\u071b\u0712\u0742\u0725\u072c\u0710",
-"Save": "\u071a\u0721\u071d\u072c\u0710",
-"Could not find the specified string.": "\u0720\u0710 \u0721\u0728\u0710 \u0720\u0717 \u0721\u072b\u071f\u0330\u0718\u071a\u0710 \u072b\u072b\u0720\u072c\u0710 \u072c\u0718\u071a\u0721\u072c\u0710",
-"Replace": "\u072b\u071a\u0720\u0726",
-"Next": "\u0712\u072c\u0742\u072a\u0717",
-"Whole words": "\u071f\u0720\u071d\u0717\u071d \u071a\u0712\u072a\u0308\u0710",
-"Find and replace": "\u0721\u072b\u071f\u0330\u071a \u0718\u072b\u071a\u0720\u0726",
-"Replace with": "\u072b\u071a\u0720\u0726 \u0712\u071d\u0715",
-"Find": "\u0721\u072b\u071f\u0330\u071a",
-"Replace all": "\u072b\u071a\u0720\u0726 \u071f\u0720\u071d\u0717\u071d",
-"Match case": "\u0713\u0718\u072a\u072c\u0710\/\u0719\u0725\u072a\u072c\u0710 ",
-"Prev": "\u0715\u0725\u0712\u0742\u072a",
-"Spellcheck": "\u0728\u071a\u0728\u071d\u072c\u0710 \u0715\u0717\u0718\u0713\u071d\u0710",
-"Finish": "\u0726\u072a\u0729\u0710",
-"Ignore all": "\u0710\u0717\u0721\u071d \u071f\u0720\u071d\u0717\u071d",
-"Ignore": "Ign\u0725\u0715\u0722\u0710",
-"Insert row before": "\u0721\u0725\u0712\u0742\u072a \u0713\u0330\u072a\u0713\u0710 \u0721\u0729\u0715\u0747\u0721",
-"Rows": "Righe",
-"Height": "\u071d\u0721\u071d\u0722\u0710",
-"Paste row after": "\u0715\u0712\u072b \u0713\u0330\u072a\u0713\u0710 \u0712\u072c\u072a",
-"Alignment": "\u0721\u0713\u0330\u072a\u0713\u0722\u072c\u0710",
-"Column group": "\u071f\u0718\u0722\u072b\u0710 \u0715\u0725\u0721\u0718\u0715\u0710",
-"Row": "\u0713\u0330\u072a\u0713\u0710",
-"Insert column before": "\u0721\u0725\u0712\u0742\u072a \u0725\u0721\u0718\u0715\u0710 \u0721\u0729\u0715\u0721",
-"Split cell": "\u0712\u072a\u0712\u0719 \u0720\u0729\u0720\u071d\u072c\u0710",
-"Cell padding": "\u0721\u0720\u071d\u072c\u0710 \u0715\u0729\u0720\u071d\u072c\u0710",
-"Cell spacing": "\u0723\u0726\u071d\u0729\u0718\u072c\u0710 \u0715\u0729\u0720\u071d\u072c\u0710",
-"Row type": "\u0710\u0715\u072b\u0710 \u0715\u0713\u0330\u072a\u0713\u0710",
-"Insert table": "\u0721\u0725\u0712\u0742\u072a \u0720\u071b\u0712\u0720\u0710",
-"Body": "\u0726\u0713\u073c\u072a\u0735\u0710",
-"Caption": "\u0712\u072a\u072b\u0721\u0710",
-"Footer": "\u0710\u0729\u0726\u072c\u0742\u0710",
-"Delete row": "\u072b\u0718\u0726 \u0720\u0713\u0330\u072a\u0713\u0710",
-"Paste row before": "\u0715\u0712\u072b \u0713\u0330\u072a\u0713\u0710 \u0721\u0729\u0715\u0721",
-"Scope": "\u071a\u0729\u0720\u0710",
-"Delete table": "\u072b\u0718\u0726 \u0720\u071b\u0712\u0720\u0710",
-"Header cell": "\u0729\u0720\u071d\u072c\u0710 \u0715\u072a\u072b\u0710",
-"Column": "\u0725\u0721\u0718\u0715\u0710",
-"Cell": "\u0729\u0720\u071d\u072c\u0710",
-"Header": "\u072a\u072b\u0710",
-"Cell type": "\u0710\u0715\u072b\u0710 \u0715\u0729\u0720\u071d\u072c\u0710",
-"Copy row": "\u0722\u0723\u0718\u071f\u0742 \u0713\u0330\u072a\u0713\u0710",
-"Row properties": "\u0715\u071d\u0720\u071d\u072c\u0308\u0710 \u0715\u0713\u072a\u0713\u0710",
-"Table properties": "\u0715\u071d\u0720\u071d\u072c\u0308\u0710 \u0715\u071b\u0712\u0720\u0710",
-"Row group": "\u071f\u0718\u0722\u072b\u0710 \u0715\u0713\u0330\u072a\u0713\u0710",
-"Right": "\u071d\u0721\u071d\u0722\u0710",
-"Insert column after": "\u0721\u0725\u0712\u0742\u072a \u0725\u0721\u0718\u0715\u0710 \u0712\u072c\u072a",
-"Cols": "\u0725\u0721\u0718\u0715\u0308\u0710",
-"Insert row after": "\u0721\u0725\u0712\u0742\u072a \u0713\u0330\u072a\u0713\u0710 \u0712\u072c\u072a",
-"Width": "\u0726\u072c\u0742\u071d\u0718\u072c\u0742\u0710",
-"Cell properties": "\u0715\u071d\u0720\u071d\u072c\u0308\u0710 \u0715\u0729\u0720\u071d\u072c\u0710",
-"Left": "\u0723\u0721\u0720\u0710",
-"Cut row": "\u0729\u0718\u0728 \u0713\u0330\u072a\u0713\u0710",
-"Delete column": "\u072b\u0718\u0726 \u0725\u0721\u0718\u0715\u0710",
-"Center": "\u0726\u0720\u0713\u0710",
-"Merge cells": "\u071a\u071d\u0715 \u0729\u0720\u071d\u072c\u0308\u0710",
-"Insert template": "\u0721\u0725\u0712\u0742\u072a \u0729\u0720\u0712\u0742\u0710",
-"Templates": "\u0729\u0720\u0712\u0742\u0710",
-"Background color": "\u0713\u0718\u0722\u0710 \u0715\u0712\u072c\u072a\u071d\u0718\u072c\u0710",
-"Text color": "\u0713\u0718\u0722\u0710 \u0715\u0728\u071a\u071a\u0710",
-"Show blocks": "\u0721\u071a\u0719\u071d \u0720\u0713\u0718\u072b\u0721\u0710",
-"Show invisible characters": "\u0721\u071a\u0719\u071d \u0720\u0710\u072c\u0718\u072c\u0308\u0710 \u0720\u0710 \u0721\u072c\u071a\u0719\u071d\u0722\u0308\u0710",
-"Words: {0}": "{0} :\u071a\u0712\u072a\u0308\u0710",
-"Insert": "\u0721\u0725\u0712\u0742\u072a",
-"File": "\u071f\u0722\u0726\u072a\u0710",
-"Edit": "\u0723\u071d\u0721\u072c\u0710",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help":"\u0729\u0710 \u0719\u0718\u0720\u0721\u0710\u0722\u0710 \u0729\u0710 \u0725\u0718\u0715\u072a\u0722\u0710 ALT-F10 \u0729\u0710 \u0720\u0718\u071a\u071d\u072c\u0710. \u0715\u0718\u072b ALT-F9 \u0715\u0718\u072b  .Rich Text Area \u0726\u0722\u071d\u072c\u0710 \u0715",
-"Tools": "\u0719\u0718\u0720\u0721\u0710\u0722\u0710",
-"View": "\u071a\u0719\u071d\u072c\u0710",
-"Table": "\u071b\u0712\u0720\u0710",
-"Format": "\u0710\u0723\u071f\u071d\u0721\u0710",
-"Inline": "\u0725\u0720 \u0713\u0330\u072a\u0713\u0710",
-"Blocks": "\u0713\u0718\u072b\u0721\u0710",
-"Edit image": "\u0723\u071d\u0721\u072c\u0710 \u0715\u0728\u0718\u072a\u072c\u0710",
-"Font Family": "\u071f\u0720\u0726\u072c \u0715\u0726\u032e\u0718\u0722\u072c",
-"Font Sizes": "\u072a\u0308\u0712\u0718\u072c\u0710 \u0715\u0726\u032e\u0718\u0722\u072c",
-"Paragraph": "\u0726\u072c\u0742\u0713\u073c\u0721\u0710",
-"Address": "\u0721\u0718\u0722\u0725\u0710",
-"Pre": "\u0721\u072c\u0729\u0720\u0712\u0742\u0722\u0718\u072c\u0710 \u0729\u0715\u0747\u0721\u072c\u0710",
-"Code": "\u071f\u0718\u0715\u0710",
-"Headers": "\u072a\u0308\u072b\u0722\u0710",
-"Header 1": "\u072a\u072b\u0710 1",
-"Header 2": "\u072a\u072b\u0710 2",
-"Header 3": "\u072a\u072b\u0710 3",
-"Header 4": "\u072a\u072b\u0710 4",
-"Header 5": "\u072a\u072b\u0710 5",
-"Header 6": "\u072a\u072b\u0710 6",
-"Insert Time": "\u0721\u0725\u0712\u0742\u072a \u0725\u0715\u0722\u0710",
-"Insert nonbreaking space": "\u0721\u0725\u0712\u0742\u072a \u0723\u0726\u071d\u0729\u0718\u072c\u0710 \u0720\u0710 \u072c\u0712\u0742\u071d\u072a\u072c\u0710",
-"Toggle blockquote": "\u072b\u071a\u0720\u0726 \u0720\u0713\u0718\u072b\u0721\u072c\u0742 \u072b\u0729\u0720\u072c\u0710",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "http:\/\/ prefix? \u0715\u0721\u0718\u0725\u0712\u0742\u072a\u0718\u071f\u0742 \u0721\u0712\u071d\u0718\u0722\u0710 \u071d\u0720\u0717 \u0715\u0717\u0307\u0718 \u071a\u0715 \u0710\u0723\u072a\u0710 \u0712\u072a\u071d\u0710 \u071d\u0720\u0717. \u0712\u0725\u072c \u072c\u0718\u0723\u0726\u072c URL",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "mailto: prefix? \u0715\u0721\u0718\u0725\u0712\u0742\u072a\u0718\u071f\u073c \u0721\u0712\u071d\u0718\u0722\u0710 \u071d\u0720\u0717 \u0715\u0717\u0307\u0718 \u071d\u0720\u0717 \u0721\u0718\u0722\u0725\u0710 \u0715\u0712\u071d\u0720\u0715\u072a\u0710 \u0710\u0720\u071f\u072c\u072a\u0718\u0722\u071d\u0710. \u0712\u0725\u072c \u072c\u0718\u0723\u0726\u072c \u0720\u071b\u0720\u0712\u072c\u0710  URL",
-"_dir": "rtl"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/ta.es5.js b/build/media_source/vendor/tinymce/langs/ta.es5.js
deleted file mode 100644
index 31ff4c769925d..0000000000000
--- a/build/media_source/vendor/tinymce/langs/ta.es5.js
+++ /dev/null
@@ -1,462 +0,0 @@
-tinymce.addI18n('ta',{
-"Redo": "\u0bae\u0bc0\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Undo": "\u0b9a\u0bc6\u0baf\u0bb2\u0bcd\u0ba4\u0bb5\u0bbf\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Cut": "\u0bb5\u0bc6\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Copy": "\u0ba8\u0b95\u0bb2\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
-"Paste": "\u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Select all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"New document": "\u0baa\u0bc1\u0ba4\u0bbf\u0baf \u0b86\u0bb5\u0ba3\u0bae\u0bcd",
-"Ok": "\u0b9a\u0bb0\u0bbf",
-"Cancel": "\u0bb0\u0ba4\u0bcd\u0ba4\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Visual aids": "\u0b95\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf\u0ba4\u0bcd \u0ba4\u0bc1\u0ba3\u0bc8\u0baf\u0ba9\u0bcd\u0b95\u0bb3\u0bcd",
-"Bold": "\u0ba4\u0b9f\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Italic": "\u0b9a\u0bbe\u0baf\u0bcd\u0bb5\u0bc1",
-"Underline": "\u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bcb\u0b9f\u0bc1",
-"Strikethrough": "\u0ba8\u0b9f\u0bc1\u0b95\u0bcd\u0b95\u0bcb\u0b9f\u0bc1",
-"Superscript": "\u0bae\u0bc7\u0bb2\u0bcd\u0b92\u0b9f\u0bcd\u0b9f\u0bc1",
-"Subscript": "\u0b95\u0bc0\u0bb4\u0bcd\u0b92\u0b9f\u0bcd\u0b9f\u0bc1",
-"Clear formatting": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b85\u0bb4\u0bbf\u0b95\u0bcd\u0b95",
-"Align left": "\u0b87\u0b9f\u0ba4\u0bc1 \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Align center": "\u0bae\u0bc8\u0baf \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Align right": "\u0bb5\u0bb2\u0ba4\u0bc1 \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Justify": "\u0ba8\u0bc7\u0bb0\u0bcd\u0ba4\u0bcd\u0ba4\u0bbf \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Bullet list": "\u0baa\u0bca\u0b9f\u0bcd\u0b9f\u0bbf\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f  \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Numbered list": "\u0b8e\u0ba3\u0bcd\u0ba3\u0bbf\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Decrease indent": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bc8 \u0b95\u0bc1\u0bb1\u0bc8\u0b95\u0bcd\u0b95",
-"Increase indent": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bc8 \u0b85\u0ba4\u0bbf\u0b95\u0bb0\u0bbf\u0b95\u0bcd\u0b95",
-"Close": "\u0bae\u0bc2\u0b9f\u0bc1\u0b95",
-"Formats": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0ba8\u0b95\u0bb2\u0b95\u0ba4\u0bcd\u0ba4\u0bbf\u0bb1\u0bcd\u0b95\u0bc1 \u0ba8\u0bc7\u0bb0\u0b9f\u0bbf \u0b85\u0ba3\u0bc1\u0b95\u0bb2\u0bc8 \u0ba4\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb2\u0bbe\u0bb5\u0bbf \u0b86\u0ba4\u0bb0\u0bbf\u0b95\u0bcd\u0b95\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8. \u0b86\u0b95\u0bb5\u0bc7 \u0bb5\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0bb2\u0b95\u0bc8 \u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf\u0b95\u0bb3\u0bbe\u0ba9 Ctrl+X\/C\/V \u0b87\u0bb5\u0bb1\u0bcd\u0bb1\u0bc8 \u0ba4\u0baf\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0ba4\u0bc1 \u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95.",
-"Headers": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Header 1": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 1",
-"Header 2": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 2",
-"Header 3": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 3",
-"Header 4": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 4",
-"Header 5": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 5",
-"Header 6": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 6",
-"Headings": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Heading 1": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 1",
-"Heading 2": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 2",
-"Heading 3": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 3",
-"Heading 4": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 4",
-"Heading 5": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 5",
-"Heading 6": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 6",
-"Preformatted": "\u0bae\u0bc1\u0ba9\u0bcd\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1",
-"Div": "\u0baa\u0bbf\u0bb0\u0bbf\u0bb5\u0bc1 (Div)",
-"Pre": "\u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1 (Pre)",
-"Code": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1",
-"Paragraph": "\u0baa\u0ba4\u0bcd\u0ba4\u0bbf",
-"Blockquote": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf \u0bae\u0bc7\u0bb1\u0bcd\u0b95\u0bcb\u0bb3\u0bcd",
-"Inline": "\u0b89\u0bb3\u0bcd\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
-"Blocks": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf\u0b95\u0bb3\u0bcd",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0b87\u0baf\u0bb2\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc8 \u0bae\u0bc1\u0bb1\u0bc8\u0bae\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0ba4\u0bb1\u0bcd\u0baa\u0bcb\u0ba4\u0bc1 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0ba4\u0bb2\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0ba4\u0bc1. \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b87\u0ba8\u0bcd\u0ba4 \u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc8 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0bb5\u0bb0\u0bc8 \u0b89\u0bb3\u0bcd\u0bb3\u0b9f\u0b95\u0bcd\u0b95\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b87\u0baf\u0bb2\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b95 \u0b92\u0b9f\u0bcd\u0b9f\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0bae\u0bcd.",
-"Fonts": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
-"Font Sizes": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1 \u0b85\u0bb3\u0bb5\u0bc1\u0b95\u0bb3\u0bcd",
-"Class": "Class",
-"Browse for an image": "\u0b92\u0bb0\u0bc1 \u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0b89\u0bb2\u0bbe\u0bb5\u0bc1\u0b95",
-"OR": "\u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1",
-"Drop an image here": "\u0b92\u0bb0\u0bc1 \u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc8 \u0b87\u0b99\u0bcd\u0b95\u0bc1 \u0b87\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd \u0baa\u0bcb\u0b9f\u0bb5\u0bc1\u0bae\u0bcd",
-"Upload": "\u0baa\u0ba4\u0bbf\u0bb5\u0bc7\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Block": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf",
-"Align": "\u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Default": "\u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc1",
-"Circle": "\u0bb5\u0b9f\u0bcd\u0b9f\u0bae\u0bcd",
-"Disc": "\u0bb5\u0b9f\u0bcd\u0b9f\u0bc1",
-"Square": "\u0b9a\u0ba4\u0bc1\u0bb0\u0bae\u0bcd",
-"Lower Alpha": "\u0b95\u0bc0\u0bb4\u0bcd \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Lower Greek": "\u0b95\u0bc0\u0bb4\u0bcd \u0b95\u0bbf\u0bb0\u0bc7\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Lower Roman": "\u0b95\u0bc0\u0bb4\u0bcd \u0bb0\u0bcb\u0bae\u0bbe\u0ba9\u0bbf\u0baf\u0bae\u0bcd",
-"Upper Alpha": "\u0bae\u0bc7\u0bb2\u0bcd \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Upper Roman": "\u0bae\u0bc7\u0bb2\u0bcd \u0bb0\u0bcb\u0bae\u0bbe\u0ba9\u0bbf\u0baf\u0bae\u0bcd",
-"Anchor...": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0bae\u0bcd...",
-"Name": "\u0baa\u0bc6\u0baf\u0bb0\u0bcd",
-"Id": "Id",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0b86\u0ba9\u0ba4\u0bc1 \u0b92\u0bb0\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0ba4\u0bca\u0b9f\u0b99\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd; \u0b87\u0ba4\u0ba9\u0bc8\u0ba4\u0bcd \u0ba4\u0bca\u0b9f\u0bb0\u0bcd\u0ba8\u0bcd\u0ba4\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd, \u0b8e\u0ba3\u0bcd\u0b95\u0bb3\u0bcd, \u0b87\u0b9f\u0bc8\u0b95\u0bcd\u0b95\u0bc7\u0bbe\u0b9f\u0bc1\u0b95\u0bb3\u0bcd (-), \u0baa\u0bc1\u0bb3\u0bcd\u0bb3\u0bbf\u0b95\u0bb3\u0bcd (.), \u0bae\u0bc1\u0b95\u0bcd\u0b95\u0bbe\u0bb1\u0bcd\u0baa\u0bc1\u0bb3\u0bcd\u0bb3\u0bbf\u0b95\u0bb3\u0bcd (:) \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc7\u0bbe\u0b9f\u0bc1\u0b95\u0bb3\u0bcd (_) \u0bae\u0b9f\u0bcd\u0b9f\u0bc1\u0bae\u0bc7 \u0b87\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd.",
-"You have unsaved changes are you sure you want to navigate away?": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bbe\u0ba4 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0ba9; \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb1\u0bc1\u0ba4\u0bbf\u0baf\u0bbe\u0b95 \u0bb5\u0bc6\u0bb3\u0bbf\u0baf\u0bc7\u0bb1 \u0bb5\u0bbf\u0bb0\u0bc1\u0bae\u0bcd\u0baa\u0bc1\u0b95\u0bbf\u0bb1\u0bc0\u0bb0\u0bcd\u0b95\u0bbe\u0bb3\u0bbe?",
-"Restore last draft": "\u0b95\u0b9f\u0ba8\u0bcd\u0ba4 \u0bb5\u0bb0\u0bc8\u0bb5\u0bc8 \u0bae\u0bc0\u0b9f\u0bcd\u0b9f\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
-"Special character...": "\u0b9a\u0bbf\u0bb1\u0baa\u0bcd\u0baa\u0bc1 \u0b89\u0bb0\u0bc1...",
-"Source code": "\u0bae\u0bc2\u0bb2 \u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1",
-"Insert\/Edit code sample": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0bae\u0bbe\u0ba4\u0bbf\u0bb0\u0bbf \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Language": "\u0bae\u0bca\u0bb4\u0bbf",
-"Code sample...": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0bae\u0bbe\u0ba4\u0bbf\u0bb0\u0bbf...",
-"Color Picker": "\u0ba8\u0bbf\u0bb1\u0ba4\u0bcd \u0ba4\u0bc6\u0bb0\u0bbf\u0bb5\u0bc1",
-"R": "R",
-"G": "G",
-"B": "B",
-"Left to right": "\u0b87\u0b9f\u0bae\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0bb5\u0bb2\u0bae\u0bcd",
-"Right to left": "\u0bb5\u0bb2\u0bae\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0b87\u0b9f\u0bae\u0bcd",
-"Emoticons": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Emoticons...": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Metadata and Document Properties": "\u0bae\u0bc0\u0ba4\u0bcd\u0ba4\u0bb0\u0bb5\u0bc1 \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b86\u0bb5\u0ba3\u0baa\u0bcd \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Title": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Keywords": "\u0bae\u0bc1\u0ba4\u0ba9\u0bcd\u0bae\u0bc8\u0b9a\u0bcd\u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"Description": "\u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
-"Robots": "\u0baa\u0bca\u0bb1\u0bbf\u0baf\u0ba9\u0bcd\u0b95\u0bb3\u0bcd (Robots)",
-"Author": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbe\u0bb3\u0bb0\u0bcd",
-"Encoding": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bbe\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Fullscreen": "\u0bae\u0bc1\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0bb0\u0bc8",
-"Action": "\u0b9a\u0bc6\u0baf\u0bb2\u0bcd",
-"Shortcut": "\u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf",
-"Help": "\u0b89\u0ba4\u0bb5\u0bbf",
-"Address": "\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf",
-"Focus to menubar": "\u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Focus to toolbar": "\u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Focus to element path": "\u0bae\u0bc2\u0bb2\u0b95\u0baa\u0bcd \u0baa\u0bbe\u0ba4\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Focus to contextual toolbar": "\u0b9a\u0bc2\u0bb4\u0bcd\u0ba8\u0bbf\u0bb2\u0bc8 \u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b95\u0bb5\u0ba9\u0bae\u0bcd \u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Insert link (if link plugin activated)": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95 (\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b9a\u0bc6\u0baf\u0bb2\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd)",
-"Save (if save plugin activated)": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95 (\u0b9a\u0bc7\u0bae\u0bbf\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b9a\u0bc6\u0baf\u0bb2\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd)",
-"Find (if searchreplace plugin activated)": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95 (\u0ba4\u0bc7\u0b9f\u0bbf\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bb2\u0bcd \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b9a\u0bc6\u0baf\u0bb2\u0bbe\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0baf\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bbe\u0bb2\u0bcd)",
-"Plugins installed ({0}):": "\u0ba8\u0bbf\u0bb1\u0bc1\u0bb5\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc1\u0bb3\u0bcd\u0bb3 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf\u0b95\u0bb3\u0bcd ({0}):",
-"Premium plugins:": "\u0b89\u0baf\u0bb0\u0bcd\u0bae\u0ba4\u0bbf\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf\u0b95\u0bb3\u0bcd:",
-"Learn more...": "\u0bae\u0bc7\u0bb2\u0bc1\u0bae\u0bcd \u0b85\u0bb1\u0bbf\u0b95...",
-"You are using {0}": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb5\u0ba4\u0bc1 {0}",
-"Plugins": "\u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf\u0b95\u0bb3\u0bcd",
-"Handy Shortcuts": "\u0b8e\u0bb3\u0bbf\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0bc8\u0baf\u0bbe\u0bb3\u0b95\u0bcd\u0b95\u0bc2\u0b9f\u0bbf\u0baf \u0b95\u0bc1\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0bb5\u0bb4\u0bbf\u0b95\u0bb3\u0bcd",
-"Horizontal line": "\u0b95\u0bbf\u0b9f\u0bc8 \u0b95\u0bcb\u0b9f\u0bc1",
-"Insert\/edit image": "\u0baa\u0b9f\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Alternative description": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
-"Accessibility": "\u0b85\u0ba3\u0bc1\u0b95\u0bb2\u0bcd\u0ba4\u0ba9\u0bcd\u0bae\u0bc8",
-"Image is decorative": "\u0baa\u0b9f\u0bae\u0bcd \u0b85\u0bb2\u0b99\u0bcd\u0b95\u0bbe\u0bb0\u0bae\u0bbe\u0ba9\u0ba4\u0bc1",
-"Source": "\u0bae\u0bc2\u0bb2\u0bae\u0bcd",
-"Dimensions": "\u0baa\u0bb0\u0bbf\u0bae\u0bbe\u0ba3\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Constrain proportions": "\u0bb5\u0bbf\u0b95\u0bbf\u0ba4\u0bbe\u0b9a\u0bcd\u0b9a\u0bbe\u0bb0\u0ba4\u0bcd\u0ba4\u0bbf\u0bb2\u0bcd \u0b95\u0b9f\u0bcd\u0b9f\u0bc1\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"General": "\u0baa\u0bca\u0ba4\u0bc1",
-"Advanced": "\u0bae\u0bc7\u0bae\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0ba4\u0bc1",
-"Style": "\u0baa\u0bbe\u0ba3\u0bbf",
-"Vertical space": "\u0ba8\u0bc6\u0b9f\u0bc1\u0ba4\u0bb3 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Horizontal space": "\u0b95\u0bbf\u0b9f\u0bc8\u0bae\u0b9f\u0bcd\u0b9f \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Border": "\u0b95\u0bb0\u0bc8",
-"Insert image": "\u0baa\u0b9f\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Image...": "\u0baa\u0b9f\u0bae\u0bcd...",
-"Image list": "\u0baa\u0b9f\u0baa\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Rotate counterclockwise": "\u0b95\u0b9f\u0bbf\u0b95\u0bbe\u0bb0 \u0b8e\u0ba4\u0bbf\u0bb0\u0bcd\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc1\u0bb4\u0bb1\u0bcd\u0bb1\u0bc1",
-"Rotate clockwise": "\u0b95\u0b9f\u0bbf\u0b95\u0bbe\u0bb0\u0ba4\u0bcd\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc1\u0bb4\u0bb1\u0bcd\u0bb1\u0bc1",
-"Flip vertically": "\u0b9a\u0bc6\u0b99\u0bcd\u0b95\u0bc1\u0ba4\u0bcd\u0ba4\u0bbe\u0b95 \u0baa\u0bc1\u0bb0\u0b9f\u0bcd\u0b9f\u0bc1",
-"Flip horizontally": "\u0b95\u0bbf\u0b9f\u0bc8\u0bae\u0b9f\u0bcd\u0b9f\u0bae\u0bbe\u0b95 \u0baa\u0bc1\u0bb0\u0b9f\u0bcd\u0b9f\u0bc1",
-"Edit image": "\u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc8 \u0ba4\u0bca\u0b95\u0bc1",
-"Image options": "\u0baa\u0b9f \u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Zoom in": "\u0baa\u0bc6\u0bb0\u0bbf\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
-"Zoom out": "\u0b9a\u0bbf\u0bb1\u0bbf\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
-"Crop": "\u0b9a\u0bc6\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bc1",
-"Resize": "\u0bae\u0bb1\u0bc1\u0b85\u0bb3\u0bb5\u0bbf\u0b9f\u0bc1",
-"Orientation": "\u0ba4\u0bbf\u0b9a\u0bc8\u0baf\u0bae\u0bc8\u0bb5\u0bc1",
-"Brightness": "\u0b92\u0bb3\u0bbf\u0bb0\u0bcd\u0bb5\u0bc1",
-"Sharpen": "\u0b95\u0bc2\u0bb0\u0bcd\u0bae\u0bc8\u0baf\u0bbe\u0b95\u0bcd\u0b95\u0bc1",
-"Contrast": "\u0ba8\u0bbf\u0bb1\u0bae\u0bbe\u0bb1\u0bc1\u0baa\u0bbe\u0b9f\u0bc1",
-"Color levels": "\u0bb5\u0ba3\u0bcd\u0ba3 \u0ba8\u0bbf\u0bb2\u0bc8\u0b95\u0bb3\u0bcd",
-"Gamma": "Gamma",
-"Invert": "\u0ba8\u0bc7\u0bb0\u0bcd\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1",
-"Apply": "\u0baa\u0baf\u0ba9\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Back": "\u0baa\u0bbf\u0ba9\u0bcd",
-"Insert date\/time": "\u0ba4\u0bc7\u0ba4\u0bbf\/\u0ba8\u0bc7\u0bb0\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Date\/time": "\u0ba4\u0bc7\u0ba4\u0bbf\/\u0ba8\u0bc7\u0bb0\u0bae\u0bcd",
-"Insert\/edit link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Text to display": "\u0b95\u0bbe\u0b9f\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bbf\u0baf \u0b89\u0bb0\u0bc8",
-"Url": "\u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf",
-"Open link in...": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc8 \u0b87\u0ba4\u0bbf\u0bb2\u0bcd \u0ba4\u0bbf\u0bb1\u0b95\u0bcd\u0b95...",
-"Current window": "\u0ba4\u0bb1\u0bcd\u0baa\u0bcb\u0ba4\u0bc8\u0baf \u0b9a\u0bbe\u0bb3\u0bb0\u0bae\u0bcd",
-"None": "\u0b8f\u0ba4\u0bc1\u0bae\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
-"New window": "\u0baa\u0bc1\u0ba4\u0bbf\u0baf \u0b9a\u0bbe\u0bb3\u0bb0\u0bae\u0bcd",
-"Open link": "\u0ba4\u0bbf\u0bb1\u0ba8\u0bcd\u0ba4 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Remove link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc8 \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Anchors": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Link...": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1...",
-"Paste or type a link": "\u0b92\u0bb0\u0bc1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95 \u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1 \u0ba4\u0b9f\u0bcd\u0b9f\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bae\u0bbf\u0ba9\u0bcd-\u0b85\u0b9e\u0bcd\u0b9a\u0bb2\u0bcd \u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 mailto: \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8\u0ba4\u0bcd (prefix) \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bbe?",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bb5\u0bc6\u0bb3\u0bbf\u0baa\u0bcd\u0baa\u0bc1\u0bb1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 (external link) \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 http:\/\/ \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8\u0ba4\u0bcd (prefix) \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bbe?",
-"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "\u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0bb3\u0bcd\u0bb3\u0bbf\u0b9f\u0bcd\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf (URL) \u0b92\u0bb0\u0bc1 \u0bb5\u0bc6\u0bb3\u0bbf\u0baa\u0bcd\u0baa\u0bc1\u0bb1 \u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 (external link) \u0baa\u0bcb\u0bb2\u0bcd \u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1. \u0ba4\u0bc7\u0bb5\u0bc8\u0baf\u0bbe\u0ba9 https:\/\/ \u0bae\u0bc1\u0ba9\u0bcd-\u0b92\u0b9f\u0bcd\u0b9f\u0bc8 (prefix) \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95 \u0ba4\u0bbe\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0bb5\u0bbf\u0bb0\u0bc1\u0bae\u0bcd\u0baa\u0bc1\u0b95\u0bbf\u0bb1\u0bc0\u0bb0\u0bcd\u0b95\u0bb3\u0bbe?",
-"Link list": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1\u0baa\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Insert video": "\u0b95\u0bbe\u0ba3\u0bca\u0bb3\u0bbf \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert\/edit video": "\u0b95\u0bbe\u0ba3\u0bca\u0bb3\u0bbf \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Insert\/edit media": "\u0b8a\u0b9f\u0b95\u0bae\u0bcd \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Alternative source": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0bae\u0bc2\u0bb2\u0bae\u0bcd",
-"Alternative source URL": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0bae\u0bc2\u0bb2 \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf",
-"Media poster (Image URL)": "\u0b8a\u0b9f\u0b95 \u0b9a\u0bc1\u0bb5\u0bb0\u0bca\u0b9f\u0bcd\u0b9f\u0bbf (\u0b89\u0b9f \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf)",
-"Paste your embed code below:": "\u0ba4\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b89\u0b9f\u0bcd\u0baa\u0bc6\u0bbe\u0ba4\u0bbf \u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bcd\u0b9f\u0bc8 \u0b95\u0bc0\u0bb4\u0bc7 \u0b92\u0b9f\u0bcd\u0b9f\u0bb5\u0bc1\u0bae\u0bcd:",
-"Embed": "\u0b89\u0b9f\u0bcd\u0baa\u0bca\u0ba4\u0bbf",
-"Media...": "\u0b8a\u0b9f\u0b95\u0bae\u0bcd...",
-"Nonbreaking space": "\u0baa\u0bbf\u0bb0\u0bbf\u0baf\u0bbe\u0ba4 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Page break": "\u0baa\u0b95\u0bcd\u0b95 \u0baa\u0bbf\u0bb0\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Paste as text": "\u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b95 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Preview": "\u0bae\u0bc1\u0ba9\u0bcd\u0ba8\u0bcb\u0b95\u0bcd\u0b95\u0bc1",
-"Print...": "\u0b85\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95...",
-"Save": "\u0b9a\u0bc7\u0bae\u0bbf\u0b95\u0bcd\u0b95",
-"Find": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
-"Replace with": "\u0b87\u0ba4\u0ba9\u0bc1\u0b9f\u0ba9\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Replace": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Replace all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Previous": "\u0bae\u0bc1\u0ba8\u0bcd\u0ba4\u0bc8\u0baf",
-"Next": "\u0b85\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4",
-"Find and Replace": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Find and replace...": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95...",
-"Could not find the specified string.": "\u0b95\u0bc1\u0bb1\u0bbf\u0baa\u0bcd\u0baa\u0bbf\u0b9f\u0bcd\u0b9f \u0b9a\u0bb0\u0bae\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95 \u0bae\u0bc1\u0b9f\u0bbf\u0baf\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
-"Match case": "\u0bb5\u0b9f\u0bbf\u0bb5\u0ba4\u0bcd\u0ba4\u0bc8 \u0baa\u0bca\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Find whole words only": "\u0bae\u0bc1\u0bb4\u0bc1 \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd \u0bae\u0b9f\u0bcd\u0b9f\u0bc1\u0bae\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
-"Find in selection": "\u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bbf\u0bb2\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
-"Spellcheck": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0baf\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Spellcheck Language": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1 \u0bae\u0bca\u0bb4\u0bbf",
-"No misspellings found.": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0b95\u0bb3\u0bcd \u0b95\u0bbe\u0ba3\u0baa\u0bcd\u0baa\u0b9f\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8.",
-"Ignore": "\u0baa\u0bc1\u0bb1\u0b95\u0bcd\u0b95\u0ba3\u0bbf\u0b95\u0bcd\u0b95",
-"Ignore all": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0baa\u0bc1\u0bb1\u0b95\u0bcd\u0b95\u0ba3\u0bbf\u0b95\u0bcd\u0b95",
-"Finish": "\u0bae\u0bc1\u0b9f\u0bbf\u0b95\u0bcd\u0b95",
-"Add to Dictionary": "\u0b85\u0b95\u0bb0\u0bbe\u0ba4\u0bbf\u0baf\u0bbf\u0bb2\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Insert table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Table properties": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Delete table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Cell": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8",
-"Row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
-"Column": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8",
-"Cell properties": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Merge cells": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8\u0b95\u0bb3\u0bcd \u0b9a\u0bc7\u0bb0\u0bcd\u0b95\u0bcd\u0b95",
-"Split cell": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0baa\u0bbf\u0bb0\u0bbf\u0b95\u0bcd\u0b95",
-"Insert row before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert row after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Delete row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Row properties": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Cut row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0bb5\u0bc6\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Copy row": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0b95\u0bb2\u0bc6\u0b9f\u0bc1\u0b95\u0bcd\u0b95",
-"Paste row before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Paste row after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b92\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Insert column before": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0bae\u0bc1\u0ba9\u0bcd \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Insert column after": "\u0b87\u0ba4\u0bb1\u0bcd\u0b95\u0bc1 \u0baa\u0bbf\u0ba9\u0bcd \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Delete column": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0ba8\u0bc0\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Cols": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0b95\u0bb3\u0bcd",
-"Rows": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0b95\u0bb3\u0bcd",
-"Width": "\u0b85\u0b95\u0bb2\u0bae\u0bcd",
-"Height": "\u0b89\u0baf\u0bb0\u0bae\u0bcd",
-"Cell spacing": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf",
-"Cell padding": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0ba8\u0bbf\u0bb0\u0baa\u0bcd\u0baa\u0bb2\u0bcd",
-"Caption": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Show caption": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Left": "\u0b87\u0b9f\u0bae\u0bcd",
-"Center": "\u0bae\u0bc8\u0baf\u0bae\u0bcd",
-"Right": "\u0bb5\u0bb2\u0bae\u0bcd",
-"Cell type": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8 \u0bb5\u0b95\u0bc8",
-"Scope": "\u0bb5\u0bb0\u0bc8\u0baf\u0bc6\u0bb2\u0bcd\u0bb2\u0bc8",
-"Alignment": "\u0b9a\u0bc0\u0bb0\u0bae\u0bc8\u0bb5\u0bc1",
-"H Align": "\u0b95\u0bbf (H) \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"V Align": "\u0b9a\u0bc6 (V) \u0b9a\u0bc0\u0bb0\u0bae\u0bc8",
-"Top": "\u0bae\u0bc7\u0bb2\u0bcd",
-"Middle": "\u0ba8\u0b9f\u0bc1",
-"Bottom": "\u0b95\u0bc0\u0bb4\u0bcd",
-"Header cell": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bb1\u0bc8",
-"Row group": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b95\u0bc1\u0bb4\u0bc1",
-"Column group": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b95\u0bc1\u0bb4\u0bc1",
-"Row type": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0bb5\u0b95\u0bc8",
-"Header": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Body": "\u0b89\u0b9f\u0bb2\u0bcd",
-"Footer": "\u0b85\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc1\u0bb1\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Border color": "\u0b95\u0bb0\u0bc8\u0baf\u0bbf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Insert template...": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95...",
-"Templates": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
-"Template": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1",
-"Text color": "\u0b89\u0bb0\u0bc8\u0baf\u0bbf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Background color": "\u0baa\u0bbf\u0ba9\u0bcd\u0ba9\u0ba3\u0bbf \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Custom...": "\u0ba4\u0ba9\u0bbf\u0baa\u0bcd\u0baa\u0baf\u0ba9\u0bcd...",
-"Custom color": "\u0ba4\u0ba9\u0bbf\u0baa\u0bcd\u0baa\u0baf\u0ba9\u0bcd \u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"No color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd \u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
-"Remove color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Table of Contents": "\u0baa\u0bca\u0bb0\u0bc1\u0bb3\u0b9f\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Show blocks": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf\u0b95\u0bb3\u0bc8 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Show invisible characters": "\u0b95\u0ba3\u0bcd\u0ba3\u0bc1\u0b95\u0bcd\u0b95\u0bc1\u0ba4\u0bcd \u0ba4\u0bc6\u0bb0\u0bbf\u0baf\u0bbe\u0ba4 \u0b89\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bc8 \u0b95\u0bbe\u0b9f\u0bcd\u0b9f\u0bc1\u0b95",
-"Word count": "\u0b9a\u0bca\u0bb2\u0bcd \u0b8e\u0ba3\u0bcd\u0ba3\u0bbf\u0b95\u0bcd\u0b95\u0bc8",
-"Count": "\u0b8e\u0ba3\u0bcd\u0ba3\u0bbf\u0b95\u0bcd\u0b95\u0bc8",
-"Document": "\u0b86\u0bb5\u0ba3\u0bae\u0bcd",
-"Selection": "\u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1",
-"Words": "\u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"Words: {0}": "\u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd: {0}",
-"{0} words": "{0} \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"File": "\u0b95\u0bcb\u0baa\u0bcd\u0baa\u0bc1",
-"Edit": "\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Insert": "\u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"View": "\u0ba8\u0bcb\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Format": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Table": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8",
-"Tools": "\u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0b95\u0bb3\u0bcd",
-"Powered by {0}": "\u0bb5\u0bb2\u0bc1\u0bb5\u0bb3\u0bbf\u0baa\u0bcd\u0baa\u0ba4\u0bc1 {0}",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0b89\u0baf\u0bb0\u0bcd \u0b89\u0bb0\u0bc8 \u0baa\u0b95\u0bc1\u0ba4\u0bbf. \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0bc1 ALT-F9 , \u0b95\u0bb0\u0bc1\u0bb5\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f\u0bc8\u0b95\u0bcd\u0b95\u0bc1 ALT-F10 , \u0b89\u0ba4\u0bb5\u0bbf\u0b95\u0bcd\u0b95\u0bc1 ALT-0",
-"Image title": "\u0baa\u0b9f\u0ba4\u0bcd \u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Border width": "\u0b95\u0bb0\u0bc8 \u0b85\u0b95\u0bb2\u0bae\u0bcd",
-"Border style": "\u0b95\u0bb0\u0bc8 \u0baa\u0bbe\u0ba3\u0bbf",
-"Error": "\u0baa\u0bbf\u0bb4\u0bc8",
-"Warn": "\u0b8e\u0b9a\u0bcd\u0b9a\u0bb0\u0bbf\u0b95\u0bcd\u0b95",
-"Valid": "\u0b9a\u0bc6\u0bb2\u0bcd\u0bb2\u0ba4\u0bcd\u0ba4\u0b95\u0bcd\u0b95\u0ba4\u0bc1",
-"To open the popup, press Shift+Enter": "\u0bae\u0bc7\u0bb2\u0bcd\u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1-\u0bb5\u0bc8\u0ba4\u0bcd \u0ba4\u0bbf\u0bb1\u0b95\u0bcd\u0b95 Shift+Enter",
-"Rich Text Area. Press ALT-0 for help.": "\u0b89\u0baf\u0bb0\u0bcd \u0b89\u0bb0\u0bc8 \u0baa\u0b95\u0bc1\u0ba4\u0bbf. \u0b89\u0ba4\u0bb5\u0bbf\u0b95\u0bcd\u0b95\u0bc1 ALT-0",
-"System Font": "\u0ba4\u0bca\u0b95\u0bc1\u0ba4\u0bbf \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1",
-"Failed to upload image: {0}": "\u0baa\u0b9f\u0bae\u0bcd \u0baa\u0ba4\u0bbf\u0bb5\u0bc7\u0bb1\u0bcd\u0bb1\u0bb2\u0bcd \u0ba4\u0bcb\u0bb2\u0bcd\u0bb5\u0bbf\u0baf\u0bc1\u0bb1\u0bcd\u0bb1\u0ba4\u0bc1: {0}",
-"Failed to load plugin: {0} from url {1}": "\u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b8f\u0bb1\u0bcd\u0bb1\u0bc1\u0ba4\u0bb2\u0bcd \u0ba4\u0bcb\u0bb2\u0bcd\u0bb5\u0bbf\u0baf\u0bc1\u0bb1\u0bcd\u0bb1\u0ba4\u0bc1: {0} - {1} \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf\u0baf\u0bbf\u0bb2\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1",
-"Failed to load plugin url: {0}": "\u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0b87\u0ba3\u0bc8\u0baf\u0bae\u0bc1\u0b95\u0bb5\u0bb0\u0bbf \u0b8f\u0bb1\u0bcd\u0bb1\u0bc1\u0ba4\u0bb2\u0bcd \u0ba4\u0bcb\u0bb2\u0bcd\u0bb5\u0bbf\u0baf\u0bc1\u0bb1\u0bcd\u0bb1\u0ba4\u0bc1: {0}",
-"Failed to initialize plugin: {0}": "\u0b9a\u0bca\u0bb0\u0bc1\u0b95\u0bbf \u0ba4\u0bc1\u0bb5\u0b99\u0bcd\u0b95\u0bc1\u0ba4\u0bb2\u0bcd \u0ba4\u0bcb\u0bb2\u0bcd\u0bb5\u0bbf\u0baf\u0bc1\u0bb1\u0bcd\u0bb1\u0ba4\u0bc1: {0}",
-"example": "\u0b89\u0ba4\u0bbe\u0bb0\u0ba3\u0bae\u0bcd",
-"Search": "\u0ba4\u0bc7\u0b9f\u0bc1\u0b95",
-"All": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc1\u0bae\u0bcd",
-"Currency": "\u0b9a\u0bc6\u0bb2\u0bbe\u0bb5\u0ba3\u0bbf (Currency)",
-"Text": "\u0b89\u0bb0\u0bc8",
-"Quotations": "\u0bae\u0bc7\u0bb1\u0bcd\u0b95\u0bc7\u0bbe\u0bb3\u0bcd\u0b95\u0bb3\u0bcd",
-"Mathematical": "\u0b95\u0ba3\u0b95\u0bcd\u0b95\u0bbf\u0baf\u0bb2\u0bcd",
-"Extended Latin": "\u0ba8\u0bc0\u0b9f\u0bcd\u0b9f\u0bbf\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0b87\u0bb2\u0ba4\u0bcd\u0ba4\u0bc0\u0ba9\u0bcd",
-"Symbols": "\u0b87\u0b9f\u0bc1\u0b95\u0bc1\u0bb1\u0bbf\u0b95\u0bb3\u0bcd",
-"Arrows": "\u0b85\u0bae\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"User Defined": "\u0baa\u0baf\u0ba9\u0bb0\u0bcd \u0bb5\u0bb0\u0bc8\u0baf\u0bb1\u0bc1\u0ba4\u0bcd\u0ba4",
-"dollar sign": "dollar \u0b95\u0bc1\u0bb1\u0bbf",
-"currency sign": "\u0b9a\u0bc6\u0bb2\u0bbe\u0bb5\u0ba3\u0bbf\u0b95\u0bcd \u0b95\u0bc1\u0bb1\u0bbf",
-"euro-currency sign": "euro-currency \u0b95\u0bc1\u0bb1\u0bbf",
-"colon sign": "colon \u0b95\u0bc1\u0bb1\u0bbf",
-"cruzeiro sign": "cruzeiro \u0b95\u0bc1\u0bb1\u0bbf",
-"french franc sign": "french franc \u0b95\u0bc1\u0bb1\u0bbf",
-"lira sign": "lira \u0b95\u0bc1\u0bb1\u0bbf",
-"mill sign": "mill \u0b95\u0bc1\u0bb1\u0bbf",
-"naira sign": "naira \u0b95\u0bc1\u0bb1\u0bbf",
-"peseta sign": "peseta \u0b95\u0bc1\u0bb1\u0bbf",
-"rupee sign": "rupee \u0b95\u0bc1\u0bb1\u0bbf",
-"won sign": "won \u0b95\u0bc1\u0bb1\u0bbf",
-"new sheqel sign": "new sheqel \u0b95\u0bc1\u0bb1\u0bbf",
-"dong sign": "dong \u0b95\u0bc1\u0bb1\u0bbf",
-"kip sign": "kip \u0b95\u0bc1\u0bb1\u0bbf",
-"tugrik sign": "tugrik \u0b95\u0bc1\u0bb1\u0bbf",
-"drachma sign": "drachma \u0b95\u0bc1\u0bb1\u0bbf",
-"german penny symbol": "german penny \u0b87\u0b9f\u0bc1\u0b95\u0bc1\u0bb1\u0bbf",
-"peso sign": "peso \u0b95\u0bc1\u0bb1\u0bbf",
-"guarani sign": "guarani \u0b95\u0bc1\u0bb1\u0bbf",
-"austral sign": "austral \u0b95\u0bc1\u0bb1\u0bbf",
-"hryvnia sign": "hryvnia \u0b95\u0bc1\u0bb1\u0bbf",
-"cedi sign": "cedi \u0b95\u0bc1\u0bb1\u0bbf",
-"livre tournois sign": "livre tournois \u0b95\u0bc1\u0bb1\u0bbf",
-"spesmilo sign": "spesmilo \u0b95\u0bc1\u0bb1\u0bbf",
-"tenge sign": "tenge \u0b95\u0bc1\u0bb1\u0bbf",
-"indian rupee sign": "indian rupee \u0b95\u0bc1\u0bb1\u0bbf",
-"turkish lira sign": "turkish lira \u0b95\u0bc1\u0bb1\u0bbf",
-"nordic mark sign": "nordic mark \u0b95\u0bc1\u0bb1\u0bbf",
-"manat sign": "manat \u0b95\u0bc1\u0bb1\u0bbf",
-"ruble sign": "ruble \u0b95\u0bc1\u0bb1\u0bbf",
-"yen character": "yen \u0b89\u0bb0\u0bc1",
-"yuan character": "yuan \u0b89\u0bb0\u0bc1",
-"yuan character, in hong kong and taiwan": "yuan \u0b89\u0bb0\u0bc1, \u0bb9\u0bbe\u0b99\u0bcd\u0b95\u0bbe\u0b99\u0bcd \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0ba4\u0bbe\u0baf\u0bcd\u0bb5\u0bbe\u0ba9\u0bcd \u0b87\u0bb2\u0bcd",
-"yen\/yuan character variant one": "yen\/yuan \u0b89\u0bb0\u0bc1 \u0bae\u0bbe\u0bb1\u0bc1\u0baa\u0bbe\u0b9f\u0bc1",
-"Loading emoticons...": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b8f\u0bb1\u0bcd\u0bb1\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0b95\u0bbf\u0ba9\u0bcd\u0bb1\u0ba9...",
-"Could not load emoticons": "\u0b89\u0ba3\u0bb0\u0bcd\u0b9a\u0bcd\u0b9a\u0bbf\u0baa\u0bcd\u0baa\u0b9f\u0bbf\u0bae\u0b99\u0bcd\u0b95\u0bb3\u0bc8 \u0b8f\u0bb1\u0bcd\u0bb1 \u0bae\u0bc1\u0b9f\u0bbf\u0baf\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8",
-"People": "\u0bae\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
-"Animals and Nature": "\u0bae\u0bbf\u0bb0\u0bc1\u0b95\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b87\u0baf\u0bb1\u0bcd\u0b95\u0bc8",
-"Food and Drink": "\u0b89\u0ba3\u0bb5\u0bc1 \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0baa\u0bbe\u0ba9\u0bae\u0bcd",
-"Activity": "\u0b9a\u0bc6\u0baf\u0bb1\u0bcd\u0baa\u0bbe\u0b9f\u0bc1",
-"Travel and Places": "\u0baa\u0baf\u0ba3\u0bae\u0bcd \u0bae\u0bb1\u0bcd\u0bb1\u0bc1\u0bae\u0bcd \u0b87\u0b9f\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Objects": "\u0baa\u0bca\u0bb0\u0bc1\u0b9f\u0bcd\u0b95\u0bb3\u0bcd",
-"Flags": "\u0b95\u0bca\u0b9f\u0bbf\u0b95\u0bb3\u0bcd",
-"Characters": "\u0b89\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
-"Characters (no spaces)": "\u0b89\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd (\u0b87\u0b9f\u0bc8\u0bb5\u0bc6\u0bb3\u0bbf\u0b95\u0bb3\u0bcd \u0b87\u0bb2\u0bcd\u0bb2\u0bc8)",
-"{0} characters": "{0} \u0b89\u0bb0\u0bc1\u0b95\u0bcd\u0b95\u0bb3\u0bcd",
-"Error: Form submit field collision.": "\u0baa\u0bbf\u0bb4\u0bc8: \u0baa\u0b9f\u0bbf\u0bb5\u0bae\u0bcd \u0b9a\u0bae\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bbf\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd \u0baa\u0bc1\u0bb2\u0bae\u0bcd \u0bae\u0bcb\u0ba4\u0bb2\u0bcd.",
-"Error: No form element found.": "\u0baa\u0bbf\u0bb4\u0bc8: \u0baa\u0bc1\u0bb2\u0bae\u0bcd \u0bae\u0bc2\u0bb2\u0b95\u0bae\u0bcd \u0b8e\u0ba4\u0bc1\u0bb5\u0bc1\u0bae\u0bcd \u0b95\u0bbe\u0ba3\u0bb5\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8.",
-"Update": "\u0baa\u0bc1\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0b95\u0bcd\u0b95",
-"Color swatch": "\u0ba8\u0bbf\u0bb1\u0b9a\u0bcd \u0b9a\u0bcb\u0ba4\u0ba9\u0bc8\u0b95\u0bcd\u0b95\u0bb2\u0bb5\u0bc8",
-"Turquoise": "\u0ba8\u0bc0\u0bb2\u0baa\u0bcd\u0baa\u0b9a\u0bcd\u0b9a\u0bc8",
-"Green": "\u0baa\u0b9a\u0bcd\u0b9a\u0bc8",
-"Blue": "\u0ba8\u0bc0\u0bb2\u0bae\u0bcd",
-"Purple": "\u0b8a\u0ba4\u0bbe",
-"Navy Blue": "\u0b95\u0b9f\u0bb1\u0bcd\u0baa\u0b9f\u0bc8 \u0ba8\u0bc0\u0bb2\u0bae\u0bcd",
-"Dark Turquoise": "\u0b85\u0b9f\u0bb0\u0bcd \u0ba8\u0bc0\u0bb2\u0baa\u0bcd\u0baa\u0b9a\u0bcd\u0b9a\u0bc8",
-"Dark Green": "\u0b85\u0b9f\u0bb0\u0bcd \u0baa\u0b9a\u0bcd\u0b9a\u0bc8",
-"Medium Blue": "\u0ba8\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bb0 \u0ba8\u0bc0\u0bb2\u0bae\u0bcd",
-"Medium Purple": "\u0ba8\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bb0 \u0b8a\u0ba4\u0bbe",
-"Midnight Blue": "\u0ba8\u0bb3\u0bcd\u0bb3\u0bbf\u0bb0\u0bb5\u0bc1 \u0ba8\u0bc0\u0bb2\u0bae\u0bcd",
-"Yellow": "\u0bae\u0b9e\u0bcd\u0b9a\u0bb3\u0bcd",
-"Orange": "\u0b9a\u0bbf\u0bb5\u0ba8\u0bcd\u0ba4 \u0bae\u0b9e\u0bcd\u0b9a\u0bb3\u0bcd",
-"Red": "\u0b9a\u0bbf\u0bb5\u0baa\u0bcd\u0baa\u0bc1",
-"Light Gray": "\u0bb5\u0bc6\u0bb3\u0bbf\u0bb0\u0bcd \u0b9a\u0bbe\u0bae\u0bcd\u0baa\u0bb2\u0bcd",
-"Gray": "\u0b9a\u0bbe\u0bae\u0bcd\u0baa\u0bb2\u0bcd",
-"Dark Yellow": "\u0b85\u0b9f\u0bb0\u0bcd \u0bae\u0b9e\u0bcd\u0b9a\u0bb3\u0bcd",
-"Dark Orange": "\u0b85\u0b9f\u0bb0\u0bcd \u0b9a\u0bbf\u0bb5\u0ba8\u0bcd\u0ba4 \u0bae\u0b9e\u0bcd\u0b9a\u0bb3\u0bcd",
-"Dark Red": "\u0b85\u0b9f\u0bb0\u0bcd \u0b9a\u0bbf\u0bb5\u0baa\u0bcd\u0baa\u0bc1",
-"Medium Gray": "\u0ba8\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bb0 \u0b9a\u0bbe\u0bae\u0bcd\u0baa\u0bb2\u0bcd",
-"Dark Gray": "\u0b85\u0b9f\u0bb0\u0bcd \u0b9a\u0bbe\u0bae\u0bcd\u0baa\u0bb2\u0bcd",
-"Light Green": "\u0bb5\u0bc6\u0bb3\u0bbf\u0bb0\u0bcd \u0baa\u0b9a\u0bcd\u0b9a\u0bc8",
-"Light Yellow": "\u0bb5\u0bc6\u0bb3\u0bbf\u0bb0\u0bcd \u0bae\u0b9e\u0bcd\u0b9a\u0bb3\u0bcd",
-"Light Red": "\u0bb5\u0bc6\u0bb3\u0bbf\u0bb0\u0bcd\u00a0\u0b9a\u0bbf\u0bb5\u0baa\u0bcd\u0baa\u0bc1",
-"Light Purple": "\u0bb5\u0bc6\u0bb3\u0bbf\u0bb0\u0bcd \u0b8a\u0ba4\u0bbe",
-"Light Blue": "\u0bb5\u0bc6\u0bb3\u0bbf\u0bb0\u0bcd \u0ba8\u0bc0\u0bb2\u0bae\u0bcd",
-"Dark Purple": "\u0b85\u0b9f\u0bb0\u0bcd \u0b8a\u0ba4\u0bbe",
-"Dark Blue": "\u0b85\u0b9f\u0bb0\u0bcd \u0ba8\u0bc0\u0bb2\u0bae\u0bcd",
-"Black": "\u0b95\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0bc1",
-"White": "\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bc8",
-"Switch to or from fullscreen mode": "\u0bae\u0bc1\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbf\u0bb0\u0bc8 \u0bae\u0bc1\u0bb1\u0bc8\u0bae\u0bc8\u0b95\u0bcd\u0b95\u0bc1\/\u0bae\u0bc1\u0bb1\u0bc8\u0bae\u0bc8\u0baf\u0bbf\u0bb2\u0bbf\u0bb0\u0bc1\u0ba8\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bc1\u0b95",
-"Open help dialog": "\u0b89\u0ba4\u0bb5\u0bbf \u0b89\u0bb0\u0bc8\u0baf\u0bbe\u0b9f\u0bb2\u0bcd \u0ba4\u0bbf\u0bb1\u0b95\u0bcd\u0b95",
-"history": "\u0bb5\u0bb0\u0bb2\u0bbe\u0bb1\u0bc1",
-"styles": "\u0baa\u0bbe\u0ba3\u0bbf\u0b95\u0bb3\u0bcd",
-"formatting": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd",
-"alignment": "\u0b9a\u0bc0\u0bb0\u0bae\u0bc8\u0bb5\u0bc1",
-"indentation": "\u0b89\u0bb3\u0bcd\u0ba4\u0bb3\u0bcd\u0bb3\u0bc1\u0ba4\u0bb2\u0bcd",
-"Font": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1",
-"Size": "\u0b85\u0bb3\u0bb5\u0bc1",
-"More...": "\u0bae\u0bc7\u0bb2\u0bc1\u0bae\u0bcd...",
-"Select...": "\u0ba4\u0bc7\u0bb0\u0bcd\u0bb5\u0bc1 \u0b9a\u0bc6\u0baf\u0bcd\u0b95...",
-"Preferences": "\u0bb5\u0bbf\u0bb0\u0bc1\u0baa\u0bcd\u0baa\u0b99\u0bcd\u0b95\u0bb3\u0bcd",
-"Yes": "\u0b86\u0bae\u0bcd",
-"No": "\u0b87\u0bb2\u0bcd\u0bb2\u0bc8",
-"Keyboard Navigation": "\u0bb5\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0bb2\u0b95\u0bc8 \u0bb5\u0bb4\u0bbf\u0b9a\u0bcd\u0b9a\u0bc6\u0bb2\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd",
-"Version": "\u0baa\u0ba4\u0bbf\u0baa\u0bcd\u0baa\u0bc1",
-"Code view": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0ba8\u0bcb\u0b95\u0bcd\u0b95\u0bc1",
-"Open popup menu for split buttons": "\u0baa\u0bbf\u0bb3\u0bb5\u0bc1 \u0baa\u0bca\u0ba4\u0bcd\u0ba4\u0bbe\u0ba9\u0bcd\u0b95\u0bb3\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0bae\u0bc7\u0bb2\u0bcd\u0ba4\u0bcb\u0ba9\u0bcd\u0bb1\u0bc1 \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bc8 \u0ba4\u0bbf\u0bb1\u0b95\u0bcd\u0b95",
-"List Properties": "\u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bbf\u0b9f\u0bc1\u0b95",
-"List properties...": "\u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bbf\u0b9f\u0bc1\u0b95..",
-"Start list at number": "\u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bc8 \u0b87\u0ba8\u0bcd\u0ba4 \u0b8e\u0ba3\u0bcd\u0ba3\u0bbf\u0bb2\u0bcd \u0ba4\u0bca\u0b9f\u0b99\u0bcd\u0b95\u0bc1\u0b95",
-"Line height": "\u0bb5\u0bb0\u0bbf \u0b89\u0baf\u0bb0\u0bae\u0bcd",
-"comments": "\u0b95\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bb3\u0bcd",
-"Format Painter": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0baa\u0bc2\u0b9a\u0bbe\u0bb3\u0ba9\u0bcd",
-"Insert\/edit iframe": "iframe \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95\/\u0ba4\u0bca\u0b95\u0bc1\u0b95\u0bcd\u0b95",
-"Capitalization": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"lowercase": "\u0b9a\u0bbf\u0bb1\u0bcd\u0bb1\u0bc6\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"UPPERCASE": "\u0baa\u0bc7\u0bb0\u0bc6\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1",
-"Title Case": "\u0ba4\u0bb2\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0bb5\u0b9f\u0bbf\u0bb5\u0bae\u0bcd",
-"permanent pen": "\u0ba8\u0bbf\u0bb0\u0ba8\u0bcd\u0ba4\u0bb0\u0baa\u0bcd \u0baa\u0bc7\u0ba9\u0bbe",
-"Permanent Pen Properties": "\u0ba8\u0bbf\u0bb0\u0ba8\u0bcd\u0ba4\u0bb0\u0baa\u0bcd \u0baa\u0bc7\u0ba9\u0bbe \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Permanent pen properties...": "\u0ba8\u0bbf\u0bb0\u0ba8\u0bcd\u0ba4\u0bb0\u0baa\u0bcd \u0baa\u0bc7\u0ba9\u0bbe \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd...",
-"case change": "\u0bb5\u0b9f\u0bbf\u0bb5\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bae\u0bcd",
-"page embed": "\u0baa\u0b95\u0bcd\u0b95\u0bae\u0bcd \u0b89\u0b9f\u0bcd\u0baa\u0bca\u0ba4\u0bbf\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd",
-"Advanced sort...": "\u0bae\u0bc7\u0bae\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0baf\u0bbe\u0b95\u0bcd\u0b95\u0bae\u0bcd...",
-"Advanced Sort": "\u0bae\u0bc7\u0bae\u0bcd\u0baa\u0b9f\u0bcd\u0b9f \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0baf\u0bbe\u0b95\u0bcd\u0b95\u0bae\u0bcd",
-"Sort table by column ascending": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8\u0baf\u0bc8 \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b8f\u0bb1\u0bc1\u0bae\u0bc1\u0b95\u0bae\u0bbe\u0b95 \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Sort table by column descending": "\u0b85\u0b9f\u0bcd\u0b9f\u0bb5\u0ba3\u0bc8\u0baf\u0bc8 \u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 \u0b87\u0bb1\u0b99\u0bcd\u0b95\u0bc1\u0bae\u0bc1\u0b95\u0bae\u0bbe\u0b95 \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Sort": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Order": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0bae\u0bc1\u0bb1\u0bc8",
-"Sort by": "\u0b87\u0ba4\u0ba9\u0bbe\u0bb2\u0bcd \u0bb5\u0bb0\u0bbf\u0b9a\u0bc8\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0b95",
-"Ascending": "\u0b8f\u0bb1\u0bc1\u0bae\u0bc1\u0b95\u0bae\u0bcd",
-"Descending": "\u0b87\u0bb1\u0b99\u0bcd\u0b95\u0bc1\u0bae\u0bc1\u0b95\u0bae\u0bcd",
-"Column {0}": "\u0ba8\u0bc6\u0b9f\u0bc1\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 {0}",
-"Row {0}": "\u0bb5\u0bb0\u0bbf\u0b9a\u0bc8 {0}",
-"Spellcheck...": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0baf\u0bc8 \u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0b95\u0bcd\u0b95...",
-"Misspelled word": "\u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0baa\u0bcd\u0baa\u0bbf\u0bb4\u0bc8\u0baf\u0bc1\u0bb3\u0bcd\u0bb3 \u0b9a\u0bca\u0bb2\u0bcd",
-"Suggestions": "\u0baa\u0bb0\u0bbf\u0ba8\u0bcd\u0ba4\u0bc1\u0bb0\u0bc8\u0b95\u0bb3\u0bcd",
-"Change": "\u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Finding word suggestions": "\u0b9a\u0bca\u0bb2\u0bcd \u0baa\u0bb0\u0bbf\u0ba8\u0bcd\u0ba4\u0bc1\u0bb0\u0bc8\u0b95\u0bb3\u0bcd \u0b95\u0ba3\u0bcd\u0b9f\u0bb1\u0bbf\u0baf\u0baa\u0bcd\u0baa\u0b9f\u0bc1\u0b95\u0bbf\u0bb1\u0ba4\u0bc1",
-"Success": "\u0bb5\u0bc6\u0bb1\u0bcd\u0bb1\u0bbf",
-"Repair": "\u0b9a\u0bb0\u0bbf \u0b9a\u0bc6\u0baf\u0bcd\u0b95",
-"Issue {0} of {1}": "\u0baa\u0bbf\u0bb0\u0b9a\u0bcd\u0b9a\u0bbf\u0ba9\u0bc8 {0} \/ {1}",
-"Images must be marked as decorative or have an alternative text description": "\u0baa\u0b9f\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0b85\u0bb2\u0b99\u0bcd\u0b95\u0bbe\u0bb0\u0bae\u0bbe\u0b95 \u0b95\u0bc1\u0bb1\u0bbf\u0b95\u0bcd\u0b95\u0baa\u0bcd\u0baa\u0b9f \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd \u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0b89\u0bb0\u0bc8 \u0bb5\u0bbf\u0bb3\u0b95\u0bcd\u0b95\u0ba4\u0bcd\u0ba4\u0bc8 \u0b95\u0bca\u0ba3\u0bcd\u0b9f\u0bbf\u0bb0\u0bc1\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd",
-"Images must have an alternative text description. Decorative images are not allowed.": "\u0baa\u0b9f\u0b99\u0bcd\u0b95\u0bb3\u0bcd \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0b89\u0bb0\u0bc8 \u0bb5\u0bbf\u0bb3\u0b95\u0bcd\u0b95\u0ba4\u0bcd\u0ba4\u0bc8 \u0b95\u0bca\u0ba3\u0bcd\u0b9f\u0bbf\u0bb0\u0bc1\u0b95\u0bcd\u0b95 \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd. \u0b85\u0bb2\u0b99\u0bcd\u0b95\u0bbe\u0bb0\u0baa\u0bcd \u0baa\u0b9f\u0b99\u0bcd\u0b95\u0bb3\u0bc1\u0b95\u0bcd\u0b95\u0bc1 \u0b85\u0ba9\u0bc1\u0bae\u0ba4\u0bbf\u0baf\u0bbf\u0bb2\u0bcd\u0bb2\u0bc8.",
-"Or provide alternative text:": "\u0b85\u0bb2\u0bcd\u0bb2\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1 \u0b89\u0bb0\u0bc8\u0baf\u0bc8 \u0bb5\u0bb4\u0b99\u0bcd\u0b95\u0bb5\u0bc1\u0bae\u0bcd",
-"Make image decorative:": "\u0baa\u0b9f\u0ba4\u0bcd\u0ba4\u0bc8 \u0b85\u0bb2\u0b99\u0bcd\u0b95\u0bbe\u0bb0\u0bae\u0bbe\u0ba9\u0ba4\u0bbe\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"ID attribute must be unique": "ID \u0baa\u0ba3\u0bcd\u0baa\u0bc1 \u0ba4\u0ba9\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1\u0bb5\u0bae\u0bbe\u0b95 \u0b87\u0bb0\u0bc1\u0ba4\u0bcd\u0ba4\u0bb2\u0bcd \u0bb5\u0bc7\u0ba3\u0bcd\u0b9f\u0bc1\u0bae\u0bcd",
-"Make ID unique": "ID-\u0baf\u0bc8 \u0ba4\u0ba9\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1\u0bb5\u0bae\u0bbe\u0b95\u0bcd\u0b95\u0bc1\u0b95",
-"Keep this ID and remove all others": "\u0b87\u0ba8\u0bcd\u0ba4 ID-\u0baf\u0bc8 \u0bb5\u0bc8\u0ba4\u0bcd\u0ba4\u0bc1\u0b95\u0bcd\u0b95\u0bca\u0ba3\u0bcd\u0b9f\u0bc1 \u0bae\u0bb1\u0bcd\u0bb1 \u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bb5\u0bc1\u0bae\u0bcd",
-"Remove this ID": "\u0b87\u0ba8\u0bcd\u0ba4 ID \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Remove all IDs": "\u0b85\u0ba9\u0bc8\u0ba4\u0bcd\u0ba4\u0bc1 ID-\u0b95\u0bb3\u0bc8\u0baf\u0bc1\u0bae\u0bcd \u0b85\u0b95\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Checklist": "\u0b9a\u0bb0\u0bbf\u0baa\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1 \u0baa\u0b9f\u0bcd\u0b9f\u0bbf\u0baf\u0bb2\u0bcd",
-"Anchor": "\u0ba8\u0b99\u0bcd\u0b95\u0bc2\u0bb0\u0bae\u0bcd",
-"Special character": "\u0b9a\u0bbf\u0bb1\u0baa\u0bcd\u0baa\u0bc1 \u0b8e\u0bb4\u0bc1\u0ba4\u0bcd\u0ba4\u0bc1\u0bb0\u0bc1",
-"Code sample": "\u0b95\u0bc1\u0bb1\u0bbf\u0baf\u0bc0\u0b9f\u0bc1 \u0bae\u0bbe\u0ba4\u0bbf\u0bb0\u0bbf",
-"Color": "\u0ba8\u0bbf\u0bb1\u0bae\u0bcd",
-"Document properties": "\u0b86\u0bb5\u0ba3\u0ba4\u0bcd\u0ba4\u0bbf\u0ba9\u0bcd \u0baa\u0ba3\u0bcd\u0baa\u0bc1\u0b95\u0bb3\u0bcd",
-"Image description": "\u0baa\u0b9f \u0bb5\u0bbf\u0bb5\u0bb0\u0bae\u0bcd",
-"Image": "\u0baa\u0b9f\u0bae\u0bcd",
-"Insert link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95",
-"Target": "\u0b87\u0bb2\u0b95\u0bcd\u0b95\u0bc1",
-"Link": "\u0b87\u0ba3\u0bc8\u0baa\u0bcd\u0baa\u0bc1",
-"Poster": "\u0b9a\u0bc1\u0bb5\u0bb0\u0bca\u0b9f\u0bcd\u0b9f\u0bbf",
-"Media": "\u0b8a\u0b9f\u0b95\u0bae\u0bcd",
-"Print": "\u0b85\u0b9a\u0bcd\u0b9a\u0bbf\u0b9f\u0bc1\u0b95",
-"Prev": "\u0bae\u0bc1\u0ba8\u0bcd\u0ba4\u0bc8\u0baf",
-"Find and replace": "\u0b95\u0ba3\u0bcd\u0b9f\u0bc1\u0baa\u0bbf\u0b9f\u0bbf\u0ba4\u0bcd\u0ba4\u0bc1 \u0bae\u0bbe\u0bb1\u0bcd\u0bb1\u0bc1\u0b95",
-"Whole words": "\u0bae\u0bc1\u0bb4\u0bc1 \u0b9a\u0bca\u0bb1\u0bcd\u0b95\u0bb3\u0bcd",
-"Insert template": "\u0bb5\u0bbe\u0bb0\u0bcd\u0baa\u0bcd\u0baa\u0bc1\u0bb0\u0bc1 \u0b9a\u0bc6\u0bb0\u0bc1\u0b95\u0bc1\u0b95"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/th.es5.js b/build/media_source/vendor/tinymce/langs/th.es5.js
deleted file mode 100644
index 15bfa20162fe9..0000000000000
--- a/build/media_source/vendor/tinymce/langs/th.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('th',{
-"Cut": "\u0e15\u0e31\u0e14",
-"Heading 5": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 5",
-"Header 2": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0e40\u0e1a\u0e23\u0e32\u0e27\u0e4c\u0e40\u0e0b\u0e2d\u0e23\u0e4c\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13\u0e44\u0e21\u0e48\u0e2a\u0e19\u0e31\u0e1a\u0e2a\u0e19\u0e38\u0e19\u0e01\u0e32\u0e23\u0e40\u0e02\u0e49\u0e32\u0e16\u0e36\u0e07\u0e42\u0e14\u0e22\u0e15\u0e23\u0e07\u0e44\u0e1b\u0e22\u0e31\u0e07\u0e04\u0e25\u0e34\u0e1b\u0e1a\u0e2d\u0e23\u0e4c\u0e14 \u0e01\u0e23\u0e38\u0e13\u0e32\u0e43\u0e0a\u0e49\u0e41\u0e1b\u0e49\u0e19\u0e1e\u0e34\u0e21\u0e1e\u0e4c\u0e25\u0e31\u0e14 Ctrl+X\/C\/V \u0e41\u0e17\u0e19",
-"Heading 4": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 4",
-"Div": "Div",
-"Heading 2": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 2",
-"Paste": "\u0e27\u0e32\u0e07",
-"Close": "\u0e1b\u0e34\u0e14",
-"Font Family": "\u0e15\u0e23\u0e30\u0e01\u0e39\u0e25\u0e41\u0e1a\u0e1a\u0e2d\u0e31\u0e01\u0e29\u0e23",
-"Pre": "\u0e01\u0e48\u0e2d\u0e19",
-"Align right": "\u0e08\u0e31\u0e14\u0e0a\u0e34\u0e14\u0e02\u0e27\u0e32",
-"New document": "\u0e40\u0e2d\u0e01\u0e2a\u0e32\u0e23\u0e43\u0e2b\u0e21\u0e48",
-"Blockquote": "\u0e22\u0e01\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e17\u0e31\u0e49\u0e07\u0e22\u0e48\u0e2d\u0e2b\u0e19\u0e49\u0e32",
-"Numbered list": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e25\u0e33\u0e14\u0e31\u0e1a\u0e40\u0e25\u0e02",
-"Heading 1": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 1",
-"Headings": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07",
-"Increase indent": "\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e01\u0e32\u0e23\u0e40\u0e22\u0e37\u0e49\u0e2d\u0e07",
-"Formats": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"Headers": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27",
-"Select all": "\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
-"Header 3": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 3",
-"Blocks": "\u0e1a\u0e25\u0e47\u0e2d\u0e01",
-"Undo": "\u0e40\u0e25\u0e34\u0e01\u0e17\u0e33",
-"Strikethrough": "\u0e02\u0e35\u0e14\u0e17\u0e31\u0e1a",
-"Bullet list": "\u0e23\u0e32\u0e22\u0e01\u0e32\u0e23\u0e2a\u0e31\u0e0d\u0e25\u0e31\u0e01\u0e29\u0e13\u0e4c\u0e2b\u0e31\u0e27\u0e02\u0e49\u0e2d\u0e22\u0e48\u0e2d\u0e22",
-"Header 1": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 1",
-"Superscript": "\u0e15\u0e31\u0e27\u0e22\u0e01",
-"Clear formatting": "\u0e25\u0e49\u0e32\u0e07\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"Font Sizes": "\u0e02\u0e19\u0e32\u0e14\u0e41\u0e1a\u0e1a\u0e2d\u0e31\u0e01\u0e29\u0e23",
-"Subscript": "\u0e15\u0e31\u0e27\u0e2b\u0e49\u0e2d\u0e22",
-"Header 6": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 6",
-"Redo": "\u0e17\u0e4d\u0e32\u0e0b\u0e49\u0e33",
-"Paragraph": "\u0e22\u0e48\u0e2d\u0e2b\u0e19\u0e49\u0e32",
-"Ok": "\u0e15\u0e01\u0e25\u0e07",
-"Bold": "\u0e15\u0e31\u0e27\u0e2b\u0e19\u0e32",
-"Code": "\u0e42\u0e04\u0e49\u0e14",
-"Italic": "\u0e15\u0e31\u0e27\u0e40\u0e2d\u0e35\u0e22\u0e07",
-"Align center": "\u0e08\u0e31\u0e14\u0e01\u0e36\u0e48\u0e07\u0e01\u0e25\u0e32\u0e07",
-"Header 5": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 5",
-"Heading 6": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 6",
-"Heading 3": "\u0e2b\u0e31\u0e27\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07 3",
-"Decrease indent": "\u0e25\u0e14\u0e01\u0e32\u0e23\u0e40\u0e22\u0e37\u0e49\u0e2d\u0e07",
-"Header 4": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0e01\u0e32\u0e23\u0e27\u0e32\u0e07\u0e15\u0e2d\u0e19\u0e19\u0e35\u0e49\u0e2d\u0e22\u0e39\u0e48\u0e43\u0e19\u0e42\u0e2b\u0e21\u0e14\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e18\u0e23\u0e23\u0e21\u0e14\u0e32 \u0e40\u0e19\u0e37\u0e49\u0e2d\u0e2b\u0e32\u0e08\u0e30\u0e16\u0e39\u0e01\u0e27\u0e32\u0e07\u0e40\u0e1b\u0e47\u0e19\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e18\u0e23\u0e23\u0e21\u0e14\u0e32\u0e08\u0e19\u0e01\u0e27\u0e48\u0e32\u0e04\u0e38\u0e13\u0e08\u0e30\u0e1b\u0e34\u0e14\u0e15\u0e31\u0e27\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e19\u0e35\u0e49",
-"Underline": "\u0e02\u0e35\u0e14\u0e40\u0e2a\u0e49\u0e19\u0e43\u0e15\u0e49",
-"Cancel": "\u0e22\u0e01\u0e40\u0e25\u0e34\u0e01",
-"Justify": "\u0e40\u0e15\u0e47\u0e21\u0e41\u0e19\u0e27",
-"Inline": "\u0e41\u0e1a\u0e1a\u0e2d\u0e34\u0e19\u0e44\u0e25\u0e19\u0e4c",
-"Copy": "\u0e04\u0e31\u0e14\u0e25\u0e2d\u0e01",
-"Align left": "\u0e08\u0e31\u0e14\u0e0a\u0e34\u0e14\u0e0b\u0e49\u0e32\u0e22",
-"Visual aids": "\u0e17\u0e31\u0e28\u0e19\u0e39\u0e1b\u0e01\u0e23\u0e13\u0e4c",
-"Lower Greek": "\u0e01\u0e23\u0e35\u0e01\u0e17\u0e35\u0e48\u0e15\u0e48\u0e33\u0e01\u0e27\u0e48\u0e32",
-"Square": "\u0e08\u0e31\u0e15\u0e38\u0e23\u0e31\u0e2a",
-"Default": "\u0e04\u0e48\u0e32\u0e40\u0e23\u0e34\u0e48\u0e21\u0e15\u0e49\u0e19",
-"Lower Alpha": "\u0e2d\u0e31\u0e25\u0e1f\u0e32\u0e17\u0e35\u0e48\u0e15\u0e48\u0e33\u0e01\u0e27\u0e48\u0e32",
-"Circle": "\u0e27\u0e07\u0e01\u0e25\u0e21",
-"Disc": "\u0e14\u0e34\u0e2a\u0e01\u0e4c",
-"Upper Alpha": "\u0e2d\u0e31\u0e25\u0e1f\u0e32\u0e17\u0e35\u0e48\u0e2a\u0e39\u0e07\u0e01\u0e27\u0e48\u0e32",
-"Upper Roman": "\u0e42\u0e23\u0e21\u0e31\u0e19\u0e17\u0e35\u0e48\u0e2a\u0e39\u0e07\u0e01\u0e27\u0e48\u0e32",
-"Lower Roman": "\u0e42\u0e23\u0e21\u0e31\u0e19\u0e17\u0e35\u0e48\u0e15\u0e48\u0e33\u0e01\u0e27\u0e48\u0e32",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "Id \u0e04\u0e27\u0e23\u0e08\u0e30\u0e02\u0e36\u0e49\u0e19\u0e15\u0e49\u0e19\u0e14\u0e49\u0e27\u0e22\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23 \u0e15\u0e32\u0e21\u0e14\u0e49\u0e27\u0e22\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23 \u0e15\u0e31\u0e27\u0e40\u0e25\u0e02 \u0e02\u0e35\u0e14\u0e01\u0e25\u0e32\u0e07 \u0e08\u0e38\u0e14 \u0e2d\u0e31\u0e12\u0e20\u0e32\u0e04 \u0e2b\u0e23\u0e37\u0e2d \u0e02\u0e35\u0e14\u0e25\u0e48\u0e32\u0e07",
-"Name": "\u0e0a\u0e37\u0e48\u0e2d",
-"Anchor": "\u0e08\u0e38\u0e14\u0e22\u0e36\u0e14",
-"Id": "Id",
-"You have unsaved changes are you sure you want to navigate away?": "\u0e04\u0e38\u0e13\u0e21\u0e35\u0e01\u0e32\u0e23\u0e40\u0e1b\u0e25\u0e35\u0e48\u0e22\u0e19\u0e41\u0e1b\u0e25\u0e07\u0e17\u0e35\u0e48\u0e44\u0e21\u0e48\u0e44\u0e14\u0e49\u0e1a\u0e31\u0e19\u0e17\u0e36\u0e01 \u0e04\u0e38\u0e13\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e17\u0e35\u0e48\u0e08\u0e30\u0e2d\u0e2d\u0e01\u0e2b\u0e23\u0e37\u0e2d\u0e44\u0e21\u0e48?",
-"Restore last draft": "\u0e04\u0e37\u0e19\u0e04\u0e48\u0e32\u0e41\u0e1a\u0e1a\u0e23\u0e48\u0e32\u0e07\u0e25\u0e48\u0e32\u0e2a\u0e38\u0e14",
-"Special character": "\u0e2d\u0e31\u0e01\u0e02\u0e23\u0e30\u0e1e\u0e34\u0e40\u0e28\u0e29",
-"Source code": "\u0e42\u0e04\u0e49\u0e14\u0e15\u0e49\u0e19\u0e09\u0e1a\u0e31\u0e1a",
-"Language": "\u0e20\u0e32\u0e29\u0e32",
-"Insert\/Edit code sample": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e15\u0e31\u0e27\u0e2d\u0e22\u0e48\u0e32\u0e07\u0e42\u0e04\u0e49\u0e14",
-"B": "\u0e19\u0e49\u0e33\u0e40\u0e07\u0e34\u0e19",
-"R": "\u0e41\u0e14\u0e07",
-"G": "\u0e40\u0e02\u0e35\u0e22\u0e27",
-"Color": "\u0e2a\u0e35",
-"Right to left": "\u0e02\u0e27\u0e32\u0e44\u0e1b\u0e0b\u0e49\u0e32\u0e22",
-"Left to right": "\u0e0b\u0e49\u0e32\u0e22\u0e44\u0e1b\u0e02\u0e27\u0e32",
-"Emoticons": "\u0e2d\u0e34\u0e42\u0e21\u0e15\u0e34\u0e04\u0e2d\u0e19",
-"Robots": "\u0e2b\u0e38\u0e48\u0e19\u0e22\u0e19\u0e15\u0e4c",
-"Document properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e40\u0e2d\u0e01\u0e2a\u0e32\u0e23",
-"Title": "\u0e0a\u0e37\u0e48\u0e2d\u0e40\u0e23\u0e37\u0e48\u0e2d\u0e07",
-"Keywords": "\u0e04\u0e33\u0e2a\u0e33\u0e04\u0e31\u0e0d",
-"Encoding": "\u0e01\u0e32\u0e23\u0e40\u0e02\u0e49\u0e32\u0e23\u0e2b\u0e31\u0e2a",
-"Description": "\u0e04\u0e33\u0e2d\u0e18\u0e34\u0e1a\u0e32\u0e22",
-"Author": "\u0e1c\u0e39\u0e49\u0e40\u0e02\u0e35\u0e22\u0e19",
-"Fullscreen": "\u0e40\u0e15\u0e47\u0e21\u0e08\u0e2d",
-"Horizontal line": "\u0e40\u0e2a\u0e49\u0e19\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
-"Horizontal space": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
-"Insert\/edit image": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e23\u0e39\u0e1b",
-"General": "\u0e17\u0e31\u0e48\u0e27\u0e44\u0e1b",
-"Advanced": "\u0e02\u0e31\u0e49\u0e19\u0e2a\u0e39\u0e07",
-"Source": "\u0e41\u0e2b\u0e25\u0e48\u0e07\u0e17\u0e35\u0e48\u0e21\u0e32",
-"Border": "\u0e40\u0e2a\u0e49\u0e19\u0e02\u0e2d\u0e1a",
-"Constrain proportions": "\u0e08\u0e33\u0e01\u0e31\u0e14\u0e2a\u0e31\u0e14\u0e2a\u0e48\u0e27\u0e19",
-"Vertical space": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e41\u0e19\u0e27\u0e15\u0e31\u0e49\u0e07",
-"Image description": "\u0e04\u0e33\u0e2d\u0e18\u0e34\u0e1a\u0e32\u0e22\u0e23\u0e39\u0e1b",
-"Style": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a",
-"Dimensions": "\u0e02\u0e19\u0e32\u0e14",
-"Insert image": "\u0e41\u0e17\u0e23\u0e01\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"Image": "\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"Zoom in": "\u0e02\u0e22\u0e32\u0e22\u0e40\u0e02\u0e49\u0e32",
-"Contrast": "\u0e04\u0e27\u0e32\u0e21\u0e40\u0e1b\u0e23\u0e35\u0e22\u0e1a\u0e15\u0e48\u0e32\u0e07",
-"Back": "\u0e01\u0e25\u0e31\u0e1a",
-"Gamma": "\u0e41\u0e01\u0e21\u0e21\u0e32",
-"Flip horizontally": "\u0e1e\u0e25\u0e34\u0e01\u0e15\u0e32\u0e21\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
-"Resize": "\u0e1b\u0e23\u0e31\u0e1a\u0e02\u0e19\u0e32\u0e14",
-"Sharpen": "\u0e04\u0e27\u0e32\u0e21\u0e04\u0e21",
-"Zoom out": "\u0e22\u0e48\u0e2d\u0e2d\u0e2d\u0e01",
-"Image options": "\u0e15\u0e31\u0e27\u0e40\u0e25\u0e37\u0e2d\u0e01\u0e23\u0e39\u0e1b\u0e20\u0e32\u0e1e",
-"Apply": "\u0e19\u0e33\u0e44\u0e1b\u0e43\u0e0a\u0e49",
-"Brightness": "\u0e04\u0e27\u0e32\u0e21\u0e2a\u0e27\u0e48\u0e32\u0e07",
-"Rotate clockwise": "\u0e2b\u0e21\u0e38\u0e19\u0e15\u0e32\u0e21\u0e40\u0e02\u0e47\u0e21\u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32",
-"Rotate counterclockwise": "\u0e2b\u0e21\u0e38\u0e19\u0e17\u0e27\u0e19\u0e40\u0e02\u0e47\u0e21\u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32",
-"Edit image": "\u0e41\u0e01\u0e49\u0e44\u0e02\u0e23\u0e39\u0e1b",
-"Color levels": "\u0e23\u0e30\u0e14\u0e31\u0e1a\u0e2a\u0e35",
-"Crop": "\u0e04\u0e23\u0e2d\u0e1b\u0e15\u0e31\u0e14",
-"Orientation": "\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e27\u0e32\u0e07",
-"Flip vertically": "\u0e1e\u0e25\u0e34\u0e01\u0e15\u0e32\u0e21\u0e41\u0e19\u0e27\u0e15\u0e31\u0e49\u0e07",
-"Invert": "\u0e22\u0e49\u0e2d\u0e19\u0e01\u0e25\u0e31\u0e1a",
-"Date\/time": "\u0e27\u0e31\u0e19\u0e17\u0e35\u0e48\/\u0e40\u0e27\u0e25\u0e32",
-"Insert date\/time": "\u0e41\u0e17\u0e23\u0e01\u0e27\u0e31\u0e19\u0e17\u0e35\u0e48\/\u0e40\u0e27\u0e25\u0e32",
-"Remove link": "\u0e40\u0e2d\u0e32\u0e25\u0e34\u0e07\u0e01\u0e4c\u0e2d\u0e2d\u0e01",
-"Url": "URL",
-"Text to display": "\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21\u0e17\u0e35\u0e48\u0e08\u0e30\u0e41\u0e2a\u0e14\u0e07",
-"Anchors": "\u0e08\u0e38\u0e14\u0e22\u0e36\u0e14",
-"Insert link": "\u0e41\u0e17\u0e23\u0e01\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"Link": "\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"New window": "\u0e40\u0e1b\u0e34\u0e14\u0e2b\u0e19\u0e49\u0e32\u0e15\u0e48\u0e32\u0e07\u0e43\u0e2b\u0e21\u0e48",
-"None": "\u0e44\u0e21\u0e48\u0e21\u0e35",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URL \u0e17\u0e35\u0e48\u0e04\u0e38\u0e13\u0e23\u0e30\u0e1a\u0e38\u0e14\u0e39\u0e40\u0e2b\u0e21\u0e37\u0e2d\u0e19\u0e27\u0e48\u0e32\u0e40\u0e1b\u0e47\u0e19\u0e25\u0e34\u0e07\u0e01\u0e4c\u0e20\u0e32\u0e22\u0e19\u0e2d\u0e01 \u0e04\u0e38\u0e13\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e43\u0e2a\u0e48 http:\/\/ \u0e19\u0e33\u0e2b\u0e19\u0e49\u0e32\u0e2b\u0e23\u0e37\u0e2d\u0e44\u0e21\u0e48",
-"Paste or type a link": "\u0e27\u0e32\u0e07\u0e2b\u0e23\u0e37\u0e2d\u0e1b\u0e49\u0e2d\u0e19\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"Target": "\u0e40\u0e1b\u0e49\u0e32\u0e2b\u0e21\u0e32\u0e22",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URL \u0e17\u0e35\u0e48\u0e04\u0e38\u0e13\u0e23\u0e30\u0e1a\u0e38\u0e14\u0e39\u0e40\u0e2b\u0e21\u0e37\u0e2d\u0e19\u0e27\u0e48\u0e32\u0e40\u0e1b\u0e47\u0e19\u0e2d\u0e35\u0e40\u0e21\u0e25\u0e41\u0e2d\u0e14\u0e40\u0e14\u0e23\u0e2a \u0e04\u0e38\u0e13\u0e15\u0e49\u0e2d\u0e07\u0e01\u0e32\u0e23\u0e43\u0e2a\u0e48 mailto: \u0e19\u0e33\u0e2b\u0e19\u0e49\u0e32\u0e2b\u0e23\u0e37\u0e2d\u0e44\u0e21\u0e48",
-"Insert\/edit link": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e25\u0e34\u0e07\u0e01\u0e4c",
-"Insert\/edit video": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e27\u0e34\u0e14\u0e35\u0e42\u0e2d",
-"Media": "\u0e2a\u0e37\u0e48\u0e2d",
-"Alternative source": "\u0e41\u0e2b\u0e25\u0e48\u0e07\u0e17\u0e35\u0e48\u0e21\u0e32\u0e2a\u0e33\u0e23\u0e2d\u0e07",
-"Paste your embed code below:": "\u0e27\u0e32\u0e07\u0e42\u0e04\u0e49\u0e14\u0e1d\u0e31\u0e07\u0e15\u0e31\u0e27\u0e02\u0e2d\u0e07\u0e04\u0e38\u0e13\u0e14\u0e49\u0e32\u0e19\u0e25\u0e48\u0e32\u0e07:",
-"Insert video": "\u0e41\u0e17\u0e23\u0e01\u0e27\u0e34\u0e14\u0e35\u0e42\u0e2d",
-"Poster": "\u0e42\u0e1b\u0e2a\u0e40\u0e15\u0e2d\u0e23\u0e4c",
-"Insert\/edit media": "\u0e41\u0e17\u0e23\u0e01\/\u0e41\u0e01\u0e49\u0e44\u0e02\u0e2a\u0e37\u0e48\u0e2d",
-"Embed": "\u0e1d\u0e31\u0e07",
-"Nonbreaking space": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e44\u0e21\u0e48\u0e41\u0e22\u0e01",
-"Page break": "\u0e15\u0e31\u0e27\u0e41\u0e1a\u0e48\u0e07\u0e2b\u0e19\u0e49\u0e32",
-"Paste as text": "\u0e27\u0e32\u0e07\u0e40\u0e1b\u0e47\u0e19\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
-"Preview": "\u0e41\u0e2a\u0e14\u0e07\u0e15\u0e31\u0e27\u0e2d\u0e22\u0e48\u0e32\u0e07",
-"Print": "\u0e1e\u0e34\u0e21\u0e1e\u0e4c",
-"Save": "\u0e1a\u0e31\u0e19\u0e17\u0e36\u0e01",
-"Could not find the specified string.": "\u0e44\u0e21\u0e48\u0e1e\u0e1a\u0e2a\u0e15\u0e23\u0e34\u0e07\u0e17\u0e35\u0e48\u0e23\u0e30\u0e1a\u0e38",
-"Replace": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48",
-"Next": "\u0e16\u0e31\u0e14\u0e44\u0e1b",
-"Whole words": "\u0e17\u0e31\u0e49\u0e07\u0e04\u0e33",
-"Find and replace": "\u0e04\u0e49\u0e19\u0e2b\u0e32\u0e41\u0e25\u0e30\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48",
-"Replace with": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48\u0e14\u0e49\u0e27\u0e22",
-"Find": "\u0e04\u0e49\u0e19\u0e2b\u0e32",
-"Replace all": "\u0e41\u0e17\u0e19\u0e17\u0e35\u0e48\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
-"Match case": "\u0e15\u0e23\u0e07\u0e15\u0e32\u0e21\u0e15\u0e31\u0e27\u0e1e\u0e34\u0e21\u0e1e\u0e4c\u0e43\u0e2b\u0e0d\u0e48-\u0e40\u0e25\u0e47\u0e01",
-"Prev": "\u0e01\u0e48\u0e2d\u0e19\u0e2b\u0e19\u0e49\u0e32",
-"Spellcheck": "\u0e15\u0e23\u0e27\u0e08\u0e01\u0e32\u0e23\u0e2a\u0e30\u0e01\u0e14",
-"Finish": "\u0e40\u0e2a\u0e23\u0e47\u0e08\u0e2a\u0e34\u0e49\u0e19",
-"Ignore all": "\u0e25\u0e30\u0e40\u0e27\u0e49\u0e19\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14",
-"Ignore": "\u0e25\u0e30\u0e40\u0e27\u0e49\u0e19",
-"Add to Dictionary": "\u0e40\u0e1e\u0e34\u0e48\u0e21\u0e43\u0e19\u0e1e\u0e08\u0e19\u0e32\u0e19\u0e38\u0e01\u0e23\u0e21",
-"Insert row before": "\u0e41\u0e17\u0e23\u0e01\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e1a\u0e19",
-"Rows": "\u0e41\u0e16\u0e27",
-"Height": "\u0e04\u0e27\u0e32\u0e21\u0e2a\u0e39\u0e07",
-"Paste row after": "\u0e27\u0e32\u0e07\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e25\u0e48\u0e32\u0e07",
-"Alignment": "\u0e01\u0e32\u0e23\u0e08\u0e31\u0e14\u0e41\u0e19\u0e27",
-"Border color": "\u0e2a\u0e35\u0e02\u0e2d\u0e1a",
-"Column group": "\u0e01\u0e25\u0e38\u0e48\u0e21\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
-"Row": "\u0e41\u0e16\u0e27",
-"Insert column before": "\u0e41\u0e17\u0e23\u0e01\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c\u0e02\u0e49\u0e32\u0e07\u0e2b\u0e19\u0e49\u0e32",
-"Split cell": "\u0e41\u0e22\u0e01\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Cell padding": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e20\u0e32\u0e22\u0e43\u0e19\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Cell spacing": "\u0e0a\u0e48\u0e2d\u0e07\u0e27\u0e48\u0e32\u0e07\u0e23\u0e30\u0e2b\u0e27\u0e48\u0e32\u0e07\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Row type": "\u0e0a\u0e19\u0e34\u0e14\u0e02\u0e2d\u0e07\u0e41\u0e16\u0e27",
-"Insert table": "\u0e41\u0e17\u0e23\u0e01\u0e15\u0e32\u0e23\u0e32\u0e07",
-"Body": "\u0e40\u0e19\u0e37\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
-"Caption": "\u0e1b\u0e49\u0e32\u0e22\u0e04\u0e33\u0e2d\u0e18\u0e34\u0e1a\u0e32\u0e22",
-"Footer": "\u0e2a\u0e48\u0e27\u0e19\u0e17\u0e49\u0e32\u0e22",
-"Delete row": "\u0e25\u0e1a\u0e41\u0e16\u0e27",
-"Paste row before": "\u0e27\u0e32\u0e07\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e1a\u0e19",
-"Scope": "\u0e02\u0e2d\u0e1a\u0e40\u0e02\u0e15",
-"Delete table": "\u0e25\u0e1a\u0e15\u0e32\u0e23\u0e32\u0e07",
-"H Align": "\u0e01\u0e32\u0e23\u0e40\u0e23\u0e35\u0e22\u0e07\u0e43\u0e19\u0e41\u0e19\u0e27\u0e19\u0e2d\u0e19",
-"Top": "\u0e1a\u0e19",
-"Header cell": "\u0e40\u0e0b\u0e25\u0e25\u0e4c\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27",
-"Column": "\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
-"Row group": "\u0e01\u0e25\u0e38\u0e48\u0e21\u0e41\u0e16\u0e27",
-"Cell": "\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Middle": "\u0e01\u0e25\u0e32\u0e07",
-"Cell type": "\u0e0a\u0e19\u0e34\u0e14\u0e02\u0e2d\u0e07\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Copy row": "\u0e04\u0e31\u0e14\u0e25\u0e2d\u0e01\u0e41\u0e16\u0e27",
-"Row properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e41\u0e16\u0e27",
-"Table properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e15\u0e32\u0e23\u0e32\u0e07",
-"Bottom": "\u0e25\u0e48\u0e32\u0e07",
-"V Align": "\u0e01\u0e32\u0e23\u0e40\u0e23\u0e35\u0e22\u0e07\u0e43\u0e19\u0e41\u0e19\u0e27\u0e15\u0e31\u0e49\u0e07",
-"Header": "\u0e2a\u0e48\u0e27\u0e19\u0e2b\u0e31\u0e27",
-"Right": "\u0e02\u0e27\u0e32",
-"Insert column after": "\u0e41\u0e17\u0e23\u0e01\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c\u0e02\u0e49\u0e32\u0e07\u0e2b\u0e25\u0e31\u0e07",
-"Cols": "\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
-"Insert row after": "\u0e41\u0e17\u0e23\u0e01\u0e41\u0e16\u0e27\u0e14\u0e49\u0e32\u0e19\u0e25\u0e48\u0e32\u0e07",
-"Width": "\u0e04\u0e27\u0e32\u0e21\u0e01\u0e27\u0e49\u0e32\u0e07",
-"Cell properties": "\u0e04\u0e38\u0e13\u0e2a\u0e21\u0e1a\u0e31\u0e15\u0e34\u0e02\u0e2d\u0e07\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Left": "\u0e0b\u0e49\u0e32\u0e22",
-"Cut row": "\u0e15\u0e31\u0e14\u0e41\u0e16\u0e27",
-"Delete column": "\u0e25\u0e1a\u0e04\u0e2d\u0e25\u0e31\u0e21\u0e19\u0e4c",
-"Center": "\u0e01\u0e36\u0e48\u0e07\u0e01\u0e25\u0e32\u0e07",
-"Merge cells": "\u0e1c\u0e2a\u0e32\u0e19\u0e40\u0e0b\u0e25\u0e25\u0e4c",
-"Insert template": "\u0e41\u0e17\u0e23\u0e01\u0e41\u0e21\u0e48\u0e41\u0e1a\u0e1a",
-"Templates": "\u0e41\u0e21\u0e48\u0e41\u0e1a\u0e1a",
-"Background color": "\u0e2a\u0e35\u0e1e\u0e37\u0e49\u0e19\u0e2b\u0e25\u0e31\u0e07",
-"Custom...": "\u0e01\u0e33\u0e2b\u0e19\u0e14\u0e40\u0e2d\u0e07",
-"Custom color": "\u0e2a\u0e35\u0e17\u0e35\u0e48\u0e01\u0e33\u0e2b\u0e19\u0e14\u0e40\u0e2d\u0e07",
-"No color": "\u0e44\u0e21\u0e48\u0e21\u0e35\u0e2a\u0e35",
-"Text color": "\u0e2a\u0e35\u0e02\u0e49\u0e2d\u0e04\u0e27\u0e32\u0e21",
-"Table of Contents": "\u0e2a\u0e32\u0e23\u0e1a\u0e31\u0e0d",
-"Show blocks": "\u0e41\u0e2a\u0e14\u0e07\u0e1a\u0e25\u0e47\u0e2d\u0e01",
-"Show invisible characters": "\u0e41\u0e2a\u0e14\u0e07\u0e15\u0e31\u0e27\u0e2d\u0e31\u0e01\u0e29\u0e23\u0e17\u0e35\u0e48\u0e21\u0e2d\u0e07\u0e44\u0e21\u0e48\u0e40\u0e2b\u0e47\u0e19",
-"Words: {0}": "\u0e04\u0e33: {0}",
-"Insert": "\u0e41\u0e17\u0e23\u0e01",
-"File": "\u0e44\u0e1f\u0e25\u0e4c",
-"Edit": "\u0e41\u0e01\u0e49\u0e44\u0e02",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0e1e\u0e37\u0e49\u0e19\u0e17\u0e35\u0e48 Rich Text \u0e01\u0e14 ALT-F9 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e40\u0e21\u0e19\u0e39 \u0e01\u0e14 ALT-F10 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e41\u0e16\u0e1a\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d \u0e01\u0e14 ALT-0 \u0e2a\u0e33\u0e2b\u0e23\u0e31\u0e1a\u0e04\u0e27\u0e32\u0e21\u0e0a\u0e48\u0e27\u0e22\u0e40\u0e2b\u0e25\u0e37\u0e2d",
-"Tools": "\u0e40\u0e04\u0e23\u0e37\u0e48\u0e2d\u0e07\u0e21\u0e37\u0e2d",
-"View": "\u0e21\u0e38\u0e21\u0e21\u0e2d\u0e07",
-"Table": "\u0e15\u0e32\u0e23\u0e32\u0e07",
-"Format": "\u0e23\u0e39\u0e1b\u0e41\u0e1a\u0e1a"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/tr.es5.js b/build/media_source/vendor/tinymce/langs/tr.es5.js
deleted file mode 100644
index c512410482a7d..0000000000000
--- a/build/media_source/vendor/tinymce/langs/tr.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('tr',{
-"Cut": "Kes",
-"Header 2": "Ba\u015fl\u0131k 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Taray\u0131c\u0131n\u0131z panoya direk eri\u015fimi desteklemiyor. L\u00fctfen Ctrl+X\/C\/V klavye k\u0131sayollar\u0131n\u0131 kullan\u0131n.",
-"Div": "Div",
-"Paste": "Yap\u0131\u015ft\u0131r",
-"Close": "Kapat",
-"Font Family": "Yaz\u0131tipi Ailesi",
-"Pre": "\u00d6n",
-"Align right": "Sa\u011fa hizala",
-"New document": "Yeni dok\u00fcman",
-"Blockquote": "Al\u0131nt\u0131",
-"Numbered list": "S\u0131ral\u0131 liste",
-"Increase indent": "Girintiyi art\u0131r",
-"Formats": "Bi\u00e7imler",
-"Headers": "Ba\u015fl\u0131klar",
-"Select all": "T\u00fcm\u00fcn\u00fc se\u00e7",
-"Header 3": "Ba\u015fl\u0131k 3",
-"Blocks": "Bloklar",
-"Undo": "Geri Al",
-"Strikethrough": "\u00dcst\u00fc \u00e7izili",
-"Bullet list": "S\u0131ras\u0131z liste",
-"Header 1": "Ba\u015fl\u0131k 1",
-"Superscript": "\u00dcst simge",
-"Clear formatting": "Bi\u00e7imi temizle",
-"Font Sizes": "Yaz\u0131tipi B\u00fcy\u00fckl\u00fc\u011f\u00fc",
-"Subscript": "Alt simge",
-"Header 6": "Ba\u015fl\u0131k 6",
-"Redo": "Yinele",
-"Paragraph": "Paragraf",
-"Ok": "Tamam",
-"Bold": "Kal\u0131n",
-"Code": "Kod",
-"Italic": "\u0130talik",
-"Align center": "Ortala",
-"Header 5": "Ba\u015fl\u0131k 5",
-"Decrease indent": "Girintiyi azalt",
-"Header 4": "Ba\u015fl\u0131k 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "D\u00fcz metin modunda yap\u0131\u015ft\u0131r. Bu se\u00e7ene\u011fi kapatana kadar i\u00e7erikler d\u00fcz metin olarak yap\u0131\u015ft\u0131r\u0131l\u0131r.",
-"Underline": "Alt\u0131 \u00e7izili",
-"Cancel": "\u0130ptal",
-"Justify": "\u0130ki yana yasla",
-"Inline": "Sat\u0131r i\u00e7i",
-"Copy": "Kopyala",
-"Align left": "Sola hizala",
-"Visual aids": "G\u00f6rsel ara\u00e7lar",
-"Lower Greek": "K\u00fc\u00e7\u00fck Yunan alfabesi",
-"Square": "Kare",
-"Default": "Varsay\u0131lan",
-"Lower Alpha": "K\u00fc\u00e7\u00fck ABC",
-"Circle": "Daire",
-"Disc": "Disk",
-"Upper Alpha": "B\u00fcy\u00fck ABC",
-"Upper Roman": "B\u00fcy\u00fck Roman alfabesi",
-"Lower Roman": "K\u00fc\u00e7\u00fck Roman alfabesi",
-"Name": "\u0130sim",
-"Anchor": "\u00c7apa",
-"You have unsaved changes are you sure you want to navigate away?": "Kaydedilmemi\u015f de\u011fi\u015fiklikler var, sayfadan ayr\u0131lmak istedi\u011finize emin misiniz?",
-"Restore last draft": "Son tasla\u011f\u0131 kurtar",
-"Special character": "\u00d6zel karakter",
-"Source code": "Kaynak kodu",
-"Right to left": "Sa\u011fdan sola",
-"Left to right": "Soldan sa\u011fa",
-"Emoticons": "G\u00fcl\u00fcc\u00fckler",
-"Robots": "Robotlar",
-"Document properties": "Dok\u00fcman \u00f6zellikleri",
-"Title": "Ba\u015fl\u0131k",
-"Keywords": "Anahtar kelimeler",
-"Encoding": "Kodlama",
-"Description": "A\u00e7\u0131klama",
-"Author": "Yazar",
-"Fullscreen": "Tam ekran",
-"Horizontal line": "Yatay \u00e7izgi",
-"Horizontal space": "Yatay bo\u015fluk",
-"Insert\/edit image": "Resim ekle\/d\u00fczenle",
-"General": "Genel",
-"Advanced": "Geli\u015fmi\u015f",
-"Source": "Kaynak",
-"Border": "\u00c7er\u00e7eve",
-"Constrain proportions": "En - Boy oran\u0131n\u0131 koru",
-"Vertical space": "Dikey bo\u015fluk",
-"Image description": "Resim a\u00e7\u0131klamas\u0131",
-"Style": "Stil",
-"Dimensions": "Boyutlar",
-"Insert image": "Resim ekle",
-"Insert date\/time": "Tarih \/ Zaman ekle",
-"Remove link": "Ba\u011flant\u0131y\u0131 kald\u0131r",
-"Url": "Url",
-"Text to display": "G\u00f6r\u00fcnen yaz\u0131",
-"Anchors": "\u00c7apalar",
-"Insert link": "Ba\u011flant\u0131 ekle",
-"New window": "Yeni pencere",
-"None": "Hi\u00e7biri",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "Hedef",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "Ba\u011flant\u0131 ekle\/d\u00fczenle",
-"Insert\/edit video": "Video ekle\/d\u00fczenle",
-"Poster": "Poster",
-"Alternative source": "Alternatif kaynak",
-"Paste your embed code below:": "Medya g\u00f6mme kodunu buraya yap\u0131\u015ft\u0131r:",
-"Insert video": "Video ekle",
-"Embed": "G\u00f6mme",
-"Nonbreaking space": "B\u00f6l\u00fcnemez bo\u015fluk",
-"Page break": "Sayfa sonu",
-"Paste as text": "Metin olarak yap\u0131\u015ft\u0131r",
-"Preview": "\u00d6nizleme",
-"Print": "Yazd\u0131r",
-"Save": "Kaydet",
-"Could not find the specified string.": "Herhangi bir sonu\u00e7 bulunamad\u0131.",
-"Replace": "De\u011fi\u015ftir",
-"Next": "Sonraki",
-"Whole words": "Tam s\u00f6zc\u00fckler",
-"Find and replace": "Bul ve de\u011fi\u015ftir",
-"Replace with": "Bununla de\u011fi\u015ftir",
-"Find": "Bul",
-"Replace all": "T\u00fcm\u00fcn\u00fc de\u011fi\u015ftir",
-"Match case": "B\u00fcy\u00fck \/ K\u00fc\u00e7\u00fck harfe duyarl\u0131",
-"Prev": "\u00d6nceki",
-"Spellcheck": "Yaz\u0131m denetimi",
-"Finish": "Bitir",
-"Ignore all": "T\u00fcm\u00fcn\u00fc yoksay",
-"Ignore": "Yoksay",
-"Insert row before": "\u00d6ncesine yeni sat\u0131r ekle",
-"Rows": "Sat\u0131rlar",
-"Height": "Y\u00fckseklik",
-"Paste row after": "Sonras\u0131na sat\u0131r  yap\u0131\u015ft\u0131r",
-"Alignment": "Hizalama",
-"Column group": "S\u00fctun grubu",
-"Row": "Sat\u0131r",
-"Insert column before": "\u00d6ncesine yeni s\u00fctun ekle",
-"Split cell": "H\u00fccreleri ay\u0131r",
-"Cell padding": "H\u00fccre i\u00e7 bo\u015flu\u011fu",
-"Cell spacing": "H\u00fccre aral\u0131\u011f\u0131",
-"Row type": "Sat\u0131r tipi",
-"Insert table": "Tablo ekle",
-"Body": "G\u00f6vde",
-"Caption": "Ba\u015fl\u0131k",
-"Footer": "Alt",
-"Delete row": "Sat\u0131r\u0131 sil",
-"Paste row before": "\u00d6ncesine sat\u0131r yap\u0131\u015ft\u0131r",
-"Scope": "Kapsam",
-"Delete table": "Tabloyu sil",
-"Header cell": "Ba\u015fl\u0131k h\u00fccresi",
-"Column": "S\u00fctun",
-"Cell": "H\u00fccre",
-"Header": "Ba\u015fl\u0131k",
-"Cell type": "H\u00fccre tipi",
-"Copy row": "Sat\u0131r\u0131 kopyala",
-"Row properties": "Sat\u0131r \u00f6zellikleri",
-"Table properties": "Tablo \u00f6zellikleri",
-"Row group": "Sat\u0131r grubu",
-"Right": "Sa\u011f",
-"Insert column after": "Sonras\u0131na yeni s\u00fctun ekle",
-"Cols": "S\u00fctunlar",
-"Insert row after": "Sonras\u0131na yeni sat\u0131r ekle",
-"Width": "Geni\u015flik",
-"Cell properties": "H\u00fccre \u00f6zellikleri",
-"Left": "Sol",
-"Cut row": "Sat\u0131r\u0131 kes",
-"Delete column": "S\u00fctunu sil",
-"Center": "Orta",
-"Merge cells": "H\u00fccreleri birle\u015ftir",
-"Insert template": "\u015eablon ekle",
-"Templates": "\u015eablonlar",
-"Background color": "Arkaplan rengi",
-"Text color": "Yaz\u0131 rengi",
-"Show blocks": "Bloklar\u0131 g\u00f6r\u00fcnt\u00fcle",
-"Show invisible characters": "G\u00f6r\u00fcnmez karakterleri g\u00f6ster",
-"Words: {0}": "Kelime: {0}",
-"Insert": "Ekle",
-"File": "Dosya",
-"Edit": "D\u00fczenle",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zengin Metin Alan\u0131. Men\u00fc i\u00e7in ALT-F9 k\u0131sayolunu kullan\u0131n. Ara\u00e7 \u00e7ubu\u011fu i\u00e7in ALT-F10 k\u0131sayolunu kullan\u0131n. Yard\u0131m i\u00e7in ALT-0 k\u0131sayolunu kullan\u0131n.",
-"Tools": "Ara\u00e7lar",
-"View": "G\u00f6r\u00fcnt\u00fcle",
-"Table": "Tablo",
-"Format": "Bi\u00e7im"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/ug.es5.js b/build/media_source/vendor/tinymce/langs/ug.es5.js
deleted file mode 100644
index 8cd3cbeed88a4..0000000000000
--- a/build/media_source/vendor/tinymce/langs/ug.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('ug',{
-"Cut": "\u0643\u06d0\u0633\u0649\u0634",
-"Header 2": "\u062a\u06d0\u0645\u0627 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0633\u0649\u0632\u0646\u0649\u06ad \u062a\u0648\u0631 \u0643\u06c6\u0631\u06af\u06c8\u0686\u0649\u06ad\u0649\u0632 \u0642\u0649\u064a\u0649\u067e \u0686\u0627\u067e\u0644\u0627\u0634 \u062a\u0627\u062e\u062a\u0649\u0633\u0649 \u0632\u0649\u064a\u0627\u0631\u06d5\u062a \u0642\u0649\u0644\u0649\u0634\u0646\u0649 \u0642\u0648\u0644\u0644\u0649\u0645\u0627\u064a\u062f\u06c7.  Ctrl+X\/C\/V \u062a\u06d0\u0632\u0644\u06d5\u062a\u0645\u06d5 \u0643\u0648\u0646\u06c7\u067e\u0643\u0649\u0633\u0649 \u0626\u0627\u0631\u0642\u0649\u0644\u0649\u0642 \u0643\u06d0\u0633\u0649\u067e \u0686\u0627\u067e\u0644\u0627\u0634 \u0645\u06d5\u0634\u063a\u06c7\u0644\u0627\u062a\u0649 \u0642\u0649\u0644\u0649\u06ad.",
-"Div": "Div",
-"Paste": "\u0686\u0627\u067e\u0644\u0627\u0634",
-"Close": "\u062a\u0627\u0642\u0627\u0634",
-"Font Family": "Font Family",
-"Pre": "Pre",
-"Align right": "\u0626\u0648\u06ad\u063a\u0627 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
-"New document": "\u064a\u06d0\u06ad\u0649 \u06be\u06c6\u062c\u062c\u06d5\u062a \u0642\u06c7\u0631\u06c7\u0634",
-"Blockquote": "\u0626\u06d5\u0633\u0643\u06d5\u0631\u062a\u0649\u0634",
-"Numbered list": "\u0633\u0627\u0646\u0644\u0649\u0642 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643",
-"Increase indent": "\u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0633\u06c8\u0631\u06c8\u0634",
-"Formats": "\u0641\u0648\u0631\u0645\u0627\u062a",
-"Headers": "Headers",
-"Select all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u062a\u0627\u0644\u0644\u0627\u0634",
-"Header 3": "\u062a\u06d0\u0645\u0627 3",
-"Blocks": "Blocks",
-"Undo": "\u0626\u0627\u0631\u0642\u0649\u063a\u0627 \u064a\u06d0\u0646\u0649\u0634",
-"Strikethrough": "\u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634 \u0633\u0649\u0632\u0649\u0642\u0649",
-"Bullet list": "\u0628\u06d5\u0644\u06af\u06d5 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643",
-"Header 1": "\u062a\u06d0\u0645\u0627 1",
-"Superscript": "\u0626\u06c8\u0633\u062a\u06c8\u0646\u0643\u0649 \u0628\u06d5\u0644\u06af\u06d5",
-"Clear formatting": "\u0641\u0648\u0631\u0645\u0627\u062a\u0646\u0649 \u062a\u0627\u0632\u0644\u0627\u0634",
-"Font Sizes": "Font Sizes",
-"Subscript": "\u0626\u0627\u0633\u062a\u0649\u0646\u0642\u0649 \u0628\u06d5\u0644\u06af\u06d5",
-"Header 6": "\u062a\u06d0\u0645\u0627 6",
-"Redo": "\u0642\u0627\u064a\u062a\u0627 \u0642\u0649\u0644\u0649\u0634",
-"Paragraph": "\u067e\u0627\u0631\u0627\u06af\u0649\u0631\u0627 \u0641",
-"Ok": "\u062c\u06d5\u0632\u0649\u0645\u0644\u06d5\u0634",
-"Bold": "\u062a\u0648\u0645",
-"Code": "Code",
-"Italic": "\u064a\u0627\u0646\u062a\u06c7",
-"Align center": "\u0645\u06d5\u0631\u0643\u06d5\u0632\u06af\u06d5 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
-"Header 5": "\u062a\u06d0\u0645\u0627 5",
-"Decrease indent": "\u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0633\u06c8\u0631\u06c8\u0634",
-"Header 4": "\u062a\u06d0\u0645\u0627 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u06be\u0627\u0632\u0649\u0631 \u0686\u0627\u067e\u0644\u0649\u0633\u0649\u06ad\u0649\u0632 \u0633\u0627\u067e \u062a\u06d0\u0643\u0649\u0634 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0649 \u0686\u0627\u067e\u0644\u0649\u0646\u0649\u062f\u06c7. \u062a\u06d0\u0643\u0649\u0634 \u0634\u06d5\u0643\u0644\u0649\u062f\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634 \u062a\u06d5\u06ad\u0634\u0649\u0643\u0649\u0646\u0649 \u062a\u0627\u0642\u0649\u06cb\u06d5\u062a\u0643\u06d5\u0646\u06af\u06d5 \u0642\u06d5\u062f\u06d5\u0631.",
-"Underline": "\u0626\u0627\u0633\u062a\u0649 \u0633\u0649\u0632\u0649\u0642",
-"Cancel": "\u0642\u0627\u0644\u062f\u06c7\u0631\u06c7\u0634",
-"Justify": "\u0626\u0649\u0643\u0643\u0649 \u064a\u0627\u0646\u063a\u0627 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
-"Inline": "Inline",
-"Copy": "\u0643\u06c6\u0686\u06c8\u0631\u06c8\u0634",
-"Align left": "\u0633\u0648\u0644\u063a\u0627 \u062a\u0648\u063a\u0631\u0649\u0644\u0627\u0634",
-"Visual aids": "\u0626\u06d5\u0633\u0643\u06d5\u0631\u062a\u0649\u0634",
-"Lower Greek": "\u06af\u0631\u06d0\u062a\u0633\u0649\u064a\u0649\u0686\u06d5 \u0643\u0649\u0686\u0649\u0643 \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
-"Square": "\u0643\u06cb\u0627\u062f\u0631\u0627\u062a",
-"Default": "\u0633\u06c8\u0643\u06c8\u062a",
-"Lower Alpha": "\u0626\u0649\u0646\u06af\u0649\u0644\u0649\u0632\u0686\u06d5 \u0643\u0649\u0686\u0649\u0643 \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
-"Circle": "\u0686\u06d5\u0645\u0628\u06d5\u0631",
-"Disc": "\u062f\u06d0\u0633\u0643\u0627",
-"Upper Alpha": "\u0626\u0649\u0646\u06af\u0649\u0644\u0649\u0632\u0686\u06d5 \u0686\u0648\u06ad \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
-"Upper Roman": "\u0631\u0649\u0645\u0686\u06d5 \u0686\u0648\u06ad \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
-"Lower Roman": "\u0631\u0649\u0645\u0686\u06d5 \u0643\u0649\u0686\u0649\u0643 \u064a\u06d0\u0632\u0649\u0644\u0649\u0634\u0649",
-"Name": "\u0646\u0627\u0645\u0649",
-"Anchor": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627",
-"You have unsaved changes are you sure you want to navigate away?": "\u0633\u0649\u0632 \u062a\u06d0\u062e\u0649 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0646\u0649 \u0633\u0627\u0642\u0644\u0649\u0645\u0649\u062f\u0649\u06ad\u0649\u0632\u060c \u0626\u0627\u064a\u0631\u0649\u0644\u0627\u0645\u0633\u0649\u0632\u061f",
-"Restore last draft": "\u0626\u0627\u062e\u0649\u0631\u0642\u0649 \u0643\u06c7\u067e\u0649\u064a\u0649\u06af\u06d5 \u0642\u0627\u064a\u062a\u0649\u0634",
-"Special character": "\u0626\u0627\u0644\u0627\u06be\u0649\u062f\u06d5 \u0628\u06d5\u0644\u06af\u0649\u0644\u06d5\u0631",
-"Source code": "\u0626\u06d5\u0633\u0644\u0649 \u0643\u0648\u062f\u0649",
-"Right to left": "\u0626\u0648\u06ad\u062f\u0649\u0646 \u0633\u0648\u0644\u063a\u0627",
-"Left to right": "\u0633\u0648\u0644\u062f\u0649\u0646 \u0626\u0648\u06ad\u063a\u0627 ",
-"Emoticons": "\u0686\u0649\u0631\u0627\u064a \u0626\u0649\u067e\u0627\u062f\u06d5",
-"Robots": "\u0645\u0627\u0634\u0649\u0646\u0627 \u0626\u0627\u062f\u06d5\u0645",
-"Document properties": "\u06be\u06c6\u062c\u062c\u06d5\u062a \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
-"Title": "\u062a\u06d0\u0645\u0627",
-"Keywords": "\u06be\u0627\u0644\u0642\u0649\u0644\u0649\u0642 \u0633\u06c6\u0632",
-"Encoding": "\u0643\u0648\u062f\u0644\u0627\u0634",
-"Description": "\u062a\u06d5\u0633\u0649\u06cb\u0649\u0631",
-"Author": "\u0626\u06c7\u0644\u0627\u0646\u0645\u0627",
-"Fullscreen": "\u067e\u06c8\u062a\u06c8\u0646 \u0626\u06d0\u0643\u0631\u0627\u0646",
-"Horizontal line": "\u06af\u0648\u0631\u0632\u0649\u0646\u062a\u0627\u0644 \u0642\u06c7\u0631",
-"Horizontal space": "\u06af\u0648\u0631\u0632\u0649\u0646\u062a\u0627\u0644 \u0628\u0648\u0634\u0644\u06c7\u0642",
-"Insert\/edit image": "\u0631\u06d5\u0633\u0649\u0645 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634 \u064a\u0627\u0643\u0649 \u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
-"General": "\u0626\u0627\u062f\u06d5\u062a\u062a\u0649\u0643\u0649",
-"Advanced": "\u0626\u0627\u0644\u0627\u06be\u0649\u062f\u06d5",
-"Source": "\u0645\u06d5\u0646\u0628\u06d5",
-"Border": "\u064a\u0627\u0642\u0627",
-"Constrain proportions": "\u0626\u06d0\u06af\u0649\u0632\u0644\u0649\u0643-\u0643\u06d5\u06ad\u0644\u0649\u0643 \u0646\u0649\u0633\u067e\u0649\u062a\u0649\u0646\u0649 \u0633\u0627\u0642\u0644\u0627\u0634",
-"Vertical space": "\u06cb\u06d0\u0631\u062a\u0649\u0643\u0627\u0644 \u0628\u0648\u0634\u0644\u06c7\u0642",
-"Image description": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u06d5\u0633\u06cb\u0649\u0631\u0649",
-"Style": "\u0626\u06c7\u0633\u0644\u06c7\u067e",
-"Dimensions": "\u0686\u0648\u06ad-\u0643\u0649\u0686\u0649\u0643",
-"Insert image": "\u0631\u06d5\u0633\u0649\u0645 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Insert date\/time": "\u0686\u0649\u0633\u0644\u0627\/\u06cb\u0627\u0642\u0649\u062a \u0643\u0649\u0631\u06af\u06c8\u0632\u06c8\u0634",
-"Remove link": "Remove link",
-"Url": "\u0626\u0627\u062f\u0631\u0649\u0633",
-"Text to display": "\u0643\u06c6\u0631\u06c8\u0646\u0649\u062f\u0649\u063a\u0627\u0646 \u0645\u06d5\u0632\u0645\u06c7\u0646",
-"Anchors": "Anchors",
-"Insert link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"New window": "\u064a\u06d0\u06ad\u0649 \u0643\u06c6\u0632\u0646\u06d5\u0643",
-"None": "\u064a\u0648\u0642",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "\u0646\u0649\u0634\u0627\u0646",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0642\u06c7\u0633\u062a\u06c7\u0631\u06c7\u0634\/\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
-"Insert\/edit video": "\u0633\u0649\u0646 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634\/\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
-"Poster": "\u064a\u0648\u0644\u0644\u0649\u063a\u06c7\u0686\u0649",
-"Alternative source": "\u062a\u06d5\u0633\u06cb\u0649\u0631\u0649",
-"Paste your embed code below:": "\u0642\u0649\u0633\u062a\u06c7\u0631\u0645\u0627\u0642\u0686\u0649 \u0628\u0648\u0644\u063a\u0627\u0646 \u0643\u0648\u062f\u0646\u0649 \u0686\u0627\u067e\u0644\u0627\u06ad",
-"Insert video": "\u0633\u0649\u0646 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Embed": "\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Nonbreaking space": "\u0628\u0648\u0634\u0644\u06c7\u0642",
-"Page break": "\u0628\u06d5\u062a \u0626\u0627\u062e\u0649\u0631\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Paste as text": "\u062a\u06d0\u0643\u0649\u0634 \u0634\u06d5\u0643\u0644\u0649\u062f\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634",
-"Preview": "\u0643\u06c6\u0631\u06c8\u0634",
-"Print": "\u0628\u0627\u0633\u0645\u0627\u0642 ",
-"Save": "\u0633\u0627\u0642\u0644\u0627\u0634",
-"Could not find the specified string.": "\u0626\u0649\u0632\u062f\u0649\u0645\u06d5\u0643\u0686\u0649 \u0628\u0648\u0644\u063a\u0627\u0646 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0646\u0649 \u062a\u0627\u067e\u0627\u0644\u0645\u0649\u062f\u0649.",
-"Replace": "\u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Next": "\u0643\u06d0\u064a\u0649\u0646\u0643\u0649\u0633\u0649",
-"Whole words": "\u062a\u0648\u0644\u06c7\u0642  \u0645\u0627\u0633\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Find and replace": "\u0626\u0649\u0632\u062f\u06d5\u0634 \u06cb\u06d5 \u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Replace with": "\u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Find": "\u0626\u0649\u0632\u062f\u06d5\u0634",
-"Replace all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Match case": "\u0686\u0648\u06ad \u0643\u0649\u0686\u0649\u0643 \u06be\u06d5\u0631\u0649\u067e\u0646\u0649 \u067e\u06d5\u0631\u0649\u0642\u0644\u06d5\u0646\u062f\u06c8\u0631\u06c8\u0634",
-"Prev": "\u0626\u0627\u0644\u062f\u0649\u0646\u0642\u0649\u0633\u0649",
-"Spellcheck": "\u0626\u0649\u0645\u0644\u0627 \u062a\u06d5\u0643\u0634\u06c8\u0631\u06c8\u0634",
-"Finish": "\u0626\u0627\u062e\u0649\u0631\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
-"Ignore all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u0626\u06c6\u062a\u0643\u06c8\u0632\u06c8\u0634",
-"Ignore": "\u0626\u06c6\u062a\u0643\u06c8\u0632\u06c8\u0634",
-"Insert row before": "\u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0642\u06c7\u0631 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Rows": "\u0642\u06c7\u0631",
-"Height": "\u0626\u06d0\u06af\u0649\u0632\u0644\u0649\u0643\u0649",
-"Paste row after": "\u0642\u06c7\u0631 \u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634",
-"Alignment": "\u064a\u06c6\u0644\u0649\u0646\u0649\u0634\u0649",
-"Column group": "\u0631\u06d5\u062a \u06af\u06c7\u0631\u06c7\u067e\u067e\u0649\u0633\u0649",
-"Row": "\u0642\u06c7\u0631",
-"Insert column before": "\u0631\u06d5\u062a \u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Split cell": "\u0643\u0627\u062a\u06d5\u0643 \u067e\u0627\u0631\u0686\u0649\u0644\u0627\u0634",
-"Cell padding": "\u0643\u0627\u062a\u06d5\u0643 \u0626\u0649\u0686\u0643\u0649 \u0626\u0627\u0631\u0649\u0644\u0649\u0642\u0649",
-"Cell spacing": "\u0643\u0627\u062a\u06d5\u0643 \u0633\u0649\u0631\u062a\u0642\u0649 \u0626\u0627\u0631\u0649\u0644\u0649\u0642\u0649",
-"Row type": "\u0642\u06c7\u0631 \u062a\u0649\u067e\u0649",
-"Insert table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Body": "\u0628\u06d5\u062f\u0649\u0646\u0649",
-"Caption": "\u0686\u06c8\u0634\u06d5\u0646\u062f\u06c8\u0631\u06c8\u0634",
-"Footer": "\u067e\u06c7\u062a\u0649",
-"Delete row": "\u0642\u06c7\u0631 \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
-"Paste row before": "\u0642\u06c7\u0631 \u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0686\u0627\u067e\u0644\u0627\u0634",
-"Scope": "\u062f\u0627\u0626\u0649\u0631\u06d5",
-"Delete table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644 \u0626\u06c6\u0686\u06c8\u0631\u0634",
-"Header cell": "\u0628\u0627\u0634 \u0643\u0627\u062a\u06d5\u0643",
-"Column": "\u0631\u06d5\u062a",
-"Cell": "\u0643\u0627\u062a\u06d5\u0643",
-"Header": "\u0628\u06d0\u0634\u0649",
-"Cell type": "\u0643\u0627\u062a\u06d5\u0643 \u062a\u0649\u067e\u0649",
-"Copy row": "\u0642\u06c7\u0631 \u0643\u06c6\u0686\u06c8\u0631\u06c8\u0634",
-"Row properties": "\u0642\u06c7\u0631 \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
-"Table properties": "\u062c\u06d5\u062f\u06cb\u06d5\u0644 \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
-"Row group": "\u0642\u06c7\u0631 \u06af\u06c7\u0631\u06c7\u067e\u067e\u0649\u0633\u0649",
-"Right": "\u0626\u0648\u06ad",
-"Insert column after": "\u0631\u06d5\u062a \u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Cols": "\u0631\u06d5\u062a",
-"Insert row after": "\u0626\u0627\u0631\u0642\u0649\u063a\u0627 \u0642\u06c7\u0631 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Width": "\u0643\u06d5\u06ad\u0644\u0649\u0643\u0649",
-"Cell properties": "\u0643\u0627\u062a\u06d5\u0643 \u062e\u0627\u0633\u0644\u0649\u0642\u0649",
-"Left": "\u0633\u0648\u0644",
-"Cut row": "\u0642\u06c7\u0631 \u0643\u06d0\u0633\u0649\u0634",
-"Delete column": "\u0631\u06d5\u062a \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
-"Center": "\u0645\u06d5\u0631\u0643\u06d5\u0632",
-"Merge cells": "\u0643\u0627\u062a\u06d5\u0643 \u0628\u0649\u0631\u0644\u06d5\u0634\u062a\u06c8\u0631\u06c8\u0634",
-"Insert template": "\u0626\u06c8\u0644\u06af\u06d5 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"Templates": "\u0626\u06c8\u0644\u06af\u0649\u0644\u06d5\u0631",
-"Background color": "\u0626\u0627\u0631\u0642\u0627 \u0631\u06d5\u06ad\u06af\u0649",
-"Text color": "\u062e\u06d5\u062a \u0631\u06d5\u06ad\u06af\u0649",
-"Show blocks": "\u0631\u0627\u064a\u0648\u0646 \u0643\u06c6\u0631\u0633\u0649\u062a\u0649\u0634",
-"Show invisible characters": "\u0643\u06c6\u0631\u06c8\u0646\u0645\u06d5\u064a\u062f\u0649\u063a\u0627\u0646 \u06be\u06d5\u0631\u0649\u067e\u0644\u06d5\u0631\u0646\u0649 \u0643\u06c6\u0631\u0633\u0649\u062a\u0649\u0634",
-"Words: {0}": "\u0633\u06c6\u0632: {0}",
-"Insert": "\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
-"File": "\u06be\u06c6\u062c\u062c\u06d5\u062a",
-"Edit": "\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help",
-"Tools": "\u0642\u06c7\u0631\u0627\u0644",
-"View": "\u0643\u06c6\u0631\u06c8\u0634",
-"Table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644",
-"Format": "\u0641\u0648\u0631\u0645\u0627\u062a"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/uk.es5.js b/build/media_source/vendor/tinymce/langs/uk.es5.js
deleted file mode 100644
index fce3eb386d4a1..0000000000000
--- a/build/media_source/vendor/tinymce/langs/uk.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('uk',{
-"Cut": "\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438",
-"Heading 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Header 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u043d\u0435 \u043f\u0456\u0434\u0442\u0440\u0438\u043c\u0443\u0454 \u043f\u0440\u044f\u043c\u0438\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u043e \u0431\u0443\u0444\u0435\u0440\u0443 \u043e\u0431\u043c\u0456\u043d\u0443. \u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0439\u0442\u0435 Ctrl+X\/C\/V \u0437\u0430\u043c\u0456\u0441\u0442\u044c \u0441\u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043d\u044f \u043a\u043b\u0430\u0432\u0456\u0448.",
-"Heading 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Div": "\u0411\u043b\u043e\u043a",
-"Heading 2": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 2",
-"Paste": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438",
-"Close": "\u0417\u0430\u043a\u0440\u0438\u0442\u0438",
-"Font Family": "\u0428\u0440\u0438\u0444\u0442 \u0437\u043c\u0456\u0441\u0442\u0443",
-"Pre": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0454 \u0444\u043e\u0440\u043c\u0430\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
-"Align right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"New document": "\u041d\u043e\u0432\u0438\u0439 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442",
-"Blockquote": "\u0426\u0438\u0442\u0430\u0442\u0430",
-"Numbered list": "\u041d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Heading 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Headings": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Increase indent": "\u0417\u0431\u0456\u043b\u044c\u0448\u0438\u0442\u0438  \u0432\u0456\u0434\u0441\u0442\u0443\u043f",
-"Formats": "\u0424\u043e\u0440\u043c\u0430\u0442\u0438",
-"Headers": "Headers",
-"Select all": "\u0412\u0438\u0434\u0456\u043b\u0438\u0442\u0438 \u0432\u0441\u0435",
-"Header 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Blocks": "\u0411\u043b\u043e\u043a\u0438",
-"Undo": "\u0412\u0456\u0434\u043c\u0456\u043d\u0438\u0442\u0438",
-"Strikethrough": "\u0417\u0430\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u0438\u0439",
-"Bullet list": "\u041d\u0435\u043d\u0443\u043c\u0435\u0440\u043e\u0432\u0430\u043d\u0438\u0439 \u0441\u043f\u0438\u0441\u043e\u043a",
-"Header 1": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 1",
-"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u0456\u043d\u0434\u0435\u043a\u0441",
-"Clear formatting": "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u0438 \u0444\u043e\u0440\u043c\u0430\u0442\u0443\u0432\u0430\u043d\u043d\u044f",
-"Font Sizes": "\u0420\u043e\u0437\u043c\u0456\u0440 \u0448\u0440\u0438\u0444\u0442\u0443",
-"Subscript": "\u041d\u0438\u0436\u043d\u0456\u0439 \u0456\u043d\u0434\u0435\u043a\u0441",
-"Header 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Redo": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438",
-"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
-"Ok": "\u0413\u0430\u0440\u0430\u0437\u0434",
-"Bold": "\u0416\u0438\u0440\u043d\u0438\u0439",
-"Code": "\u041a\u043e\u0434",
-"Italic": "\u041a\u0443\u0440\u0441\u0438\u0432",
-"Align center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Header 5": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 5",
-"Heading 6": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 6",
-"Heading 3": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 3",
-"Decrease indent": "\u0417\u043c\u0435\u043d\u0448\u0438\u0442\u0438\u0442\u0438 \u0432\u0456\u0434\u0441\u0442\u0443\u043f",
-"Header 4": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0412\u0441\u0442\u0430\u0432\u043a\u0430 \u0437\u0434\u0456\u0439\u0441\u043d\u044e\u0454\u0442\u044c\u0441\u044f \u0443 \u0432\u0438\u0433\u043b\u044f\u0434\u0456 \u043f\u0440\u043e\u0441\u0442\u043e\u0433\u043e \u0442\u0435\u043a\u0441\u0442\u0443, \u043f\u043e\u043a\u0438 \u043d\u0435 \u0432\u0456\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u0438 \u0434\u0430\u043d\u0443 \u043e\u043f\u0446\u0456\u044e.",
-"Underline": "\u041f\u0456\u0434\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u0438\u0439",
-"Cancel": "\u0412\u0456\u0434\u043c\u0456\u043d\u0438\u0442\u0438",
-"Justify": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Inline": "\u0412\u0431\u0443\u0434\u043e\u0432\u0430\u043d\u0456",
-"Copy": "\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438",
-"Align left": "\u041f\u043e \u043b\u0456\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Visual aids": "\u041d\u0430\u043e\u0447\u043d\u0456 \u043f\u0440\u0438\u043b\u0430\u0434\u0434\u044f",
-"Lower Greek": "\u041c\u0430\u043b\u0456 \u0433\u0440\u0435\u0446\u044c\u043a\u0456 \u0431\u0443\u043a\u0432\u0438",
-"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u0438",
-"Default": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u0438\u0439",
-"Lower Alpha": "\u041c\u0430\u043b\u0456 \u043b\u0430\u0442\u0438\u043d\u0441\u044c\u043a\u0456 \u0431\u0443\u043a\u0432\u0438",
-"Circle": "\u041e\u043a\u0440\u0443\u0436\u043d\u043e\u0441\u0442\u0456",
-"Disc": "\u041a\u0440\u0443\u0433\u0438",
-"Upper Alpha": "\u0412\u0435\u043b\u0438\u043a\u0456 \u043b\u0430\u0442\u0438\u043d\u0441\u044c\u043a\u0456 \u0431\u0443\u043a\u0432\u0438",
-"Upper Roman": "\u0420\u0438\u043c\u0441\u044c\u043a\u0456 \u0446\u0438\u0444\u0440\u0438",
-"Lower Roman": "\u041c\u0430\u043b\u0456 \u0440\u0438\u043c\u0441\u044c\u043a\u0456 \u0446\u0438\u0444\u0440\u0438",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u041a\u043e\u0434 \u043c\u0430\u0454 \u043f\u043e\u0447\u0438\u043d\u0430\u0442\u0438\u0441\u044f \u0437 \u043b\u0456\u0442\u0435\u0440\u0438 \u0456 \u043c\u043e\u0436\u0435 \u043c\u0456\u0441\u0442\u0438\u0442\u0438 \u043b\u0438\u0448\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u0438 \u043b\u0456\u0442\u0435\u0440, \u0446\u0438\u0444\u0440, \u0434\u0435\u0444\u0456\u0441\u0443, \u043a\u0440\u0430\u043f\u043a\u0438, \u043a\u043e\u043c\u0438 \u0430\u0431\u043e \u043d\u0438\u0436\u043d\u044c\u043e\u0433\u043e \u043f\u0456\u0434\u043a\u0440\u0435\u0441\u043b\u0435\u043d\u043d\u044f.",
-"Name": "\u041d\u0430\u0437\u0432\u0430",
-"Anchor": "\u042f\u043a\u0456\u0440",
-"Id": "\u041a\u043e\u0434",
-"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0412\u0430\u0441 \u0454 \u043d\u0435\u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0456 \u0437\u043c\u0456\u043d\u0438. \u0412\u0438 \u0432\u043f\u0435\u0432\u043d\u0435\u043d\u0456, \u0449\u043e \u0445\u043e\u0447\u0435\u0442\u0435 \u043f\u0456\u0442\u0438?",
-"Restore last draft": "\u0412\u0456\u0434\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044f \u043e\u0441\u0442\u0430\u043d\u043d\u044c\u043e\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0443",
-"Special character": "\u0421\u043f\u0435\u0446\u0456\u0430\u043b\u044c\u043d\u0456 \u0441\u0438\u043c\u0432\u043e\u043b\u0438",
-"Source code": "\u0412\u0438\u0445\u0456\u0434\u043d\u0438\u0439 \u043a\u043e\u0434",
-"Language": "\u041c\u043e\u0432\u0430",
-"Insert\/Edit code sample": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u043d\u0430\u043f\u0438\u0441\u0430\u0442\u0438 \u043f\u0440\u0438\u043a\u043b\u0430\u0434 \u043a\u043e\u0434\u0443",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "\u043a\u043e\u043b\u0456\u0440",
-"Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0456\u0432\u043e",
-"Left to right": "\u0417\u043b\u0456\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u043e",
-"Emoticons": "\u0415\u043c\u043e\u0446\u0456\u0457",
-"Robots": "\u0420\u043e\u0431\u043e\u0442\u0438",
-"Document properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
-"Title": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Keywords": "\u041a\u043b\u044e\u0447\u043e\u0432\u0456 \u0441\u043b\u043e\u0432\u0430",
-"Encoding": "\u041a\u043e\u0434\u0443\u0432\u0430\u043d\u043d\u044f",
-"Description": "\u041e\u043f\u0438\u0441",
-"Author": "\u0410\u0432\u0442\u043e\u0440",
-"Fullscreen": "\u041f\u043e\u0432\u043d\u043e\u0435\u043a\u0440\u0430\u043d\u043d\u0438\u0439 \u0440\u0435\u0436\u0438\u043c",
-"Horizontal line": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0430 \u043b\u0456\u043d\u0456\u044f",
-"Horizontal space": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0438\u0439 \u0456\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Insert\/edit image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0437\u043c\u0456\u043d\u0438\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"General": "\u0417\u0430\u0433\u0430\u043b\u044c\u043d\u0456",
-"Advanced": "\u0420\u043e\u0437\u0448\u0438\u0440\u0435\u043d\u0456",
-"Source": "\u0414\u0436\u0435\u0440\u0435\u043b\u043e",
-"Border": "\u041c\u0435\u0436\u0430",
-"Constrain proportions": "\u0417\u0431\u0435\u0440\u0456\u0433\u0430\u0442\u0438 \u043f\u0440\u043e\u043f\u043e\u0440\u0446\u0456\u0457",
-"Vertical space": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0438\u0439 \u0456\u043d\u0442\u0435\u0440\u0432\u0430\u043b",
-"Image description": "\u041e\u043f\u0438\u0441 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Style": "\u0421\u0442\u0438\u043b\u044c",
-"Dimensions": "\u0420\u043e\u0437\u043c\u0456\u0440",
-"Insert image": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Image": "\u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Zoom in": "\u041d\u0430\u0431\u043b\u0438\u0437\u0438\u0442\u0438",
-"Contrast": "\u041a\u043e\u043d\u0442\u0440\u0430\u0441\u0442",
-"Back": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438\u0441\u044f",
-"Gamma": "\u0413\u0430\u043c\u043c\u0430",
-"Flip horizontally": "\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043f\u043e \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u0456",
-"Resize": "\u0417\u043c\u0456\u043d\u0438\u0442\u0438 \u0440\u043e\u0437\u043c\u0456\u0440",
-"Sharpen": "\u0427\u0456\u0442\u043a\u0456\u0441\u0442\u044c",
-"Zoom out": "\u0412\u0456\u0434\u0434\u0430\u043b\u0438\u0442\u0438",
-"Image options": "\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Apply": "\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438",
-"Brightness": "\u042f\u0441\u043a\u0440\u0430\u0432\u0456\u0441\u0442\u044c",
-"Rotate clockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438 \u0437\u0430 \u0433\u043e\u0434\u0438\u043d\u043d\u0438\u043a\u043e\u0432\u043e\u044e \u0441\u0442\u0440\u0456\u043b\u043a\u043e\u044e",
-"Rotate counterclockwise": "\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438 \u043f\u0440\u043e\u0442\u0438 \u0433\u043e\u0434\u0438\u043d\u043d\u0438\u043a\u043e\u0432\u043e\u0457 \u0441\u0442\u0440\u0456\u043b\u043a\u0438",
-"Edit image": "\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Color levels": "\u0420\u0456\u0432\u043d\u0456 \u043a\u043e\u043b\u044c\u043e\u0440\u0456\u0432",
-"Crop": "\u041e\u0431\u0440\u0456\u0437\u0430\u0442\u0438",
-"Orientation": "\u041e\u0440\u0456\u0454\u043d\u0442\u0430\u0446\u0456\u044f",
-"Flip vertically": "\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043f\u043e \u0432\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u0456",
-"Invert": "\u0406\u043d\u0432\u0435\u0440\u0441\u0456\u044f",
-"Date\/time": "\u0414\u0430\u0442\u0430\/\u0447\u0430\u0441",
-"Insert date\/time": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0434\u0430\u0442\u0443\/\u0447\u0430\u0441",
-"Remove link": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Url": "\u0410\u0434\u0440\u0435\u0441\u0430 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Text to display": "\u0422\u0435\u043a\u0441\u0442 \u0434\u043b\u044f \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Anchors": "\u042f\u043a\u043e\u0440\u0456",
-"Insert link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Link": "\u041f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"New window": "\u0423 \u043d\u043e\u0432\u043e\u043c\u0443 \u0432\u0456\u043a\u043d\u0456",
-"None": "\u041d\u0456",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0437\u043e\u0432\u043d\u0456\u0448\u043d\u0454 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 http:\/\/ \u043f\u0440\u0435\u0444\u0456\u043a\u0441?",
-"Paste or type a link": "\u041d\u0430\u043f\u0438\u0441\u0430\u0442\u0438 \u0430\u0431\u043e \u0432\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Target": "\u0412\u0456\u0434\u043a\u0440\u0438\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0430\u0434\u0440\u0435\u0441\u0443 \u0435\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0457 \u043f\u043e\u0448\u0442\u0438. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 mailto: \u043f\u0440\u0435\u0444\u0456\u043a\u0441?",
-"Insert\/edit link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
-"Insert\/edit video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0432\u0456\u0434\u0435\u043e",
-"Media": "\u041c\u0435\u0434\u0456\u0430\u0434\u0430\u043d\u0456",
-"Alternative source": "\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0435 \u0434\u0436\u0435\u0440\u0435\u043b\u043e",
-"Paste your embed code below:": "\u0412\u0441\u0442\u0430\u0432\u0442\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0438\u0436\u0447\u0435:",
-"Insert video": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0432\u0456\u0434\u0435\u043e",
-"Poster": "\u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f",
-"Insert\/edit media": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0430\u0443\u0434\u0456\u043e",
-"Embed": "\u041a\u043e\u0434 \u0434\u043b\u044f \u0432\u0441\u0442\u0430\u0432\u043a\u0438",
-"Nonbreaking space": "\u041d\u0435\u0440\u043e\u0437\u0440\u0438\u0432\u043d\u0438\u0439 \u043f\u0440\u043e\u0431\u0456\u043b",
-"Page break": "\u0420\u043e\u0437\u0440\u0438\u0432 \u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0438",
-"Paste as text": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u044f\u043a \u0442\u0435\u043a\u0441\u0442",
-"Preview": "\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439 \u043f\u0435\u0440\u0435\u0433\u043b\u044f\u0434",
-"Print": "\u0414\u0440\u0443\u043a\u0443\u0432\u0430\u0442\u0438",
-"Save": "\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438",
-"Could not find the specified string.": "\u0412\u043a\u0430\u0437\u0430\u043d\u0438\u0439 \u0440\u044f\u0434\u043e\u043a \u043d\u0435 \u0437\u043d\u0430\u0439\u0434\u0435\u043d\u043e",
-"Replace": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438",
-"Next": "\u0412\u043d\u0438\u0437",
-"Whole words": "\u0426\u0456\u043b\u0456 \u0441\u043b\u043e\u0432\u0430",
-"Find and replace": "\u041f\u043e\u0448\u0443\u043a \u0456 \u0437\u0430\u043c\u0456\u043d\u0430",
-"Replace with": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u043d\u0430",
-"Find": "\u0417\u043d\u0430\u0439\u0442\u0438",
-"Replace all": "\u0417\u0430\u043c\u0456\u043d\u0438\u0442\u0438 \u0432\u0441\u0435",
-"Match case": "\u0412\u0440\u0430\u0445\u043e\u0432\u0443\u0432\u0430\u0442\u0438 \u0440\u0435\u0433\u0456\u0441\u0442\u0440",
-"Prev": "\u0412\u0433\u043e\u0440\u0443",
-"Spellcheck": "\u041f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0430 \u043e\u0440\u0444\u043e\u0433\u0440\u0430\u0444\u0456\u0457",
-"Finish": "\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u0438",
-"Ignore all": "\u0406\u0433\u043d\u043e\u0440\u0443\u0432\u0430\u0442\u0438 \u0432\u0441\u0435",
-"Ignore": "\u0406\u0433\u043d\u043e\u0440\u0443\u0432\u0430\u0442\u0438",
-"Add to Dictionary": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0434\u043e \u0421\u043b\u043e\u0432\u043d\u0438\u043a\u0430",
-"Insert row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u0440\u044f\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
-"Rows": "\u0420\u044f\u0434\u043a\u0438",
-"Height": "\u0412\u0438\u0441\u043e\u0442\u0430",
-"Paste row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u0437\u043d\u0438\u0437\u0443",
-"Alignment": "\u0412\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Border color": "\u043a\u043e\u043b\u0456\u0440 \u0440\u0430\u043c\u043a\u0438",
-"Column group": "\u0413\u0440\u0443\u043f\u0430 \u0441\u0442\u043e\u0432\u043f\u0446\u0456\u0432",
-"Row": "\u0420\u044f\u0434\u043e\u043a",
-"Insert column before": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c \u043b\u0456\u0432\u043e\u0440\u0443\u0447",
-"Split cell": "\u0420\u043e\u0437\u0431\u0438\u0442\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0443",
-"Cell padding": "\u041f\u043e\u043b\u044f \u043a\u043e\u043c\u0456\u0440\u043e\u043a",
-"Cell spacing": "\u0412\u0456\u0434\u0441\u0442\u0430\u043d\u044c \u043c\u0456\u0436 \u043a\u043e\u043c\u0456\u0440\u043a\u0430\u043c\u0438",
-"Row type": "\u0422\u0438\u043f \u0440\u044f\u0434\u043a\u0430",
-"Insert table": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u044e",
-"Body": "\u0422\u0456\u043b\u043e",
-"Caption": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Footer": "\u041d\u0438\u0436\u043d\u0456\u0439 \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b",
-"Delete row": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Paste row before": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0440\u044f\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
-"Scope": "\u0421\u0444\u0435\u0440\u0430",
-"Delete table": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0442\u0430\u0431\u043b\u0438\u0446\u044e",
-"H Align": "\u0413\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u0435  \u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Top": "\u041f\u043e \u0432\u0435\u0440\u0445\u043d\u044c\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Header cell": "\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a",
-"Column": "\u0421\u0442\u043e\u0432\u043f\u0435\u0446\u044c",
-"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u044f\u0434\u043a\u0456\u0432",
-"Cell": "\u041a\u043e\u043c\u0456\u0440\u043a\u0430",
-"Middle": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Cell type": "\u0422\u0438\u043f \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Copy row": "\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Row properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u0440\u044f\u0434\u043a\u0430",
-"Table properties": "\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0442\u0430\u0431\u043b\u0438\u0446\u0456",
-"Bottom": "\u041f\u043e \u043d\u0438\u0436\u043d\u044c\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"V Align": "\u0412\u0435\u0440\u0442\u0438\u043a\u0430\u043b\u044c\u043d\u0435 \u0432\u0438\u0440\u0456\u0432\u043d\u044e\u0432\u0430\u043d\u043d\u044f",
-"Header": "\u0412\u0435\u0440\u0445\u043d\u0456\u0439 \u043a\u043e\u043b\u043e\u043d\u0442\u0438\u0442\u0443\u043b",
-"Right": "\u041f\u043e \u043f\u0440\u0430\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Insert column after": "\u0414\u043e\u0434\u0430\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c \u043f\u0440\u0430\u0432\u043e\u0440\u0443\u0447",
-"Cols": "\u0421\u0442\u043e\u0432\u043f\u0446\u0456",
-"Insert row after": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0440\u043e\u0436\u043d\u0456\u0439 \u0440\u044f\u0434\u043e\u043a \u0437\u043d\u0438\u0437\u0443",
-"Width": "\u0428\u0438\u0440\u0438\u043d\u0430",
-"Cell properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Left": "\u041f\u043e \u043b\u0456\u0432\u043e\u043c\u0443 \u043a\u0440\u0430\u044e",
-"Cut row": "\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438 \u0440\u044f\u0434\u043e\u043a",
-"Delete column": "\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0441\u0442\u043e\u0432\u043f\u0435\u0446\u044c",
-"Center": "\u041f\u043e \u0446\u0435\u043d\u0442\u0440\u0443",
-"Merge cells": "\u041e\u0431'\u0454\u0434\u043d\u0430\u0442\u0438 \u043a\u043e\u043c\u0456\u0440\u043a\u0438",
-"Insert template": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0448\u0430\u0431\u043b\u043e\u043d",
-"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u0438",
-"Background color": "\u041a\u043e\u043b\u0456\u0440 \u0444\u043e\u043d\u0443",
-"Custom...": "\u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044c\u043a\u0438\u0439",
-"Custom color": "\u043a\u043e\u0440\u0438\u0441\u0442\u0443\u0432\u0430\u0446\u044c\u043a\u0438\u0439 \u043a\u043e\u043b\u0456\u0440",
-"No color": "\u0431\u0435\u0437 \u043a\u043e\u043b\u044c\u043e\u0440\u0443",
-"Text color": "\u041a\u043e\u043b\u0456\u0440 \u0442\u0435\u043a\u0441\u0442\u0443",
-"Table of Contents": "\u0417\u043c\u0456\u0441\u0442",
-"Show blocks": "\u041f\u043e\u043a\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u0431\u043b\u043e\u043a\u0438",
-"Show invisible characters": "\u041f\u043e\u043a\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u0456 \u0441\u0438\u043c\u0432\u043e\u043b\u0438",
-"Words: {0}": "\u041a\u0456\u043b\u044c\u043a\u0456\u0441\u0442\u044c \u0441\u043b\u0456\u0432: {0}",
-"Insert": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438",
-"File": "\u0424\u0430\u0439\u043b",
-"Edit": "\u0417\u043c\u0456\u043d\u0438\u0442\u0438",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u0435 \u043f\u043e\u043b\u0435. \u041d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c ALT-F9 \u0449\u043e\u0431 \u0432\u0438\u043a\u043b\u0438\u043a\u0430\u0442\u0438 \u043c\u0435\u043d\u044e, ALT-F10 \u043f\u0430\u043d\u0435\u043b\u044c \u0456\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0456\u0432, ALT-0 \u0434\u043b\u044f \u0432\u0438\u043a\u043b\u0438\u043a\u0443 \u0434\u043e\u043f\u043e\u043c\u043e\u0433\u0438.",
-"Tools": "\u0406\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438",
-"View": "\u0412\u0438\u0433\u043b\u044f\u0434",
-"Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u044f",
-"Format": "\u0424\u043e\u0440\u043c\u0430\u0442"
-});
diff --git a/build/media_source/vendor/tinymce/langs/vi.es5.js b/build/media_source/vendor/tinymce/langs/vi.es5.js
deleted file mode 100644
index fb7668bd82cdc..0000000000000
--- a/build/media_source/vendor/tinymce/langs/vi.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('vi',{
-"Cut": "C\u1eaft",
-"Header 2": "Ti\u00eau \u0111\u1ec1 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "Tr\u00ecnh duy\u1ec7t c\u1ee7a b\u1ea1n kh\u00f4ng h\u1ed7 tr\u1ee3 truy c\u1eadp truy c\u1eadp b\u1ed9 nh\u1edb \u1ea3o, vui l\u00f2ng s\u1eed d\u1ee5ng c\u00e1c t\u1ed5 h\u1ee3p ph\u00edm Ctrl + X, C, V.",
-"Div": "Khung",
-"Paste": "D\u00e1n",
-"Close": "\u0110\u00f3ng L\u1ea1i",
-"Font Family": "Font Family",
-"Pre": "\u0110\u1ecbnh d\u1ea1ng",
-"Align right": "Canh ph\u1ea3i",
-"New document": "T\u1ea1o t\u00e0i li\u1ec7u m\u1edbi",
-"Blockquote": "\u0110o\u1ea1n Tr\u00edch D\u1eabn",
-"Numbered list": "Danh s\u00e1ch d\u1ea1ng s\u1ed1",
-"Increase indent": "T\u0103ng kho\u1ea3ng c\u00e1ch d\u00f2ng",
-"Formats": "\u0110\u1ecbnh d\u1ea1ng",
-"Headers": "\u0110\u1ea7u trang",
-"Select all": "Ch\u1ecdn t\u1ea5t c\u1ea3",
-"Header 3": "Ti\u00eau \u0111\u1ec1 3",
-"Blocks": "Bao",
-"Undo": "H\u1ee7y thao t\u00e1c",
-"Strikethrough": "G\u1ea1ch ngang",
-"Bullet list": "Danh s\u00e1ch d\u1ea1ng bi\u1ec3u t\u01b0\u1ee3ng",
-"Header 1": "Ti\u00eau \u0111\u1ec1 1",
-"Superscript": "K\u00fd t\u1ef1 m\u0169",
-"Clear formatting": "L\u01b0\u1ee3c b\u1ecf ph\u1ea7n hi\u1ec7u \u1ee9ng",
-"Font Sizes": "Font Sizes",
-"Subscript": "K\u00fd t\u1ef1 th\u1ea5p",
-"Header 6": "Ti\u00eau \u0111\u1ec1 6",
-"Redo": "L\u00e0m l\u1ea1i",
-"Paragraph": "\u0110o\u1ea1n v\u0103n",
-"Ok": "\u0110\u1ed3ng \u00dd",
-"Bold": "In \u0111\u1eadm",
-"Code": "M\u00e3",
-"Italic": "In nghi\u00eang",
-"Align center": "Canh gi\u1eefa",
-"Header 5": "Ti\u00eau \u0111\u1ec1 5",
-"Decrease indent": "Th\u1ee5t l\u00f9i d\u00f2ng",
-"Header 4": "Ti\u00eau \u0111\u1ec1 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "Ch\u1ee9c n\u0103ng D\u00e1n \u0111ang trong tr\u1ea1ng th\u00e1i v\u0103n b\u1ea3n \u0111\u01a1n gi\u1ea3n. N\u1ed9i dung s\u1ebd \u0111\u01b0\u1ee3c d\u00e1n d\u01b0\u1edbi d\u1ea1ng v\u0103n b\u1ea3n thu\u1ea7n, kh\u00f4ng c\u00f3 \u0111\u1ecbnh d\u1ea1ng.",
-"Underline": "G\u1ea1ch d\u01b0\u1edbi",
-"Cancel": "Hu\u1ef7 B\u1ecf",
-"Justify": "Canh \u0111\u1ec1u hai b\u00ean",
-"Inline": "C\u00f9ng d\u00f2ng",
-"Copy": "Sao ch\u00e9p",
-"Align left": "Canh tr\u00e1i",
-"Visual aids": "M\u1edf khung so\u1ea1n th\u1ea3o",
-"Lower Greek": "S\u1ed1 hy l\u1ea1p th\u01b0\u1eddng",
-"Square": "\u00d4 vu\u00f4ng",
-"Default": "M\u1eb7c \u0111\u1ecbnh",
-"Lower Alpha": "K\u00fd t\u1ef1 th\u01b0\u1eddng",
-"Circle": "H\u00ecnh tr\u00f2n",
-"Disc": "H\u00ecnh tr\u00f2n  d\u1ea1ng m\u1ecfng",
-"Upper Alpha": "K\u00fd t\u1ef1 hoa",
-"Upper Roman": "S\u1ed1 la m\u00e3 hoa",
-"Lower Roman": "S\u1ed1 la m\u00e3 th\u01b0\u1eddng",
-"Name": "Name",
-"Anchor": "Anchor",
-"You have unsaved changes are you sure you want to navigate away?": "B\u1ea1n ch\u01b0a l\u01b0u thay \u0111\u1ed5i b\u1ea1n c\u00f3 ch\u1eafc b\u1ea1n mu\u1ed1n di chuy\u1ec3n \u0111i?",
-"Restore last draft": "Kh\u00f4i ph\u1ee5c b\u1ea3n g\u1ea7n nh\u1ea5t",
-"Special character": "Special character",
-"Source code": "M\u00e3 ngu\u1ed3n",
-"Right to left": "Right to left",
-"Left to right": "Left to right",
-"Emoticons": "Bi\u1ec3u t\u01b0\u1ee3ng c\u1ea3m x\u00fac",
-"Robots": "Robots",
-"Document properties": "Thu\u1ed9c t\u00ednh t\u00e0i li\u1ec7u",
-"Title": "Ti\u00eau \u0111\u1ec1",
-"Keywords": "T\u1eeb kh\u00f3a",
-"Encoding": "M\u00e3 h\u00f3a",
-"Description": "Description",
-"Author": "T\u00e1c gi\u1ea3",
-"Fullscreen": "Fullscreen",
-"Horizontal line": "K\u1ebb ngang",
-"Horizontal space": "N\u1eb1m ngang",
-"Insert\/edit image": "Ch\u00e8n\/s\u1eeda \u1ea3nh",
-"General": "Chung",
-"Advanced": "N\u00e2ng cao",
-"Source": "Ngu\u1ed3n",
-"Border": "\u0110\u01b0\u1eddng vi\u1ec1n",
-"Constrain proportions": "T\u1ef7 l\u1ec7 h\u1ea1n ch\u1ebf",
-"Vertical space": "N\u1eb1m d\u1ecdc",
-"Image description": "M\u00f4 t\u1ea3 \u1ea3nh",
-"Style": "Ki\u1ec3u",
-"Dimensions": "K\u00edch th\u01b0\u1edbc",
-"Insert image": "Ch\u00e8n \u1ea3nh",
-"Insert date\/time": "Insert date\/time",
-"Remove link": "B\u1ecf li\u00ean k\u1ebft",
-"Url": "Url",
-"Text to display": "N\u1ed9i dung hi\u1ec3n th\u1ecb",
-"Anchors": "Anchors",
-"Insert link": "Ch\u00e8n li\u00ean k\u1ebft",
-"New window": "C\u1eeda s\u1ed5 m\u1edbi",
-"None": "Kh\u00f4ng",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "\u0110\u00edch",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "Ch\u00e8n\/s\u1eeda li\u00ean k\u1ebft",
-"Insert\/edit video": "Ch\u00e8n\/s\u1eeda video",
-"Poster": "Ng\u01b0\u1eddi g\u1eedi",
-"Alternative source": "Ngu\u1ed3n thay th\u1ebf",
-"Paste your embed code below:": "D\u00e1n m\u00e3 nh\u00fang c\u1ee7a b\u1ea1n d\u01b0\u1edbi \u0111\u00e2y:",
-"Insert video": "Ch\u00e8n video",
-"Embed": "Nh\u00fang",
-"Nonbreaking space": "Nonbreaking space",
-"Page break": "Ng\u1eaft trang",
-"Paste as text": "D\u00e1n \u0111o\u1ea1n v\u0103n b\u1ea3n",
-"Preview": "Xem th\u1eed",
-"Print": "In",
-"Save": "L\u01b0u",
-"Could not find the specified string.": "Could not find the specified string.",
-"Replace": "Replace",
-"Next": "Next",
-"Whole words": "To\u00e0n b\u1ed9 t\u1eeb",
-"Find and replace": "Find and replace",
-"Replace with": "Replace with",
-"Find": "Find",
-"Replace all": "Thay t\u1ea5t c\u1ea3",
-"Match case": "Match case",
-"Prev": "Tr\u01b0\u1edbc",
-"Spellcheck": "Ki\u1ec3m tra ch\u00ednh t\u1ea3",
-"Finish": "Ho\u00e0n t\u1ea5t",
-"Ignore all": "B\u1ecf qua t\u1ea5t",
-"Ignore": "B\u1ecf qua",
-"Insert row before": "Th\u00eam d\u00f2ng ph\u00eda tr\u00ean",
-"Rows": "D\u00f2ng",
-"Height": "\u0110\u1ed9 Cao",
-"Paste row after": "D\u00e1n v\u00e0o ph\u00eda sau, d\u01b0\u1edbi",
-"Alignment": "Canh ch\u1ec9nh",
-"Column group": "Gom nh\u00f3m c\u1ed9t",
-"Row": "D\u00f2ng",
-"Insert column before": "Th\u00eam c\u1ed9t b\u00ean tr\u00e1i",
-"Split cell": "Chia c\u1eaft \u00f4",
-"Cell padding": "Kho\u1ea3ng c\u00e1ch trong \u00f4",
-"Cell spacing": "Kho\u1ea3ng c\u00e1ch \u00f4",
-"Row type": "Th\u1ec3 lo\u1ea1i d\u00f2ng",
-"Insert table": "Th\u00eam b\u1ea3ng",
-"Body": "N\u1ed9i dung",
-"Caption": "Ti\u00eau \u0111\u1ec1",
-"Footer": "Ch\u00e2n",
-"Delete row": "Xo\u00e1 d\u00f2ng",
-"Paste row before": "D\u00e1n v\u00e0o ph\u00eda tr\u01b0\u1edbc, tr\u00ean",
-"Scope": "Quy\u1ec1n",
-"Delete table": "Xo\u00e1 b\u1ea3ng",
-"Header cell": "Ti\u00eau \u0111\u1ec1 \u00f4",
-"Column": "C\u1ed9t",
-"Cell": "\u00d4",
-"Header": "Ti\u00eau \u0111\u1ec1",
-"Cell type": "Lo\u1ea1i \u00f4",
-"Copy row": "Sao ch\u00e9p d\u00f2ng",
-"Row properties": "Thu\u1ed9c t\u00ednh d\u00f2ng",
-"Table properties": "Thu\u1ed9c t\u00ednh b\u1ea3ng",
-"Row group": "Gom nh\u00f3m d\u00f2ng",
-"Right": "Ph\u1ea3i",
-"Insert column after": "Th\u00eam c\u1ed9t b\u00ean ph\u1ea3i",
-"Cols": "C\u1ed9t",
-"Insert row after": "Th\u00eam d\u00f2ng ph\u00eda d\u01b0\u1edbi",
-"Width": "\u0110\u1ed9 R\u1ed9ng",
-"Cell properties": "Thu\u1ed9c t\u00ednh \u00f4",
-"Left": "Tr\u00e1i",
-"Cut row": "C\u1eaft d\u00f2ng",
-"Delete column": "Xo\u00e1 c\u1ed9t",
-"Center": "Gi\u1eefa",
-"Merge cells": "Tr\u1ed9n \u00f4",
-"Insert template": "Insert template",
-"Templates": "Templates",
-"Background color": "M\u00e0u n\u1ec1n",
-"Text color": "M\u00e0u v\u0103n b\u1ea3n",
-"Show blocks": "Show blocks",
-"Show invisible characters": "Hi\u1ec3n th\u1ecb k\u00fd t\u1ef1 \u1ea9n",
-"Words: {0}": "Words: {0}",
-"Insert": "Insert",
-"File": "File",
-"Edit": "Edit",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help",
-"Tools": "Tools",
-"View": "View",
-"Table": "Table",
-"Format": "Format"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/zh-CN.es5.js b/build/media_source/vendor/tinymce/langs/zh-CN.es5.js
deleted file mode 100644
index 130e3d10e114b..0000000000000
--- a/build/media_source/vendor/tinymce/langs/zh-CN.es5.js
+++ /dev/null
@@ -1,230 +0,0 @@
-tinymce.addI18n('zh-CN',{
-"Cut": "\u526a\u5207",
-"Heading 5": "\u6807\u98985",
-"Header 2": "\u6807\u98982",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u4f60\u7684\u6d4f\u89c8\u5668\u4e0d\u652f\u6301\u5bf9\u526a\u8d34\u677f\u7684\u8bbf\u95ee\uff0c\u8bf7\u4f7f\u7528Ctrl+X\/C\/V\u952e\u8fdb\u884c\u590d\u5236\u7c98\u8d34\u3002",
-"Heading 4": "\u6807\u98984",
-"Div": "Div\u533a\u5757",
-"Heading 2": "\u6807\u98982",
-"Paste": "\u7c98\u8d34",
-"Close": "\u5173\u95ed",
-"Font Family": "\u5b57\u4f53",
-"Pre": "\u9884\u683c\u5f0f\u6587\u672c",
-"Align right": "\u53f3\u5bf9\u9f50",
-"New document": "\u65b0\u6587\u6863",
-"Blockquote": "\u5f15\u7528",
-"Numbered list": "\u7f16\u53f7\u5217\u8868",
-"Heading 1": "\u6807\u98981",
-"Headings": "\u6807\u9898",
-"Increase indent": "\u589e\u52a0\u7f29\u8fdb",
-"Formats": "\u683c\u5f0f",
-"Headers": "\u6807\u9898",
-"Select all": "\u5168\u9009",
-"Header 3": "\u6807\u98983",
-"Blocks": "\u533a\u5757",
-"Undo": "\u64a4\u6d88",
-"Strikethrough": "\u5220\u9664\u7ebf",
-"Bullet list": "\u9879\u76ee\u7b26\u53f7",
-"Header 1": "\u6807\u98981",
-"Superscript": "\u4e0a\u6807",
-"Clear formatting": "\u6e05\u9664\u683c\u5f0f",
-"Font Sizes": "\u5b57\u53f7",
-"Subscript": "\u4e0b\u6807",
-"Header 6": "\u6807\u98986",
-"Redo": "\u91cd\u590d",
-"Paragraph": "\u6bb5\u843d",
-"Ok": "\u786e\u5b9a",
-"Bold": "\u7c97\u4f53",
-"Code": "\u4ee3\u7801",
-"Italic": "\u659c\u4f53",
-"Align center": "\u5c45\u4e2d",
-"Header 5": "\u6807\u98985",
-"Heading 6": "\u6807\u98986",
-"Heading 3": "\u6807\u98983",
-"Decrease indent": "\u51cf\u5c11\u7f29\u8fdb",
-"Header 4": "\u6807\u98984",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u5f53\u524d\u4e3a\u7eaf\u6587\u672c\u7c98\u8d34\u6a21\u5f0f\uff0c\u518d\u6b21\u70b9\u51fb\u53ef\u4ee5\u56de\u5230\u666e\u901a\u7c98\u8d34\u6a21\u5f0f\u3002",
-"Underline": "\u4e0b\u5212\u7ebf",
-"Cancel": "\u53d6\u6d88",
-"Justify": "\u4e24\u7aef\u5bf9\u9f50",
-"Inline": "\u6587\u672c",
-"Copy": "\u590d\u5236",
-"Align left": "\u5de6\u5bf9\u9f50",
-"Visual aids": "\u7f51\u683c\u7ebf",
-"Lower Greek": "\u5c0f\u5199\u5e0c\u814a\u5b57\u6bcd",
-"Square": "\u65b9\u5757",
-"Default": "\u9ed8\u8ba4",
-"Lower Alpha": "\u5c0f\u5199\u82f1\u6587\u5b57\u6bcd",
-"Circle": "\u7a7a\u5fc3\u5706",
-"Disc": "\u5b9e\u5fc3\u5706",
-"Upper Alpha": "\u5927\u5199\u82f1\u6587\u5b57\u6bcd",
-"Upper Roman": "\u5927\u5199\u7f57\u9a6c\u5b57\u6bcd",
-"Lower Roman": "\u5c0f\u5199\u7f57\u9a6c\u5b57\u6bcd",
-"Id should start with a letter, followed only by letters, numbers, dashes, dots, colons or underscores.": "\u6807\u8bc6\u7b26\u5e94\u8be5\u4ee5\u5b57\u6bcd\u5f00\u5934\uff0c\u540e\u8ddf\u5b57\u6bcd\u3001\u6570\u5b57\u3001\u7834\u6298\u53f7\u3001\u70b9\u3001\u5192\u53f7\u6216\u4e0b\u5212\u7ebf\u3002",
-"Name": "\u540d\u79f0",
-"Anchor": "\u951a\u70b9",
-"Id": "\u6807\u8bc6\u7b26",
-"You have unsaved changes are you sure you want to navigate away?": "\u4f60\u8fd8\u6709\u6587\u6863\u5c1a\u672a\u4fdd\u5b58\uff0c\u786e\u5b9a\u8981\u79bb\u5f00\uff1f",
-"Restore last draft": "\u6062\u590d\u4e0a\u6b21\u7684\u8349\u7a3f",
-"Special character": "\u7279\u6b8a\u7b26\u53f7",
-"Source code": "\u6e90\u4ee3\u7801",
-"Language": "\u8bed\u8a00",
-"Insert\/Edit code sample": "\u63d2\u5165\/\u7f16\u8f91\u4ee3\u7801\u793a\u4f8b",
-"B": "B",
-"R": "R",
-"G": "G",
-"Color": "\u989c\u8272",
-"Right to left": "\u4ece\u53f3\u5230\u5de6",
-"Left to right": "\u4ece\u5de6\u5230\u53f3",
-"Emoticons": "\u8868\u60c5",
-"Robots": "\u673a\u5668\u4eba",
-"Document properties": "\u6587\u6863\u5c5e\u6027",
-"Title": "\u6807\u9898",
-"Keywords": "\u5173\u952e\u8bcd",
-"Encoding": "\u7f16\u7801",
-"Description": "\u63cf\u8ff0",
-"Author": "\u4f5c\u8005",
-"Fullscreen": "\u5168\u5c4f",
-"Horizontal line": "\u6c34\u5e73\u5206\u5272\u7ebf",
-"Horizontal space": "\u6c34\u5e73\u8fb9\u8ddd",
-"Insert\/edit image": "\u63d2\u5165\/\u7f16\u8f91\u56fe\u7247",
-"General": "\u666e\u901a",
-"Advanced": "\u9ad8\u7ea7",
-"Source": "\u5730\u5740",
-"Border": "\u8fb9\u6846",
-"Constrain proportions": "\u4fdd\u6301\u7eb5\u6a2a\u6bd4",
-"Vertical space": "\u5782\u76f4\u8fb9\u8ddd",
-"Image description": "\u56fe\u7247\u63cf\u8ff0",
-"Style": "\u6837\u5f0f",
-"Dimensions": "\u5927\u5c0f",
-"Insert image": "\u63d2\u5165\u56fe\u7247",
-"Image": "\u56fe\u7247",
-"Zoom in": "\u653e\u5927",
-"Contrast": "\u5bf9\u6bd4\u5ea6",
-"Back": "\u540e\u9000",
-"Gamma": "\u4f3d\u9a6c\u503c",
-"Flip horizontally": "\u6c34\u5e73\u7ffb\u8f6c",
-"Resize": "\u8c03\u6574\u5927\u5c0f",
-"Sharpen": "\u9510\u5316",
-"Zoom out": "\u7f29\u5c0f",
-"Image options": "\u56fe\u7247\u9009\u9879",
-"Apply": "\u5e94\u7528",
-"Brightness": "\u4eae\u5ea6",
-"Rotate clockwise": "\u987a\u65f6\u9488\u65cb\u8f6c",
-"Rotate counterclockwise": "\u9006\u65f6\u9488\u65cb\u8f6c",
-"Edit image": "\u7f16\u8f91\u56fe\u7247",
-"Color levels": "\u989c\u8272\u5c42\u6b21",
-"Crop": "\u88c1\u526a",
-"Orientation": "\u65b9\u5411",
-"Flip vertically": "\u5782\u76f4\u7ffb\u8f6c",
-"Invert": "\u53cd\u8f6c",
-"Date\/time": "\u65e5\u671f\/\u65f6\u95f4",
-"Insert date\/time": "\u63d2\u5165\u65e5\u671f\/\u65f6\u95f4",
-"Remove link": "\u5220\u9664\u94fe\u63a5",
-"Url": "\u5730\u5740",
-"Text to display": "\u663e\u793a\u6587\u5b57",
-"Anchors": "\u951a\u70b9",
-"Insert link": "\u63d2\u5165\u94fe\u63a5",
-"Link": "\u94fe\u63a5",
-"New window": "\u5728\u65b0\u7a97\u53e3\u6253\u5f00",
-"None": "\u65e0",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u5c5e\u4e8e\u5916\u90e8\u94fe\u63a5\uff0c\u9700\u8981\u52a0\u4e0ahttp:\/\/:\u524d\u7f00\u5417\uff1f",
-"Paste or type a link": "\u7c98\u8d34\u6216\u8f93\u5165\u94fe\u63a5",
-"Target": "\u6253\u5f00\u65b9\u5f0f",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u4e3a\u90ae\u4ef6\u5730\u5740\uff0c\u9700\u8981\u52a0\u4e0amailto:\u524d\u7f00\u5417\uff1f",
-"Insert\/edit link": "\u63d2\u5165\/\u7f16\u8f91\u94fe\u63a5",
-"Insert\/edit video": "\u63d2\u5165\/\u7f16\u8f91\u89c6\u9891",
-"Media": "\u5a92\u4f53",
-"Alternative source": "\u955c\u50cf",
-"Paste your embed code below:": "\u5c06\u5185\u5d4c\u4ee3\u7801\u7c98\u8d34\u5728\u4e0b\u9762:",
-"Insert video": "\u63d2\u5165\u89c6\u9891",
-"Poster": "\u5c01\u9762",
-"Insert\/edit media": "\u63d2\u5165\/\u7f16\u8f91\u5a92\u4f53",
-"Embed": "\u5185\u5d4c",
-"Nonbreaking space": "\u4e0d\u95f4\u65ad\u7a7a\u683c",
-"Page break": "\u5206\u9875\u7b26",
-"Paste as text": "\u7c98\u8d34\u4e3a\u6587\u672c",
-"Preview": "\u9884\u89c8",
-"Print": "\u6253\u5370",
-"Save": "\u4fdd\u5b58",
-"Could not find the specified string.": "\u672a\u627e\u5230\u641c\u7d22\u5185\u5bb9.",
-"Replace": "\u66ff\u6362",
-"Next": "\u4e0b\u4e00\u4e2a",
-"Whole words": "\u5168\u5b57\u5339\u914d",
-"Find and replace": "\u67e5\u627e\u548c\u66ff\u6362",
-"Replace with": "\u66ff\u6362\u4e3a",
-"Find": "\u67e5\u627e",
-"Replace all": "\u5168\u90e8\u66ff\u6362",
-"Match case": "\u533a\u5206\u5927\u5c0f\u5199",
-"Prev": "\u4e0a\u4e00\u4e2a",
-"Spellcheck": "\u62fc\u5199\u68c0\u67e5",
-"Finish": "\u5b8c\u6210",
-"Ignore all": "\u5168\u90e8\u5ffd\u7565",
-"Ignore": "\u5ffd\u7565",
-"Add to Dictionary": "\u6dfb\u52a0\u5230\u5b57\u5178",
-"Insert row before": "\u5728\u4e0a\u65b9\u63d2\u5165",
-"Rows": "\u884c",
-"Height": "\u9ad8",
-"Paste row after": "\u7c98\u8d34\u5230\u4e0b\u65b9",
-"Alignment": "\u5bf9\u9f50\u65b9\u5f0f",
-"Border color": "\u8fb9\u6846\u989c\u8272",
-"Column group": "\u5217\u7ec4",
-"Row": "\u884c",
-"Insert column before": "\u5728\u5de6\u4fa7\u63d2\u5165",
-"Split cell": "\u62c6\u5206\u5355\u5143\u683c",
-"Cell padding": "\u5355\u5143\u683c\u5185\u8fb9\u8ddd",
-"Cell spacing": "\u5355\u5143\u683c\u5916\u95f4\u8ddd",
-"Row type": "\u884c\u7c7b\u578b",
-"Insert table": "\u63d2\u5165\u8868\u683c",
-"Body": "\u8868\u4f53",
-"Caption": "\u6807\u9898",
-"Footer": "\u8868\u5c3e",
-"Delete row": "\u5220\u9664\u884c",
-"Paste row before": "\u7c98\u8d34\u5230\u4e0a\u65b9",
-"Scope": "\u8303\u56f4",
-"Delete table": "\u5220\u9664\u8868\u683c",
-"H Align": "\u6c34\u5e73\u5bf9\u9f50",
-"Top": "\u9876\u90e8\u5bf9\u9f50",
-"Header cell": "\u8868\u5934\u5355\u5143\u683c",
-"Column": "\u5217",
-"Row group": "\u884c\u7ec4",
-"Cell": "\u5355\u5143\u683c",
-"Middle": "\u5782\u76f4\u5c45\u4e2d",
-"Cell type": "\u5355\u5143\u683c\u7c7b\u578b",
-"Copy row": "\u590d\u5236\u884c",
-"Row properties": "\u884c\u5c5e\u6027",
-"Table properties": "\u8868\u683c\u5c5e\u6027",
-"Bottom": "\u5e95\u90e8\u5bf9\u9f50",
-"V Align": "\u5782\u76f4\u5bf9\u9f50",
-"Header": "\u8868\u5934",
-"Right": "\u53f3\u5bf9\u9f50",
-"Insert column after": "\u5728\u53f3\u4fa7\u63d2\u5165",
-"Cols": "\u5217",
-"Insert row after": "\u5728\u4e0b\u65b9\u63d2\u5165",
-"Width": "\u5bbd",
-"Cell properties": "\u5355\u5143\u683c\u5c5e\u6027",
-"Left": "\u5de6\u5bf9\u9f50",
-"Cut row": "\u526a\u5207\u884c",
-"Delete column": "\u5220\u9664\u5217",
-"Center": "\u5c45\u4e2d",
-"Merge cells": "\u5408\u5e76\u5355\u5143\u683c",
-"Insert template": "\u63d2\u5165\u6a21\u677f",
-"Templates": "\u6a21\u677f",
-"Background color": "\u80cc\u666f\u8272",
-"Custom...": "\u81ea\u5b9a\u4e49...",
-"Custom color": "\u81ea\u5b9a\u4e49\u989c\u8272",
-"No color": "\u65e0",
-"Text color": "\u6587\u5b57\u989c\u8272",
-"Table of Contents": "\u5185\u5bb9\u5217\u8868",
-"Show blocks": "\u663e\u793a\u533a\u5757\u8fb9\u6846",
-"Show invisible characters": "\u663e\u793a\u4e0d\u53ef\u89c1\u5b57\u7b26",
-"Words: {0}": "\u5b57\u6570\uff1a{0}",
-"Insert": "\u63d2\u5165",
-"File": "\u6587\u4ef6",
-"Edit": "\u7f16\u8f91",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u5728\u7f16\u8f91\u533a\u6309ALT-F9\u6253\u5f00\u83dc\u5355\uff0c\u6309ALT-F10\u6253\u5f00\u5de5\u5177\u680f\uff0c\u6309ALT-0\u67e5\u770b\u5e2e\u52a9",
-"Tools": "\u5de5\u5177",
-"View": "\u89c6\u56fe",
-"Table": "\u8868\u683c",
-"Format": "\u683c\u5f0f"
-});
\ No newline at end of file
diff --git a/build/media_source/vendor/tinymce/langs/zh-TW.es5.js b/build/media_source/vendor/tinymce/langs/zh-TW.es5.js
deleted file mode 100644
index 2468e57123480..0000000000000
--- a/build/media_source/vendor/tinymce/langs/zh-TW.es5.js
+++ /dev/null
@@ -1,179 +0,0 @@
-tinymce.addI18n('zh-TW',{
-"Cut": "\u526a\u4e0b",
-"Header 2": "\u6a19\u984c 2",
-"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u60a8\u7684\u700f\u89bd\u5668\u4e0d\u652f\u63f4\u5b58\u53d6\u526a\u8cbc\u7c3f\uff0c\u53ef\u4ee5\u4f7f\u7528\u5feb\u901f\u9375 Ctrl + X\/C\/V \u4ee3\u66ff\u526a\u4e0b\u3001\u8907\u88fd\u8207\u8cbc\u4e0a\u3002",
-"Div": "Div",
-"Paste": "\u8cbc\u4e0a",
-"Close": "\u95dc\u9589",
-"Font Family": "\u5b57\u9ad4",
-"Pre": "Pre",
-"Align right": "\u7f6e\u53f3\u5c0d\u9f4a",
-"New document": "\u65b0\u6587\u4ef6",
-"Blockquote": "\u5f15\u7528",
-"Numbered list": "\u6578\u5b57\u6e05\u55ae",
-"Increase indent": "\u589e\u52a0\u7e2e\u6392",
-"Formats": "\u683c\u5f0f",
-"Headers": "\u6a19\u984c",
-"Select all": "\u5168\u9078",
-"Header 3": "\u6a19\u984c 3",
-"Blocks": "\u5340\u584a",
-"Undo": "\u5fa9\u539f",
-"Strikethrough": "\u522a\u9664\u7dda",
-"Bullet list": "\u9805\u76ee\u6e05\u55ae",
-"Header 1": "\u6a19\u984c 1",
-"Superscript": "\u4e0a\u6a19",
-"Clear formatting": "\u6e05\u9664\u683c\u5f0f",
-"Font Sizes": "\u5b57\u578b\u5927\u5c0f",
-"Subscript": "\u4e0b\u6a19",
-"Header 6": "\u6a19\u984c 6",
-"Redo": "\u53d6\u6d88\u5fa9\u539f",
-"Paragraph": "\u6bb5\u843d",
-"Ok": "\u78ba\u5b9a",
-"Bold": "\u7c97\u9ad4",
-"Code": "\u7a0b\u5f0f\u78bc",
-"Italic": "\u659c\u9ad4",
-"Align center": "\u7f6e\u4e2d\u5c0d\u9f4a",
-"Header 5": "\u6a19\u984c 5",
-"Decrease indent": "\u6e1b\u5c11\u7e2e\u6392",
-"Header 4": "\u6a19\u984c 4",
-"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u76ee\u524d\u5c07\u4ee5\u7d14\u6587\u5b57\u7684\u6a21\u5f0f\u8cbc\u4e0a\uff0c\u60a8\u53ef\u4ee5\u518d\u9ede\u9078\u4e00\u6b21\u53d6\u6d88\u3002",
-"Underline": "\u5e95\u7dda",
-"Cancel": "\u53d6\u6d88",
-"Justify": "\u5de6\u53f3\u5c0d\u9f4a",
-"Inline": "Inline",
-"Copy": "\u8907\u88fd",
-"Align left": "\u7f6e\u5de6\u5c0d\u9f4a",
-"Visual aids": "\u5c0f\u5e6b\u624b",
-"Lower Greek": "\u5e0c\u81d8\u5b57\u6bcd",
-"Square": "\u6b63\u65b9\u5f62",
-"Default": "\u9810\u8a2d",
-"Lower Alpha": "\u5c0f\u5beb\u82f1\u6587\u5b57\u6bcd",
-"Circle": "\u7a7a\u5fc3\u5713",
-"Disc": "\u5be6\u5fc3\u5713",
-"Upper Alpha": "\u5927\u5beb\u82f1\u6587\u5b57\u6bcd",
-"Upper Roman": "\u5927\u5beb\u7f85\u99ac\u6578\u5b57",
-"Lower Roman": "\u5c0f\u5beb\u7f85\u99ac\u6578\u5b57",
-"Name": "\u540d\u7a31",
-"Anchor": "\u52a0\u5165\u9328\u9ede",
-"You have unsaved changes are you sure you want to navigate away?": "\u7de8\u8f2f\u5c1a\u672a\u88ab\u5132\u5b58\uff0c\u4f60\u78ba\u5b9a\u8981\u96e2\u958b\uff1f",
-"Restore last draft": "\u8f09\u5165\u4e0a\u4e00\u6b21\u7de8\u8f2f\u7684\u8349\u7a3f",
-"Special character": "\u7279\u6b8a\u5b57\u5143",
-"Source code": "\u539f\u59cb\u78bc",
-"Right to left": "\u5f9e\u53f3\u5230\u5de6",
-"Left to right": "\u5f9e\u5de6\u5230\u53f3",
-"Emoticons": "\u8868\u60c5",
-"Robots": "\u6a5f\u5668\u4eba",
-"Document properties": "\u6587\u4ef6\u7684\u5c6c\u6027",
-"Title": "\u6a19\u984c",
-"Keywords": "\u95dc\u9375\u5b57",
-"Encoding": "\u7de8\u78bc",
-"Description": "\u63cf\u8ff0",
-"Author": "\u4f5c\u8005",
-"Fullscreen": "\u5168\u87a2\u5e55",
-"Horizontal line": "\u6c34\u5e73\u7dda",
-"Horizontal space": "\u5bec\u5ea6",
-"Insert\/edit image": "\u63d2\u5165\/\u7de8\u8f2f \u5716\u7247",
-"General": "\u4e00\u822c",
-"Advanced": "\u9032\u968e",
-"Source": "\u5716\u7247\u7db2\u5740",
-"Border": "\u908a\u6846",
-"Constrain proportions": "\u7b49\u6bd4\u4f8b\u7e2e\u653e",
-"Vertical space": "\u9ad8\u5ea6",
-"Image description": "\u5716\u7247\u63cf\u8ff0",
-"Style": "\u6a23\u5f0f",
-"Dimensions": "\u5c3a\u5bf8",
-"Insert image": "\u63d2\u5165\u5716\u7247",
-"Insert date\/time": "\u63d2\u5165 \u65e5\u671f\/\u6642\u9593",
-"Remove link": "\u79fb\u9664\u9023\u7d50",
-"Url": "\u7db2\u5740",
-"Text to display": "\u986f\u793a\u6587\u5b57",
-"Anchors": "\u52a0\u5165\u9328\u9ede",
-"Insert link": "\u63d2\u5165\u9023\u7d50",
-"New window": "\u53e6\u958b\u8996\u7a97",
-"None": "\u7121",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
-"Target": "\u958b\u555f\u65b9\u5f0f",
-"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
-"Insert\/edit link": "\u63d2\u5165\/\u7de8\u8f2f\u9023\u7d50",
-"Insert\/edit video": "\u63d2\u4ef6\/\u7de8\u8f2f \u5f71\u97f3",
-"Poster": "\u9810\u89bd\u5716\u7247",
-"Alternative source": "\u66ff\u4ee3\u5f71\u97f3",
-"Paste your embed code below:": "\u8acb\u5c07\u60a8\u7684\u5d4c\u5165\u5f0f\u7a0b\u5f0f\u78bc\u8cbc\u5728\u4e0b\u9762:",
-"Insert video": "\u63d2\u5165\u5f71\u97f3",
-"Embed": "\u5d4c\u5165\u78bc",
-"Nonbreaking space": "\u4e0d\u5206\u884c\u7684\u7a7a\u683c",
-"Page break": "\u5206\u9801",
-"Paste as text": "\u4ee5\u7d14\u6587\u5b57\u8cbc\u4e0a",
-"Preview": "\u9810\u89bd",
-"Print": "\u5217\u5370",
-"Save": "\u5132\u5b58",
-"Could not find the specified string.": "\u7121\u6cd5\u67e5\u8a62\u5230\u6b64\u7279\u5b9a\u5b57\u4e32",
-"Replace": "\u66ff\u63db",
-"Next": "\u4e0b\u4e00\u500b",
-"Whole words": "\u6574\u500b\u55ae\u5b57",
-"Find and replace": "\u5c0b\u627e\u53ca\u53d6\u4ee3",
-"Replace with": "\u66f4\u63db",
-"Find": "\u641c\u5c0b",
-"Replace all": "\u66ff\u63db\u5168\u90e8",
-"Match case": "\u76f8\u5339\u914d\u6848\u4ef6",
-"Prev": "\u4e0a\u4e00\u500b",
-"Spellcheck": "\u62fc\u5b57\u6aa2\u67e5",
-"Finish": "\u5b8c\u6210",
-"Ignore all": "\u5ffd\u7565\u6240\u6709",
-"Ignore": "\u5ffd\u7565",
-"Insert row before": "\u63d2\u5165\u5217\u5728...\u4e4b\u524d",
-"Rows": "\u5217",
-"Height": "\u9ad8\u5ea6",
-"Paste row after": "\u8cbc\u4e0a\u5217\u5728...\u4e4b\u5f8c",
-"Alignment": "\u5c0d\u9f4a",
-"Column group": "\u6b04\u4f4d\u7fa4\u7d44",
-"Row": "\u5217",
-"Insert column before": "\u63d2\u5165\u6b04\u4f4d\u5728...\u4e4b\u524d",
-"Split cell": "\u5206\u5272\u5132\u5b58\u683c",
-"Cell padding": "\u5132\u5b58\u683c\u7684\u908a\u8ddd",
-"Cell spacing": "\u5132\u5b58\u683c\u5f97\u9593\u8ddd",
-"Row type": "\u884c\u7684\u985e\u578b",
-"Insert table": "\u63d2\u5165\u8868\u683c",
-"Body": "\u4e3b\u9ad4",
-"Caption": "\u8868\u683c\u6a19\u984c",
-"Footer": "\u9801\u5c3e",
-"Delete row": "\u522a\u9664\u5217",
-"Paste row before": "\u8cbc\u4e0a\u5217\u5728...\u4e4b\u524d",
-"Scope": "\u7bc4\u570d",
-"Delete table": "\u522a\u9664\u8868\u683c",
-"Header cell": "\u6a19\u982d\u5132\u5b58\u683c",
-"Column": "\u884c",
-"Cell": "\u5132\u5b58\u683c",
-"Header": "\u6a19\u982d",
-"Cell type": "\u5132\u5b58\u683c\u7684\u985e\u578b",
-"Copy row": "\u8907\u88fd\u5217",
-"Row properties": "\u5217\u5c6c\u6027",
-"Table properties": "\u8868\u683c\u5c6c\u6027",
-"Row group": "\u5217\u7fa4\u7d44",
-"Right": "\u53f3\u908a",
-"Insert column after": "\u63d2\u5165\u6b04\u4f4d\u5728...\u4e4b\u5f8c",
-"Cols": "\u6b04\u4f4d\u6bb5",
-"Insert row after": "\u63d2\u5165\u5217\u5728...\u4e4b\u5f8c",
-"Width": "\u5bec\u5ea6",
-"Cell properties": "\u5132\u5b58\u683c\u5c6c\u6027",
-"Left": "\u5de6\u908a",
-"Cut row": "\u526a\u4e0b\u5217",
-"Delete column": "\u522a\u9664\u884c",
-"Center": "\u4e2d\u9593",
-"Merge cells": "\u5408\u4f75\u5132\u5b58\u683c",
-"Insert template": "\u63d2\u5165\u6a23\u7248",
-"Templates": "\u6a23\u7248",
-"Background color": "\u80cc\u666f\u984f\u8272",
-"Text color": "\u6587\u5b57\u984f\u8272",
-"Show blocks": "\u986f\u793a\u5340\u584a\u8cc7\u8a0a",
-"Show invisible characters": "\u986f\u793a\u96b1\u85cf\u5b57\u5143",
-"Words: {0}": "\u5b57\u6578\uff1a{0}",
-"Insert": "\u63d2\u5165",
-"File": "\u6a94\u6848",
-"Edit": "\u7de8\u8f2f",
-"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u8c50\u5bcc\u7684\u6587\u672c\u5340\u57df\u3002\u6309ALT-F9\u524d\u5f80\u4e3b\u9078\u55ae\u3002\u6309ALT-F10\u547c\u53eb\u5de5\u5177\u6b04\u3002\u6309ALT-0\u5c0b\u6c42\u5e6b\u52a9",
-"Tools": "\u5de5\u5177",
-"View": "\u6aa2\u8996",
-"Table": "\u8868\u683c",
-"Format": "\u683c\u5f0f"
-});
\ No newline at end of file
diff --git a/build/phpmd.xml b/build/phpmd.xml
deleted file mode 100644
index 1f998988369dd..0000000000000
--- a/build/phpmd.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="Custom rule set for the Joomla CMS."
-         xmlns="http://pmd.sf.net/ruleset/1.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
-                     http://pmd.sf.net/ruleset_xml_schema.xsd"
-         xsi:noNamespaceSchemaLocation="
-                     http://pmd.sf.net/ruleset_xml_schema.xsd">
-    <description>
-        Custom rule set for the Joomla CMS.
-    </description>
-
-    <!-- Import the entire unused code rule set -->
-    <rule ref="rulesets/unusedcode.xml" />
-</ruleset>
diff --git a/build/phpstan/joomla-bootstrap.php b/build/phpstan/joomla-bootstrap.php
index c285e232b6c25..21178069ab352 100644
--- a/build/phpstan/joomla-bootstrap.php
+++ b/build/phpstan/joomla-bootstrap.php
@@ -10,7 +10,6 @@
  */
 
 \define('_JEXEC', 1);
-\define('JPATH_PLATFORM', 1);
 \define('JPATH_BASE', \dirname(__DIR__, 2));
 
 // Load the Joomla environment
diff --git a/build/psr12/clean_errors.php b/build/psr12/clean_errors.php
index 257cd183d49f8..3db025ea466fd 100644
--- a/build/psr12/clean_errors.php
+++ b/build/psr12/clean_errors.php
@@ -40,10 +40,6 @@
                                     "defined('_JEXEC') or die();",
                                     "\defined('_JEXEC') or die;",
                                     "defined('_JEXEC') or die;",
-                                    "\defined('JPATH_PLATFORM') or die();",
-                                    "defined('JPATH_PLATFORM') or die();",
-                                    "\defined('JPATH_PLATFORM') or die;",
-                                    "defined('JPATH_PLATFORM') or die;",
                                     "\defined('JPATH_BASE') or die();",
                                     "defined('JPATH_BASE') or die();",
                                     "\defined('JPATH_BASE') or die;",
diff --git a/build/psr12/phpcs.joomla.report.php b/build/psr12/phpcs.joomla.report.php
index c4d0e21bf4bbe..f49a2b3305cf2 100644
--- a/build/psr12/phpcs.joomla.report.php
+++ b/build/psr12/phpcs.joomla.report.php
@@ -144,14 +144,11 @@ private function prepareProcessing($file, $phpcsFile, $line, $column, $error)
                 break;
 
             case 'Squiz.Classes.ValidClassName.NotCamelCaps':
-                if (
-                    strpos($file, 'localise') !== false
-                    || strpos($file, 'recaptcha_invisible') !== false
-                ) {
+                if (strpos($file, 'localise') !== false) {
                     $this->preProcessing[] = [
-                        'file' => $file,
-                        'line' => $line,
-                        'column' => $column,
+                        'file'    => $file,
+                        'line'    => $line,
+                        'column'  => $column,
                         'cleanup' => 'ValidClassNameNotCamelCaps',
                     ];
                 }
diff --git a/build/psr12/ruleset.xml b/build/psr12/ruleset.xml
index 9882ec0b6491d..16304e5261073 100644
--- a/build/psr12/ruleset.xml
+++ b/build/psr12/ruleset.xml
@@ -93,7 +93,6 @@
         <exclude-pattern type="relative">libraries/src/Encrypt/Totp\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Form/Field/CaptchaField\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Input/Json\.php</exclude-pattern>
-        <exclude-pattern type="relative">libraries/src/MVC/Model/DatabaseAwareTrait\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/MVC/Model/FormBehaviorTrait\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/MVC/Model/ItemModel\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/MVC/Model/StateBehaviorTrait\.php</exclude-pattern>
diff --git a/cli/joomla.php b/cli/joomla.php
index c058598f1334a..775b765e605e6 100755
--- a/cli/joomla.php
+++ b/cli/joomla.php
@@ -12,7 +12,7 @@
 const _JEXEC = 1;
 
 // Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
-const JOOMLA_MINIMUM_PHP = '8.1.0';
+const JOOMLA_MINIMUM_PHP = '8.3.0';
 
 if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<')) {
     echo 'Sorry, your PHP version is not supported.' . PHP_EOL;
@@ -38,7 +38,7 @@
 if (!file_exists(JPATH_LIBRARIES . '/vendor/autoload.php') || !is_dir(JPATH_ROOT . '/media/vendor')) {
     echo 'It looks like you are trying to run Joomla! from our git repository.' . PHP_EOL;
     echo 'To do so requires you complete a couple of extra steps first.' . PHP_EOL;
-    echo 'Please see https://docs.joomla.org/Special:MyLanguage/J5.x:Setting_Up_Your_Local_Environment for further details.' . PHP_EOL;
+    echo 'Please see https://guide.joomla.org/user-manual/hosting/local-environment-setup for further details.' . PHP_EOL;
 
     exit;
 }
diff --git a/components/com_ajax/ajax.php b/components/com_ajax/ajax.php
index f7dd3b9393f17..b54a0ba7201a2 100644
--- a/components/com_ajax/ajax.php
+++ b/components/com_ajax/ajax.php
@@ -18,7 +18,7 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Response\JsonResponse;
 use Joomla\CMS\String\StringableInterface;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Extension;
 
 /*
  * References
@@ -83,7 +83,7 @@
      *
      */
     $module   = $input->get('module');
-    $table    = Table::getInstance('extension');
+    $table    = new Extension(Factory::getDbo());
     $moduleId = $table->find(['type' => 'module', 'element' => 'mod_' . $module]);
 
     if ($moduleId && $table->load($moduleId) && $table->enabled) {
@@ -189,7 +189,7 @@
      *
      */
     $template   = $input->get('template');
-    $table      = Table::getInstance('extension');
+    $table      = new Extension(Factory::getDbo());
     $templateId = $table->find(['type' => 'template', 'element' => $template]);
 
     if ($templateId && $table->load($templateId) && $table->enabled) {
diff --git a/components/com_banners/src/Model/BannerModel.php b/components/com_banners/src/Model/BannerModel.php
index 653e7194cd67f..3e226465159ca 100644
--- a/components/com_banners/src/Model/BannerModel.php
+++ b/components/com_banners/src/Model/BannerModel.php
@@ -56,7 +56,7 @@ public function click()
 
         // Update click count
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->update($db->quoteName('#__banners'))
             ->set($db->quoteName('clicks') . ' = ' . $db->quoteName('clicks') . ' + 1')
@@ -87,7 +87,7 @@ public function click()
             $trackDate = Factory::getDate()->format('Y-m-d H:00:00');
             $trackDate = Factory::getDate($trackDate)->toSql();
 
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->select($db->quoteName('count'))
                 ->from($db->quoteName('#__banner_tracks'))
@@ -111,7 +111,7 @@ public function click()
 
             $count = $db->loadResult();
 
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             if ($count) {
                 // Update count
@@ -163,7 +163,8 @@ public function &getItem()
     {
         if (!isset($this->_item)) {
             /** @var \Joomla\CMS\Cache\Controller\CallbackController $cache */
-            $cache = Factory::getCache('com_banners', 'callback');
+            $cache = $this->getCacheControllerFactory()
+                ->createCacheController('callback', ['defaultgroup' => 'com_banners']);
 
             $id = (int) $this->getState('banner.id');
 
@@ -172,7 +173,7 @@ public function &getItem()
 
             $loader = function ($id) use ($db) {
                 $nowDate = Factory::getDate()->toSql();
-                $query   = $db->getQuery(true);
+                $query   = $db->createQuery();
 
                 $query->select(
                     [
diff --git a/components/com_banners/src/Model/BannersModel.php b/components/com_banners/src/Model/BannersModel.php
index 524e058bd6961..bca819a72bb2c 100644
--- a/components/com_banners/src/Model/BannersModel.php
+++ b/components/com_banners/src/Model/BannersModel.php
@@ -65,7 +65,7 @@ protected function getStoreId($id = '')
     protected function getListQuery()
     {
         $db         = $this->getDatabase();
-        $query      = $db->getQuery(true);
+        $query      = $db->createQuery();
         $ordering   = $this->getState('filter.ordering');
         $tagSearch  = $this->getState('filter.tag_search');
         $cid        = (int) $this->getState('filter.client_id');
@@ -138,7 +138,7 @@ protected function getListQuery()
                 $levels = (int) $this->getState('filter.max_category_levels', '1');
 
                 // Create a subquery for the subcategory list
-                $subQuery = $db->getQuery(true);
+                $subQuery = $db->createQuery();
                 $subQuery->select($db->quoteName('sub.id'))
                     ->from($db->quoteName('#__categories', 'sub'))
                     ->join(
@@ -307,7 +307,7 @@ public function impress()
         }
 
         // Increment impression made
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->update($db->quoteName('#__banners'))
             ->set($db->quoteName('impmade') . ' = ' . $db->quoteName('impmade') . ' + 1')
             ->whereIn($db->quoteName('id'), $bid);
@@ -335,7 +335,7 @@ public function impress()
             if ($trackImpressions > 0) {
                 // Is track already created?
                 // Update count
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
                 $query->update($db->quoteName('#__banner_tracks'))
                     ->set($db->quoteName('count') . ' = ' . $db->quoteName('count') . ' + 1')
                     ->where(
@@ -358,7 +358,7 @@ public function impress()
 
                 if ($db->getAffectedRows() === 0) {
                     // Insert new count
-                    $query = $db->getQuery(true);
+                    $query = $db->createQuery();
                     $query->insert($db->quoteName('#__banner_tracks'))
                         ->columns(
                             [
diff --git a/components/com_config/src/Controller/ConfigController.php b/components/com_config/src/Controller/ConfigController.php
index 6f12d73fa24d4..f56dba4259e0a 100644
--- a/components/com_config/src/Controller/ConfigController.php
+++ b/components/com_config/src/Controller/ConfigController.php
@@ -17,6 +17,7 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
+use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -30,12 +31,12 @@
 class ConfigController extends BaseController
 {
     /**
-     * @param   array                     $config   An optional associative array of configuration settings.
-     *                                              Recognized key values include 'name', 'default_task', 'model_path', and
-     *                                              'view_path' (this list is not meant to be comprehensive).
-     * @param   ?MVCFactoryInterface      $factory  The factory.
-     * @param   ?CMSApplication           $app      The JApplication for the dispatcher
-     * @param   ?\Joomla\CMS\Input\Input  $input    The Input object for the request
+     * @param   array                 $config   An optional associative array of configuration settings.
+     *                                          Recognized key values include 'name', 'default_task', 'model_path', and
+     *                                          'view_path' (this list is not meant to be comprehensive).
+     * @param   ?MVCFactoryInterface  $factory  The factory.
+     * @param   ?CMSApplication       $app      The JApplication for the dispatcher
+     * @param   ?Input                $input    The Input object for the request
      *
      * @since   1.6
      */
diff --git a/components/com_config/src/Controller/ModulesController.php b/components/com_config/src/Controller/ModulesController.php
index 07ad8d6a60d79..4fc2b1fc8c4da 100644
--- a/components/com_config/src/Controller/ModulesController.php
+++ b/components/com_config/src/Controller/ModulesController.php
@@ -21,6 +21,7 @@
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Modules\Administrator\Controller\ModuleController;
+use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -34,12 +35,12 @@
 class ModulesController extends BaseController
 {
     /**
-     * @param   array                     $config   An optional associative array of configuration settings.
-     *                                              Recognized key values include 'name', 'default_task', 'model_path', and
-     *                                              'view_path' (this list is not meant to be comprehensive).
-     * @param   ?MVCFactoryInterface      $factory  The factory.
-     * @param   ?CMSApplication           $app      The Application for the dispatcher
-     * @param   ?\Joomla\CMS\Input\Input  $input    The Input object for the request
+     * @param   array                 $config   An optional associative array of configuration settings.
+     *                                          Recognized key values include 'name', 'default_task', 'model_path', and
+     *                                          'view_path' (this list is not meant to be comprehensive).
+     * @param   ?MVCFactoryInterface  $factory  The factory.
+     * @param   ?CMSApplication       $app      The Application for the dispatcher
+     * @param   ?Input                $input    The Input object for the request
      *
      * @since   1.6
      */
diff --git a/components/com_config/src/Controller/TemplatesController.php b/components/com_config/src/Controller/TemplatesController.php
index dd27c137537db..703d9d5de0afb 100644
--- a/components/com_config/src/Controller/TemplatesController.php
+++ b/components/com_config/src/Controller/TemplatesController.php
@@ -17,6 +17,7 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
+use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -30,12 +31,12 @@
 class TemplatesController extends BaseController
 {
     /**
-     * @param   array                     $config   An optional associative array of configuration settings.
-     *                                              Recognized key values include 'name', 'default_task', 'model_path', and
-     *                                              'view_path' (this list is not meant to be comprehensive).
-     * @param   ?MVCFactoryInterface      $factory  The factory.
-     * @param   ?CMSApplication           $app      The Application for the dispatcher
-     * @param   ?\Joomla\CMS\Input\Input  $input    The Input object for the request
+     * @param   array                 $config   An optional associative array of configuration settings.
+     *                                          Recognized key values include 'name', 'default_task', 'model_path', and
+     *                                          'view_path' (this list is not meant to be comprehensive).
+     * @param   ?MVCFactoryInterface  $factory  The factory.
+     * @param   ?CMSApplication       $app      The Application for the dispatcher
+     * @param   ?Input                $input    The Input object for the request
      *
      * @since   1.6
      */
diff --git a/components/com_config/src/Model/ConfigModel.php b/components/com_config/src/Model/ConfigModel.php
index c934cbce16cd8..911efd63f3f6a 100644
--- a/components/com_config/src/Model/ConfigModel.php
+++ b/components/com_config/src/Model/ConfigModel.php
@@ -14,6 +14,8 @@
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
+use Joomla\CMS\Form\Form;
+
 /**
  * Model for the global configuration
  *
@@ -27,19 +29,13 @@ class ConfigModel extends FormModel
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  mixed   A Form object on success, false on failure
+     * @return  Form   A Form object
      *
      * @since   3.2
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_config.config', 'config', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_config.config', 'config', ['control' => 'jform', 'load_data' => $loadData]);
     }
 }
diff --git a/components/com_config/src/Model/FormModel.php b/components/com_config/src/Model/FormModel.php
index cf96ceeb35614..af7019295796b 100644
--- a/components/com_config/src/Model/FormModel.php
+++ b/components/com_config/src/Model/FormModel.php
@@ -10,6 +10,8 @@
 
 namespace Joomla\Component\Config\Site\Model;
 
+use Joomla\CMS\Event\Model\PrepareDataEvent;
+use Joomla\CMS\Event\Model\PrepareFormEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
@@ -121,10 +123,11 @@ public function checkout($pk = null)
      * @param   boolean  $clear    Optional argument to force load a new form.
      * @param   string   $xpath    An optional xpath to search for the fields.
      *
-     * @return  mixed  JForm object on success, False on error.
+     * @return  Form  A Form object
      *
-     * @see     JForm
+     * @see     Form
      * @since   3.2
+     * @throws  \Exception on failure
      */
     protected function loadForm($name, $source = null, $options = [], $clear = false, $xpath = false)
     {
@@ -198,10 +201,14 @@ protected function loadFormData()
     protected function preprocessData($context, &$data, $group = 'content')
     {
         // Get the dispatcher and load the users plugins.
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         // Trigger the data preparation event.
-        Factory::getApplication()->triggerEvent('onContentPrepareData', [$context, $data]);
+        $dispatcher->dispatch('onContentPrepareData', new PrepareDataEvent('onContentPrepareData', [
+            'context' => $context,
+            'data'    => $data,
+        ]));
     }
 
     /**
@@ -220,10 +227,14 @@ protected function preprocessData($context, &$data, $group = 'content')
     protected function preprocessForm(Form $form, $data, $group = 'content')
     {
         // Import the appropriate plugin group.
-        PluginHelper::importPlugin($group);
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin($group, null, true, $dispatcher);
 
         // Trigger the form preparation event.
-        Factory::getApplication()->triggerEvent('onContentPrepareForm', [$form, $data]);
+        $dispatcher->dispatch('onContentPrepareForm', new PrepareFormEvent('onContentPrepareForm', [
+            'subject' => $form,
+            'data'    => $data,
+        ]));
     }
 
     /**
diff --git a/components/com_config/src/Model/ModulesModel.php b/components/com_config/src/Model/ModulesModel.php
index bad8c1ed7de91..c48bc43c29165 100644
--- a/components/com_config/src/Model/ModulesModel.php
+++ b/components/com_config/src/Model/ModulesModel.php
@@ -52,20 +52,14 @@ protected function populateState()
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   3.2
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_config.modules', 'modules', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_config.modules', 'modules', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -177,7 +171,7 @@ public function getPositions()
     public static function getActivePositions($clientId, $editPositions = false)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT position')
             ->from($db->quoteName('#__modules'))
             ->where($db->quoteName('client_id') . ' = ' . (int) $clientId)
diff --git a/components/com_config/src/Model/TemplatesModel.php b/components/com_config/src/Model/TemplatesModel.php
index 9c8d5ca53eee0..9847e9e8ce28a 100644
--- a/components/com_config/src/Model/TemplatesModel.php
+++ b/components/com_config/src/Model/TemplatesModel.php
@@ -49,7 +49,7 @@ protected function populateState()
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|bool    A Form object on success, false on failure
+     * @return  Form|false    A Form object on success, false on failure
      *
      * @since   3.2
      */
@@ -70,10 +70,6 @@ public function getForm($data = [], $loadData = true)
             return false;
         }
 
-        if (empty($form)) {
-            return false;
-        }
-
         return $form;
     }
 
@@ -93,18 +89,23 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
     {
         $lang = Factory::getLanguage();
 
-        $template = Factory::getApplication()->getTemplate();
+        $templateObj = Factory::getApplication()->getTemplate(true);
+
+        // Load the parent and child overrides for template language constants
+        if (!empty($templateObj->parent)) {
+            $lang->load('tpl_' . $templateObj->parent, JPATH_BASE)
+                || $lang->load('tpl_' . $templateObj->parent, JPATH_BASE . '/templates/' . $templateObj->parent);
+        }
 
-        // Load the core and/or local language file(s).
-        $lang->load('tpl_' . $template, JPATH_BASE)
-        || $lang->load('tpl_' . $template, JPATH_BASE . '/templates/' . $template);
+        $lang->load('tpl_' . $templateObj->template, JPATH_BASE)
+            || $lang->load('tpl_' . $templateObj->template, JPATH_BASE . '/templates/' . $templateObj->template);
 
         // Look for com_config.xml, which contains fields to display
-        $formFile = Path::clean(JPATH_BASE . '/templates/' . $template . '/com_config.xml');
+        $formFile = Path::clean(JPATH_BASE . '/templates/' . $templateObj->template . '/com_config.xml');
 
         if (!file_exists($formFile)) {
             // If com_config.xml not found, fall back to templateDetails.xml
-            $formFile = Path::clean(JPATH_BASE . '/templates/' . $template . '/templateDetails.xml');
+            $formFile = Path::clean(JPATH_BASE . '/templates/' . $templateObj->template . '/templateDetails.xml');
         }
 
         // Get the template form.
diff --git a/components/com_config/src/View/Config/HtmlView.php b/components/com_config/src/View/Config/HtmlView.php
index adbb16beef0d5..3c225ba4d1457 100644
--- a/components/com_config/src/View/Config/HtmlView.php
+++ b/components/com_config/src/View/Config/HtmlView.php
@@ -99,6 +99,10 @@ public function display($tpl = null)
         $this->form = $form;
         $this->data = $serviceData;
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task');
+
         $this->_prepareDocument();
 
         parent::display($tpl);
diff --git a/components/com_config/src/View/Modules/HtmlView.php b/components/com_config/src/View/Modules/HtmlView.php
index 832c8298aa28b..a23c0d325e9da 100644
--- a/components/com_config/src/View/Modules/HtmlView.php
+++ b/components/com_config/src/View/Modules/HtmlView.php
@@ -63,7 +63,7 @@ public function display($tpl = null)
         // @todo Move and clean up
         $module = (new \Joomla\Component\Modules\Administrator\Model\ModuleModel())->getItem(Factory::getApplication()->getInput()->getInt('id'));
 
-        $moduleData = $module->getProperties();
+        $moduleData = get_object_vars($module);
         unset($moduleData['xml']);
 
         /** @var \Joomla\Component\Config\Site\Model\ModulesModel $model */
@@ -80,6 +80,12 @@ public function display($tpl = null)
 
         if ($this->form) {
             $this->form->bind($moduleData);
+
+            // Add form control fields
+            $this->form
+                ->addControlField('task')
+                ->addControlField('return', Factory::getApplication()->getInput()->get('return', null, 'base64'))
+                ->addControlField('id', $this->item['id']);
         }
 
         $this->_prepareDocument();
diff --git a/components/com_config/src/View/Templates/HtmlView.php b/components/com_config/src/View/Templates/HtmlView.php
index ecaf86aed0506..495c2c7673306 100644
--- a/components/com_config/src/View/Templates/HtmlView.php
+++ b/components/com_config/src/View/Templates/HtmlView.php
@@ -117,6 +117,9 @@ public function display($tpl = null)
 
         if ($form) {
             $form->bind($data);
+
+            // Add form control fields
+            $form->addControlField('task');
         }
 
         $this->form = $form;
diff --git a/components/com_config/tmpl/config/default.php b/components/com_config/tmpl/config/default.php
index 7d1f5abde0863..a23b745790583 100644
--- a/components/com_config/tmpl/config/default.php
+++ b/components/com_config/tmpl/config/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -47,8 +46,7 @@
     <?php echo $this->loadTemplate('seo'); ?>
     <?php echo $this->loadTemplate('metadata'); ?>
 
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php echo $this->form->renderControlFields(); ?>
 
     <div class="d-grid gap-2 d-sm-block mb-2">
     <button type="button" class="btn btn-primary" data-submit-task="config.apply">
diff --git a/components/com_config/tmpl/modules/default.php b/components/com_config/tmpl/modules/default.php
index d8a81b6948eba..c9be9c837d35e 100644
--- a/components/com_config/tmpl/modules/default.php
+++ b/components/com_config/tmpl/modules/default.php
@@ -10,20 +10,17 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
-HTMLHelper::_('behavior.combobox');
-
 /** @var \Joomla\Component\Config\Site\View\Modules\HtmlView $this */
-/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
-$wa = $this->getDocument()->getWebAssetManager();
-$wa->useScript('keepalive')
+
+$this->getDocument()->getWebAssetManager()
+    ->useScript('keepalive')
     ->useScript('form.validate')
-    ->useScript('com_config.modules');
+    ->useScript('com_config.modules')
+    ->useScript('awesomplete');
 
 $editorText  = false;
 $moduleXml   = JPATH_SITE . '/modules/' . $this->item['module'] . '/' . $this->item['module'] . '.xml';
@@ -164,10 +161,7 @@
                     <?php endif; ?>
                 </div>
 
-                <input type="hidden" name="id" value="<?php echo $this->item['id']; ?>">
-                <input type="hidden" name="return" value="<?php echo Factory::getApplication()->getInput()->get('return', null, 'base64'); ?>">
-                <input type="hidden" name="task" value="">
-                <?php echo HTMLHelper::_('form.token'); ?>
+                <?php echo $this->form->renderControlFields(); ?>
             </div>
             <div class="d-grid gap-2 d-sm-block mb-2">
             <button type="button" class="btn btn-primary" data-submit-task="modules.apply">
diff --git a/components/com_config/tmpl/templates/default.php b/components/com_config/tmpl/templates/default.php
index 1aceabb244a44..383a7074cb96a 100644
--- a/components/com_config/tmpl/templates/default.php
+++ b/components/com_config/tmpl/templates/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -45,8 +44,7 @@
         </div>
     </div>
 
-    <input type="hidden" name="task" value="">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php echo $this->form->renderControlFields(); ?>
 
     <div class="d-grid gap-2 d-sm-block mb-2">
     <button type="button" class="btn btn-primary " data-submit-task="templates.apply">
diff --git a/components/com_contact/helpers/route.php b/components/com_contact/helpers/route.php
index 6d08b7da9774c..19c6cf7e562a7 100644
--- a/components/com_contact/helpers/route.php
+++ b/components/com_contact/helpers/route.php
@@ -24,7 +24,7 @@
  * @subpackage  com_contact
  * @since       1.5
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Contact\Site\Helper\RouteHelper instead
  *              Example: RouteHelper::method();
  */
diff --git a/components/com_contact/src/Controller/ContactController.php b/components/com_contact/src/Controller/ContactController.php
index 846e60925d0dd..3ebab35ce7f9c 100644
--- a/components/com_contact/src/Controller/ContactController.php
+++ b/components/com_contact/src/Controller/ContactController.php
@@ -12,10 +12,13 @@
 
 use Joomla\CMS\Event\Contact\SubmitContactEvent;
 use Joomla\CMS\Event\Contact\ValidateContactEvent;
-use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Controller\FormController;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -38,10 +41,12 @@
  *
  * @since  1.5.19
  */
-class ContactController extends FormController implements UserFactoryAwareInterface
+class ContactController extends FormController implements UserFactoryAwareInterface, MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
     use UserFactoryAwareTrait;
     use VersionableControllerTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * The URL view item variable.
@@ -129,7 +134,7 @@ public function submit()
 
         // Check for a valid session cookie
         if ($contact->params->get('validate_session', 0)) {
-            if (Factory::getSession()->getState() !== 'active') {
+            if ($app->getSession()->getState() !== 'active') {
                 $this->app->enqueueMessage(Text::_('JLIB_ENVIRONMENT_SESSION_INVALID'), 'warning');
 
                 // Save the data in the session.
@@ -279,7 +284,12 @@ private function _sendEmail($data, $contact, $emailCopyToSender)
         }
 
         try {
-            $mailer = new MailTemplate('com_contact.mail', $app->getLanguage()->getTag());
+            $mailer = new MailTemplate(
+                'com_contact.mail',
+                $app->getLanguage()->getTag(),
+                $this->getMailerFactory()->createMailer(),
+                $this->getLanguageFactory()
+            );
             $mailer->addRecipient($contact->email_to);
             $mailer->setReplyTo($templateData['email'], $templateData['name']);
             $mailer->addTemplateData($templateData);
@@ -288,7 +298,12 @@ private function _sendEmail($data, $contact, $emailCopyToSender)
 
             // If we are supposed to copy the sender, do so.
             if ($emailCopyToSender && !empty($data['contact_email_copy'])) {
-                $mailer = new MailTemplate('com_contact.mail.copy', $app->getLanguage()->getTag());
+                $mailer = new MailTemplate(
+                    'com_contact.mail.copy',
+                    $app->getLanguage()->getTag(),
+                    $this->getMailerFactory()->createMailer(),
+                    $this->getLanguageFactory()
+                );
                 $mailer->addRecipient($templateData['email']);
                 $mailer->setReplyTo($templateData['email'], $templateData['name']);
                 $mailer->addTemplateData($templateData);
diff --git a/components/com_contact/src/Controller/DisplayController.php b/components/com_contact/src/Controller/DisplayController.php
index 50ddae3318575..51932d64a99a1 100644
--- a/components/com_contact/src/Controller/DisplayController.php
+++ b/components/com_contact/src/Controller/DisplayController.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -27,12 +28,12 @@
 class DisplayController extends BaseController
 {
     /**
-     * @param   array                     $config   An optional associative array of configuration settings.
-     *                                              Recognized key values include 'name', 'default_task', 'model_path', and
-     *                                              'view_path' (this list is not meant to be comprehensive).
-     * @param   ?MVCFactoryInterface      $factory  The factory.
-     * @param   ?CMSApplication           $app      The Application for the dispatcher
-     * @param   ?\Joomla\CMS\Input\Input  $input    The Input object for the request
+     * @param   array                 $config   An optional associative array of configuration settings.
+     *                                          Recognized key values include 'name', 'default_task', 'model_path', and
+     *                                          'view_path' (this list is not meant to be comprehensive).
+     * @param   ?MVCFactoryInterface  $factory  The factory.
+     * @param   ?CMSApplication       $app      The Application for the dispatcher
+     * @param   ?Input                $input    The Input object for the request
      *
      * @since   3.0
      */
diff --git a/components/com_contact/src/Helper/RouteHelper.php b/components/com_contact/src/Helper/RouteHelper.php
index 073dc4d42ad25..3775129c90348 100644
--- a/components/com_contact/src/Helper/RouteHelper.php
+++ b/components/com_contact/src/Helper/RouteHelper.php
@@ -32,13 +32,13 @@ abstract class RouteHelper
      *
      * @param   integer  $id        The id of the contact
      * @param   integer  $catid     The id of the contact's category
-     * @param   mixed    $language  The id of the language being used.
+     * @param   string   $language  The language code.
      *
      * @return  string  The link to the contact
      *
      * @since   1.5
      */
-    public static function getContactRoute($id, $catid, $language = 0)
+    public static function getContactRoute($id, $catid, $language = null)
     {
         // Create the link
         $link = 'index.php?option=com_contact&view=contact&id=' . $id;
@@ -47,7 +47,7 @@ public static function getContactRoute($id, $catid, $language = 0)
             $link .= '&catid=' . $catid;
         }
 
-        if ($language && $language !== '*' && Multilanguage::isEnabled()) {
+        if (!empty($language) && $language !== '*' && Multilanguage::isEnabled()) {
             $link .= '&lang=' . $language;
         }
 
@@ -57,14 +57,14 @@ public static function getContactRoute($id, $catid, $language = 0)
     /**
      * Get the URL route for a contact category from a contact category ID and language
      *
-     * @param   mixed  $catid     The id of the contact's category either an integer id or an instance of CategoryNode
-     * @param   mixed  $language  The id of the language being used.
+     * @param   mixed   $catid     The id of the contact's category either an integer id or an instance of CategoryNode
+     * @param   string  $language  The language code.
      *
      * @return  string  The link to the contact
      *
      * @since   1.5
      */
-    public static function getCategoryRoute($catid, $language = 0)
+    public static function getCategoryRoute($catid, $language = null)
     {
         if ($catid instanceof CategoryNode) {
             $id = $catid->id;
@@ -78,7 +78,7 @@ public static function getCategoryRoute($catid, $language = 0)
             // Create the link
             $link = 'index.php?option=com_contact&view=category&id=' . $id;
 
-            if ($language && $language !== '*' && Multilanguage::isEnabled()) {
+            if (!empty($language) && $language !== '*' && Multilanguage::isEnabled()) {
                 $link .= '&lang=' . $language;
             }
         }
diff --git a/components/com_contact/src/Model/CategoryModel.php b/components/com_contact/src/Model/CategoryModel.php
index 86379743d74f9..4ddfa2bdc023f 100644
--- a/components/com_contact/src/Model/CategoryModel.php
+++ b/components/com_contact/src/Model/CategoryModel.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Category;
 use Joomla\Database\ParameterType;
 use Joomla\Database\QueryInterface;
 use Joomla\Registry\Registry;
@@ -165,7 +165,7 @@ protected function getListQuery()
         $db = $this->getDatabase();
 
         /** @var \Joomla\Database\DatabaseQuery $query */
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($this->getState('list.select', 'a.*'))
             ->select($this->getSlugColumn($query, 'a.id', 'a.alias') . ' AS slug')
@@ -187,7 +187,7 @@ protected function getListQuery()
             $levels = (int) $this->getState('filter.max_category_levels', 1);
 
             // Create a subquery for the subcategory list
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select($db->quoteName('sub.id'))
                 ->from($db->quoteName('#__categories', 'sub'))
                 ->join(
@@ -488,7 +488,7 @@ public function hit($pk = 0)
         if ($hitcount) {
             $pk = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
 
-            $table = Table::getInstance('Category');
+            $table = new Category($this->getDatabase());
             $table->hit($pk);
         }
 
diff --git a/components/com_contact/src/Model/ContactModel.php b/components/com_contact/src/Model/ContactModel.php
index dd0f3eb7e210e..e952c9fad1af7 100644
--- a/components/com_contact/src/Model/ContactModel.php
+++ b/components/com_contact/src/Model/ContactModel.php
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Application\SiteApplication;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Model\PrepareDataEvent;
+use Joomla\CMS\Event\Model\PrepareFormEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Helper\TagsHelper;
@@ -98,18 +100,15 @@ protected function populateState()
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
         $form = $this->loadForm('com_contact.contact', 'contact', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         $temp    = clone $this->getState('params');
         $contact = $this->getItem($this->getState('contact.id'));
         $active  = Factory::getContainer()->get(SiteApplication::class)->getMenu()->getActive();
@@ -180,7 +179,7 @@ public function getItem($pk = null)
         if (!isset($this->_item[$pk])) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->select($this->getState('item.select', 'a.*'))
                     ->select($this->getSlugColumn($query, 'a.id', 'a.alias') . ' AS slug')
@@ -300,7 +299,7 @@ protected function buildContactExtendedData($contact)
         $user      = $this->getCurrentUser();
         $groups    = $user->getAuthorisedViewLevels();
         $published = $this->getState('filter.published');
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
 
         // If we are showing a contact list, then the contact parameters take priority
         // So merge the contact parameters with the merged parameters
@@ -373,7 +372,8 @@ protected function buildContactExtendedData($contact)
             ->createModel('User', 'Administrator', ['ignore_request' => true]);
         $data = $userModel->getItem((int) $contact->user_id);
 
-        PluginHelper::importPlugin('user');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('user', null, true, $dispatcher);
 
         // Get the form.
         Form::addFormPath(JPATH_SITE . '/components/com_users/forms');
@@ -381,10 +381,16 @@ protected function buildContactExtendedData($contact)
         $form = Form::getInstance('com_users.profile', 'profile');
 
         // Trigger the form preparation event.
-        Factory::getApplication()->triggerEvent('onContentPrepareForm', [$form, $data]);
+        $dispatcher->dispatch('onContentPrepareForm', new PrepareFormEvent('onContentPrepareForm', [
+            'subject' => $form,
+            'data'    => $data,
+        ]));
 
         // Trigger the data preparation event.
-        Factory::getApplication()->triggerEvent('onContentPrepareData', ['com_users.profile', $data]);
+        $dispatcher->dispatch('onContentPrepareData', new PrepareDataEvent('onContentPrepareData', [
+            'context' => 'com_users.profile',
+            'data'    => $data,
+        ]));
 
         // Load the data into the form after the plugins have operated.
         $form->bind($data);
diff --git a/components/com_contact/src/Model/FeaturedModel.php b/components/com_contact/src/Model/FeaturedModel.php
index 9ee414bb4334d..a4f99c22caf03 100644
--- a/components/com_contact/src/Model/FeaturedModel.php
+++ b/components/com_contact/src/Model/FeaturedModel.php
@@ -89,7 +89,7 @@ protected function getListQuery()
 
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select required fields from the categories.
         $query->select($this->getState('list.select', 'a.*'))
diff --git a/components/com_contact/src/Model/FormModel.php b/components/com_contact/src/Model/FormModel.php
index 446dea89a5c34..9ea86cd1b9f01 100644
--- a/components/com_contact/src/Model/FormModel.php
+++ b/components/com_contact/src/Model/FormModel.php
@@ -54,7 +54,7 @@ class FormModel extends \Joomla\Component\Contact\Administrator\Model\ContactMod
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean  A Form object on success, false on failure
+     * @return  Form|boolean  A Form object, false on failure
      *
      * @since   4.0.0
      */
@@ -81,7 +81,7 @@ public function getForm($data = [], $loadData = true)
      *
      * @param   integer  $itemId  The id of the contact.
      *
-     * @return  mixed  Contact item data object on success, false on failure.
+     * @return  \stdClass|false  Contact item data object on success, false on failure.
      *
      * @throws  \Exception
      *
@@ -106,7 +106,7 @@ public function getItem($itemId = null)
         }
 
         $properties = $table->getProperties();
-        $value      = ArrayHelper::toObject($properties, \Joomla\CMS\Object\CMSObject::class);
+        $value      = ArrayHelper::toObject($properties);
 
         // Convert field to Registry.
         $value->params = new Registry($value->params);
diff --git a/components/com_contact/src/Service/Category.php b/components/com_contact/src/Service/Category.php
index 6c7515514d7a4..d5c737181918d 100644
--- a/components/com_contact/src/Service/Category.php
+++ b/components/com_contact/src/Service/Category.php
@@ -32,9 +32,10 @@ class Category extends Categories
      */
     public function __construct($options = [])
     {
-        $options['table']      = '#__contact_details';
-        $options['extension']  = 'com_contact';
-        $options['statefield'] = 'published';
+        $options['table']       = '#__contact_details';
+        $options['extension']   = 'com_contact';
+        $options['accessfield'] = 'access';
+        $options['statefield']  = 'published';
 
         parent::__construct($options);
     }
diff --git a/components/com_contact/src/Service/Router.php b/components/com_contact/src/Service/Router.php
index f72eb1d2222f2..bc02d57c9cf51 100644
--- a/components/com_contact/src/Service/Router.php
+++ b/components/com_contact/src/Service/Router.php
@@ -253,7 +253,7 @@ public function getCategoriesId($segment, $query)
     public function getContactId($segment, $query)
     {
         if ($this->noIDs) {
-            $dbquery = $this->db->getQuery(true);
+            $dbquery = $this->db->createQuery();
             $dbquery->select($this->db->quoteName('id'))
                 ->from($this->db->quoteName('#__contact_details'))
                 ->where($this->db->quoteName('alias') . ' = :segment')
@@ -279,7 +279,7 @@ public function getContactId($segment, $query)
         $id = (int) $segment;
 
         if ($id) {
-            $dbquery = $this->db->getQuery(true);
+            $dbquery = $this->db->createQuery();
             $dbquery->select($this->db->quoteName('alias'))
                 ->from($this->db->quoteName('#__contact_details'))
                 ->where($this->db->quoteName('id') . ' = :id')
diff --git a/components/com_contact/src/View/Contact/HtmlView.php b/components/com_contact/src/View/Contact/HtmlView.php
index 033407264889e..6a977ee7ee4b9 100644
--- a/components/com_contact/src/View/Contact/HtmlView.php
+++ b/components/com_contact/src/View/Contact/HtmlView.php
@@ -11,6 +11,10 @@
 namespace Joomla\Component\Contact\Site\View\Contact;
 
 use Joomla\CMS\Categories\Categories;
+use Joomla\CMS\Event\Content\AfterDisplayEvent;
+use Joomla\CMS\Event\Content\AfterTitleEvent;
+use Joomla\CMS\Event\Content\BeforeDisplayEvent;
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
@@ -312,7 +316,8 @@ public function display($tpl = null)
         }
 
         // Process the content plugins.
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
         $offset = $state->get('list.offset');
 
         // Fix for where some plugins require a text attribute
@@ -322,18 +327,29 @@ public function display($tpl = null)
             $item->text = $item->misc;
         }
 
-        $app->triggerEvent('onContentPrepare', ['com_contact.contact', &$item, &$item->params, $offset]);
+        $contentEventArguments = [
+            'context' => 'com_contact.contact',
+            'subject' => $item,
+            'params'  => $item->params,
+            'page'    => $offset,
+        ];
+
+        $dispatcher->dispatch('onContentPrepare', new ContentPrepareEvent('onContentPrepare', $contentEventArguments));
 
         // Store the events for later
-        $item->event                    = new \stdClass();
-        $results                        = $app->triggerEvent('onContentAfterTitle', ['com_contact.contact', &$item, &$item->params, $offset]);
-        $item->event->afterDisplayTitle = trim(implode("\n", $results));
+        $item->event = new \stdClass();
+
+        $contentEvents = [
+            'afterDisplayTitle'    => new AfterTitleEvent('onContentAfterTitle', $contentEventArguments),
+            'beforeDisplayContent' => new BeforeDisplayEvent('onContentBeforeDisplay', $contentEventArguments),
+            'afterDisplayContent'  => new AfterDisplayEvent('onContentAfterDisplay', $contentEventArguments),
+        ];
 
-        $results                           = $app->triggerEvent('onContentBeforeDisplay', ['com_contact.contact', &$item, &$item->params, $offset]);
-        $item->event->beforeDisplayContent = trim(implode("\n", $results));
+        foreach ($contentEvents as $resultKey => $event) {
+            $results = $dispatcher->dispatch($event->getName(), $event)->getArgument('result', []);
 
-        $results                          = $app->triggerEvent('onContentAfterDisplay', ['com_contact.contact', &$item, &$item->params, $offset]);
-        $item->event->afterDisplayContent = trim(implode("\n", $results));
+            $item->event->{$resultKey} = trim(implode("\n", $results));
+        }
 
         if (!empty($item->text)) {
             $item->misc = $item->text;
@@ -343,7 +359,12 @@ public function display($tpl = null)
 
         if ($item->params->get('show_user_custom_fields') && $item->user_id && $contactUser = $this->getUserFactory()->loadUserById($item->user_id)) {
             $contactUser->text = '';
-            $app->triggerEvent('onContentPrepare', ['com_users.user', &$contactUser, &$item->params, 0]);
+            $dispatcher->dispatch('onContentPrepare', new ContentPrepareEvent('onContentPrepare', [
+                'context' => 'com_users.user',
+                'subject' => $contactUser,
+                'params'  => $item->params,
+                'page'    => 0,
+            ]));
 
             if (!isset($contactUser->jcfields)) {
                 $contactUser->jcfields = [];
diff --git a/components/com_contact/src/View/Contact/VcfView.php b/components/com_contact/src/View/Contact/VcfView.php
index 6afbdebdd657e..90167382cab45 100644
--- a/components/com_contact/src/View/Contact/VcfView.php
+++ b/components/com_contact/src/View/Contact/VcfView.php
@@ -101,7 +101,11 @@ public function display($tpl = null)
 
         $rev = date('c', strtotime($item->modified));
 
-        Factory::getApplication()->setHeader('Content-disposition', 'attachment; filename="' . $card_name . '.vcf"', true);
+        Factory::getApplication()->setHeader(
+            'Content-disposition',
+            'attachment; filename="' . str_replace('"', '', $card_name) . '.vcf"',
+            true
+        );
 
         $vcard   = [];
         $vcard[] = 'BEGIN:VCARD';
diff --git a/components/com_contact/src/View/Form/HtmlView.php b/components/com_contact/src/View/Form/HtmlView.php
index 90ce463d9842a..013737b5968d6 100644
--- a/components/com_contact/src/View/Form/HtmlView.php
+++ b/components/com_contact/src/View/Form/HtmlView.php
@@ -130,6 +130,11 @@ public function display($tpl = null)
             $this->form->setFieldAttribute('language', 'default', $lang);
         }
 
+        // Add form control fields
+        $this->form
+            ->addControlField('task')
+            ->addControlField('return', $this->return_page);
+
         $this->_prepareDocument();
 
         parent::display($tpl);
diff --git a/components/com_contact/tmpl/form/edit.php b/components/com_contact/tmpl/form/edit.php
index 60f23f13432db..aec10e419e0e1 100644
--- a/components/com_contact/tmpl/form/edit.php
+++ b/components/com_contact/tmpl/form/edit.php
@@ -65,9 +65,7 @@
             <?php echo LayoutHelper::render('joomla.edit.params', $this); ?>
             <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
-            <input type="hidden" name="task" value=""/>
-            <input type="hidden" name="return" value="<?php echo $this->return_page; ?>"/>
-            <?php echo HTMLHelper::_('form.token'); ?>
+            <?php echo $this->form->renderControlFields(); ?>
         </fieldset>
         <div class="d-grid gap-2 d-sm-block mb-2">
             <button type="button" class="btn btn-primary" onclick="Joomla.submitbutton('contact.save')">
diff --git a/components/com_content/forms/article.xml b/components/com_content/forms/article.xml
index 252ddf25ed5a8..8274295973950 100644
--- a/components/com_content/forms/article.xml
+++ b/components/com_content/forms/article.xml
@@ -238,20 +238,29 @@
 			/>
 
 			<field
-				name="image_intro_caption"
+				name="imgclass_intro"
 				type="text"
-				label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
+				label="COM_CONTENT_FIELD_IMAGE_CLASS_LABEL"
 				size="20"
+				useglobal="true"
+				validate="CssIdentifier"
 			/>
-
+			
 			<field
 				name="float_intro"
 				type="text"
-				label="COM_CONTENT_FIELD_IMAGE_CLASS_LABEL"
+				label="COM_CONTENT_FIELD_FIGURE_CLASS_LABEL"
 				size="20"
 				useglobal="true"
 				validate="CssIdentifier"
 			/>
+
+			<field
+				name="image_intro_caption"
+				type="text"
+				label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
+				size="20"
+			/>
 		</fieldset>
 		<fieldset name="image-full">
 			<field
@@ -278,20 +287,29 @@
 			/>
 
 			<field
-				name="image_fulltext_caption"
+				name="imgclass_fulltext"
 				type="text"
-				label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
+				label="COM_CONTENT_FIELD_IMAGE_CLASS_LABEL"
 				size="20"
+				useglobal="true"
+				validate="CssIdentifier"
 			/>
 
 			<field
 				name="float_fulltext"
 				type="text"
-				label="COM_CONTENT_FIELD_IMAGE_CLASS_LABEL"
+				label="COM_CONTENT_FIELD_FIGURE_CLASS_LABEL"
 				size="20"
 				useglobal="true"
 				validate="CssIdentifier"
 			/>
+
+			<field
+				name="image_fulltext_caption"
+				type="text"
+				label="COM_CONTENT_FIELD_IMAGE_CAPTION_LABEL"
+				size="20"
+			/>
 		</fieldset>
 	</fields>
 	<fields name="urls">
diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php
index 9906ef941646a..fef4d332e90a8 100644
--- a/components/com_content/helpers/icon.php
+++ b/components/com_content/helpers/icon.php
@@ -22,7 +22,7 @@
  *
  * @since       1.5
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the class \Joomla\Component\Content\Administrator\Service\HTML\Icon instead
  */
 abstract class JHtmlIcon
@@ -37,7 +37,7 @@ abstract class JHtmlIcon
      *
      * @return  string  The HTML markup for the create item link
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use \Joomla\Component\Content\Administrator\Service\HTML\Icon::create instead
      *              Example:
      *              use Joomla\Component\Content\Administrator\Service\HTML\Icon;
@@ -64,7 +64,7 @@ public static function create($category, $params, $attribs = [], $legacy = false
      *
      * @since   1.6
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use \Joomla\Component\Content\Administrator\Service\HTML\Icon::edit instead
      *              Example:
      *              use Joomla\Component\Content\Administrator\Service\HTML\Icon;
@@ -86,7 +86,7 @@ public static function edit($article, $params, $attribs = [], $legacy = false)
      *
      * @return  string  The HTML markup for the popup link
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              No longer used, will be removed without replacement
      */
     public static function print_popup($article, $params, $attribs = [], $legacy = false)
@@ -104,7 +104,7 @@ public static function print_popup($article, $params, $attribs = [], $legacy = f
      *
      * @return  string  The HTML markup for the popup link
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use \Joomla\Component\Content\Administrator\Service\HTML\Icon::print_screen instead
      *              Example:
      *              use Joomla\Component\Content\Administrator\Service\HTML\Icon;
@@ -121,7 +121,7 @@ public static function print_screen($article, $params, $attribs = [], $legacy =
      *
      * @return  \Joomla\Component\Content\Administrator\Service\HTML\Icon
      *
-     * @deprecated  4.3 will be removed in 6.0 without replacement
+     * @deprecated  4.3 will be removed in 7.0 without replacement
      */
     private static function getIcon()
     {
diff --git a/components/com_content/src/Controller/DisplayController.php b/components/com_content/src/Controller/DisplayController.php
index ebe4421cd602a..ddc70f104c62c 100644
--- a/components/com_content/src/Controller/DisplayController.php
+++ b/components/com_content/src/Controller/DisplayController.php
@@ -15,6 +15,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -28,12 +29,12 @@
 class DisplayController extends \Joomla\CMS\MVC\Controller\BaseController
 {
     /**
-     * @param   array                     $config   An optional associative array of configuration settings.
-     *                                              Recognized key values include 'name', 'default_task', 'model_path', and
-     *                                              'view_path' (this list is not meant to be comprehensive).
-     * @param   ?MVCFactoryInterface      $factory  The factory.
-     * @param   ?CMSApplication           $app      The Application for the dispatcher
-     * @param   ?\Joomla\CMS\Input\Input  $input    The Input object for the request
+     * @param   array                 $config   An optional associative array of configuration settings.
+     *                                          Recognized key values include 'name', 'default_task', 'model_path', and
+     *                                          'view_path' (this list is not meant to be comprehensive).
+     * @param   ?MVCFactoryInterface  $factory  The factory.
+     * @param   ?CMSApplication       $app      The Application for the dispatcher
+     * @param   ?Input                $input    The Input object for the request
      *
      * @since   3.0.1
      */
diff --git a/components/com_content/src/Helper/AssociationHelper.php b/components/com_content/src/Helper/AssociationHelper.php
index 04c3955044fc3..732b0f84b461e 100644
--- a/components/com_content/src/Helper/AssociationHelper.php
+++ b/components/com_content/src/Helper/AssociationHelper.php
@@ -30,11 +30,11 @@ abstract class AssociationHelper extends CategoryAssociationHelper
     /**
      * Method to get the associations for a given item
      *
-     * @param   integer  $id      Id of the item
-     * @param   string   $view    Name of the view
-     * @param   string   $layout  View layout
+     * @param   int|int[]  $id      ID of the item or array of IDs.
+     * @param   string     $view    Name of the view
+     * @param   string     $layout  View layout
      *
-     * @return  array   Array of associations for the item
+     * @return  array   Array of associations for the item, optionally grouped by ID
      *
      * @since  3.0
      */
@@ -79,7 +79,7 @@ public static function getAssociations($id = 0, $view = null, $layout = null)
                     'com_content',
                     '#__content',
                     'com_content.item',
-                    $id,
+                    (array) $id,
                     'id',
                     'alias',
                     'catid',
@@ -88,11 +88,13 @@ public static function getAssociations($id = 0, $view = null, $layout = null)
 
                 $return = [];
 
-                foreach ($associations as $tag => $item) {
-                    $return[$tag] = RouteHelper::getArticleRoute($item->id, (int) $item->catid, $item->language, $layout);
+                foreach ($associations as $itemId => $itemAssociations) {
+                    foreach ($itemAssociations as $tag => $item) {
+                        $return[$itemId][$tag] = RouteHelper::getArticleRoute($item->id, (int) $item->catid, $item->language, $layout);
+                    }
                 }
 
-                return $return;
+                return \is_array($id) ? $return : ($return[$id] ?? []);
             }
         }
 
@@ -106,9 +108,9 @@ public static function getAssociations($id = 0, $view = null, $layout = null)
     /**
      * Method to display in frontend the associations for a given article
      *
-     * @param   integer  $id  Id of the article
+     * @param   int|int[]  $id  ID of the article or array of IDs
      *
-     * @return  array  An array containing the association URL and the related language object
+     * @return  array  An array containing the association URL and the related language object, optionally grouped by article ID
      *
      * @since  3.7.0
      */
@@ -116,35 +118,39 @@ public static function displayAssociations($id)
     {
         $return = [];
 
-        if ($associations = self::getAssociations($id, 'article')) {
-            $levels    = Factory::getUser()->getAuthorisedViewLevels();
-            $languages = LanguageHelper::getLanguages();
-
-            foreach ($languages as $language) {
-                // Do not display language when no association
-                if (empty($associations[$language->lang_code])) {
-                    continue;
-                }
-
-                // Do not display language without frontend UI
-                if (!\array_key_exists($language->lang_code, LanguageHelper::getInstalledLanguages(0))) {
-                    continue;
-                }
-
-                // Do not display language without specific home menu
-                if (!\array_key_exists($language->lang_code, Multilanguage::getSiteHomePages())) {
-                    continue;
-                }
-
-                // Do not display language without authorized access level
-                if (isset($language->access) && $language->access && !\in_array($language->access, $levels)) {
-                    continue;
+        if ($associations = self::getAssociations((array) $id, 'article')) {
+            $levels             = Factory::getUser()->getAuthorisedViewLevels();
+            $languages          = LanguageHelper::getLanguages();
+            $installedLanguages = LanguageHelper::getInstalledLanguages(0);
+            $siteHomePages      = Multilanguage::getSiteHomePages();
+
+            foreach ($associations as $itemId => $itemAssociations) {
+                foreach ($languages as $language) {
+                    // Do not display language when no association
+                    if (empty($itemAssociations[$language->lang_code])) {
+                        continue;
+                    }
+
+                    // Do not display language without frontend UI
+                    if (!\array_key_exists($language->lang_code, $installedLanguages)) {
+                        continue;
+                    }
+
+                    // Do not display language without specific home menu
+                    if (!\array_key_exists($language->lang_code, $siteHomePages)) {
+                        continue;
+                    }
+
+                    // Do not display language without authorized access level
+                    if (isset($language->access) && $language->access && !\in_array($language->access, $levels)) {
+                        continue;
+                    }
+
+                    $return[$itemId][$language->lang_code] = ['item' => $itemAssociations[$language->lang_code], 'language' => $language];
                 }
-
-                $return[$language->lang_code] = ['item' => $associations[$language->lang_code], 'language' => $language];
             }
         }
 
-        return $return;
+        return \is_array($id) ? $return : ($return[$id] ?? []);
     }
 }
diff --git a/components/com_content/src/Helper/QueryHelper.php b/components/com_content/src/Helper/QueryHelper.php
index decf875b238e2..9366461af33a0 100644
--- a/components/com_content/src/Helper/QueryHelper.php
+++ b/components/com_content/src/Helper/QueryHelper.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Component\Content\Site\Helper;
 
-use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Database\DatabaseInterface;
@@ -117,7 +116,7 @@ public static function orderbySecondary($orderby, $orderDate = 'created', ?Datab
                 break;
 
             case 'random':
-                $orderby = $db->getQuery(true)->rand();
+                $orderby = $db->createQuery()->rand();
                 break;
 
             case 'vote':
@@ -193,36 +192,4 @@ public static function getQueryDate($orderDate, ?DatabaseInterface $db = null)
 
         return $queryDate;
     }
-
-    /**
-     * Get join information for the voting query.
-     *
-     * @param   \Joomla\Registry\Registry  $params  An options object for the article.
-     *
-     * @return  array  A named array with "select" and "join" keys.
-     *
-     * @since   1.5
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Will be removed without replacement
-     */
-    public static function buildVotingQuery($params = null)
-    {
-        if (!$params) {
-            $params = ComponentHelper::getParams('com_content');
-        }
-
-        $voting = $params->get('show_vote');
-
-        if ($voting) {
-            // Calculate voting count
-            $select = ' , ROUND(v.rating_sum / v.rating_count) AS rating, v.rating_count';
-            $join   = ' LEFT JOIN #__content_rating AS v ON a.id = v.content_id';
-        } else {
-            $select = '';
-            $join   = '';
-        }
-
-        return ['select' => $select, 'join' => $join];
-    }
 }
diff --git a/components/com_content/src/Helper/RouteHelper.php b/components/com_content/src/Helper/RouteHelper.php
index fc86fcf69b4e4..7276aa16ae31d 100644
--- a/components/com_content/src/Helper/RouteHelper.php
+++ b/components/com_content/src/Helper/RouteHelper.php
@@ -60,14 +60,14 @@ public static function getArticleRoute($id, $catid = 0, $language = null, $layou
      * Get the category route.
      *
      * @param   integer  $catid     The category ID.
-     * @param   integer  $language  The language code.
+     * @param   string   $language  The language code.
      * @param   string   $layout    The layout value.
      *
      * @return  string  The article route.
      *
      * @since   1.5
      */
-    public static function getCategoryRoute($catid, $language = 0, $layout = null)
+    public static function getCategoryRoute($catid, $language = null, $layout = null)
     {
         if ($catid instanceof CategoryNode) {
             $id = $catid->id;
@@ -81,7 +81,7 @@ public static function getCategoryRoute($catid, $language = 0, $layout = null)
 
         $link = 'index.php?option=com_content&view=category&id=' . $id;
 
-        if ($language && $language !== '*' && Multilanguage::isEnabled()) {
+        if (!empty($language) && $language !== '*' && Multilanguage::isEnabled()) {
             $link .= '&lang=' . $language;
         }
 
diff --git a/components/com_content/src/Model/ArchiveModel.php b/components/com_content/src/Model/ArchiveModel.php
index d08cd94041293..cc4849ed6379e 100644
--- a/components/com_content/src/Model/ArchiveModel.php
+++ b/components/com_content/src/Model/ArchiveModel.php
@@ -157,7 +157,7 @@ public function getYears()
     {
         $db        = $this->getDatabase();
         $nowDate   = Factory::getDate()->toSql();
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
         $queryDate = QueryHelper::getQueryDate($this->state->get('params')->get('order_date'), $db);
         $years     = $query->year($queryDate);
         $yearSort  = $this->state->get('params')->get('year_sort_order', 'ASC');
diff --git a/components/com_content/src/Model/ArticleModel.php b/components/com_content/src/Model/ArticleModel.php
index f451814aa4f09..1c91f19f43229 100644
--- a/components/com_content/src/Model/ArticleModel.php
+++ b/components/com_content/src/Model/ArticleModel.php
@@ -15,8 +15,9 @@
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\ItemModel;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Content;
 use Joomla\Component\Content\Administrator\Extension\ContentComponent;
+use Joomla\Component\Content\Administrator\Service\PreviewTokenService;
 use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\IpHelper;
@@ -68,6 +69,17 @@ protected function populateState()
         // If $pk is set then authorise on complete asset, else on component only
         $asset = empty($pk) ? 'com_content' : 'com_content.article.' . $pk;
 
+        // Validate preview token if present, before any permission checks.
+        $token = $app->getInput()->getString('preview_token', '');
+
+        if ($token !== '' && $pk > 0) {
+            $previewTokenHelper = new PreviewTokenService($app->get('secret'));
+
+            if ($previewTokenHelper->validateToken($token, $pk)) {
+                $this->setState('article.preview', true);
+            }
+        }
+
         if ((!$user->authorise('core.edit.state', $asset)) && (!$user->authorise('core.edit', $asset))) {
             $this->setState('filter.published', ContentComponent::CONDITION_PUBLISHED);
             $this->setState('filter.archived', ContentComponent::CONDITION_ARCHIVED);
@@ -96,7 +108,7 @@ public function getItem($pk = null)
         if (!isset($this->_item[$pk])) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->select(
                     $this->getState(
@@ -177,8 +189,11 @@ public function getItem($pk = null)
                     $query->whereIn($db->quoteName('a.language'), [Factory::getLanguage()->getTag(), '*'], ParameterType::STRING);
                 }
 
+                $isPreview = $this->getState('article.preview', false);
+
                 if (
-                    !$user->authorise('core.edit.state', 'com_content.article.' . $pk)
+                    !$isPreview
+                    && !$user->authorise('core.edit.state', 'com_content.article.' . $pk)
                     && !$user->authorise('core.edit', 'com_content.article.' . $pk)
                 ) {
                     // Filter by start and end dates.
@@ -207,7 +222,7 @@ public function getItem($pk = null)
                 $published = $this->getState('filter.published');
                 $archived  = $this->getState('filter.archived');
 
-                if (is_numeric($published)) {
+                if (!$isPreview && is_numeric($published)) {
                     $query->whereIn($db->quoteName('a.state'), [(int) $published, (int) $archived]);
                 }
 
@@ -220,7 +235,7 @@ public function getItem($pk = null)
                 }
 
                 // Check for published state if filter set.
-                if ((is_numeric($published) || is_numeric($archived)) && ($data->state != $published && $data->state != $archived)) {
+                if (!$isPreview && (is_numeric($published) || is_numeric($archived)) && ($data->state != $published && $data->state != $archived)) {
                     throw new \Exception(Text::_('COM_CONTENT_ERROR_ARTICLE_NOT_FOUND'), 404);
                 }
 
@@ -262,8 +277,8 @@ public function getItem($pk = null)
                 }
 
                 // Compute view access permissions.
-                if ($this->getState('filter.access')) {
-                    // If the access filter has been set, we already know this user can view.
+                if ($isPreview || $this->getState('filter.access')) {
+                    // Valid preview token or access filter set — user can view.
                     $data->params->set('access-view', true);
                 } else {
                     // If no access filter is set, the layout takes some responsibility for display of limited information.
@@ -307,7 +322,7 @@ public function hit($pk = 0)
         if ($hitcount) {
             $pk = (!empty($pk)) ? $pk : (int) $this->getState('article.id');
 
-            $table = Table::getInstance('Content', '\\Joomla\\CMS\\Table\\');
+            $table = new Content($this->getDatabase());
             $table->hit($pk);
         }
 
@@ -332,7 +347,7 @@ public function storeVote($pk = 0, $rate = 0)
 
             // Initialize variables.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Create the base select statement.
             $query->select('*')
@@ -354,7 +369,7 @@ public function storeVote($pk = 0, $rate = 0)
 
             // There are no ratings yet, so lets insert our rating
             if (!$rating) {
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 // Create the base insert statement.
                 $query->insert($db->quoteName('#__content_rating'))
@@ -383,7 +398,7 @@ public function storeVote($pk = 0, $rate = 0)
                 }
             } else {
                 if ($userIP != $rating->lastip) {
-                    $query = $db->getQuery(true);
+                    $query = $db->createQuery();
 
                     // Create the base update statement.
                     $query->update($db->quoteName('#__content_rating'))
@@ -427,15 +442,13 @@ public function storeVote($pk = 0, $rate = 0)
     /**
      * Cleans the cache of com_content and content modules
      *
-     * @param   string   $group     The cache group
-     * @param   integer  $clientId  No longer used, will be removed without replacement
-     *                              @deprecated   4.3 will be removed in 6.0
+     * @param  string  $group  Cache group name.
      *
      * @return  void
      *
      * @since   3.9.9
      */
-    protected function cleanCache($group = null, $clientId = 0)
+    protected function cleanCache($group = null)
     {
         parent::cleanCache('com_content');
         parent::cleanCache('mod_articles');
diff --git a/components/com_content/src/Model/ArticlesModel.php b/components/com_content/src/Model/ArticlesModel.php
index a87bb7fccb44a..e7700dfd5c465 100644
--- a/components/com_content/src/Model/ArticlesModel.php
+++ b/components/com_content/src/Model/ArticlesModel.php
@@ -195,7 +195,7 @@ protected function getListQuery()
         // Create a new query object.
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $nowDate = Factory::getDate()->toSql();
 
@@ -413,7 +413,7 @@ protected function getListQuery()
                 $levels     = (int) $this->getState('filter.max_category_levels', 1);
 
                 // Create a subquery for the subcategory list
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select($db->quoteName('sub.id'))
                     ->from($db->quoteName('#__categories', 'sub'))
                     ->join(
@@ -625,7 +625,7 @@ protected function getListQuery()
             $tagId = ArrayHelper::toInteger($tagId);
 
             if ($tagId) {
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where(
@@ -682,10 +682,11 @@ public function getItems()
         // Get the global params
         $globalParams = ComponentHelper::getParams('com_content', true);
 
-        $taggedItems = [];
+        $taggedItems     = [];
+        $associatedItems = [];
 
         // Convert the parameter fields into objects.
-        foreach ($items as $item) {
+        foreach ($items as $i => $item) {
             $articleParams = new Registry($item->attribs);
 
             // Unpack readmore and layout params
@@ -782,11 +783,12 @@ public function getItems()
             // Some contexts may not use tags data at all, so we allow callers to disable loading tag data
             if ($this->getState('load_tags', $item->params->get('show_tags', '1'))) {
                 $item->tags             = new TagsHelper();
-                $taggedItems[$item->id] = $item;
+                $taggedItems[$item->id] = $i;
             }
 
+            // Collect items for associations load
             if (Associations::isEnabled() && $item->params->get('show_associations')) {
-                $item->associations = AssociationHelper::displayAssociations($item->id);
+                $associatedItems[$item->id] = $i;
             }
         }
 
@@ -796,7 +798,17 @@ public function getItems()
             $itemIds    = array_keys($taggedItems);
 
             foreach ($tagsHelper->getMultipleItemTags('com_content.article', $itemIds) as $id => $tags) {
-                $taggedItems[$id]->tags->itemTags = $tags;
+                $items[$taggedItems[$id]]->tags->itemTags = $tags;
+            }
+        }
+
+        // Load associations of all items.
+        if ($associatedItems) {
+            $itemIds      = array_keys($associatedItems);
+            $associations = AssociationHelper::displayAssociations($itemIds);
+
+            foreach ($associatedItems as $itemId => $i) {
+                $items[$i]->associations = $associations[$itemId] ?? [];
             }
         }
 
@@ -826,7 +838,7 @@ public function countItemsByMonth()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Get the list query.
         $listQuery = $this->getListQuery();
diff --git a/components/com_content/src/Model/CategoriesModel.php b/components/com_content/src/Model/CategoriesModel.php
index 5c25dc5f4227e..a7b5403ae978b 100644
--- a/components/com_content/src/Model/CategoriesModel.php
+++ b/components/com_content/src/Model/CategoriesModel.php
@@ -122,10 +122,13 @@ public function getItems($recursive = false)
                 $params = new Registry();
             }
 
-            $options               = [];
-            $options['countItems'] = $params->get('show_cat_num_articles_cat', 1) || !$params->get('show_empty_categories_cat', 0);
-            $categories            = Categories::getInstance('Content', $options);
-            $this->_parent         = $categories->get($this->getState('filter.parentId', 'root'));
+            $params = (clone $this->getState('params'))->merge($params);
+
+            $options                  = [];
+            $options['countItems']    = $params->get('show_cat_num_articles_cat', 1) || !$params->get('show_empty_categories_cat', 0);
+            $options['accessOnItems'] = !$params->get('show_noauth', 0);
+            $categories               = Categories::getInstance('Content', $options);
+            $this->_parent            = $categories->get($this->getState('filter.parentId', 'root'));
 
             if (\is_object($this->_parent)) {
                 $this->cache[$store] = $this->_parent->getChildren($recursive);
diff --git a/components/com_content/src/Model/CategoryModel.php b/components/com_content/src/Model/CategoryModel.php
index 4ab90dc3247db..d64a842b75b7c 100644
--- a/components/com_content/src/Model/CategoryModel.php
+++ b/components/com_content/src/Model/CategoryModel.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\CMS\Pagination\Pagination;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Category;
 use Joomla\Component\Content\Site\Helper\QueryHelper;
 use Joomla\Utilities\ArrayHelper;
 
@@ -220,6 +220,16 @@ protected function populateState($ordering = null, $direction = null)
 
         // Set the featured articles state
         $this->setState('filter.featured', $params->get('show_featured'));
+
+        $authorFilteringType = (int) $params->get('list_author_filtering_type', 1);
+
+        if ($authorFilteringType === 2) {
+            $this->setState('filter.author_id', [(int) $user->id]);
+            $this->setState('filter.author_id.include', true);
+        } else {
+            $this->setState('filter.author_id', (array) $params->get('list_author', []));
+            $this->setState('filter.author_id.include', (bool) $authorFilteringType);
+        }
     }
 
     /**
@@ -259,6 +269,8 @@ public function getItems()
             $model->setState('list.direction', $this->getState('list.direction'));
             $model->setState('list.filter', $this->getState('list.filter'));
             $model->setState('filter.tag', $this->getState('filter.tag'));
+            $model->setState('filter.author_id', $this->getState('filter.author_id'));
+            $model->setState('filter.author_id.include', $this->getState('filter.author_id.include', true));
 
             // Filter.subcategories indicates whether to include articles from subcategories in the list or blog
             $model->setState('filter.subcategories', $this->getState('filter.subcategories'));
@@ -348,10 +360,11 @@ public function getCategory()
     {
         if (!\is_object($this->_item)) {
             if (isset($this->state) && !empty($this->state->get('params'))) {
-                $params                = $this->state->get('params');
-                $options               = [];
-                $options['countItems'] = $params->get('show_cat_num_articles', 1) || !$params->get('show_empty_categories_cat', 0);
-                $options['access']     = $params->get('check_access_rights', 1);
+                $params                   = $this->state->get('params');
+                $options                  = [];
+                $options['countItems']    = $params->get('show_cat_num_articles', 1) || !$params->get('show_empty_categories_cat', 0);
+                $options['access']        = $params->get('check_access_rights', 1);
+                $options['accessOnItems'] = !$params->get('show_noauth', 0);
             } else {
                 $options['countItems'] = 0;
             }
@@ -478,7 +491,7 @@ public function hit($pk = 0)
         if ($hitcount) {
             $pk = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
 
-            $table = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\');
+            $table = new Category($this->getDatabase());
             $table->hit($pk);
         }
 
diff --git a/components/com_content/src/Model/FormModel.php b/components/com_content/src/Model/FormModel.php
index 4119f8d610e39..35933a855684e 100644
--- a/components/com_content/src/Model/FormModel.php
+++ b/components/com_content/src/Model/FormModel.php
@@ -15,7 +15,6 @@
 use Joomla\CMS\Helper\TagsHelper;
 use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Multilanguage;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Table\Table;
 use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
@@ -100,7 +99,7 @@ public function getItem($itemId = null)
         }
 
         $properties = $table->getProperties(1);
-        $value      = ArrayHelper::toObject($properties, CMSObject::class);
+        $value      = ArrayHelper::toObject($properties);
 
         // Convert attrib field to Registry.
         $value->params = new Registry($value->attribs);
@@ -158,7 +157,7 @@ public function getItem($itemId = null)
             if ($value->featured) {
                 // Get featured dates.
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select(
                         [
                             $db->quoteName('featured_up'),
@@ -229,7 +228,7 @@ public function save($data)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean  A Form object on success, false on failure
+     * @return  Form|boolean  A Form object, false on failure
      *
      * @since   1.6
      */
@@ -293,7 +292,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
                 $categoryId = (int) $params->get('catid');
 
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('language'))
                     ->from($db->quoteName('#__categories'))
                     ->where($db->quoteName('id') . ' = :categoryId')
diff --git a/components/com_content/src/Service/Category.php b/components/com_content/src/Service/Category.php
index db686a3f6bd03..ad5d8b055293b 100644
--- a/components/com_content/src/Service/Category.php
+++ b/components/com_content/src/Service/Category.php
@@ -32,8 +32,9 @@ class Category extends Categories
      */
     public function __construct($options = [])
     {
-        $options['table']     = '#__content';
-        $options['extension'] = 'com_content';
+        $options['table']       = '#__content';
+        $options['extension']   = 'com_content';
+        $options['accessfield'] = 'access';
 
         parent::__construct($options);
     }
diff --git a/components/com_content/src/Service/Router.php b/components/com_content/src/Service/Router.php
index d82ce68771e11..177f1d4ff091a 100644
--- a/components/com_content/src/Service/Router.php
+++ b/components/com_content/src/Service/Router.php
@@ -254,7 +254,7 @@ public function getCategoriesId($segment, $query)
     public function getArticleId($segment, $query)
     {
         if ($this->noIDs) {
-            $dbquery = $this->db->getQuery(true);
+            $dbquery = $this->db->createQuery();
             $dbquery->select($this->db->quoteName('id'))
                 ->from($this->db->quoteName('#__content'))
                 ->where($this->db->quoteName('alias') . ' = :segment')
@@ -280,7 +280,7 @@ public function getArticleId($segment, $query)
         $id = (int) $segment;
 
         if ($id) {
-            $dbquery = $this->db->getQuery(true);
+            $dbquery = $this->db->createQuery();
             $dbquery->select($this->db->quoteName('alias'))
                 ->from($this->db->quoteName('#__content'))
                 ->where($this->db->quoteName('id') . ' = :id')
diff --git a/components/com_content/src/View/Archive/HtmlView.php b/components/com_content/src/View/Archive/HtmlView.php
index 3d0d925897c8b..204a882b8384b 100644
--- a/components/com_content/src/View/Archive/HtmlView.php
+++ b/components/com_content/src/View/Archive/HtmlView.php
@@ -10,6 +10,10 @@
 
 namespace Joomla\Component\Content\Site\View\Archive;
 
+use Joomla\CMS\Event\Content\AfterDisplayEvent;
+use Joomla\CMS\Event\Content\AfterTitleEvent;
+use Joomla\CMS\Event\Content\BeforeDisplayEvent;
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
@@ -134,7 +138,8 @@ public function display($tpl = null)
         // Get the page/component configuration
         $params = $state->get('params');
 
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         foreach ($items as $item) {
             $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
@@ -151,19 +156,32 @@ public function display($tpl = null)
                 $item->text = $item->introtext;
             }
 
-            Factory::getApplication()->triggerEvent('onContentPrepare', ['com_content.archive', &$item, &$item->params, 0]);
+            $contentEventArguments = [
+                'context' => 'com_content.archive',
+                'subject' => $item,
+                'params'  => $item->params,
+                'page'    => 0,
+            ];
+
+            $dispatcher->dispatch(
+                'onContentPrepare',
+                new ContentPrepareEvent('onContentPrepare', $contentEventArguments)
+            );
 
             // Old plugins: Use processed text as introtext
             $item->introtext = $item->text;
 
-            $results                        = Factory::getApplication()->triggerEvent('onContentAfterTitle', ['com_content.archive', &$item, &$item->params, 0]);
-            $item->event->afterDisplayTitle = trim(implode("\n", $results));
+            $contentEvents = [
+                'afterDisplayTitle'    => new AfterTitleEvent('onContentAfterTitle', $contentEventArguments),
+                'beforeDisplayContent' => new BeforeDisplayEvent('onContentBeforeDisplay', $contentEventArguments),
+                'afterDisplayContent'  => new AfterDisplayEvent('onContentAfterDisplay', $contentEventArguments),
+            ];
 
-            $results                           = Factory::getApplication()->triggerEvent('onContentBeforeDisplay', ['com_content.archive', &$item, &$item->params, 0]);
-            $item->event->beforeDisplayContent = trim(implode("\n", $results));
+            foreach ($contentEvents as $resultKey => $event) {
+                $results = $dispatcher->dispatch($event->getName(), $event)->getArgument('result', []);
 
-            $results                          = Factory::getApplication()->triggerEvent('onContentAfterDisplay', ['com_content.archive', &$item, &$item->params, 0]);
-            $item->event->afterDisplayContent = trim(implode("\n", $results));
+                $item->event->{$resultKey} = trim(implode("\n", $results));
+            }
         }
 
         $form = new \stdClass();
diff --git a/components/com_content/src/View/Category/FeedView.php b/components/com_content/src/View/Category/FeedView.php
index 72c1cb9febc28..55b257c46b689 100644
--- a/components/com_content/src/View/Category/FeedView.php
+++ b/components/com_content/src/View/Category/FeedView.php
@@ -57,7 +57,8 @@ protected function reconcileNames($item)
             $item->description = '<p>' . HTMLHelper::_('image', $obj->image_intro, $obj->image_intro_alt) . '</p>';
         }
 
-        $item->description .= ($params->get('feed_summary', 0) ? $item->introtext . $item->fulltext : $item->introtext);
+        $item->description .= $item->params->get('show_intro', 1) ? $item->introtext : '';
+        $item->description .= $params->get('feed_summary', 0) ? $item->fulltext : '';
 
         // Add readmore link to description if introtext is shown, show_readmore is true and fulltext exists
         if (!$item->params->get('feed_summary', 0) && $item->params->get('feed_show_readmore', 0) && $item->fulltext) {
diff --git a/components/com_content/src/View/Category/HtmlView.php b/components/com_content/src/View/Category/HtmlView.php
index b735e92b17ca4..1bae9f30d2965 100644
--- a/components/com_content/src/View/Category/HtmlView.php
+++ b/components/com_content/src/View/Category/HtmlView.php
@@ -10,6 +10,10 @@
 
 namespace Joomla\Component\Content\Site\View\Category;
 
+use Joomla\CMS\Event\Content\AfterDisplayEvent;
+use Joomla\CMS\Event\Content\AfterTitleEvent;
+use Joomla\CMS\Event\Content\BeforeDisplayEvent;
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\View\CategoryView;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -93,7 +97,8 @@ public function display($tpl = null)
         $numLinks   = $params->def('num_links', 4);
         $this->vote = PluginHelper::isEnabled('content', 'vote');
 
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         $app     = Factory::getApplication();
 
@@ -113,19 +118,32 @@ public function display($tpl = null)
                 $item->text = $item->introtext;
             }
 
-            $app->triggerEvent('onContentPrepare', ['com_content.category', &$item, &$item->params, 0]);
+            $contentEventArguments = [
+                'context' => 'com_content.category',
+                'subject' => $item,
+                'params'  => $item->params,
+                'page'    => 0,
+            ];
+
+            $dispatcher->dispatch(
+                'onContentPrepare',
+                new ContentPrepareEvent('onContentPrepare', $contentEventArguments)
+            );
 
             // Old plugins: Use processed text as introtext
             $item->introtext = $item->text;
 
-            $results                        = $app->triggerEvent('onContentAfterTitle', ['com_content.category', &$item, &$item->params, 0]);
-            $item->event->afterDisplayTitle = trim(implode("\n", $results));
+            $contentEvents = [
+                'afterDisplayTitle'    => new AfterTitleEvent('onContentAfterTitle', $contentEventArguments),
+                'beforeDisplayContent' => new BeforeDisplayEvent('onContentBeforeDisplay', $contentEventArguments),
+                'afterDisplayContent'  => new AfterDisplayEvent('onContentAfterDisplay', $contentEventArguments),
+            ];
 
-            $results                           = $app->triggerEvent('onContentBeforeDisplay', ['com_content.category', &$item, &$item->params, 0]);
-            $item->event->beforeDisplayContent = trim(implode("\n", $results));
+            foreach ($contentEvents as $resultKey => $event) {
+                $results = $dispatcher->dispatch($event->getName(), $event)->getArgument('result', []);
 
-            $results                          = $app->triggerEvent('onContentAfterDisplay', ['com_content.category', &$item, &$item->params, 0]);
-            $item->event->afterDisplayContent = trim(implode("\n", $results));
+                $item->event->{$resultKey} = trim(implode("\n", $results));
+            }
         }
 
         // For blog layouts, preprocess the breakdown of leading, intro and linked articles.
diff --git a/components/com_content/src/View/Featured/FeedView.php b/components/com_content/src/View/Featured/FeedView.php
index 2e58b28b84541..29672d7ddbba9 100644
--- a/components/com_content/src/View/Featured/FeedView.php
+++ b/components/com_content/src/View/Featured/FeedView.php
@@ -79,8 +79,9 @@ public function display($tpl = null)
                 $description = '<p>' . HTMLHelper::_('image', $obj->image_intro, $obj->image_intro_alt) . '</p>';
             }
 
-            $description .= ($params->get('feed_summary', 0) ? $row->introtext . $row->fulltext : $row->introtext);
-            $author      = $row->created_by_alias ?: $row->author;
+            $description .= $row->params->get('show_intro', 1) ? $row->introtext : '';
+            $description .= $params->get('feed_summary', 0) ? $row->fulltext : '';
+            $author       = $row->created_by_alias ?: $row->author;
 
             // Load individual item creator class
             $item           = new FeedItem();
diff --git a/components/com_content/src/View/Featured/HtmlView.php b/components/com_content/src/View/Featured/HtmlView.php
index 686a1b24a7fed..66ea89e12a144 100644
--- a/components/com_content/src/View/Featured/HtmlView.php
+++ b/components/com_content/src/View/Featured/HtmlView.php
@@ -10,6 +10,10 @@
 
 namespace Joomla\Component\Content\Site\View\Featured;
 
+use Joomla\CMS\Event\Content\AfterDisplayEvent;
+use Joomla\CMS\Event\Content\AfterTitleEvent;
+use Joomla\CMS\Event\Content\BeforeDisplayEvent;
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
@@ -71,17 +75,6 @@ class HtmlView extends BaseHtmlView
      */
     protected $link_items = [];
 
-    /**
-     * @var    \Joomla\Database\DatabaseDriver
-     *
-     * @since  3.6.3
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Will be removed without replacement use database from the container instead
-     *              Example: Factory::getContainer()->get(DatabaseInterface::class);
-     */
-    protected $db;
-
     /**
      * The user object
      *
@@ -141,7 +134,8 @@ public function display($tpl = null)
         $numLeading = (int) $params->def('num_leading_articles', 1);
         $numIntro   = (int) $params->def('num_intro_articles', 4);
 
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         // Compute the article slugs and prepare introtext (runs content plugins).
         foreach ($items as &$item) {
@@ -159,19 +153,32 @@ public function display($tpl = null)
                 $item->text = $item->introtext;
             }
 
-            Factory::getApplication()->triggerEvent('onContentPrepare', ['com_content.featured', &$item, &$item->params, 0]);
+            $contentEventArguments = [
+                'context' => 'com_content.featured',
+                'subject' => $item,
+                'params'  => $item->params,
+                'page'    => 0,
+            ];
+
+            $dispatcher->dispatch(
+                'onContentPrepare',
+                new ContentPrepareEvent('onContentPrepare', $contentEventArguments)
+            );
 
             // Old plugins: Use processed text as introtext
             $item->introtext = $item->text;
 
-            $results                        = Factory::getApplication()->triggerEvent('onContentAfterTitle', ['com_content.featured', &$item, &$item->params, 0]);
-            $item->event->afterDisplayTitle = trim(implode("\n", $results));
+            $contentEvents = [
+                'afterDisplayTitle'    => new AfterTitleEvent('onContentAfterTitle', $contentEventArguments),
+                'beforeDisplayContent' => new BeforeDisplayEvent('onContentBeforeDisplay', $contentEventArguments),
+                'afterDisplayContent'  => new AfterDisplayEvent('onContentAfterDisplay', $contentEventArguments),
+            ];
 
-            $results                           = Factory::getApplication()->triggerEvent('onContentBeforeDisplay', ['com_content.featured', &$item, &$item->params, 0]);
-            $item->event->beforeDisplayContent = trim(implode("\n", $results));
+            foreach ($contentEvents as $resultKey => $event) {
+                $results = $dispatcher->dispatch($event->getName(), $event)->getArgument('result', []);
 
-            $results                          = Factory::getApplication()->triggerEvent('onContentAfterDisplay', ['com_content.featured', &$item, &$item->params, 0]);
-            $item->event->afterDisplayContent = trim(implode("\n", $results));
+                $item->event->{$resultKey} = trim(implode("\n", $results));
+            }
         }
 
         // Preprocess the breakdown of leading, intro and linked articles.
@@ -205,7 +212,6 @@ public function display($tpl = null)
         $this->items      = &$items;
         $this->pagination = &$pagination;
         $this->user       = &$user;
-        $this->db         = Factory::getDbo();
 
         $this->_prepareDocument();
 
diff --git a/components/com_content/src/View/Form/HtmlView.php b/components/com_content/src/View/Form/HtmlView.php
index 558dcafb42214..ef08938725b87 100644
--- a/components/com_content/src/View/Form/HtmlView.php
+++ b/components/com_content/src/View/Form/HtmlView.php
@@ -196,7 +196,7 @@ public function display($tpl = null)
 
         // Add form control fields
         $this->form
-            ->addControlField('task', '')
+            ->addControlField('task')
             ->addControlField('return', $this->return_page ?? '');
 
         $this->_prepareDocument();
diff --git a/components/com_content/tmpl/archive/default.xml b/components/com_content/tmpl/archive/default.xml
index 7e0fb8ececd38..9db86bab73dd4 100644
--- a/components/com_content/tmpl/archive/default.xml
+++ b/components/com_content/tmpl/archive/default.xml
@@ -19,9 +19,9 @@
 				extension="com_content"
 				multiple="true"
 				layout="joomla.form.field.list-fancy-select"
-				default=" "
+				default=""
 				>
-				<option value=" ">JOPTION_ALL_CATEGORIES</option>
+				<option value="">JOPTION_ALL_CATEGORIES</option>
 			</field>
 		</fieldset>
 	</fields>
diff --git a/components/com_content/tmpl/article/default_links.php b/components/com_content/tmpl/article/default_links.php
index 47ae3dcd21fac..746d43a877f49 100644
--- a/components/com_content/tmpl/article/default_links.php
+++ b/components/com_content/tmpl/article/default_links.php
@@ -10,7 +10,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = $this->getDocument()->getWebAssetManager();
 
 /** @var \Joomla\Component\Content\Site\View\Article\HtmlView $this */
 // Create shortcut
@@ -62,22 +63,13 @@
                             htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . '</a>';
                         break;
                     case 3:
-                        echo '<a href="' . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '" rel="noopener noreferrer" data-bs-toggle="modal" data-bs-target="#linkModal">' .
+                        $wa->useScript('joomla.dialog-autocreate');
+                        $popupOptions = ['textHeader' => $label, 'className' => 'dialog-content-link', 'width' => '800px', 'height' => '500px', 'preferredParent' => 'body'];
+
+                        echo '<a href="' . htmlspecialchars($link, ENT_COMPAT, 'UTF-8') . '" rel="noopener noreferrer"'
+                            . ' data-joomla-dialog="' . htmlspecialchars(json_encode($popupOptions, JSON_UNESCAPED_SLASHES), ENT_COMPAT, 'UTF-8') . '">' .
                             htmlspecialchars($label, ENT_COMPAT, 'UTF-8') . ' </a>';
-                        echo HTMLHelper::_(
-                            'bootstrap.renderModal',
-                            'linkModal',
-                            [
-                                'url'    => $link,
-                                'title'  => $label,
-                                'height' => '100%',
-                                'width'  => '100%',
-                                'modalWidth'  => '500',
-                                'bodyHeight'  => '500',
-                                'footer' => '<button type="button" class="btn btn-secondary" data-bs-dismiss="modal" aria-hidden="true">'
-                                    . \Joomla\CMS\Language\Text::_('JLIB_HTML_BEHAVIOR_CLOSE') . '</button>'
-                            ]
-                        );
+
                         break;
 
                     default:
diff --git a/components/com_content/tmpl/category/blog.php b/components/com_content/tmpl/category/blog.php
index 14904fab846d8..aeb5dbaedbae5 100644
--- a/components/com_content/tmpl/category/blog.php
+++ b/components/com_content/tmpl/category/blog.php
@@ -10,26 +10,52 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Event\Content\AfterDisplayEvent;
+use Joomla\CMS\Event\Content\AfterTitleEvent;
+use Joomla\CMS\Event\Content\BeforeDisplayEvent;
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
 use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\Event\DispatcherInterface;
 
-$app = Factory::getApplication();
+$dispatcher = Factory::getContainer()->get(DispatcherInterface::class);
 
 /** @var \Joomla\Component\Content\Site\View\Category\HtmlView $this */
 $this->category->text = $this->category->description;
-$app->triggerEvent('onContentPrepare', [$this->category->extension . '.categories', &$this->category, &$this->params, 0]);
+
+$contentEventArguments = [
+    'context' => $this->category->extension . '.categories',
+    'subject' => $this->category,
+    'params'  => $this->params,
+    'page'    => 0,
+];
+
+$dispatcher->dispatch('onContentPrepare', new ContentPrepareEvent('onContentPrepare', $contentEventArguments));
+
 $this->category->description = $this->category->text;
 
-$results = $app->triggerEvent('onContentAfterTitle', [$this->category->extension . '.categories', &$this->category, &$this->params, 0]);
+$results = $dispatcher->dispatch(
+    'onContentAfterTitle',
+    new AfterTitleEvent('onContentAfterTitle', $contentEventArguments)
+)->getArgument('result', []);
+
 $afterDisplayTitle = trim(implode("\n", $results));
 
-$results = $app->triggerEvent('onContentBeforeDisplay', [$this->category->extension . '.categories', &$this->category, &$this->params, 0]);
+$results = $dispatcher->dispatch(
+    'onContentBeforeDisplay',
+    new BeforeDisplayEvent('onContentBeforeDisplay', $contentEventArguments)
+)->getArgument('result', []);
+
 $beforeDisplayContent = trim(implode("\n", $results));
 
-$results = $app->triggerEvent('onContentAfterDisplay', [$this->category->extension . '.categories', &$this->category, &$this->params, 0]);
+$results = $dispatcher->dispatch(
+    'onContentAfterDisplay',
+    new AfterDisplayEvent('onContentAfterDisplay', $contentEventArguments)
+)->getArgument('result', []);
+
 $afterDisplayContent = trim(implode("\n", $results));
 
 $htag    = $this->params->get('show_page_heading') ? 'h2' : 'h1';
diff --git a/components/com_content/tmpl/category/blog.xml b/components/com_content/tmpl/category/blog.xml
index e369680ca62c8..c0d6031985a0c 100644
--- a/components/com_content/tmpl/category/blog.xml
+++ b/components/com_content/tmpl/category/blog.xml
@@ -171,7 +171,9 @@
 
 		</fieldset>
 
-		<fieldset name="advanced" label="JGLOBAL_BLOG_LAYOUT_OPTIONS" description="JGLOBAL_SUBSLIDER_BLOG_LAYOUT_LABEL">
+		<fieldset name="advanced" label="JGLOBAL_BLOG_LAYOUT_OPTIONS" description="JGLOBAL_SUBSLIDER_BLOG_LAYOUT_LABEL"
+			addfieldprefix="Joomla\Component\Content\Administrator\Field"
+		>
 
 			<field
 				name="num_leading_articles"
@@ -263,6 +265,29 @@
 				<option value="only">JONLY</option>
 			</field>
 
+			<field
+				name="list_author_filtering_type"
+				type="list"
+				label="COM_CONTENT_FIELD_AUTHORFILTERING_LABEL"
+				default="1"
+				filter="integer"
+				>
+				<option value="0">COM_CONTENT_OPTION_EXCLUSIVE_VALUE</option>
+				<option value="1">COM_CONTENT_OPTION_INCLUSIVE_VALUE</option>
+				<option value="2">COM_CONTENT_OPTION_ONLYCURRENTUSER_VALUE</option>
+			</field>
+
+			<field
+				name="list_author"
+				type="author"
+				label="COM_CONTENT_FIELD_AUTHOR_LABEL"
+				multiple="true"
+				layout="joomla.form.field.list-fancy-select"
+				filter="intarray"
+				class="multipleAuthors"
+				showon="list_author_filtering_type!:2"
+			/>
+
 			<field
 				name="link_intro_image"
 				type="list"
diff --git a/components/com_content/tmpl/category/default.xml b/components/com_content/tmpl/category/default.xml
index 44289ebd558bb..ff210b53a8dc6 100644
--- a/components/com_content/tmpl/category/default.xml
+++ b/components/com_content/tmpl/category/default.xml
@@ -141,6 +141,18 @@
 				<option value="1">JSHOW</option>
 			</field>
 
+			<field
+				name="show_subcat_image"
+				type="list"
+				label="JGLOBAL_SHOW_SUBCATEGORIES_IMAGE_LABEL"
+				useglobal="true"
+				class="form-select-color-state"
+				default="0"
+				>
+				<option value="0">JHIDE</option>
+				<option value="1">JSHOW</option>
+			</field>
+
 			<field
 				name="show_cat_num_articles"
 				type="list"
@@ -197,6 +209,29 @@
 				<option value="month">JMONTH_PUBLISHED</option>
 			</field>
 
+			<field
+				name="list_author_filtering_type"
+				type="list"
+				label="COM_CONTENT_FIELD_AUTHORFILTERING_LABEL"
+				default="1"
+				filter="integer"
+				>
+				<option value="0">COM_CONTENT_OPTION_EXCLUSIVE_VALUE</option>
+				<option value="1">COM_CONTENT_OPTION_INCLUSIVE_VALUE</option>
+				<option value="2">COM_CONTENT_OPTION_ONLYCURRENTUSER_VALUE</option>
+			</field>
+
+			<field
+				name="list_author"
+				type="author"
+				label="COM_CONTENT_FIELD_AUTHOR_LABEL"
+				multiple="true"
+				layout="joomla.form.field.list-fancy-select"
+				filter="intarray"
+				class="multipleAuthors"
+				showon="list_author_filtering_type!:2"
+			/>
+
 			<field
 				name="show_headings"
 				type="list"
diff --git a/components/com_content/tmpl/category/default_children.php b/components/com_content/tmpl/category/default_children.php
index cd39ed88c6079..8077f94cf65c6 100644
--- a/components/com_content/tmpl/category/default_children.php
+++ b/components/com_content/tmpl/category/default_children.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 
@@ -25,6 +26,7 @@
     <?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
         <?php // Check whether category access level allows access to subcategories. ?>
         <?php if (in_array($child->access, $groups)) : ?>
+            <?php $childParams = new \Joomla\Registry\Registry($child->params); ?>
             <?php if ($this->params->get('show_empty_categories') || $child->getNumItems(true) || count($child->getChildren())) : ?>
             <div class="com-content-category__children">
                 <?php if ($lang->isRtl()) : ?>
@@ -55,6 +57,15 @@
                     <?php endif; ?>
                 </h3>
                 <?php endif; ?>
+                <?php if ($this->params->get('show_subcat_image') && $childParams->get('image')) : ?>
+                    <?php echo LayoutHelper::render(
+                        'joomla.html.image',
+                        [
+                            'src' => $childParams->get('image'),
+                            'alt' => $childParams->get('image_alt', false),
+                        ]
+                    ); ?>
+                <?php endif; ?>
                 <?php if ($this->params->get('show_subcat_desc') == 1) : ?>
                     <?php if ($child->description) : ?>
                         <div class="category-desc">
diff --git a/components/com_content/tmpl/featured/default.xml b/components/com_content/tmpl/featured/default.xml
index c102644d7517d..638ff14a591e9 100644
--- a/components/com_content/tmpl/featured/default.xml
+++ b/components/com_content/tmpl/featured/default.xml
@@ -19,10 +19,10 @@
 				extension="com_content"
 				multiple="true"
 				layout="joomla.form.field.list-fancy-select"
-				default=" "
+				default=""
 				parentclass="stack span-3"
 				>
-				<option value=" ">JOPTION_ALL_CATEGORIES</option>
+				<option value="">JOPTION_ALL_CATEGORIES</option>
 			</field>
 
 			<field
diff --git a/components/com_content/tmpl/form/edit.php b/components/com_content/tmpl/form/edit.php
index 712e85befb321..241ba38d9284b 100644
--- a/components/com_content/tmpl/form/edit.php
+++ b/components/com_content/tmpl/form/edit.php
@@ -12,7 +12,6 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
@@ -52,9 +51,8 @@
             <?php echo HTMLHelper::_('uitab.addTab', $this->tab_name, 'editor', Text::_('COM_CONTENT_ARTICLE_CONTENT')); ?>
                 <?php echo $this->form->renderField('title'); ?>
 
-                <?php if (is_null($this->item->id)) : ?>
-                    <?php echo $this->form->renderField('alias'); ?>
-                <?php endif; ?>
+                <?php echo $this->form->renderField('alias'); ?>
+
 
                 <?php echo $this->form->renderField('articletext'); ?>
 
@@ -68,13 +66,15 @@
                 <?php echo $this->form->renderField('image_intro', 'images'); ?>
                 <?php echo $this->form->renderField('image_intro_alt', 'images'); ?>
                 <?php echo $this->form->renderField('image_intro_alt_empty', 'images'); ?>
-                <?php echo $this->form->renderField('image_intro_caption', 'images'); ?>
+                <?php echo $this->form->renderField('imgclass_intro', 'images'); ?>
                 <?php echo $this->form->renderField('float_intro', 'images'); ?>
+                <?php echo $this->form->renderField('image_intro_caption', 'images'); ?>
                 <?php echo $this->form->renderField('image_fulltext', 'images'); ?>
                 <?php echo $this->form->renderField('image_fulltext_alt', 'images'); ?>
                 <?php echo $this->form->renderField('image_fulltext_alt_empty', 'images'); ?>
+                <?php echo $this->form->renderField('imgclass_fulltext', 'images'); ?> 
+                <?php echo $this->form->renderField('float_fulltext', 'images'); ?>  
                 <?php echo $this->form->renderField('image_fulltext_caption', 'images'); ?>
-                <?php echo $this->form->renderField('float_fulltext', 'images'); ?>
                 <?php echo $this->form->renderField('urla', 'urls'); ?>
                 <?php echo $this->form->renderField('urlatext', 'urls'); ?>
                 <div class="control-group">
@@ -101,54 +101,46 @@
 
             <?php echo LayoutHelper::render('joomla.edit.params', $this); ?>
 
-            <?php echo HTMLHelper::_('uitab.addTab', $this->tab_name, 'publishing', Text::_('COM_CONTENT_PUBLISHING')); ?>
-
+            <?php echo HTMLHelper::_('uitab.addTab', $this->tab_name, 'options', Text::_('JOPTIONS')); ?>
                 <?php echo $this->form->renderField('transition'); ?>
-                <?php echo $this->form->renderField('state'); ?>
-                <?php echo $this->form->renderField('catid'); ?>
-                <?php echo $this->form->renderField('tags'); ?>
-                <?php echo $this->form->renderField('note'); ?>
-                <?php if ($params->get('save_history', 0)) : ?>
-                    <?php echo $this->form->renderField('version_note'); ?>
-                <?php endif; ?>
-                <?php if ($params->get('show_publishing_options', 1) == 1) : ?>
-                    <?php echo $this->form->renderField('created_by_alias'); ?>
-                <?php endif; ?>
-                <?php if ($this->item->params->get('access-change')) : ?>
-                    <?php echo $this->form->renderField('featured'); ?>
-                    <?php if ($params->get('show_publishing_options', 1) == 1) : ?>
-                        <?php echo $this->form->renderField('featured_up'); ?>
-                        <?php echo $this->form->renderField('featured_down'); ?>
-                        <?php echo $this->form->renderField('publish_up'); ?>
-                        <?php echo $this->form->renderField('publish_down'); ?>
+                    <?php echo $this->form->renderField('state'); ?>
+                    <?php echo $this->form->renderField('catid'); ?>
+                    <?php if ($this->item->params->get('access-change')) : ?>
+                        <?php echo $this->form->renderField('featured'); ?>
                     <?php endif; ?>
-                <?php endif; ?>
-                <?php echo $this->form->renderField('access'); ?>
-                <?php if (is_null($this->item->id)) : ?>
-                    <div class="control-group">
-                        <div class="control-label">
-                        </div>
-                        <div class="controls">
-                            <?php echo Text::_('COM_CONTENT_ORDERING'); ?>
-                        </div>
-                    </div>
-                <?php endif; ?>
-            <?php echo HTMLHelper::_('uitab.endTab'); ?>
-
-            <?php if (Multilanguage::isEnabled()) : ?>
-                <?php echo HTMLHelper::_('uitab.addTab', $this->tab_name, 'language', Text::_('JFIELD_LANGUAGE_LABEL')); ?>
+                    <?php echo $this->form->renderField('access'); ?>
                     <?php echo $this->form->renderField('language'); ?>
+                    <?php echo $this->form->renderField('tags'); ?>
+                    <?php echo $this->form->renderField('note'); ?>
+                    <?php if ($params->get('save_history', 0)) : ?>
+                        <?php echo $this->form->renderField('version_note'); ?>
+                    <?php endif; ?>
+                    <?php if (is_null($this->item->id)) : ?>
+                        <div class="control-group">
+                            <div class="controls">
+                                <?php echo Text::_('COM_CONTENT_ORDERING'); ?>
+                            </div>
+                        </div>
+                    <?php endif; ?>
                 <?php echo HTMLHelper::_('uitab.endTab'); ?>
-            <?php else : ?>
-                <?php echo $this->form->renderField('language'); ?>
-            <?php endif; ?>
 
-            <?php if ($params->get('show_publishing_options', 1) == 1) : ?>
-                <?php echo HTMLHelper::_('uitab.addTab', $this->tab_name, 'metadata', Text::_('COM_CONTENT_METADATA')); ?>
-                    <?php echo $this->form->renderField('metadesc'); ?>
-                    <?php echo $this->form->renderField('metakey'); ?>
-                <?php echo HTMLHelper::_('uitab.endTab'); ?>
-            <?php endif; ?>
+                <?php if ($params->get('show_publishing_options', 1) == 1) : ?>
+                    <?php echo HTMLHelper::_('uitab.addTab', $this->tab_name, 'publishing', Text::_('COM_CONTENT_PUBLISHING')); ?>
+                        <?php if ($this->item->params->get('access-change')) : ?>
+                            <?php echo $this->form->renderField('publish_up'); ?>
+                            <?php echo $this->form->renderField('publish_down'); ?>
+                            <?php echo $this->form->renderField('featured_up'); ?>
+                            <?php echo $this->form->renderField('featured_down'); ?>
+                        <?php endif; ?>
+                        <?php echo $this->form->renderField('created_by_alias'); ?>
+
+                        <fieldset id="fieldset-metadata" class="options-form">
+                            <legend><?php echo Text::_('COM_CONTENT_METADATA'); ?></legend>
+                            <?php echo $this->form->renderField('metadesc'); ?>
+                            <?php echo $this->form->renderField('metakey'); ?>
+                        </fieldset>
+                    <?php echo HTMLHelper::_('uitab.endTab'); ?>
+                <?php endif; ?>
 
             <?php echo HTMLHelper::_('uitab.endTabSet'); ?>
 
diff --git a/components/com_contenthistory/src/Controller/DisplayController.php b/components/com_contenthistory/src/Controller/DisplayController.php
index dc1e329c3d60f..b3a6751a61b38 100644
--- a/components/com_contenthistory/src/Controller/DisplayController.php
+++ b/components/com_contenthistory/src/Controller/DisplayController.php
@@ -11,9 +11,9 @@
 namespace Joomla\Component\Contenthistory\Site\Controller;
 
 use Joomla\CMS\Application\CMSApplication;
-use Joomla\CMS\Input\Input;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/components/com_fields/src/Controller/DisplayController.php b/components/com_fields/src/Controller/DisplayController.php
index bd1db65e71c21..6c8bcd62ed6df 100644
--- a/components/com_fields/src/Controller/DisplayController.php
+++ b/components/com_fields/src/Controller/DisplayController.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -25,12 +26,12 @@
 class DisplayController extends \Joomla\CMS\MVC\Controller\BaseController
 {
     /**
-     * @param   array                     $config   An optional associative array of configuration settings.
-     *                                              Recognized key values include 'name', 'default_task', 'model_path', and
-     *                                              'view_path' (this list is not meant to be comprehensive).
-     * @param   ?MVCFactoryInterface      $factory  The factory.
-     * @param   ?CMSApplication           $app      The Application for the dispatcher
-     * @param   ?\Joomla\CMS\Input\Input  $input    The request's input object
+     * @param   array                 $config   An optional associative array of configuration settings.
+     *                                          Recognized key values include 'name', 'default_task', 'model_path', and
+     *                                          'view_path' (this list is not meant to be comprehensive).
+     * @param   ?MVCFactoryInterface  $factory  The factory.
+     * @param   ?CMSApplication       $app      The Application for the dispatcher
+     * @param   ?Input                $input    The request's input object
      *
      * @since   3.7.0
      */
diff --git a/components/com_finder/helpers/route.php b/components/com_finder/helpers/route.php
index f024fe098f51a..80110198b3cfe 100644
--- a/components/com_finder/helpers/route.php
+++ b/components/com_finder/helpers/route.php
@@ -21,7 +21,7 @@
  *
  * @since  2.5
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Finder\Site\Helper\RouteHelper instead
  */
 class FinderHelperRoute extends RouteHelper
diff --git a/components/com_finder/src/Helper/FinderHelper.php b/components/com_finder/src/Helper/FinderHelper.php
index 70a42092bef6f..fbc9a72a28eae 100644
--- a/components/com_finder/src/Helper/FinderHelper.php
+++ b/components/com_finder/src/Helper/FinderHelper.php
@@ -48,7 +48,7 @@ public static function logSearch(Query $searchquery, $resultCount = 0)
 
         // Initialise our variables
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Sanitise the term for the database
         $temp              = new \stdClass();
diff --git a/components/com_finder/src/Model/SearchModel.php b/components/com_finder/src/Model/SearchModel.php
index 13a399e402767..f1b2e20ae8af3 100644
--- a/components/com_finder/src/Model/SearchModel.php
+++ b/components/com_finder/src/Model/SearchModel.php
@@ -155,7 +155,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
@@ -302,7 +302,7 @@ protected function getListQuery()
 
         // Check if there are any excluded terms to deal with.
         if (\count($this->excludedTerms)) {
-            $query2 = $db->getQuery(true);
+            $query2 = $db->createQuery();
             $query2->select('e.link_id')
                 ->from($db->quoteName('#__finder_links_terms', 'e'))
                 ->where('e.term_id IN (' . implode(',', $this->excludedTerms) . ')');
diff --git a/components/com_finder/src/Model/SuggestionsModel.php b/components/com_finder/src/Model/SuggestionsModel.php
index d3a9e5d65e1ed..894364600b8f1 100644
--- a/components/com_finder/src/Model/SuggestionsModel.php
+++ b/components/com_finder/src/Model/SuggestionsModel.php
@@ -73,9 +73,9 @@ protected function getListQuery()
 
         // Create a new query object.
         $db          = $this->getDatabase();
-        $termIdQuery = $db->getQuery(true);
-        $termQuery   = $db->getQuery(true);
-        $aQuery      = $db->getQuery(true);
+        $termIdQuery = $db->createQuery();
+        $termQuery   = $db->createQuery();
+        $aQuery      = $db->createQuery();
 
         // Limit term count to a reasonable number of results to reduce main query join size
         $termIdQuery->select('ti.term_id')
diff --git a/components/com_modules/src/Controller/DisplayController.php b/components/com_modules/src/Controller/DisplayController.php
index 895b33effdad7..1278a40b95a34 100644
--- a/components/com_modules/src/Controller/DisplayController.php
+++ b/components/com_modules/src/Controller/DisplayController.php
@@ -12,9 +12,9 @@
 
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Input\Input;
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
diff --git a/components/com_newsfeeds/helpers/route.php b/components/com_newsfeeds/helpers/route.php
index d550ba9032ffc..27870d1c959ea 100644
--- a/components/com_newsfeeds/helpers/route.php
+++ b/components/com_newsfeeds/helpers/route.php
@@ -21,7 +21,7 @@
  *
  * @since  1.5
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use Joomla\Component\Newsfeeds\Site\Helper\RouteHelper instead
  */
 abstract class NewsfeedsHelperRoute extends RouteHelper
diff --git a/components/com_newsfeeds/src/Helper/RouteHelper.php b/components/com_newsfeeds/src/Helper/RouteHelper.php
index e236310299e68..7434578ef14ad 100644
--- a/components/com_newsfeeds/src/Helper/RouteHelper.php
+++ b/components/com_newsfeeds/src/Helper/RouteHelper.php
@@ -27,13 +27,13 @@ abstract class RouteHelper
     /**
      * getNewsfeedRoute
      *
-     * @param   int  $id        menu itemid
-     * @param   int  $catid     category id
-     * @param   int  $language  language
+     * @param   int     $id        menu itemid
+     * @param   int     $catid     category id
+     * @param   string  $language  language
      *
      * @return string
      */
-    public static function getNewsfeedRoute($id, $catid, $language = 0)
+    public static function getNewsfeedRoute($id, $catid, $language = null)
     {
         // Create the link
         $link = 'index.php?option=com_newsfeeds&view=newsfeed&id=' . $id;
@@ -42,7 +42,7 @@ public static function getNewsfeedRoute($id, $catid, $language = 0)
             $link .= '&catid=' . $catid;
         }
 
-        if ($language && $language !== '*' && Multilanguage::isEnabled()) {
+        if (!empty($language) && $language !== '*' && Multilanguage::isEnabled()) {
             $link .= '&lang=' . $language;
         }
 
@@ -52,12 +52,12 @@ public static function getNewsfeedRoute($id, $catid, $language = 0)
     /**
      * getCategoryRoute
      *
-     * @param   int  $catid     category id
-     * @param   int  $language  language
+     * @param   int     $catid     category id
+     * @param   string  $language  language
      *
      * @return string
      */
-    public static function getCategoryRoute($catid, $language = 0)
+    public static function getCategoryRoute($catid, $language = null)
     {
         if ($catid instanceof CategoryNode) {
             $id = $catid->id;
@@ -71,7 +71,7 @@ public static function getCategoryRoute($catid, $language = 0)
             // Create the link
             $link = 'index.php?option=com_newsfeeds&view=category&id=' . $id;
 
-            if ($language && $language !== '*' && Multilanguage::isEnabled()) {
+            if (!empty($language) && $language !== '*' && Multilanguage::isEnabled()) {
                 $link .= '&lang=' . $language;
             }
         }
diff --git a/components/com_newsfeeds/src/Model/CategoryModel.php b/components/com_newsfeeds/src/Model/CategoryModel.php
index 28e61e8766087..2e4ac20f0a444 100644
--- a/components/com_newsfeeds/src/Model/CategoryModel.php
+++ b/components/com_newsfeeds/src/Model/CategoryModel.php
@@ -17,7 +17,7 @@
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Category;
 use Joomla\Database\ParameterType;
 use Joomla\Database\QueryInterface;
 use Joomla\Registry\Registry;
@@ -159,7 +159,7 @@ protected function getListQuery()
         // Create a new query object.
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select required fields from the categories.
         $query->select($this->getState('list.select', $db->quoteName('a') . '.*'))
@@ -404,7 +404,7 @@ public function hit($pk = 0)
 
         if ($hitcount) {
             $pk    = (!empty($pk)) ? $pk : (int) $this->getState('category.id');
-            $table = Table::getInstance('Category', '\\Joomla\\CMS\\Table\\');
+            $table = new Category($this->getDatabase());
             $table->hit($pk);
         }
 
diff --git a/components/com_newsfeeds/src/Model/NewsfeedModel.php b/components/com_newsfeeds/src/Model/NewsfeedModel.php
index ddfc24600dc5b..7e97fb84c84b1 100644
--- a/components/com_newsfeeds/src/Model/NewsfeedModel.php
+++ b/components/com_newsfeeds/src/Model/NewsfeedModel.php
@@ -87,7 +87,7 @@ public function &getItem($pk = null)
         if (!isset($this->_item[$pk])) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select(
                         [
                             $this->getState('item.select', $db->quoteName('a') . '.*'),
diff --git a/components/com_newsfeeds/src/Service/Category.php b/components/com_newsfeeds/src/Service/Category.php
index b67213226e26e..4f8177c5a7546 100644
--- a/components/com_newsfeeds/src/Service/Category.php
+++ b/components/com_newsfeeds/src/Service/Category.php
@@ -30,9 +30,11 @@ class Category extends Categories
      */
     public function __construct($options = [])
     {
-        $options['table']      = '#__newsfeeds';
-        $options['extension']  = 'com_newsfeeds';
-        $options['statefield'] = 'published';
+        $options['table']       = '#__newsfeeds';
+        $options['extension']   = 'com_newsfeeds';
+        $options['accessfield'] = 'access';
+        $options['statefield']  = 'published';
+
         parent::__construct($options);
     }
 }
diff --git a/components/com_newsfeeds/src/Service/Router.php b/components/com_newsfeeds/src/Service/Router.php
index 179a55b82e760..1cc90077c2801 100644
--- a/components/com_newsfeeds/src/Service/Router.php
+++ b/components/com_newsfeeds/src/Service/Router.php
@@ -234,7 +234,7 @@ public function getCategoriesId($segment, $query)
     public function getNewsfeedId($segment, $query)
     {
         if ($this->noIDs) {
-            $dbquery = $this->db->getQuery(true);
+            $dbquery = $this->db->createQuery();
             $dbquery->select($this->db->quoteName('id'))
                 ->from($this->db->quoteName('#__newsfeeds'))
                 ->where($this->db->quoteName('alias') . ' = :segment')
@@ -260,7 +260,7 @@ public function getNewsfeedId($segment, $query)
         $id = (int) $segment;
 
         if ($id) {
-            $dbquery = $this->db->getQuery(true);
+            $dbquery = $this->db->createQuery();
             $dbquery->select($this->db->quoteName('alias'))
                 ->from($this->db->quoteName('#__newsfeeds'))
                 ->where($this->db->quoteName('id') . ' = :id')
diff --git a/components/com_privacy/src/Model/ConfirmModel.php b/components/com_privacy/src/Model/ConfirmModel.php
index 3b911bff39e43..61c2acf3e53e9 100644
--- a/components/com_privacy/src/Model/ConfirmModel.php
+++ b/components/com_privacy/src/Model/ConfirmModel.php
@@ -162,19 +162,16 @@ public function confirmRequest($data)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   3.9.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
         // Get the form.
         $form = $this->loadForm('com_privacy.confirm', 'confirm', ['control' => 'jform']);
 
-        if (empty($form)) {
-            return false;
-        }
-
         $input = Factory::getApplication()->getInput();
 
         if ($input->getMethod() === 'GET') {
diff --git a/components/com_privacy/src/Model/RemindModel.php b/components/com_privacy/src/Model/RemindModel.php
index 5df7813986413..a95cd380ab754 100644
--- a/components/com_privacy/src/Model/RemindModel.php
+++ b/components/com_privacy/src/Model/RemindModel.php
@@ -70,7 +70,7 @@ public function remindRequest($data)
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['r.id', 'r.user_id', 'r.token']));
         $query->from($db->quoteName('#__privacy_consents', 'r'));
         $query->join(
@@ -128,19 +128,16 @@ public function remindRequest($data)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   3.9.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
         // Get the form.
         $form = $this->loadForm('com_privacy.remind', 'remind', ['control' => 'jform']);
 
-        if (empty($form)) {
-            return false;
-        }
-
         $input = Factory::getApplication()->getInput();
 
         if ($input->getMethod() === 'GET') {
diff --git a/components/com_privacy/src/Model/RequestModel.php b/components/com_privacy/src/Model/RequestModel.php
index 3543158a30eae..66afea3483368 100644
--- a/components/com_privacy/src/Model/RequestModel.php
+++ b/components/com_privacy/src/Model/RequestModel.php
@@ -13,8 +13,12 @@
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Router\Route;
@@ -36,8 +40,11 @@
  *
  * @since  3.9.0
  */
-class RequestModel extends AdminModel
+class RequestModel extends AdminModel implements MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
+
     /**
      * Creates an information request.
      *
@@ -89,7 +96,7 @@ public function createRequest($data)
 
         // Search for an open information request matching the email and type
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(id)')
             ->from($db->quoteName('#__privacy_requests'))
             ->where($db->quoteName('email') . ' = :email')
@@ -148,12 +155,22 @@ public function createRequest($data)
 
             switch ($data['request_type']) {
                 case 'export':
-                    $mailer = new MailTemplate('com_privacy.notification.export', $app->getLanguage()->getTag());
+                    $mailer = new MailTemplate(
+                        'com_privacy.notification.export',
+                        $app->getLanguage()->getTag(),
+                        $this->getMailerFactory()->createMailer(),
+                        $this->getLanguageFactory()
+                    );
 
                     break;
 
                 case 'remove':
-                    $mailer = new MailTemplate('com_privacy.notification.remove', $app->getLanguage()->getTag());
+                    $mailer = new MailTemplate(
+                        'com_privacy.notification.remove',
+                        $app->getLanguage()->getTag(),
+                        $this->getMailerFactory()->createMailer(),
+                        $this->getLanguageFactory()
+                    );
 
                     break;
 
@@ -203,9 +220,10 @@ public function createRequest($data)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|boolean  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   3.9.0
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
diff --git a/components/com_privacy/tmpl/confirm/default.php b/components/com_privacy/tmpl/confirm/default.php
index ce3c30a299411..efb2afce1f6e4 100644
--- a/components/com_privacy/tmpl/confirm/default.php
+++ b/components/com_privacy/tmpl/confirm/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -46,6 +45,7 @@
                 </button>
             </div>
         </div>
-        <?php echo HTMLHelper::_('form.token'); ?>
+
+        <?php echo $this->form->renderControlFields(); ?>
     </form>
 </div>
diff --git a/components/com_privacy/tmpl/remind/default.php b/components/com_privacy/tmpl/remind/default.php
index bfec2924c1639..6155c3c13cccb 100644
--- a/components/com_privacy/tmpl/remind/default.php
+++ b/components/com_privacy/tmpl/remind/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -46,6 +45,6 @@
                 </button>
             </div>
         </div>
-        <?php echo HTMLHelper::_('form.token'); ?>
+        <?php echo $this->form->renderControlFields(); ?>
     </form>
 </div>
diff --git a/components/com_privacy/tmpl/request/default.php b/components/com_privacy/tmpl/request/default.php
index c40ca0808eecb..1c5e10371955d 100644
--- a/components/com_privacy/tmpl/request/default.php
+++ b/components/com_privacy/tmpl/request/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -47,7 +46,7 @@
                     </button>
                 </div>
             </div>
-            <?php echo HTMLHelper::_('form.token'); ?>
+            <?php echo $this->form->renderControlFields(); ?>
         </form>
     <?php else : ?>
         <div class="alert alert-warning">
diff --git a/components/com_tags/helpers/route.php b/components/com_tags/helpers/route.php
index add993490d0f9..26ce8cffa5d12 100644
--- a/components/com_tags/helpers/route.php
+++ b/components/com_tags/helpers/route.php
@@ -21,7 +21,7 @@
  *
  * @since  3.1
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use \Joomla\Component\Tags\Site\Helper\RouteHelper instead
  */
 class TagsHelperRoute extends RouteHelper
diff --git a/components/com_tags/src/Helper/RouteHelper.php b/components/com_tags/src/Helper/RouteHelper.php
index 395f6765f76e8..224b2ec080003 100644
--- a/components/com_tags/src/Helper/RouteHelper.php
+++ b/components/com_tags/src/Helper/RouteHelper.php
@@ -86,7 +86,7 @@ public static function getItemRoute($contentItemId, $contentItemAlias, $contentC
      * @since      3.1
      * @throws     \Exception
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use RouteHelper::getComponentTagRoute() instead
      */
     public static function getTagRoute($id)
@@ -141,7 +141,7 @@ public static function getComponentTagRoute(string $id, string $language = '*'):
      * @since      3.7
      * @throws     \Exception
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use RouteHelper::getComponentTagsRoute() instead
      *
      */
diff --git a/components/com_tags/src/Model/TagModel.php b/components/com_tags/src/Model/TagModel.php
index 751bdf1562374..8fe1181846741 100644
--- a/components/com_tags/src/Model/TagModel.php
+++ b/components/com_tags/src/Model/TagModel.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Component\Tags\Site\Helper\RouteHelper;
 use Joomla\Database\QueryInterface;
 use Joomla\Utilities\ArrayHelper;
@@ -261,7 +260,7 @@ protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
      *
      * @param   integer  $pk  An optional ID
      *
-     * @return  array
+     * @return  \stdClass|false
      *
      * @since   3.1
      */
@@ -294,9 +293,9 @@ public function getItem($pk = null)
                         continue;
                     }
 
-                    // Convert the Table to a clean CMSObject.
+                    // Convert the Table to a clean object.
                     $properties   = $table->getProperties(1);
-                    $this->item[] = ArrayHelper::toObject($properties, CMSObject::class);
+                    $this->item[] = ArrayHelper::toObject($properties);
                 } catch (\RuntimeException $e) {
                     $this->setError($e->getMessage());
 
diff --git a/components/com_tags/src/Model/TagsModel.php b/components/com_tags/src/Model/TagsModel.php
index 60e81d16a6e53..97b2dc1b51d81 100644
--- a/components/com_tags/src/Model/TagsModel.php
+++ b/components/com_tags/src/Model/TagsModel.php
@@ -103,7 +103,7 @@ protected function getListQuery()
 
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select required fields from the tags.
         $query->select('a.*, u.name as created_by_user_name, u.email')
diff --git a/components/com_tags/src/Service/Router.php b/components/com_tags/src/Service/Router.php
index 4a89504ced9b0..45af977b8af2c 100644
--- a/components/com_tags/src/Service/Router.php
+++ b/components/com_tags/src/Service/Router.php
@@ -55,7 +55,7 @@ class Router extends RouterBase
      *
      * @var   Registry
      * @since 5.2.0
-     * @deprecated  5.2.0 will be removed in 6.0
+     * @deprecated  5.2.0 will be removed in 7.0
      *              without replacement
      */
     private $sefparams;
@@ -107,7 +107,7 @@ public function preprocess($query)
 
             foreach ($query['id'] as &$item) {
                 if (!strpos($item, ':')) {
-                    $dbquery = $this->db->getQuery(true);
+                    $dbquery = $this->db->createQuery();
                     $id      = (int) $item;
 
                     $dbquery->select($dbquery->quoteName('alias'))
@@ -187,7 +187,7 @@ public function preprocess($query)
             }
         }
 
-        // TODO: Remove this whole block in 6.0 as it is a bug
+        // TODO: Remove this whole block in 7.0 as it is a bug
         if (!$this->sefparams->get('strictrouting', 0)) {
             // If not found, return language specific home link
             if (!isset($query['Itemid'])) {
@@ -401,7 +401,7 @@ protected function buildLookup()
                         continue;
                     }
 
-                    $query = $this->db->getQuery(true);
+                    $query = $this->db->createQuery();
                     $query->select($this->db->quoteName('a.id'))
                         ->from($this->db->quoteName('#__tags', 'a'))
                         ->leftJoin(
@@ -436,7 +436,7 @@ protected function fixSegment($segment)
         // Try to find tag id
         $alias = str_replace(':', '-', $segment);
 
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('id'))
             ->from($this->db->quoteName('#__tags'))
             ->where($this->db->quoteName('alias') . ' = :alias')
diff --git a/components/com_tags/src/View/Tag/HtmlView.php b/components/com_tags/src/View/Tag/HtmlView.php
index eb26c247956f9..6d77e48cbdb27 100644
--- a/components/com_tags/src/View/Tag/HtmlView.php
+++ b/components/com_tags/src/View/Tag/HtmlView.php
@@ -10,6 +10,10 @@
 
 namespace Joomla\Component\Tags\Site\View\Tag;
 
+use Joomla\CMS\Event\Content\AfterDisplayEvent;
+use Joomla\CMS\Event\Content\AfterTitleEvent;
+use Joomla\CMS\Event\Content\BeforeDisplayEvent;
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Menu\MenuItem;
 use Joomla\CMS\MVC\View\GenericDataException;
@@ -187,7 +191,8 @@ public function display($tpl = null)
             $itemElement->metadata = new Registry($itemElement->metadata);
         }
 
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
 
         foreach ($this->items as $itemElement) {
             $itemElement->event = new \stdClass();
@@ -197,25 +202,29 @@ public function display($tpl = null)
 
             $itemElement->core_params = new Registry($itemElement->core_params);
 
-            $app->triggerEvent('onContentPrepare', ['com_tags.tag', &$itemElement, &$itemElement->core_params, 0]);
+            $contentEventArguments = [
+                'context' => 'com_tags.tag',
+                'subject' => $itemElement,
+                'params'  => $itemElement->core_params,
+                'page'    => 0,
+            ];
 
-            $results = $app->triggerEvent(
-                'onContentAfterTitle',
-                ['com_tags.tag', &$itemElement, &$itemElement->core_params, 0]
+            $dispatcher->dispatch(
+                'onContentPrepare',
+                new ContentPrepareEvent('onContentPrepare', $contentEventArguments)
             );
-            $itemElement->event->afterDisplayTitle = trim(implode("\n", $results));
 
-            $results = $app->triggerEvent(
-                'onContentBeforeDisplay',
-                ['com_tags.tag', &$itemElement, &$itemElement->core_params, 0]
-            );
-            $itemElement->event->beforeDisplayContent = trim(implode("\n", $results));
+            $contentEvents = [
+                'afterDisplayTitle'    => new AfterTitleEvent('onContentAfterTitle', $contentEventArguments),
+                'beforeDisplayContent' => new BeforeDisplayEvent('onContentBeforeDisplay', $contentEventArguments),
+                'afterDisplayContent'  => new AfterDisplayEvent('onContentAfterDisplay', $contentEventArguments),
+            ];
 
-            $results = $app->triggerEvent(
-                'onContentAfterDisplay',
-                ['com_tags.tag', &$itemElement, &$itemElement->core_params, 0]
-            );
-            $itemElement->event->afterDisplayContent = trim(implode("\n", $results));
+            foreach ($contentEvents as $resultKey => $event) {
+                $results = $dispatcher->dispatch($event->getName(), $event)->getArgument('result', []);
+
+                $itemElement->event->{$resultKey} = trim(implode("\n", $results));
+            }
 
             // Write the results back into the body
             if (!empty($itemElement->core_body)) {
diff --git a/components/com_users/forms/reset_complete.xml b/components/com_users/forms/reset_complete.xml
index a5f292baf1ff6..a008ad6091fb4 100644
--- a/components/com_users/forms/reset_complete.xml
+++ b/components/com_users/forms/reset_complete.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<fieldset name="default" label="COM_USERS_RESET_COMPLETE_LABEL">
+	<fieldset name="default" legend="COM_USERS_COMPLETE" description="COM_USERS_RESET_COMPLETE_LABEL">
 		<field
 			name="password1"
 			type="password"
diff --git a/components/com_users/forms/reset_confirm.xml b/components/com_users/forms/reset_confirm.xml
index a80774dd0ad50..30cd18a2987ae 100644
--- a/components/com_users/forms/reset_confirm.xml
+++ b/components/com_users/forms/reset_confirm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<fieldset name="default" label="COM_USERS_RESET_CONFIRM_LABEL">
+	<fieldset name="default" legend="COM_USERS_FIELD_RESET_CONFIRM_TOKEN_LABEL" description="COM_USERS_RESET_CONFIRM_LABEL">
 		<field
 			name="username"
 			type="text"
diff --git a/components/com_users/forms/reset_request.xml b/components/com_users/forms/reset_request.xml
index eb83464830fd2..73dbb83a6e92b 100644
--- a/components/com_users/forms/reset_request.xml
+++ b/components/com_users/forms/reset_request.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form>
-	<fieldset name="default" label="COM_USERS_RESET_REQUEST_LABEL">
+	<fieldset name="default" legend="COM_USERS_RESET" description="COM_USERS_RESET_REQUEST_LABEL">
 		<field
 			name="email"
 			type="email"
diff --git a/components/com_users/src/Model/LoginModel.php b/components/com_users/src/Model/LoginModel.php
index 0d9780ebc3b2b..e1eae71e65bc2 100644
--- a/components/com_users/src/Model/LoginModel.php
+++ b/components/com_users/src/Model/LoginModel.php
@@ -37,20 +37,14 @@ class LoginModel extends FormModel
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form    A Form object on success, false on failure
+     * @return  Form    A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_users.login', 'login', ['load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_users.login', 'login', ['load_data' => $loadData]);
     }
 
     /**
@@ -137,7 +131,7 @@ public function getMenuLanguage(int $id): string
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('language'))
             ->from($db->quoteName('#__menu'))
             ->where($db->quoteName('client_id') . ' = 0')
diff --git a/components/com_users/src/Model/ProfileModel.php b/components/com_users/src/Model/ProfileModel.php
index 99831c892194a..412d94c2b2bf8 100644
--- a/components/com_users/src/Model/ProfileModel.php
+++ b/components/com_users/src/Model/ProfileModel.php
@@ -112,19 +112,16 @@ public function getData()
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|bool  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
         // Get the form.
         $form = $this->loadForm('com_users.profile', 'profile', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         // Check for username compliance and parameter set
         $isUsernameCompliant = true;
         $username            = $loadData ? $form->getValue('username') : $this->loadFormData()->username;
@@ -298,7 +295,7 @@ public function save($data)
      *
      * @since   3.2
      *
-     * @deprecated   4.2 will be removed in 6.0.
+     * @deprecated   4.2 will be removed in 7.0.
      *               Will be removed without replacement
      */
     public function getTwofactorform($userId = null)
@@ -315,7 +312,7 @@ public function getTwofactorform($userId = null)
      *
      * @since   3.2
      *
-     * @deprecated   4.2 will be removed in 6.0.
+     * @deprecated   4.2 will be removed in 7.0.
      *               Will be removed without replacement
      */
     public function getOtpConfig($userId = null)
diff --git a/components/com_users/src/Model/RegistrationModel.php b/components/com_users/src/Model/RegistrationModel.php
index 87e1a6adaf61a..0b837abc4081e 100644
--- a/components/com_users/src/Model/RegistrationModel.php
+++ b/components/com_users/src/Model/RegistrationModel.php
@@ -14,12 +14,17 @@
 use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Date\Date;
+use Joomla\CMS\Event\Model\PrepareDataEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormFactoryInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\FormModel;
@@ -43,9 +48,11 @@
  *
  * @since  1.6
  */
-class RegistrationModel extends FormModel implements UserFactoryAwareInterface
+class RegistrationModel extends FormModel implements UserFactoryAwareInterface, MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * @var    object  The user registration data.
@@ -89,7 +96,7 @@ public function getUserIdFromToken($token)
         $db       = $this->getDatabase();
 
         // Get the user id based on the token.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('activation') . ' = :activation')
@@ -159,7 +166,7 @@ public function activate($token)
 
             // Get all admin users
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['name', 'email', 'sendEmail', 'id']))
                 ->from($db->quoteName('#__users'))
                 ->where($db->quoteName('sendEmail') . ' = 1')
@@ -181,7 +188,12 @@ public function activate($token)
 
                 if ($usercreator->authorise('core.create', 'com_users') && $usercreator->authorise('core.manage', 'com_users')) {
                     try {
-                        $mailer = new MailTemplate('com_users.registration.admin.verification_request', $app->getLanguage()->getTag());
+                        $mailer = new MailTemplate(
+                            'com_users.registration.admin.verification_request',
+                            $app->getLanguage()->getTag(),
+                            $this->getMailerFactory()->createMailer(),
+                            $this->getLanguageFactory()
+                        );
                         $mailer->addTemplateData($data);
                         $mailer->addRecipient($row->email);
                         $return = $mailer->send();
@@ -217,7 +229,12 @@ public function activate($token)
             $data['mailfrom'] = $app->get('mailfrom');
             $data['sitename'] = $app->get('sitename');
             $data['siteurl']  = Uri::base();
-            $mailer           = new MailTemplate('com_users.registration.user.admin_activated', $app->getLanguage()->getTag());
+            $mailer           = new MailTemplate(
+                'com_users.registration.user.admin_activated',
+                $app->getLanguage()->getTag(),
+                $this->getMailerFactory()->createMailer(),
+                $this->getLanguageFactory()
+            );
             $mailer->addTemplateData($data);
             $mailer->addRecipient($data['email']);
 
@@ -308,10 +325,14 @@ public function getData()
             unset($this->data->password1, $this->data->password2);
 
             // Get the dispatcher and load the users plugins.
-            PluginHelper::importPlugin('user');
+            $dispatcher = $this->getDispatcher();
+            PluginHelper::importPlugin('user', null, true, $dispatcher);
 
             // Trigger the data preparation event.
-            Factory::getApplication()->triggerEvent('onContentPrepareData', ['com_users.registration', $this->data]);
+            $dispatcher->dispatch('onContentPrepareData', new PrepareDataEvent('onContentPrepareData', [
+                'context' => 'com_users.registration',
+                'data'    => $this->data,
+            ]));
         }
 
         return $this->data;
@@ -326,19 +347,16 @@ public function getData()
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
         // Get the form.
         $form = $this->loadForm('com_users.registration', 'registration', ['control' => 'jform', 'load_data' => $loadData]);
 
-        if (empty($form)) {
-            return false;
-        }
-
         // When multilanguage is set, a user's default site language should also be a Content Language
         if (Multilanguage::isEnabled()) {
             $form->setFieldAttribute('language', 'type', 'frontendlanguage', 'params');
@@ -466,7 +484,7 @@ public function register($temp)
         // From this moment the user is registered, so we don't return false anymore
         $app   = Factory::getApplication();
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Compile the notification mail values.
         $data             = ArrayHelper::fromObject($user, false);
@@ -512,7 +530,12 @@ public function register($temp)
 
         // Try to send the registration email.
         try {
-            $mailer = new MailTemplate($mailtemplate, $app->getLanguage()->getTag());
+            $mailer = new MailTemplate(
+                $mailtemplate,
+                $app->getLanguage()->getTag(),
+                $this->getMailerFactory()->createMailer(),
+                $this->getLanguageFactory()
+            );
             $mailer->addTemplateData($data);
             $mailer->addRecipient($data['email']);
             $mailer->addUnsafeTags(['username', 'password_clear', 'name']);
@@ -554,7 +577,12 @@ public function register($temp)
                 }
 
                 try {
-                    $mailer = new MailTemplate('com_users.registration.admin.new_notification', $app->getLanguage()->getTag());
+                    $mailer = new MailTemplate(
+                        'com_users.registration.admin.new_notification',
+                        $app->getLanguage()->getTag(),
+                        $this->getMailerFactory()->createMailer(),
+                        $this->getLanguageFactory()
+                    );
                     $mailer->addTemplateData($data);
                     $mailer->addRecipient($row->email);
                     $mailer->addUnsafeTags(['username', 'name']);
diff --git a/components/com_users/src/Model/RemindModel.php b/components/com_users/src/Model/RemindModel.php
index 0a6f23959592d..77a736d236e27 100644
--- a/components/com_users/src/Model/RemindModel.php
+++ b/components/com_users/src/Model/RemindModel.php
@@ -13,8 +13,12 @@
 use Joomla\CMS\Event\User\AfterRemindEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\FormModel;
 use Joomla\CMS\Router\Route;
@@ -30,28 +34,25 @@
  *
  * @since  1.5
  */
-class RemindModel extends FormModel
+class RemindModel extends FormModel implements MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
+
     /**
      * Method to get the username remind request form.
      *
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form|bool A Form object on success, false on failure
+     * @return  Form A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_users.remind', 'remind', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_users.remind', 'remind', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -133,7 +134,7 @@ public function processRemindRequest($data)
 
         // Find the user id for the given email address.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__users'))
             ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
@@ -176,7 +177,12 @@ public function processRemindRequest($data)
         $data['link_text'] = Route::link('site', $link, false, $mode, true);
         $data['link_html'] = Route::link('site', $link, true, $mode, true);
 
-        $mailer = new MailTemplate('com_users.reminder', $app->getLanguage()->getTag());
+        $mailer = new MailTemplate(
+            'com_users.reminder',
+            $app->getLanguage()->getTag(),
+            $this->getMailerFactory()->createMailer(),
+            $this->getLanguageFactory()
+        );
         $mailer->addTemplateData($data);
         $mailer->addRecipient($user->email, $user->name);
 
diff --git a/components/com_users/src/Model/ResetModel.php b/components/com_users/src/Model/ResetModel.php
index 36eb39d40f924..1642605dc8d2c 100644
--- a/components/com_users/src/Model/ResetModel.php
+++ b/components/com_users/src/Model/ResetModel.php
@@ -14,8 +14,12 @@
 use Joomla\CMS\Event\AbstractEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Model\FormModel;
 use Joomla\CMS\Router\Route;
@@ -35,9 +39,11 @@
  *
  * @since  1.5
  */
-class ResetModel extends FormModel implements UserFactoryAwareInterface
+class ResetModel extends FormModel implements UserFactoryAwareInterface, MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * Method to get the password reset request form.
@@ -48,20 +54,14 @@ class ResetModel extends FormModel implements UserFactoryAwareInterface
      * @param   array    $data      An optional array of data for the form to interrogate.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_users.reset_request', 'reset_request', ['control' => 'jform', 'load_data' => $loadData]);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_users.reset_request', 'reset_request', ['control' => 'jform', 'load_data' => $loadData]);
     }
 
     /**
@@ -70,20 +70,14 @@ public function getForm($data = [], $loadData = true)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form    A Form object on success, false on failure
+     * @return  Form    A Form object
      *
      * @since   1.6
+     * @throws  \Exception on failure
      */
     public function getResetCompleteForm($data = [], $loadData = true)
     {
-        // Get the form.
-        $form = $this->loadForm('com_users.reset_complete', 'reset_complete', ['control' => 'jform']);
-
-        if (empty($form)) {
-            return false;
-        }
-
-        return $form;
+        return $this->loadForm('com_users.reset_complete', 'reset_complete', ['control' => 'jform']);
     }
 
     /**
@@ -92,7 +86,7 @@ public function getResetCompleteForm($data = [], $loadData = true)
      * @param   array    $data      Data for the form.
      * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
      *
-     * @return  Form  A Form object on success, false on failure
+     * @return  Form  A Form object
      *
      * @since   1.6
      * @throws  \Exception
@@ -102,10 +96,6 @@ public function getResetConfirmForm($data = [], $loadData = true)
         // Get the form.
         $form = $this->loadForm('com_users.reset_confirm', 'reset_confirm', ['control' => 'jform']);
 
-        if (empty($form)) {
-            return false;
-        }
-
         $form->setValue('token', '', Factory::getApplication()->getInput()->get('token'));
 
         return $form;
@@ -302,7 +292,7 @@ public function processResetConfirm($data)
 
         // Find the user id for the given token.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['activation', 'id', 'block']))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :username')
@@ -397,7 +387,7 @@ public function processResetRequest($data)
 
         // Find the user id for the given email address.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
@@ -476,7 +466,12 @@ public function processResetRequest($data)
         $data['link_html'] = Route::link('site', $link, true, $mode, true);
         $data['token']     = $token;
 
-        $mailer = new MailTemplate('com_users.password_reset', $app->getLanguage()->getTag());
+        $mailer = new MailTemplate(
+            'com_users.password_reset',
+            $app->getLanguage()->getTag(),
+            $this->getMailerFactory()->createMailer(),
+            $this->getLanguageFactory()
+        );
         $mailer->addTemplateData($data);
         $mailer->addRecipient($user->email, $user->name);
 
diff --git a/components/com_users/src/View/Login/HtmlView.php b/components/com_users/src/View/Login/HtmlView.php
index 2f05588e2a1e7..da33bee87c1ab 100644
--- a/components/com_users/src/View/Login/HtmlView.php
+++ b/components/com_users/src/View/Login/HtmlView.php
@@ -65,17 +65,6 @@ class HtmlView extends BaseHtmlView
      */
     protected $pageclass_sfx = '';
 
-    /**
-     * No longer used
-     *
-     * @var    boolean
-     * @since  4.0.0
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Will be removed without replacement
-     */
-    protected $tfa = false;
-
     /**
      * Additional buttons to show on the login page
      *
@@ -120,6 +109,12 @@ public function display($tpl = null)
         // Escape strings for HTML output
         $this->pageclass_sfx = htmlspecialchars($this->params->get('pageclass_sfx', ''), ENT_COMPAT, 'UTF-8');
 
+        // Add form control fields
+        $return = $this->form->getValue('return', '', $this->params->get('login_redirect_url', $this->params->get('login_redirect_menuitem', '')));
+
+        $this->form
+            ->addControlField('return', base64_encode($return));
+
         $this->prepareDocument();
 
         parent::display($tpl);
diff --git a/components/com_users/src/View/Profile/HtmlView.php b/components/com_users/src/View/Profile/HtmlView.php
index 651e27819105e..a2783c06e0100 100644
--- a/components/com_users/src/View/Profile/HtmlView.php
+++ b/components/com_users/src/View/Profile/HtmlView.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Component\Users\Site\View\Profile;
 
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
@@ -19,7 +20,6 @@
 use Joomla\CMS\User\User;
 use Joomla\Component\Users\Administrator\Helper\Mfa;
 use Joomla\Component\Users\Site\Model\ProfileModel;
-use Joomla\Database\DatabaseDriver;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -60,18 +60,6 @@ class HtmlView extends BaseHtmlView
      */
     protected $state;
 
-    /**
-     * An instance of DatabaseDriver.
-     *
-     * @var    DatabaseDriver
-     * @since  3.6.3
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Will be removed without replacement use database from the container instead
-     *              Example: Factory::getContainer()->get(DatabaseInterface::class);
-     */
-    protected $db;
-
     /**
      * The page class suffix
      *
@@ -109,7 +97,6 @@ public function display($tpl = null)
         $this->state              = $model->getState();
         $this->params             = $this->state->get('params');
         $this->mfaConfigurationUI = Mfa::getConfigurationInterface($user);
-        $this->db                 = Factory::getDbo();
 
         // Check for errors.
         if (\count($errors = $model->getErrors())) {
@@ -132,9 +119,15 @@ public function display($tpl = null)
             throw new \Exception(Text::_('JERROR_USERS_PROFILE_NOT_FOUND'), 404);
         }
 
-        PluginHelper::importPlugin('content');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('content', null, true, $dispatcher);
         $this->data->text = '';
-        Factory::getApplication()->triggerEvent('onContentPrepare', ['com_users.user', &$this->data, &$this->data->params, 0]);
+        $dispatcher->dispatch('onContentPrepare', new ContentPrepareEvent('onContentPrepare', [
+            'context' => 'com_users.user',
+            'subject' => $this->data,
+            'params'  => $this->data->params,
+            'page'    => 0,
+        ]));
         unset($this->data->text);
 
         // Check for layout from menu item.
diff --git a/components/com_users/tmpl/captive/default.php b/components/com_users/tmpl/captive/default.php
index d99864080ce8f..57628677e1645 100644
--- a/components/com_users/tmpl/captive/default.php
+++ b/components/com_users/tmpl/captive/default.php
@@ -12,13 +12,11 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\Component\Users\Site\Model\CaptiveModel;
-use Joomla\Component\Users\Site\View\Captive\HtmlView;
 use Joomla\Utilities\ArrayHelper;
 
 /**
- * @var HtmlView     $this  View object
- * @var CaptiveModel $model The model
+ * @var \Joomla\Component\Users\Site\View\Captive\HtmlView  $this  View object
+ * @var \Joomla\Component\Users\Site\Model\CaptiveModel     $model The model
  */
 $model = $this->getModel();
 
@@ -117,7 +115,7 @@ class="btn btn-danger btn-sm" id="users-mfa-captive-button-logout">
 
                 <?php if (count($this->records) > 1) : ?>
                     <div id="users-mfa-captive-form-choose-another" class="my-3">
-                        <a href="<?php echo Route::_('index.php?option=com_users&view=captive&task=select') ?>">
+                        <a href="<?php echo Route::_('index.php?option=com_users&view=captive&task=captive.select') ?>">
                             <?php echo Text::_('COM_USERS_MFA_USE_DIFFERENT_METHOD'); ?>
                         </a>
                     </div>
diff --git a/components/com_users/tmpl/captive/select.php b/components/com_users/tmpl/captive/select.php
index c09272c8d0346..a0d247e87acd0 100644
--- a/components/com_users/tmpl/captive/select.php
+++ b/components/com_users/tmpl/captive/select.php
@@ -14,9 +14,8 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
-use Joomla\Component\Users\Site\View\Captive\HtmlView;
 
-/** @var HtmlView $this */
+/** @var \Joomla\Component\Users\Site\View\Captive\HtmlView $this */
 
 $shownMethods = [];
 
diff --git a/components/com_users/tmpl/login/default_login.php b/components/com_users/tmpl/login/default_login.php
index f066d6c72734d..93d5ba4a0a3ec 100644
--- a/components/com_users/tmpl/login/default_login.php
+++ b/components/com_users/tmpl/login/default_login.php
@@ -109,9 +109,7 @@ class="btn btn-secondary w-100 <?php echo $button['class'] ?? '' ?>"
                 </div>
             </div>
 
-            <?php $return = $this->form->getValue('return', '', $this->params->get('login_redirect_url', $this->params->get('login_redirect_menuitem', ''))); ?>
-            <input type="hidden" name="return" value="<?php echo base64_encode($return); ?>">
-            <?php echo HTMLHelper::_('form.token'); ?>
+            <?php echo $this->form->renderControlFields(); ?>
         </fieldset>
     </form>
     <div class="com-users-login__options list-group">
diff --git a/components/com_users/tmpl/method/backupcodes.php b/components/com_users/tmpl/method/backupcodes.php
index ba5224a61e848..8b9573cb97b12 100644
--- a/components/com_users/tmpl/method/backupcodes.php
+++ b/components/com_users/tmpl/method/backupcodes.php
@@ -15,9 +15,8 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\Component\Users\Site\View\Method\HtmlView;
 
-/** @var  HtmlView $this */
+/** @var  \Joomla\Component\Users\Site\View\Method\HtmlView $this */
 
 HTMLHelper::_('bootstrap.tooltip', '.hasTooltip');
 
diff --git a/components/com_users/tmpl/method/edit.php b/components/com_users/tmpl/method/edit.php
index c369063528bb8..c30c17820d3db 100644
--- a/components/com_users/tmpl/method/edit.php
+++ b/components/com_users/tmpl/method/edit.php
@@ -14,10 +14,9 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\Component\Users\Site\View\Method\HtmlView;
 use Joomla\Utilities\ArrayHelper;
 
-/** @var  HtmlView  $this */
+/** @var  \Joomla\Component\Users\Site\View\Method\HtmlView  $this */
 
 $cancelURL = Route::_('index.php?option=com_users&task=methods.display&user_id=' . $this->user->id);
 
diff --git a/components/com_users/tmpl/methods/default.php b/components/com_users/tmpl/methods/default.php
index ceb3a5064c6b3..f3bc0e851b252 100644
--- a/components/com_users/tmpl/methods/default.php
+++ b/components/com_users/tmpl/methods/default.php
@@ -14,12 +14,11 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\Component\Users\Site\View\Methods\HtmlView;
 
-/** @var HtmlView $this */
+/** @var \Joomla\Component\Users\Site\View\Methods\HtmlView $this */
 ?>
 <div id="com-users-methods-list">
-    <?php if (!$this->get('forHMVC', false)) : ?>
+    <?php if (!isset($this->forHMVC) || !$this->forHMVC) : ?>
         <h2 id="com-users-methods-list-head">
             <?php echo Text::_('COM_USERS_MFA_LIST_PAGE_HEAD'); ?>
         </h2>
diff --git a/components/com_users/tmpl/methods/firsttime.php b/components/com_users/tmpl/methods/firsttime.php
index 73f5f17e6e0c8..d08f9fe96e52a 100644
--- a/components/com_users/tmpl/methods/firsttime.php
+++ b/components/com_users/tmpl/methods/firsttime.php
@@ -14,9 +14,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\Component\Users\Site\View\Methods\HtmlView;
 
-/** @var HtmlView $this */
+/** @var \Joomla\Component\Users\Site\View\Methods\HtmlView $this */
 
 $headingLevel = 2;
 ?>
diff --git a/components/com_users/tmpl/methods/list.php b/components/com_users/tmpl/methods/list.php
index 6188cd44131a3..6d5bb21f7d60a 100644
--- a/components/com_users/tmpl/methods/list.php
+++ b/components/com_users/tmpl/methods/list.php
@@ -18,9 +18,8 @@
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Users\Administrator\Helper\Mfa as MfaHelper;
 use Joomla\Component\Users\Site\Model\MethodsModel;
-use Joomla\Component\Users\Site\View\Methods\HtmlView;
 
-/** @var HtmlView $this */
+/** @var \Joomla\Component\Users\Site\View\Methods\HtmlView $this */
 
 /** @var MethodsModel $model */
 $model = $this->getModel();
diff --git a/components/com_users/tmpl/profile/edit.php b/components/com_users/tmpl/profile/edit.php
index 9864f51778cea..bf99c1e2137b4 100644
--- a/components/com_users/tmpl/profile/edit.php
+++ b/components/com_users/tmpl/profile/edit.php
@@ -82,6 +82,7 @@
                 <input type="hidden" name="option" value="com_users">
             </div>
         </div>
-        <?php echo HTMLHelper::_('form.token'); ?>
+
+        <?php echo $this->form->renderControlFields(); ?>
     </form>
 </div>
diff --git a/components/com_users/tmpl/registration/default.php b/components/com_users/tmpl/registration/default.php
index 04a312c42c0b5..26de906bfa92b 100644
--- a/components/com_users/tmpl/registration/default.php
+++ b/components/com_users/tmpl/registration/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -57,6 +56,7 @@
                 <input type="hidden" name="task" value="registration.register">
             </div>
         </div>
-        <?php echo HTMLHelper::_('form.token'); ?>
+
+        <?php echo $this->form->renderControlFields(); ?>
     </form>
 </div>
diff --git a/components/com_users/tmpl/remind/default.php b/components/com_users/tmpl/remind/default.php
index a0d4453f7a180..59110d441fc48 100644
--- a/components/com_users/tmpl/remind/default.php
+++ b/components/com_users/tmpl/remind/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -45,6 +44,7 @@
                 </button>
             </div>
         </div>
-        <?php echo HTMLHelper::_('form.token'); ?>
+
+        <?php echo $this->form->renderControlFields(); ?>
     </form>
 </div>
diff --git a/components/com_users/tmpl/reset/complete.php b/components/com_users/tmpl/reset/complete.php
index 13fe66290e8dc..7165addd18cfc 100644
--- a/components/com_users/tmpl/reset/complete.php
+++ b/components/com_users/tmpl/reset/complete.php
@@ -32,8 +32,11 @@
     <form action="<?php echo Route::_('index.php?task=reset.complete'); ?>" method="post" class="com-users-reset-complete__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
-                <?php if (isset($fieldset->label)) : ?>
-                    <legend><?php echo Text::_($fieldset->label); ?></legend>
+                <?php if (isset($fieldset->legend)) : ?>
+                    <legend><?php echo Text::_($fieldset->legend); ?></legend>
+                <?php endif; ?>
+                <?php if (isset($fieldset->description)) : ?>
+                    <p><?php echo Text::_($fieldset->description); ?></p>
                 <?php endif; ?>
                 <?php echo $this->form->renderFieldset($fieldset->name); ?>
             </fieldset>
diff --git a/components/com_users/tmpl/reset/confirm.php b/components/com_users/tmpl/reset/confirm.php
index 755240c7896c7..ee1e3b7ab9558 100644
--- a/components/com_users/tmpl/reset/confirm.php
+++ b/components/com_users/tmpl/reset/confirm.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -32,8 +31,11 @@
     <form action="<?php echo Route::_('index.php?task=reset.confirm'); ?>" method="post" class="com-users-reset-confirm__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
-                <?php if (isset($fieldset->label)) : ?>
-                    <legend><?php echo Text::_($fieldset->label); ?></legend>
+                <?php if (isset($fieldset->legend)) : ?>
+                    <legend><?php echo Text::_($fieldset->legend); ?></legend>
+                <?php endif; ?>
+                <?php if (isset($fieldset->description)) : ?>
+                    <p><?php echo Text::_($fieldset->description); ?></p>
                 <?php endif; ?>
                 <?php echo $this->form->renderFieldset($fieldset->name); ?>
             </fieldset>
@@ -45,6 +47,7 @@
                 </button>
             </div>
         </div>
-        <?php echo HTMLHelper::_('form.token'); ?>
+
+        <?php echo $this->form->renderControlFields(); ?>
     </form>
 </div>
diff --git a/components/com_users/tmpl/reset/default.php b/components/com_users/tmpl/reset/default.php
index 7fa7267a5c047..fc2809a1b7ee4 100644
--- a/components/com_users/tmpl/reset/default.php
+++ b/components/com_users/tmpl/reset/default.php
@@ -10,7 +10,6 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
@@ -32,8 +31,11 @@
     <form action="<?php echo Route::_('index.php?task=reset.request'); ?>" method="post" id="user-registration" class="com-users-reset__form form-validate form-horizontal well">
         <?php foreach ($this->form->getFieldsets() as $fieldset) : ?>
             <fieldset>
-                <?php if (isset($fieldset->label)) : ?>
-                    <legend><?php echo Text::_($fieldset->label); ?></legend>
+                <?php if (isset($fieldset->legend)) : ?>
+                    <legend><?php echo Text::_($fieldset->legend); ?></legend>
+                <?php endif; ?>
+                <?php if (isset($fieldset->description)) : ?>
+                    <p><?php echo Text::_($fieldset->description); ?></p>
                 <?php endif; ?>
                 <?php echo $this->form->renderFieldset($fieldset->name); ?>
             </fieldset>
@@ -45,6 +47,7 @@
                 </button>
             </div>
         </div>
-        <?php echo HTMLHelper::_('form.token'); ?>
+
+        <?php echo $this->form->renderControlFields(); ?>
     </form>
 </div>
diff --git a/components/com_workflow/src/Dispatcher/Dispatcher.php b/components/com_workflow/src/Dispatcher/Dispatcher.php
new file mode 100644
index 0000000000000..a9e26aabc4db0
--- /dev/null
+++ b/components/com_workflow/src/Dispatcher/Dispatcher.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_workflow
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Workflow\Site\Dispatcher;
+
+use Joomla\CMS\Access\Exception\NotAllowed;
+use Joomla\CMS\Dispatcher\ComponentDispatcher;
+use Joomla\CMS\MVC\Controller\BaseController;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * ComponentDispatcher class for com_contenthistory
+ *
+ * @since  6.1.0
+ */
+class Dispatcher extends ComponentDispatcher
+{
+    /**
+     * Load the language
+     *
+     * @since   6.1.0
+     *
+     * @return  void
+     */
+    protected function loadLanguage()
+    {
+        // Load common and local language files.
+        $this->app->getLanguage()->load($this->option, JPATH_ADMINISTRATOR) ||
+        $this->app->getLanguage()->load($this->option, JPATH_SITE);
+    }
+
+    /**
+     * Method to check component access permission
+     *
+     * @since   6.1.0
+     *
+     * @return  void
+     *
+     * @throws  \Exception|NotAllowed
+     */
+    protected function checkAccess()
+    {
+        $input      = $this->app->getInput();
+        $view       = $input->getCmd('view');
+        $task       = $input->getCmd('task');
+
+        $allowedTasks = [
+            'graph.getWorkflow',
+            'graph.getStages',
+            'graph.getTransitions',
+        ];
+
+        // Check the user has permission to access this component if in the backend
+        if ($this->app->getIdentity()->guest || $view !== 'graph' || !\in_array($task, $allowedTasks, true)) {
+            throw new NotAllowed($this->app->getLanguage()->_('JERROR_ALERTNOAUTHOR'), 403);
+        }
+    }
+
+    /**
+     * Get a controller from the component
+     *
+     * @param   string  $name    Controller name
+     * @param   string  $client  Optional client (like Administrator, Site etc.)
+     * @param   array   $config  Optional controller config
+     *
+     * @return  BaseController
+     *
+     * @since   6.1.0
+     */
+    public function getController(string $name, string $client = '', array $config = []): BaseController
+    {
+        $config['base_path'] = JPATH_ADMINISTRATOR . '/components/com_workflow';
+        $client              = 'Administrator';
+
+        return parent::getController($name, $client, $config);
+    }
+}
diff --git a/composer.json b/composer.json
index 1b95216d70f6e..b948a65c065af 100644
--- a/composer.json
+++ b/composer.json
@@ -11,16 +11,21 @@
   "config": {
     "optimize-autoloader": true,
     "platform": {
-      "php": "8.1.0"
+      "php": "8.3.0"
     },
     "vendor-dir": "libraries/vendor",
-    "github-protocols": ["https"]
+    "github-protocols": ["https"],
+    "audit": {
+      "ignore": { "PKSA-3mms-4n3p-ym65": "Temporary until Webauthn plugin has been updated." }
+    }
   },
   "support": {
+    "github": "https://github.com/joomla/joomla-cms",
     "issues": "https://issues.joomla.org/",
-    "irc": "irc://chat.freenode.net/joomla/",
+    "chat": "https://joom.la/chat/",
     "forum": "https://forum.joomla.org/",
-    "docs": "https://docs.joomla.org/"
+    "docs": "https://guide.joomla.org/",
+    "developer docs": "https://manual.joomla.org/"
   },
   "repositories": [
     {
@@ -32,11 +37,6 @@
       "type": "vcs",
       "url": "https://github.com/joomla-backports/php-tuf.git",
       "no-api": true
-    },
-    {
-      "type": "vcs",
-      "url": "https://github.com/joomla-backports/portable-utf8.git",
-      "no-api": true
     }
   ],
   "autoload": {
@@ -51,46 +51,45 @@
     }
   },
   "require": {
-    "php": "^8.1.0",
-    "joomla/application": "^3.0.4",
-    "joomla/archive": "^3.0.4",
-    "joomla/authentication": "^3.0.3",
-    "joomla/console": "^3.0.3",
-    "joomla/crypt": "^3.0.3",
-    "joomla/data": "^3.0.3",
-    "joomla/database": "^3.4",
-    "joomla/di": "^3.1.1",
-    "joomla/event": "^3.0.2",
-    "joomla/filter": "^3.0.6",
-    "joomla/filesystem": "^3.3.0",
-    "joomla/http": "^3.1.4",
-    "joomla/input": "~3.0",
-    "joomla/language": "~3.0",
-    "joomla/oauth1": "~3.0",
-    "joomla/oauth2": "~3.0",
-    "joomla/registry": "~3.0",
-    "joomla/router": "~3.0",
-    "joomla/session": "^3.0.3",
-    "joomla/string": "^3.0.4",
-    "joomla/uri": "~3.0",
-    "joomla/utilities": "~3.0",
-    "algo26-matthias/idna-convert": "^3.2.1",
+    "php": "^8.3.0",
+    "joomla/application": "^4.0",
+    "joomla/archive": "^4.0",
+    "joomla/authentication": "^4.0",
+    "joomla/console": "^4.0",
+    "joomla/crypt": "^4.0",
+    "joomla/data": "^4.0",
+    "joomla/database": "^4.0",
+    "joomla/di": "^4.0",
+    "joomla/event": "^4.0",
+    "joomla/filter": "^4.1.0",
+    "joomla/filesystem": "^4.2.1",
+    "joomla/http": "^4.0",
+    "joomla/input": "^4.0",
+    "joomla/language": "^4.0",
+    "joomla/oauth1": "^4.0",
+    "joomla/oauth2": "^4.0",
+    "joomla/registry": "^4.0",
+    "joomla/router": "^4.0",
+    "joomla/session": "^4.0",
+    "joomla/string": "^4.0",
+    "joomla/uri": "^4.0",
+    "joomla/utilities": "^4.0",
+    "algo26-matthias/idna-convert": "^4.2.1",
     "defuse/php-encryption": "^2.4.0",
-    "doctrine/inflector": "^1.4.4",
+    "doctrine/inflector": "^2.1.0",
     "fig/link-util": "^1.2.0",
     "google/recaptcha": "^1.3.1",
-    "laminas/laminas-diactoros": "^2.26.0",
+    "laminas/laminas-diactoros": "^3.8.0",
     "paragonie/sodium_compat": "^1.24.0",
-    "phpmailer/phpmailer": "^6.10.0",
+    "phpmailer/phpmailer": "^6.12.0",
     "psr/link": "~1.1.1",
-    "symfony/console": "^6.4.25",
-    "symfony/error-handler": "^6.4.24",
-    "symfony/ldap": "^6.4.24",
-    "symfony/options-resolver": "^6.4.25",
+    "symfony/console": "^7",
+    "symfony/error-handler": "^7",
+    "symfony/ldap": "^7",
+    "symfony/options-resolver": "^7",
     "symfony/polyfill-mbstring": "^1.33.0",
-    "symfony/web-link": "^6.4.24",
-    "symfony/yaml": "^6.4.41",
-    "typo3/phar-stream-wrapper": "^3.1.8",
+    "symfony/web-link": "^6.4.32",
+    "symfony/yaml": "^6.4.34",
     "wamania/php-stemmer": "^4.0.0",
     "tobscure/json-api": "dev-joomla-backports",
     "willdurand/negotiation": "^3.1.0",
@@ -100,35 +99,32 @@
     "ext-gd": "*",
     "web-auth/webauthn-lib": "4.5.2",
     "ext-dom": "*",
-    "composer/ca-bundle": "^1.5.8",
-    "dragonmantank/cron-expression": "^3.4.0",
+    "composer/ca-bundle": "^1.5.10",
+    "dragonmantank/cron-expression": "^3.6.0",
     "enshrined/svg-sanitize": "^0.22.0",
     "lcobucci/jwt": "^4.3.0",
     "web-token/jwt-library": "^3.4.10",
     "phpseclib/bcmath_compat": "^2.0.3",
     "jfcherng/php-diff": "^6.16.2",
-    "voku/portable-utf8": "dev-joomla-5.3 as 6.0.13",
     "php-tuf/php-tuf": "^1.0.3",
-    "php-debugbar/php-debugbar": "^2.2.4"
+    "php-debugbar/php-debugbar": "^2.2.6",
+    "altcha-org/altcha": "^1.3.2"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.6.34",
-    "friendsofphp/php-cs-fixer": "^3.88.0",
-    "squizlabs/php_codesniffer": "^3.13.4",
-    "joomla/mediawiki": "^3.0",
-    "joomla/test": "~3.0",
-    "phpstan/phpstan": "^2.1.29",
-    "phpstan/phpstan-deprecation-rules": "^2.0.3"
+    "friendsofphp/php-cs-fixer": "^3.94.2",
+    "squizlabs/php_codesniffer": "^3.13.5",
+    "joomla/mediawiki": "^4.0",
+    "joomla/test": "~4.0",
+    "phpstan/phpstan": "^2.1.40",
+    "phpstan/phpstan-deprecation-rules": "^2.0.4"
   },
   "replace": {
     "paragonie/random_compat": "9.99.99",
-    "symfony/polyfill-php70": "*",
-    "symfony/polyfill-php71": "*",
-    "symfony/polyfill-php72": "*",
-    "symfony/polyfill-php73": "*",
-    "symfony/polyfill-php74": "*",
     "symfony/polyfill-php80": "*",
-    "symfony/polyfill-php81": "*"
+    "symfony/polyfill-php81": "*",
+    "symfony/polyfill-php82": "*",
+    "symfony/polyfill-php83": "*"
   },
   "extra": {
     "composer-exit-on-patch-failure": true
@@ -136,6 +132,8 @@
   "scripts": {
     "post-install-cmd": [
     "php build/update_fido_cache.php"
-    ]
+    ],
+    "phpcs": "./libraries/vendor/bin/phpcs --extensions=php -p --standard=ruleset.xml .",
+    "csfixer": "./libraries/vendor/bin/php-cs-fixer fix -vvv --dry-run --diff"
   }
 }
diff --git a/composer.lock b/composer.lock
index e34496e53527f..e36ba9b39d320 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,29 +4,29 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a57ffa9d593e21ab64d0dacd2c607920",
+    "content-hash": "2409c13ac45e0db9103c9377e0a7fd00",
     "packages": [
         {
             "name": "algo26-matthias/idna-convert",
-            "version": "v3.2.1",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/algo26-matthias/idna-convert.git",
-                "reference": "82fe7b60e1a1620c72e68803cc5dcff0b5f59bdc"
+                "reference": "87bfcab8e453d7ede78eeec15d75c75f0e926f3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/algo26-matthias/idna-convert/zipball/82fe7b60e1a1620c72e68803cc5dcff0b5f59bdc",
-                "reference": "82fe7b60e1a1620c72e68803cc5dcff0b5f59bdc",
+                "url": "https://api.github.com/repos/algo26-matthias/idna-convert/zipball/87bfcab8e453d7ede78eeec15d75c75f0e926f3c",
+                "reference": "87bfcab8e453d7ede78eeec15d75c75f0e926f3c",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
                 "jakeasmith/http_build_url": "^1",
-                "php": ">=7.2.0"
+                "php": ">=8.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "8.0"
+                "phpunit/phpunit": "^9 || ^10"
             },
             "suggest": {
                 "ext-iconv": "Install ext/iconv for using input / output other than UTF-8 or ISO-8859-1",
@@ -50,7 +50,7 @@
                 }
             ],
             "description": "A library for encoding and decoding internationalized domain names",
-            "homepage": "http://idnaconv.net/",
+            "homepage": "https://github.com/algo26-matthias/idna-convert",
             "keywords": [
                 "idn",
                 "idna",
@@ -58,9 +58,55 @@
             ],
             "support": {
                 "issues": "https://github.com/algo26-matthias/idna-convert/issues",
-                "source": "https://github.com/algo26-matthias/idna-convert/tree/v3.2.1"
+                "source": "https://github.com/algo26-matthias/idna-convert/tree/v4.2.1"
+            },
+            "time": "2025-10-10T11:39:49+00:00"
+        },
+        {
+            "name": "altcha-org/altcha",
+            "version": "v1.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/altcha-org/altcha-lib-php.git",
+                "reference": "9a9b98c48dea0b2e8c353ea991d5f5627cbdab36"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/altcha-org/altcha-lib-php/zipball/9a9b98c48dea0b2e8c353ea991d5f5627cbdab36",
+                "reference": "9a9b98c48dea0b2e8c353ea991d5f5627cbdab36",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.72",
+                "phpstan/extension-installer": "^1.4",
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpunit/phpunit": "^11.5.50"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "AltchaOrg\\Altcha\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Daniel Regeci",
+                    "email": "536331+ovx@users.noreply.github.com"
+                }
+            ],
+            "support": {
+                "issues": "https://github.com/altcha-org/altcha-lib-php/issues",
+                "source": "https://github.com/altcha-org/altcha-lib-php/tree/v1.3.3"
             },
-            "time": "2025-10-10T11:40:12+00:00"
+            "time": "2026-04-02T12:13:35+00:00"
         },
         {
             "name": "brick/math",
@@ -124,16 +170,16 @@
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.5.8",
+            "version": "1.5.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "719026bb30813accb68271fee7e39552a58e9f65"
+                "reference": "00a2f4201641d5c53f7fc0195e6c8d9fcc321a78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/719026bb30813accb68271fee7e39552a58e9f65",
-                "reference": "719026bb30813accb68271fee7e39552a58e9f65",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/00a2f4201641d5c53f7fc0195e6c8d9fcc321a78",
+                "reference": "00a2f4201641d5c53f7fc0195e6c8d9fcc321a78",
                 "shasum": ""
             },
             "require": {
@@ -180,7 +226,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/1.5.8"
+                "source": "https://github.com/composer/ca-bundle/tree/1.5.12"
             },
             "funding": [
                 {
@@ -192,7 +238,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-08-20T18:49:47+00:00"
+            "time": "2026-05-19T11:26:22+00:00"
         },
         {
             "name": "defuse/php-encryption",
@@ -263,38 +309,32 @@
         },
         {
             "name": "doctrine/inflector",
-            "version": "1.4.4",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9"
+                "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9",
-                "reference": "4bd5c1cdfcd00e9e2d8c484f79150f67e5d355d9",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/6d6c96277ea252fc1304627204c3d5e6e15faa3b",
+                "reference": "6d6c96277ea252fc1304627204c3d5e6e15faa3b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^8.0",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpstan/phpstan-strict-rules": "^0.12",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "doctrine/coding-standard": "^12.0 || ^13.0",
+                "phpstan/phpstan": "^1.12 || ^2.0",
+                "phpstan/phpstan-phpunit": "^1.4 || ^2.0",
+                "phpstan/phpstan-strict-rules": "^1.6 || ^2.0",
+                "phpunit/phpunit": "^8.5 || ^12.2"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Inflector\\": "lib/Doctrine/Inflector",
-                    "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
+                    "Doctrine\\Inflector\\": "src"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -339,7 +379,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/1.4.4"
+                "source": "https://github.com/doctrine/inflector/tree/2.1.0"
             },
             "funding": [
                 {
@@ -355,33 +395,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-04-16T17:34:40+00:00"
+            "time": "2025-08-10T19:31:58+00:00"
         },
         {
             "name": "dragonmantank/cron-expression",
-            "version": "v3.4.0",
+            "version": "v3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dragonmantank/cron-expression.git",
-                "reference": "8c784d071debd117328803d86b2097615b457500"
+                "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/8c784d071debd117328803d86b2097615b457500",
-                "reference": "8c784d071debd117328803d86b2097615b457500",
+                "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/d61a8a9604ec1f8c3d150d09db6ce98b32675013",
+                "reference": "d61a8a9604ec1f8c3d150d09db6ce98b32675013",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2|^8.0",
-                "webmozart/assert": "^1.0"
+                "php": "^8.2|^8.3|^8.4|^8.5"
             },
             "replace": {
                 "mtdowling/cron-expression": "^1.0"
             },
             "require-dev": {
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^1.0",
-                "phpunit/phpunit": "^7.0|^8.0|^9.0"
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^1.12.32|^2.1.31",
+                "phpunit/phpunit": "^8.5.48|^9.0"
             },
             "type": "library",
             "extra": {
@@ -412,7 +451,7 @@
             ],
             "support": {
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
-                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.4.0"
+                "source": "https://github.com/dragonmantank/cron-expression/tree/v3.6.0"
             },
             "funding": [
                 {
@@ -420,7 +459,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-10-09T13:47:03+00:00"
+            "time": "2025-10-31T18:51:33+00:00"
         },
         {
             "name": "enshrined/svg-sanitize",
@@ -582,24 +621,25 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.3.0",
+            "version": "2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "481557b130ef3790cf82b713667b43030dc9c957"
+                "reference": "4360e982f87f5f258bf872d094647791db2f4c8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
-                "reference": "481557b130ef3790cf82b713667b43030dc9c957",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/4360e982f87f5f258bf872d094647791db2f4c8e",
+                "reference": "4360e982f87f5f258bf872d094647791db2f4c8e",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2.5 || ^8.0"
+                "php": "^7.2.5 || ^8.0",
+                "symfony/deprecation-contracts": "^2.5 || ^3.0"
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
+                "phpunit/phpunit": "^8.5.52 || ^9.6.34"
             },
             "type": "library",
             "extra": {
@@ -645,7 +685,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.3.0"
+                "source": "https://github.com/guzzle/promises/tree/2.5.0"
             },
             "funding": [
                 {
@@ -661,20 +701,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-22T14:34:08+00:00"
+            "time": "2026-06-02T12:23:43+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.12.3",
+            "version": "2.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "7ec62dc3f44aa218487dbed81a9bf9bc647be55d"
+                "reference": "172ef2f4e9824c1e058b7f30be8ae25a02c0f2b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/7ec62dc3f44aa218487dbed81a9bf9bc647be55d",
-                "reference": "7ec62dc3f44aa218487dbed81a9bf9bc647be55d",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/172ef2f4e9824c1e058b7f30be8ae25a02c0f2b7",
+                "reference": "172ef2f4e9824c1e058b7f30be8ae25a02c0f2b7",
                 "shasum": ""
             },
             "require": {
@@ -683,7 +723,7 @@
                 "psr/http-message": "^1.1 || ^2.0",
                 "ralouphie/getallheaders": "^3.0",
                 "symfony/deprecation-contracts": "^2.5 || ^3.0",
-                "symfony/polyfill-php80": "^1.25"
+                "symfony/polyfill-php80": "^1.24"
             },
             "provide": {
                 "psr/http-factory-implementation": "1.0",
@@ -764,7 +804,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.12.3"
+                "source": "https://github.com/guzzle/psr7/tree/2.12.1"
             },
             "funding": [
                 {
@@ -780,7 +820,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-23T15:21:08+00:00"
+            "time": "2026-06-18T09:49:37+00:00"
         },
         {
             "name": "jakeasmith/http_build_url",
@@ -1058,58 +1098,52 @@
         },
         {
             "name": "joomla/application",
-            "version": "3.0.4",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/application.git",
-                "reference": "3ab2450f712136f1893337a38bb4c4f951cc853b"
+                "reference": "878d1f4a2dc03b6197d0e6cfb4a969ec06a3314d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/application/zipball/3ab2450f712136f1893337a38bb4c4f951cc853b",
-                "reference": "3ab2450f712136f1893337a38bb4c4f951cc853b",
+                "url": "https://api.github.com/repos/joomla-framework/application/zipball/878d1f4a2dc03b6197d0e6cfb4a969ec06a3314d",
+                "reference": "878d1f4a2dc03b6197d0e6cfb4a969ec06a3314d",
                 "shasum": ""
             },
             "require": {
-                "joomla/event": "^3.0",
-                "joomla/registry": "^3.0",
-                "laminas/laminas-diactoros": "^2.24.0",
-                "php": "^8.1.0",
-                "psr/http-message": "^1.0",
+                "joomla/event": "^4.0",
+                "joomla/registry": "^4.0",
+                "laminas/laminas-diactoros": "^3.6.0",
+                "php": "^8.3.0",
+                "psr/http-message": "^2.0",
                 "psr/log": "^1.0|^2.0|^3.0",
                 "symfony/deprecation-contracts": "^2|^3"
             },
             "require-dev": {
                 "ext-json": "*",
-                "joomla/controller": "^3.0",
-                "joomla/di": "^3.0",
-                "joomla/input": "^3.0",
-                "joomla/router": "^3.0",
-                "joomla/session": "^3.0",
-                "joomla/test": "^3.0",
-                "joomla/uri": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
+                "joomla/controller": "^4.0",
+                "joomla/di": "^4.0",
+                "joomla/input": "^4.0",
+                "joomla/router": "^4.0",
+                "joomla/session": "^4.0",
+                "joomla/test": "^4.0",
+                "joomla/uri": "^4.0",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
                 "phpunit/phpunit": "^10.0",
                 "squizlabs/php_codesniffer": "~3.10.2",
                 "symfony/phpunit-bridge": "^7.0"
             },
             "suggest": {
                 "ext-json": "To use JSON format, ext-json is required",
-                "joomla/controller": "^3.0 To support resolving ControllerInterface objects in ControllerResolverInterface, install joomla/controller",
-                "joomla/input": "^3.0 To use WebApplicationInterface, install joomla/input",
-                "joomla/router": "^3.0 To use WebApplication or ControllerResolverInterface implementations, install joomla/router",
-                "joomla/session": "^3.0 To use SessionAwareWebApplicationInterface, install joomla/session",
-                "joomla/uri": "^3.0 To use AbstractWebApplication, install joomla/uri",
-                "psr/container": "^1.0 To use the ContainerControllerResolver, install any PSR-11 compatible container"
+                "joomla/controller": "^4.0 To support resolving ControllerInterface objects in ControllerResolverInterface, install joomla/controller",
+                "joomla/input": "^4.0 To use WebApplicationInterface, install joomla/input",
+                "joomla/router": "^4.0 To use WebApplication or ControllerResolverInterface implementations, install joomla/router",
+                "joomla/session": "^4.0 To use SessionAwareWebApplicationInterface, install joomla/session",
+                "joomla/uri": "^4.0 To use AbstractWebApplication, install joomla/uri",
+                "psr/container": "^2.0 To use the ContainerControllerResolver, install any PSR-11 compatible container"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Application\\": "src/"
@@ -1150,32 +1184,32 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-07-11T09:17:42+00:00"
+            "time": "2025-07-24T09:55:44+00:00"
         },
         {
             "name": "joomla/archive",
-            "version": "3.0.4",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/archive.git",
-                "reference": "1d506857685f3537c1193f4e77b12f24cc9afe49"
+                "reference": "7a8d0eda637bd37bc3de744aa3e4ce516d4356b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/archive/zipball/1d506857685f3537c1193f4e77b12f24cc9afe49",
-                "reference": "1d506857685f3537c1193f4e77b12f24cc9afe49",
+                "url": "https://api.github.com/repos/joomla-framework/archive/zipball/7a8d0eda637bd37bc3de744aa3e4ce516d4356b0",
+                "reference": "7a8d0eda637bd37bc3de744aa3e4ce516d4356b0",
                 "shasum": ""
             },
             "require": {
-                "joomla/filesystem": "^3.0",
-                "php": "^8.1.0"
+                "joomla/filesystem": "^4.0",
+                "php": "^8.3.0"
             },
             "require-dev": {
-                "joomla/test": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^10.0",
-                "squizlabs/php_codesniffer": "~3.10.2"
+                "joomla/test": "^4.0",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.0",
+                "squizlabs/php_codesniffer": "^3.10.2"
             },
             "suggest": {
                 "ext-bz2": "To extract bzip2 compressed packages",
@@ -1183,12 +1217,6 @@
                 "ext-zlib": "To extract gzip or zip compressed packages"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Archive\\": "src/"
@@ -1207,47 +1235,41 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/archive/issues",
-                "source": "https://github.com/joomla-framework/archive/tree/3.0.4"
+                "source": "https://github.com/joomla-framework/archive/tree/4.0.0"
             },
-            "time": "2025-07-11T10:54:02+00:00"
+            "time": "2025-07-24T08:04:38+00:00"
         },
         {
             "name": "joomla/authentication",
-            "version": "3.0.3",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/authentication.git",
-                "reference": "ea3a263985a40c231a42d050ccd3f822b7b5e778"
+                "reference": "1d9b946410ac43c8d206d9d6bf741173b83a8e4c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/authentication/zipball/ea3a263985a40c231a42d050ccd3f822b7b5e778",
-                "reference": "ea3a263985a40c231a42d050ccd3f822b7b5e778",
+                "url": "https://api.github.com/repos/joomla-framework/authentication/zipball/1d9b946410ac43c8d206d9d6bf741173b83a8e4c",
+                "reference": "1d9b946410ac43c8d206d9d6bf741173b83a8e4c",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1.0"
+                "php": "^8.3.0"
             },
             "require-dev": {
-                "joomla/database": "^3.0",
-                "joomla/input": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^10.0",
-                "squizlabs/php_codesniffer": "~3.10.2",
-                "symfony/phpunit-bridge": "^7.0"
+                "joomla/database": "^4.0",
+                "joomla/input": "^4.0",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.0",
+                "squizlabs/php_codesniffer": "^3.10.2",
+                "symfony/phpunit-bridge": "^8.0"
             },
             "suggest": {
                 "joomla/database": "Required if you want to use Joomla\\Authentication\\Strategies\\DatabaseStrategy",
                 "joomla/input": "Required if you want to use classes in the Joomla\\Authentication\\Strategies namespace"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Authentication\\": "src/"
@@ -1266,50 +1288,44 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/authentication/issues",
-                "source": "https://github.com/joomla-framework/authentication/tree/3.0.3"
+                "source": "https://github.com/joomla-framework/authentication/tree/4.0.0"
             },
-            "time": "2025-07-17T14:56:13+00:00"
+            "time": "2025-07-24T08:02:13+00:00"
         },
         {
             "name": "joomla/console",
-            "version": "3.0.3",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/console.git",
-                "reference": "839ac3e759a9c8bf962175906480923a7b680c36"
+                "reference": "b58fb572436ad9e230061ff6929aa1446849efe8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/console/zipball/839ac3e759a9c8bf962175906480923a7b680c36",
-                "reference": "839ac3e759a9c8bf962175906480923a7b680c36",
+                "url": "https://api.github.com/repos/joomla-framework/console/zipball/b58fb572436ad9e230061ff6929aa1446849efe8",
+                "reference": "b58fb572436ad9e230061ff6929aa1446849efe8",
                 "shasum": ""
             },
             "require": {
-                "joomla/application": "^3.0",
-                "joomla/event": "^3.0",
-                "joomla/string": "^3.0",
-                "php": "^8.1.0",
-                "symfony/console": "^v6.2.0",
-                "symfony/error-handler": "^6"
+                "joomla/application": "^4.0",
+                "joomla/event": "^4.0",
+                "joomla/string": "^4.0",
+                "php": "^8.3.0",
+                "symfony/console": "^v7.0.0",
+                "symfony/error-handler": "^7"
             },
             "require-dev": {
-                "joomla/test": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^10.0",
-                "psr/container": "^1.0",
+                "joomla/test": "^4.0",
+                "phpstan/phpstan": "2.1.17",
+                "phpstan/phpstan-deprecation-rules": "2.0.3",
+                "phpunit/phpunit": "^12.0",
+                "psr/container": "^2.0",
                 "squizlabs/php_codesniffer": "~3.10.2"
             },
             "suggest": {
                 "psr/container-implementation": "To use the ContainerLoader"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Console\\": "src/"
@@ -1328,35 +1344,34 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/console/issues",
-                "source": "https://github.com/joomla-framework/console/tree/3.0.3"
+                "source": "https://github.com/joomla-framework/console/tree/4.0.0"
             },
-            "time": "2025-07-17T14:55:35+00:00"
+            "time": "2025-07-24T08:33:34+00:00"
         },
         {
             "name": "joomla/crypt",
-            "version": "3.0.3",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/crypt.git",
-                "reference": "0cfd0a3ab2fc64015030319348a16f4fa6e0355a"
+                "reference": "9b069827a7875ae3bff409695624071f4d356aca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/crypt/zipball/0cfd0a3ab2fc64015030319348a16f4fa6e0355a",
-                "reference": "0cfd0a3ab2fc64015030319348a16f4fa6e0355a",
+                "url": "https://api.github.com/repos/joomla-framework/crypt/zipball/9b069827a7875ae3bff409695624071f4d356aca",
+                "reference": "9b069827a7875ae3bff409695624071f4d356aca",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1.0"
+                "php": "^8.3.0"
             },
             "require-dev": {
                 "defuse/php-encryption": "^2.0",
                 "paragonie/sodium_compat": "^1|^2",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.2.6",
                 "squizlabs/php_codesniffer": "~3.7.2",
-                "symfony/phpunit-bridge": "^5.0",
                 "symfony/polyfill-util": "^1.0"
             },
             "suggest": {
@@ -1366,12 +1381,6 @@
                 "paragonie/sodium_compat": "To use Sodium cipher if neither ext/sodium or ext/libsodium are available"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Crypt\\": "src/"
@@ -1390,42 +1399,36 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/crypt/issues",
-                "source": "https://github.com/joomla-framework/crypt/tree/3.0.3"
+                "source": "https://github.com/joomla-framework/crypt/tree/4.0.0"
             },
-            "time": "2025-07-19T11:01:54+00:00"
+            "time": "2025-07-24T07:56:55+00:00"
         },
         {
             "name": "joomla/data",
-            "version": "3.0.3",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/data.git",
-                "reference": "8eaa08b07b84dce217b1735e5c51d66285ff93ae"
+                "reference": "e00293048e893dc3c5e793b091e87da84faf3963"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/data/zipball/8eaa08b07b84dce217b1735e5c51d66285ff93ae",
-                "reference": "8eaa08b07b84dce217b1735e5c51d66285ff93ae",
+                "url": "https://api.github.com/repos/joomla-framework/data/zipball/e00293048e893dc3c5e793b091e87da84faf3963",
+                "reference": "e00293048e893dc3c5e793b091e87da84faf3963",
                 "shasum": ""
             },
             "require": {
-                "joomla/registry": "^3.0",
-                "php": "^8.1.0"
+                "joomla/registry": "^4.0",
+                "php": "^8.3.0"
             },
             "require-dev": {
-                "joomla/test": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
-                "squizlabs/php_codesniffer": "~3.7.2"
+                "joomla/test": "^4.0",
+                "phpstan/phpstan": "2.1.17",
+                "phpstan/phpstan-deprecation-rules": "2.0.3",
+                "phpunit/phpunit": "^12.0",
+                "squizlabs/php_codesniffer": "~3.10.2"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Data\\": "src/"
@@ -1444,42 +1447,43 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/data/issues",
-                "source": "https://github.com/joomla-framework/data/tree/3.0.3"
+                "source": "https://github.com/joomla-framework/data/tree/4.0.0"
             },
-            "time": "2025-07-19T12:27:51+00:00"
+            "time": "2025-07-24T08:48:07+00:00"
         },
         {
             "name": "joomla/database",
-            "version": "3.4.3",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/database.git",
-                "reference": "6a8aedaea444cd78912153c4d8361eb06ba2a9cd"
+                "reference": "2e744e7959368891fe52ccb35790e201251f6f39"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/database/zipball/6a8aedaea444cd78912153c4d8361eb06ba2a9cd",
-                "reference": "6a8aedaea444cd78912153c4d8361eb06ba2a9cd",
+                "url": "https://api.github.com/repos/joomla-framework/database/zipball/2e744e7959368891fe52ccb35790e201251f6f39",
+                "reference": "2e744e7959368891fe52ccb35790e201251f6f39",
                 "shasum": ""
             },
             "require": {
-                "joomla/event": "^3.0",
-                "php": "^8.1.0",
+                "joomla/event": "^4.0",
+                "php": "^8.3.0",
                 "symfony/deprecation-contracts": "^2|^3"
             },
             "require-dev": {
-                "joomla/archive": "^3.0",
-                "joomla/console": "^3.0",
-                "joomla/di": "^3.0",
-                "joomla/filesystem": "^3.0",
-                "joomla/registry": "^3.0",
-                "joomla/test": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
-                "psr/log": "^1.1",
-                "squizlabs/php_codesniffer": "~3.7.2",
-                "symfony/phpunit-bridge": "^5.0"
+                "colinodell/psr-testlogger": "^1.3.0",
+                "joomla/archive": "^4.0",
+                "joomla/console": "^4.0",
+                "joomla/di": "^4.0",
+                "joomla/filesystem": "^4.0",
+                "joomla/registry": "^4.0",
+                "joomla/test": "^4.0",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.0",
+                "psr/log": "^3.0.2",
+                "squizlabs/php_codesniffer": "^3.10.2",
+                "symfony/phpunit-bridge": "^8.0"
             },
             "suggest": {
                 "ext-mysqli": "To connect to a MySQL database via MySQLi",
@@ -1493,12 +1497,6 @@
                 "psr/log": "To use the LoggingMonitor, install psr/log."
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Database\\": "src/"
@@ -1517,46 +1515,40 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/database/issues",
-                "source": "https://github.com/joomla-framework/database/tree/3.4.3"
+                "source": "https://github.com/joomla-framework/database/tree/4.0.0"
             },
-            "time": "2025-07-19T15:40:51+00:00"
+            "time": "2025-07-24T09:46:18+00:00"
         },
         {
             "name": "joomla/di",
-            "version": "3.1.1",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/di.git",
-                "reference": "fd98d11dddf65adf9c6eff68a4c80f9f2f34b2b9"
+                "reference": "e8511111e2b5b239f75116f9ff75b43c18809868"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/di/zipball/fd98d11dddf65adf9c6eff68a4c80f9f2f34b2b9",
-                "reference": "fd98d11dddf65adf9c6eff68a4c80f9f2f34b2b9",
+                "url": "https://api.github.com/repos/joomla-framework/di/zipball/e8511111e2b5b239f75116f9ff75b43c18809868",
+                "reference": "e8511111e2b5b239f75116f9ff75b43c18809868",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1.0",
-                "psr/container": "^1.0",
+                "php": "^8.3.0",
+                "psr/container": "^2.0",
                 "symfony/deprecation-contracts": "^2|^3"
             },
             "provide": {
                 "psr/container-implementation": "~1.0"
             },
             "require-dev": {
-                "joomla/test": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
+                "joomla/test": "^4.0",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.2.6",
                 "squizlabs/php_codesniffer": "~3.7.2"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\DI\\": "src/"
@@ -1578,47 +1570,41 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/di/issues",
-                "source": "https://github.com/joomla-framework/di/tree/3.1.1"
+                "source": "https://github.com/joomla-framework/di/tree/4.0.0"
             },
-            "time": "2025-07-19T16:11:41+00:00"
+            "time": "2025-07-24T07:51:22+00:00"
         },
         {
             "name": "joomla/event",
-            "version": "3.0.2",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/event.git",
-                "reference": "d1a5dd4c5c8aa1d1c7a7101da93e677ec5d3ef3f"
+                "reference": "4bbbfb0a3444cb3e3f9abd57d623caa06e9207b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/event/zipball/d1a5dd4c5c8aa1d1c7a7101da93e677ec5d3ef3f",
-                "reference": "d1a5dd4c5c8aa1d1c7a7101da93e677ec5d3ef3f",
+                "url": "https://api.github.com/repos/joomla-framework/event/zipball/4bbbfb0a3444cb3e3f9abd57d623caa06e9207b5",
+                "reference": "4bbbfb0a3444cb3e3f9abd57d623caa06e9207b5",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1.0",
+                "php": "^8.3.0",
                 "symfony/deprecation-contracts": "^2|^3"
             },
             "require-dev": {
-                "joomla/console": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
-                "psr/container": "^1.0",
-                "squizlabs/php_codesniffer": "~3.7.2"
+                "joomla/console": "^4.0",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.2.7",
+                "psr/container": "^2.0",
+                "squizlabs/php_codesniffer": "^3.7.2"
             },
             "suggest": {
                 "joomla/console": "If you want to use the DebugEventDispatcherCommand class, please install joomla/console",
                 "psr/container-implementation": "If you want to use the LazyServiceEventListener class, please install a PSR-11 container"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Event\\": "src/"
@@ -1637,42 +1623,36 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/event/issues",
-                "source": "https://github.com/joomla-framework/event/tree/3.0.2"
+                "source": "https://github.com/joomla-framework/event/tree/4.0.0"
             },
-            "time": "2025-07-19T18:30:21+00:00"
+            "time": "2025-07-24T09:34:33+00:00"
         },
         {
             "name": "joomla/filesystem",
-            "version": "3.3.0",
+            "version": "4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/filesystem.git",
-                "reference": "0452f6ce0365d90a39fe9d005059aa245613f4e1"
+                "reference": "a79ed5044970b81a5aed22049199c1d6bc902d9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/filesystem/zipball/0452f6ce0365d90a39fe9d005059aa245613f4e1",
-                "reference": "0452f6ce0365d90a39fe9d005059aa245613f4e1",
+                "url": "https://api.github.com/repos/joomla-framework/filesystem/zipball/a79ed5044970b81a5aed22049199c1d6bc902d9a",
+                "reference": "a79ed5044970b81a5aed22049199c1d6bc902d9a",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1.0"
+                "php": "^8.3.0"
             },
             "require-dev": {
-                "joomla/test": "^3.0",
+                "joomla/test": "^4.0",
                 "mikey179/vfsstream": "^1.6.11",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
-                "squizlabs/php_codesniffer": "^3.7.2"
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.2.7",
+                "squizlabs/php_codesniffer": "^3.13.2"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Filesystem\\": "src/"
@@ -1691,45 +1671,39 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/filesystem/issues",
-                "source": "https://github.com/joomla-framework/filesystem/tree/3.3.0"
+                "source": "https://github.com/joomla-framework/filesystem/tree/4.2.1"
             },
-            "time": "2026-06-25T19:30:56+00:00"
+            "time": "2026-08-18T15:44:34+00:00"
         },
         {
             "name": "joomla/filter",
-            "version": "3.0.6",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/filter.git",
-                "reference": "dde731979af1a34a0b5610281c227274628c1b6f"
+                "reference": "f61782cddb50f3d27a970b355ac1712bc6b16689"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/filter/zipball/dde731979af1a34a0b5610281c227274628c1b6f",
-                "reference": "dde731979af1a34a0b5610281c227274628c1b6f",
+                "url": "https://api.github.com/repos/joomla-framework/filter/zipball/f61782cddb50f3d27a970b355ac1712bc6b16689",
+                "reference": "f61782cddb50f3d27a970b355ac1712bc6b16689",
                 "shasum": ""
             },
             "require": {
-                "joomla/string": "^3.0",
-                "php": "^8.1.0"
+                "joomla/string": "^4.0",
+                "php": "^8.3.0"
             },
             "require-dev": {
-                "joomla/language": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
+                "joomla/language": "^4.0",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.2.7",
                 "squizlabs/php_codesniffer": "^3.7.2"
             },
             "suggest": {
                 "joomla/language": "Required only if you want to use `OutputFilter::stringURLSafe`."
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Filter\\": "src/"
@@ -1748,49 +1722,43 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/filter/issues",
-                "source": "https://github.com/joomla-framework/filter/tree/3.0.6"
+                "source": "https://github.com/joomla-framework/filter/tree/4.1.0"
             },
-            "time": "2026-05-26T16:06:28+00:00"
+            "time": "2026-08-14T10:06:10+00:00"
         },
         {
             "name": "joomla/http",
-            "version": "3.1.4",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/http.git",
-                "reference": "493dc254d9fa9277c7ab3488573ddb4f3bbfa9bc"
+                "reference": "3c494722385f556e022ea57b9e9c7474d95452c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/http/zipball/493dc254d9fa9277c7ab3488573ddb4f3bbfa9bc",
-                "reference": "493dc254d9fa9277c7ab3488573ddb4f3bbfa9bc",
+                "url": "https://api.github.com/repos/joomla-framework/http/zipball/3c494722385f556e022ea57b9e9c7474d95452c3",
+                "reference": "3c494722385f556e022ea57b9e9c7474d95452c3",
                 "shasum": ""
             },
             "require": {
                 "composer/ca-bundle": "^1.3.5",
-                "joomla/uri": "^3.0",
-                "laminas/laminas-diactoros": "^2.24.0",
-                "php": "^8.1.0",
+                "joomla/uri": "^4.0",
+                "laminas/laminas-diactoros": "^3.6.0",
+                "php": "^8.3.0",
                 "psr/http-client": "^1.0",
-                "psr/http-message": "^1.0"
+                "psr/http-message": "^2.0"
             },
             "require-dev": {
-                "joomla/test": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
+                "joomla/test": "^4.0",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.2.6",
                 "squizlabs/php_codesniffer": "^3.7.2"
             },
             "suggest": {
                 "ext-curl": "To use cURL for HTTP connections"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Http\\": "src/"
@@ -1809,43 +1777,37 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/http/issues",
-                "source": "https://github.com/joomla-framework/http/tree/3.1.4"
+                "source": "https://github.com/joomla-framework/http/tree/4.0.2"
             },
-            "time": "2026-01-07T16:36:43+00:00"
+            "time": "2026-01-08T07:18:39+00:00"
         },
         {
             "name": "joomla/input",
-            "version": "3.0.2",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/input.git",
-                "reference": "b4ef792308e7adb42fb71a8118025ced899e4386"
+                "reference": "f366f97b143bd9d15f57dad74b21f72ac99d89ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/input/zipball/b4ef792308e7adb42fb71a8118025ced899e4386",
-                "reference": "b4ef792308e7adb42fb71a8118025ced899e4386",
+                "url": "https://api.github.com/repos/joomla-framework/input/zipball/f366f97b143bd9d15f57dad74b21f72ac99d89ec",
+                "reference": "f366f97b143bd9d15f57dad74b21f72ac99d89ec",
                 "shasum": ""
             },
             "require": {
-                "joomla/filter": "^3.0",
-                "php": "^8.1.0",
+                "joomla/filter": "^4.0",
+                "php": "^8.3.0",
                 "symfony/deprecation-contracts": "^2|^3"
             },
             "require-dev": {
-                "joomla/test": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
-                "squizlabs/php_codesniffer": "^3.7.2"
+                "joomla/test": "^4.0",
+                "phpstan/phpstan": "2.1.17",
+                "phpstan/phpstan-deprecation-rules": "2.0.3",
+                "phpunit/phpunit": "^12.0",
+                "squizlabs/php_codesniffer": "^3.10.2"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Input\\": "src/"
@@ -1864,49 +1826,43 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/input/issues",
-                "source": "https://github.com/joomla-framework/input/tree/3.0.2"
+                "source": "https://github.com/joomla-framework/input/tree/4.0.0"
             },
-            "time": "2025-07-19T12:57:48+00:00"
+            "time": "2025-07-23T19:52:44+00:00"
         },
         {
             "name": "joomla/language",
-            "version": "3.0.2",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/language.git",
-                "reference": "7bd3d468ffad1e9639468a17751ec4324fc57d09"
+                "reference": "371507d84103e9e7b48253e72b3bcc8d91cf5a63"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/language/zipball/7bd3d468ffad1e9639468a17751ec4324fc57d09",
-                "reference": "7bd3d468ffad1e9639468a17751ec4324fc57d09",
+                "url": "https://api.github.com/repos/joomla-framework/language/zipball/371507d84103e9e7b48253e72b3bcc8d91cf5a63",
+                "reference": "371507d84103e9e7b48253e72b3bcc8d91cf5a63",
                 "shasum": ""
             },
             "require": {
                 "ext-xml": "*",
-                "joomla/string": "^3.0",
-                "php": "^8.1.0",
+                "joomla/string": "^4.0",
+                "php": "^8.3.0",
                 "symfony/deprecation-contracts": "^2|^3"
             },
             "require-dev": {
-                "joomla/di": "^3.0",
-                "joomla/registry": "^3.0",
-                "joomla/test": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
+                "joomla/di": "^4.0",
+                "joomla/registry": "^4.0",
+                "joomla/test": "^4.0",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.2.6",
                 "squizlabs/php_codesniffer": "^3.7.2"
             },
             "suggest": {
                 "joomla/di": "To use the Language ServiceProviderInterface objects, install joomla/di."
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Language\\": "src/"
@@ -1925,48 +1881,42 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/language/issues",
-                "source": "https://github.com/joomla-framework/language/tree/3.0.2"
+                "source": "https://github.com/joomla-framework/language/tree/4.0.0"
             },
-            "time": "2025-07-19T13:19:12+00:00"
+            "time": "2025-07-23T19:48:37+00:00"
         },
         {
             "name": "joomla/oauth1",
-            "version": "3.0.1",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/oauth1.git",
-                "reference": "4c1407cc98e0689ff36fa566906673829a8627ec"
+                "reference": "e48c0af2173222494cbac414e971c807f32a9eb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/oauth1/zipball/4c1407cc98e0689ff36fa566906673829a8627ec",
-                "reference": "4c1407cc98e0689ff36fa566906673829a8627ec",
+                "url": "https://api.github.com/repos/joomla-framework/oauth1/zipball/e48c0af2173222494cbac414e971c807f32a9eb9",
+                "reference": "e48c0af2173222494cbac414e971c807f32a9eb9",
                 "shasum": ""
             },
             "require": {
-                "joomla/application": "^3.0",
-                "joomla/http": "^3.0",
-                "joomla/input": "^3.0",
-                "joomla/registry": "^3.0",
-                "joomla/session": "^3.0",
-                "joomla/uri": "^3.0",
-                "php": "^8.1.0"
+                "joomla/application": "^4.0",
+                "joomla/http": "^4.0",
+                "joomla/input": "^4.0",
+                "joomla/registry": "^4.0",
+                "joomla/session": "^4.0",
+                "joomla/uri": "^4.0",
+                "php": "^8.3.0"
             },
             "require-dev": {
-                "joomla/event": "^3.0",
-                "joomla/test": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
-                "squizlabs/php_codesniffer": "^3.7.2"
+                "joomla/event": "^4.0",
+                "joomla/test": "^4.0",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.2.7",
+                "squizlabs/php_codesniffer": "^3.13.2"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\OAuth1\\": "src/"
@@ -1985,45 +1935,39 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/oauth1/issues",
-                "source": "https://github.com/joomla-framework/oauth1/tree/3.0.1"
+                "source": "https://github.com/joomla-framework/oauth1/tree/4.0.1"
             },
-            "time": "2025-07-19T19:54:15+00:00"
+            "time": "2025-08-06T11:59:19+00:00"
         },
         {
             "name": "joomla/oauth2",
-            "version": "3.0.3",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/oauth2.git",
-                "reference": "318bae49ddfe67f83626bc05e0d0c82d20c365d0"
+                "reference": "bb24c0a969fcc62c97997ba33a476ec888c34b00"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/oauth2/zipball/318bae49ddfe67f83626bc05e0d0c82d20c365d0",
-                "reference": "318bae49ddfe67f83626bc05e0d0c82d20c365d0",
+                "url": "https://api.github.com/repos/joomla-framework/oauth2/zipball/bb24c0a969fcc62c97997ba33a476ec888c34b00",
+                "reference": "bb24c0a969fcc62c97997ba33a476ec888c34b00",
                 "shasum": ""
             },
             "require": {
-                "joomla/application": "^3.0",
-                "joomla/http": "^3.0",
-                "joomla/input": "^3.0",
-                "joomla/session": "^3.0",
-                "joomla/uri": "^3.0",
-                "php": "^8.1.0"
+                "joomla/application": "^4.0",
+                "joomla/http": "^4.0",
+                "joomla/input": "^4.0",
+                "joomla/session": "^4.0",
+                "joomla/uri": "^4.0",
+                "php": "^8.3.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
-                "squizlabs/php_codesniffer": "^3.7.2"
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.0",
+                "squizlabs/php_codesniffer": "^3.10.2"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\OAuth2\\": "src/"
@@ -2042,34 +1986,34 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/oauth2/issues",
-                "source": "https://github.com/joomla-framework/oauth2/tree/3.0.3"
+                "source": "https://github.com/joomla-framework/oauth2/tree/4.0.2"
             },
-            "time": "2026-04-19T10:05:06+00:00"
+            "time": "2026-04-15T17:57:50+00:00"
         },
         {
             "name": "joomla/registry",
-            "version": "3.0.2",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/registry.git",
-                "reference": "4452de9c66abfec59b535e27c62af3528a539311"
+                "reference": "5692d8423c9b568627df701e9fd505eae5ea8f72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/registry/zipball/4452de9c66abfec59b535e27c62af3528a539311",
-                "reference": "4452de9c66abfec59b535e27c62af3528a539311",
+                "url": "https://api.github.com/repos/joomla-framework/registry/zipball/5692d8423c9b568627df701e9fd505eae5ea8f72",
+                "reference": "5692d8423c9b568627df701e9fd505eae5ea8f72",
                 "shasum": ""
             },
             "require": {
-                "joomla/utilities": "^3.0",
-                "php": "^8.1.0"
+                "joomla/utilities": "^4.0",
+                "php": "^8.3.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.2.6",
                 "squizlabs/php_codesniffer": "^3.7.2",
-                "symfony/yaml": "^5.0"
+                "symfony/yaml": "^7.3"
             },
             "suggest": {
                 "ext-json": "ext-json is needed for JSON support",
@@ -2077,12 +2021,6 @@
                 "symfony/yaml": "Install symfony/yaml if you require YAML support."
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Registry\\": "src/"
@@ -2101,49 +2039,40 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/registry/issues",
-                "source": "https://github.com/joomla-framework/registry/tree/3.0.2"
+                "source": "https://github.com/joomla-framework/registry/tree/4.0.0"
             },
-            "time": "2025-07-19T16:26:22+00:00"
+            "time": "2025-07-23T19:26:22+00:00"
         },
         {
             "name": "joomla/router",
-            "version": "3.0.2",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/router.git",
-                "reference": "8aa0013a6ba59ef250496b47855498e9a83156d1"
+                "reference": "d0552ac09b92712a140fff2323579b84fbaa12b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/router/zipball/8aa0013a6ba59ef250496b47855498e9a83156d1",
-                "reference": "8aa0013a6ba59ef250496b47855498e9a83156d1",
+                "url": "https://api.github.com/repos/joomla-framework/router/zipball/d0552ac09b92712a140fff2323579b84fbaa12b8",
+                "reference": "d0552ac09b92712a140fff2323579b84fbaa12b8",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1.0"
-            },
-            "conflict": {
-                "jeremeamia/superclosure": "<2.4"
+                "php": "^8.3.0"
             },
             "require-dev": {
-                "jeremeamia/superclosure": "^2.4",
-                "joomla/console": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
+                "joomla/console": "^4.0",
+                "opis/closure": "^4.3.1",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.2.6",
                 "squizlabs/php_codesniffer": "^3.7.2"
             },
             "suggest": {
-                "jeremeamia/superclosure": "If you use Closure based controllers and want to be able to serialize the router, please install jeremeamia/superclosure",
-                "joomla/console": "If you want to use the DebugRouterCommand class, please install joomla/console"
+                "joomla/console": "If you want to use the DebugRouterCommand class, please install joomla/console",
+                "opis/closure": "If you use Closure based controllers and want to be able to serialize the router, please install opis/closure"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Router\\": "src/"
@@ -2162,39 +2091,39 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/router/issues",
-                "source": "https://github.com/joomla-framework/router/tree/3.0.2"
+                "source": "https://github.com/joomla-framework/router/tree/4.0.0"
             },
-            "time": "2025-07-19T13:51:10+00:00"
+            "time": "2025-07-23T19:21:30+00:00"
         },
         {
             "name": "joomla/session",
-            "version": "3.0.3",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/session.git",
-                "reference": "6bebada5dccf70be0d18db673aa3a68af19b3972"
+                "reference": "3d1d8bc093d659053c46eec4962bef4c1e9e0206"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/session/zipball/6bebada5dccf70be0d18db673aa3a68af19b3972",
-                "reference": "6bebada5dccf70be0d18db673aa3a68af19b3972",
+                "url": "https://api.github.com/repos/joomla-framework/session/zipball/3d1d8bc093d659053c46eec4962bef4c1e9e0206",
+                "reference": "3d1d8bc093d659053c46eec4962bef4c1e9e0206",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1.0",
+                "php": "^8.3.0",
                 "symfony/deprecation-contracts": "^2|^3"
             },
             "require-dev": {
-                "joomla/console": "^3.0",
-                "joomla/database": "^3.0",
-                "joomla/event": "^3.0",
-                "joomla/input": "^3.0",
-                "joomla/test": "^3.0",
-                "joomla/utilities": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
-                "squizlabs/php_codesniffer": "^3.7.2"
+                "joomla/console": "^4.0",
+                "joomla/database": "^4.0",
+                "joomla/event": "^4.0",
+                "joomla/input": "^4.0",
+                "joomla/test": "^4.0",
+                "joomla/utilities": "^4.0",
+                "phpstan/phpstan": "2.1.17",
+                "phpstan/phpstan-deprecation-rules": "2.0.3",
+                "phpunit/phpunit": "^12.0",
+                "squizlabs/php_codesniffer": "^3.10.2"
             },
             "suggest": {
                 "ext-apcu": "To use APCu cache as a session handler",
@@ -2208,12 +2137,6 @@
                 "joomla/input": "The joomla/input package is required to use Address and Forwarded session validators."
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.x-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Session\\": "src/"
@@ -2232,37 +2155,35 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/session/issues",
-                "source": "https://github.com/joomla-framework/session/tree/3.0.3"
+                "source": "https://github.com/joomla-framework/session/tree/4.0.0"
             },
-            "time": "2025-07-19T15:19:54+00:00"
+            "time": "2025-07-23T19:16:20+00:00"
         },
         {
             "name": "joomla/string",
-            "version": "3.0.4",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/string.git",
-                "reference": "0b3d33564db389e27346f7e275c694897c939434"
+                "reference": "da2329e05f1f5fc98b709f8638f279513bcd1108"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/string/zipball/0b3d33564db389e27346f7e275c694897c939434",
-                "reference": "0b3d33564db389e27346f7e275c694897c939434",
+                "url": "https://api.github.com/repos/joomla-framework/string/zipball/da2329e05f1f5fc98b709f8638f279513bcd1108",
+                "reference": "da2329e05f1f5fc98b709f8638f279513bcd1108",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1.0",
-                "symfony/deprecation-contracts": "^2|^3"
-            },
-            "conflict": {
-                "doctrine/inflector": "<1.2"
+                "php": "^8.3.0",
+                "symfony/deprecation-contracts": "^2|^3",
+                "symfony/polyfill-mbstring": "^1.31.0"
             },
             "require-dev": {
-                "doctrine/inflector": "^1.2",
-                "joomla/test": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
+                "doctrine/inflector": "^2.0.10",
+                "joomla/test": "^4.0",
+                "phpstan/phpstan": "2.1.17",
+                "phpstan/phpstan-deprecation-rules": "2.0.3",
+                "phpunit/phpunit": "^12.2.6",
                 "squizlabs/php_codesniffer": "^3.7.2"
             },
             "suggest": {
@@ -2270,30 +2191,7 @@
                 "ext-mbstring": "For improved processing"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
-                "files": [
-                    "src/phputf8/utf8.php",
-                    "src/phputf8/ord.php",
-                    "src/phputf8/str_ireplace.php",
-                    "src/phputf8/str_pad.php",
-                    "src/phputf8/str_split.php",
-                    "src/phputf8/strcasecmp.php",
-                    "src/phputf8/strcspn.php",
-                    "src/phputf8/stristr.php",
-                    "src/phputf8/strrev.php",
-                    "src/phputf8/strspn.php",
-                    "src/phputf8/trim.php",
-                    "src/phputf8/ucfirst.php",
-                    "src/phputf8/ucwords.php",
-                    "src/phputf8/utils/ascii.php",
-                    "src/phputf8/utils/validation.php"
-                ],
                 "psr-4": {
                     "Joomla\\String\\": "src/"
                 }
@@ -2311,43 +2209,37 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/string/issues",
-                "source": "https://github.com/joomla-framework/string/tree/3.0.4"
+                "source": "https://github.com/joomla-framework/string/tree/4.0.0"
             },
-            "time": "2025-07-19T15:25:56+00:00"
+            "time": "2025-07-23T18:42:26+00:00"
         },
         {
             "name": "joomla/uri",
-            "version": "3.0.2",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/uri.git",
-                "reference": "ac18b410b58c5d2cb652eac7c13acb4971cb5e0d"
+                "reference": "9fa4fac811bf63e830d46d83031c353cf2765bcd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/uri/zipball/ac18b410b58c5d2cb652eac7c13acb4971cb5e0d",
-                "reference": "ac18b410b58c5d2cb652eac7c13acb4971cb5e0d",
+                "url": "https://api.github.com/repos/joomla-framework/uri/zipball/9fa4fac811bf63e830d46d83031c353cf2765bcd",
+                "reference": "9fa4fac811bf63e830d46d83031c353cf2765bcd",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1.0"
+                "php": "^8.3.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.2.6",
                 "squizlabs/php_codesniffer": "^3.7.2"
             },
             "suggest": {
                 "ext-mbstring": "Used to speed up url parsing"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Uri\\": "src/"
@@ -2366,41 +2258,35 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/uri/issues",
-                "source": "https://github.com/joomla-framework/uri/tree/3.0.2"
+                "source": "https://github.com/joomla-framework/uri/tree/4.0.0"
             },
-            "time": "2025-07-12T12:01:42+00:00"
+            "time": "2025-07-23T19:02:38+00:00"
         },
         {
             "name": "joomla/utilities",
-            "version": "3.0.2",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/utilities.git",
-                "reference": "bec074fa469cfdb30fae168899cf65159bf7890d"
+                "reference": "5f234527f7dad7111830b091aef52787c3c07cc8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/utilities/zipball/bec074fa469cfdb30fae168899cf65159bf7890d",
-                "reference": "bec074fa469cfdb30fae168899cf65159bf7890d",
+                "url": "https://api.github.com/repos/joomla-framework/utilities/zipball/5f234527f7dad7111830b091aef52787c3c07cc8",
+                "reference": "5f234527f7dad7111830b091aef52787c3c07cc8",
                 "shasum": ""
             },
             "require": {
-                "joomla/string": "^3.0",
-                "php": "^8.1.0"
+                "joomla/string": "^4.0",
+                "php": "^8.3.0"
             },
             "require-dev": {
                 "phpstan/phpstan": "^2.1.17",
                 "phpstan/phpstan-deprecation-rules": "^2.0.3",
-                "phpunit/phpunit": "^9.5.28",
+                "phpunit/phpunit": "^12.2.6",
                 "squizlabs/php_codesniffer": "^3.7.2"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Utilities\\": "src/"
@@ -2419,47 +2305,47 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/utilities/issues",
-                "source": "https://github.com/joomla-framework/utilities/tree/3.0.2"
+                "source": "https://github.com/joomla-framework/utilities/tree/4.0.0"
             },
-            "time": "2025-07-19T16:29:29+00:00"
+            "time": "2025-07-23T18:52:12+00:00"
         },
         {
             "name": "laminas/laminas-diactoros",
-            "version": "2.26.0",
+            "version": "3.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-diactoros.git",
-                "reference": "6584d44eb8e477e89d453313b858daac6183cddc"
+                "reference": "60c182916b2749480895601649563970f3f12ec4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6584d44eb8e477e89d453313b858daac6183cddc",
-                "reference": "6584d44eb8e477e89d453313b858daac6183cddc",
+                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/60c182916b2749480895601649563970f3f12ec4",
+                "reference": "60c182916b2749480895601649563970f3f12ec4",
                 "shasum": ""
             },
             "require": {
-                "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
-                "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.1"
+                "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
+                "psr/http-factory": "^1.1",
+                "psr/http-message": "^1.1 || ^2.0"
             },
             "conflict": {
-                "zendframework/zend-diactoros": "*"
+                "amphp/amp": "<2.6.4"
             },
             "provide": {
-                "psr/http-factory-implementation": "1.0",
-                "psr/http-message-implementation": "1.0"
+                "psr/http-factory-implementation": "^1.0",
+                "psr/http-message-implementation": "^1.1 || ^2.0"
             },
             "require-dev": {
                 "ext-curl": "*",
                 "ext-dom": "*",
                 "ext-gd": "*",
                 "ext-libxml": "*",
-                "http-interop/http-factory-tests": "^0.9.0",
-                "laminas/laminas-coding-standard": "^2.5",
-                "php-http/psr7-integration-tests": "^1.2",
-                "phpunit/phpunit": "^9.5.28",
-                "psalm/plugin-phpunit": "^0.18.4",
-                "vimeo/psalm": "^5.6"
+                "http-interop/http-factory-tests": "^2.2.0",
+                "laminas/laminas-coding-standard": "~3.1.0",
+                "php-http/psr7-integration-tests": "^1.4.0",
+                "phpunit/phpunit": "^10.5.36",
+                "psalm/plugin-phpunit": "^0.19.5",
+                "vimeo/psalm": "^6.13"
             },
             "type": "library",
             "extra": {
@@ -2474,18 +2360,9 @@
                     "src/functions/marshal_headers_from_sapi.php",
                     "src/functions/marshal_method_from_sapi.php",
                     "src/functions/marshal_protocol_version_from_sapi.php",
-                    "src/functions/marshal_uri_from_sapi.php",
                     "src/functions/normalize_server.php",
                     "src/functions/normalize_uploaded_files.php",
-                    "src/functions/parse_cookie_header.php",
-                    "src/functions/create_uploaded_file.legacy.php",
-                    "src/functions/marshal_headers_from_sapi.legacy.php",
-                    "src/functions/marshal_method_from_sapi.legacy.php",
-                    "src/functions/marshal_protocol_version_from_sapi.legacy.php",
-                    "src/functions/marshal_uri_from_sapi.legacy.php",
-                    "src/functions/normalize_server.legacy.php",
-                    "src/functions/normalize_uploaded_files.legacy.php",
-                    "src/functions/parse_cookie_header.legacy.php"
+                    "src/functions/parse_cookie_header.php"
                 ],
                 "psr-4": {
                     "Laminas\\Diactoros\\": "src/"
@@ -2518,38 +2395,38 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-10-29T16:17:44+00:00"
+            "time": "2025-10-12T15:31:36+00:00"
         },
         {
             "name": "lcobucci/clock",
-            "version": "3.0.0",
+            "version": "3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lcobucci/clock.git",
-                "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc"
+                "reference": "a3139d9e97d47826f27e6a17bb63f13621f86058"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lcobucci/clock/zipball/039ef98c6b57b101d10bd11d8fdfda12cbd996dc",
-                "reference": "039ef98c6b57b101d10bd11d8fdfda12cbd996dc",
+                "url": "https://api.github.com/repos/lcobucci/clock/zipball/a3139d9e97d47826f27e6a17bb63f13621f86058",
+                "reference": "a3139d9e97d47826f27e6a17bb63f13621f86058",
                 "shasum": ""
             },
             "require": {
-                "php": "~8.1.0 || ~8.2.0",
+                "php": "~8.3.0 || ~8.4.0 || ~8.5.0",
                 "psr/clock": "^1.0"
             },
             "provide": {
                 "psr/clock-implementation": "1.0"
             },
             "require-dev": {
-                "infection/infection": "^0.26",
-                "lcobucci/coding-standard": "^9.0",
-                "phpstan/extension-installer": "^1.2",
-                "phpstan/phpstan": "^1.9.4",
-                "phpstan/phpstan-deprecation-rules": "^1.1.1",
-                "phpstan/phpstan-phpunit": "^1.3.2",
-                "phpstan/phpstan-strict-rules": "^1.4.4",
-                "phpunit/phpunit": "^9.5.27"
+                "infection/infection": "^0.31",
+                "lcobucci/coding-standard": "^11.2.0",
+                "phpstan/extension-installer": "^1.3.1",
+                "phpstan/phpstan": "^2.0.0",
+                "phpstan/phpstan-deprecation-rules": "^2.0.0",
+                "phpstan/phpstan-phpunit": "^2.0.0",
+                "phpstan/phpstan-strict-rules": "^2.0.0",
+                "phpunit/phpunit": "^12.0.0"
             },
             "type": "library",
             "autoload": {
@@ -2570,7 +2447,7 @@
             "description": "Yet another clock abstraction",
             "support": {
                 "issues": "https://github.com/lcobucci/clock/issues",
-                "source": "https://github.com/lcobucci/clock/tree/3.0.0"
+                "source": "https://github.com/lcobucci/clock/tree/3.5.0"
             },
             "funding": [
                 {
@@ -2582,7 +2459,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2022-12-19T15:00:24+00:00"
+            "time": "2025-10-27T09:03:17+00:00"
         },
         {
             "name": "lcobucci/jwt",
@@ -2813,31 +2690,32 @@
         },
         {
             "name": "php-debugbar/php-debugbar",
-            "version": "v2.2.4",
+            "version": "v2.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-debugbar/php-debugbar.git",
-                "reference": "3146d04671f51f69ffec2a4207ac3bdcf13a9f35"
+                "reference": "abb9fa3c5c8dbe7efe03ddba56782917481de3e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/3146d04671f51f69ffec2a4207ac3bdcf13a9f35",
-                "reference": "3146d04671f51f69ffec2a4207ac3bdcf13a9f35",
+                "url": "https://api.github.com/repos/php-debugbar/php-debugbar/zipball/abb9fa3c5c8dbe7efe03ddba56782917481de3e8",
+                "reference": "abb9fa3c5c8dbe7efe03ddba56782917481de3e8",
                 "shasum": ""
             },
             "require": {
-                "php": "^8",
+                "php": "^8.1",
                 "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^4|^5|^6|^7"
+                "symfony/var-dumper": "^5.4|^6.4|^7.3|^8.0"
             },
             "replace": {
                 "maximebf/debugbar": "self.version"
             },
             "require-dev": {
                 "dbrekelmans/bdi": "^1",
-                "phpunit/phpunit": "^8|^9",
+                "phpunit/phpunit": "^10",
+                "symfony/browser-kit": "^6.0|7.0",
                 "symfony/panther": "^1|^2.1",
-                "twig/twig": "^1.38|^2.7|^3.0"
+                "twig/twig": "^3.11.2"
             },
             "suggest": {
                 "kriswallsmith/assetic": "The best way to manage assets",
@@ -2847,7 +2725,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.2-dev"
                 }
             },
             "autoload": {
@@ -2880,9 +2758,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-debugbar/php-debugbar/issues",
-                "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.2.4"
+                "source": "https://github.com/php-debugbar/php-debugbar/tree/v2.2.6"
             },
-            "time": "2025-07-22T14:01:30+00:00"
+            "time": "2025-12-22T13:21:32+00:00"
         },
         {
             "name": "php-tuf/php-tuf",
@@ -2960,16 +2838,16 @@
         },
         {
             "name": "phpmailer/phpmailer",
-            "version": "v6.10.0",
+            "version": "v6.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144"
+                "reference": "d1ac35d784bf9f5e61b424901d5a014967f15b12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144",
-                "reference": "bf74d75a1fde6beaa34a0ddae2ec5fce0f72a144",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/d1ac35d784bf9f5e61b424901d5a014967f15b12",
+                "reference": "d1ac35d784bf9f5e61b424901d5a014967f15b12",
                 "shasum": ""
             },
             "require": {
@@ -3029,7 +2907,7 @@
             "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
             "support": {
                 "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.10.0"
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.12.0"
             },
             "funding": [
                 {
@@ -3037,7 +2915,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-04-24T15:19:31+00:00"
+            "time": "2025-10-15T16:49:08+00:00"
         },
         {
             "name": "phpseclib/bcmath_compat",
@@ -3310,22 +3188,27 @@
         },
         {
             "name": "psr/container",
-            "version": "1.1.2",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.4.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -3352,9 +3235,9 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/1.1.2"
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
             },
-            "time": "2021-11-05T16:50:12+00:00"
+            "time": "2021-11-05T16:47:00+00:00"
         },
         {
             "name": "psr/event-dispatcher",
@@ -3515,16 +3398,16 @@
         },
         {
             "name": "psr/http-message",
-            "version": "1.1",
+            "version": "2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-message.git",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba"
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
-                "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
                 "shasum": ""
             },
             "require": {
@@ -3533,7 +3416,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "2.0.x-dev"
                 }
             },
             "autoload": {
@@ -3548,7 +3431,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP messages",
@@ -3562,9 +3445,9 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-message/tree/1.1"
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
             },
-            "time": "2023-04-04T09:50:52+00:00"
+            "time": "2023-04-04T09:54:51+00:00"
         },
         {
             "name": "psr/link",
@@ -3715,40 +3598,28 @@
         },
         {
             "name": "spomky-labs/cbor-php",
-            "version": "3.1.1",
+            "version": "3.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Spomky-Labs/cbor-php.git",
-                "reference": "5404f3e21cbe72f5cf612aa23db2b922fd2f43bf"
+                "reference": "dd6eb84e6d92f7b8bd0da56b4b4dd7235aed0c32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Spomky-Labs/cbor-php/zipball/5404f3e21cbe72f5cf612aa23db2b922fd2f43bf",
-                "reference": "5404f3e21cbe72f5cf612aa23db2b922fd2f43bf",
+                "url": "https://api.github.com/repos/Spomky-Labs/cbor-php/zipball/dd6eb84e6d92f7b8bd0da56b4b4dd7235aed0c32",
+                "reference": "dd6eb84e6d92f7b8bd0da56b4b4dd7235aed0c32",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.9|^0.10|^0.11|^0.12|^0.13",
+                "brick/math": "^0.9|^0.10|^0.11|^0.12|^0.13|^0.14|^0.15|^0.16|^0.17",
                 "ext-mbstring": "*",
                 "php": ">=8.0"
             },
             "require-dev": {
-                "deptrac/deptrac": "^3.0",
-                "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0",
                 "ext-json": "*",
-                "infection/infection": "^0.29",
-                "php-parallel-lint/php-parallel-lint": "^1.3",
-                "phpstan/extension-installer": "^1.1",
-                "phpstan/phpstan": "^1.0|^2.0",
-                "phpstan/phpstan-beberlei-assert": "^1.0|^2.0",
-                "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
-                "phpstan/phpstan-phpunit": "^1.0|^2.0",
-                "phpstan/phpstan-strict-rules": "^1.0|^2.0",
-                "phpunit/phpunit": "^10.1|^11.0|^12.0",
-                "rector/rector": "^1.0|^2.0",
                 "roave/security-advisories": "dev-latest",
-                "symfony/var-dumper": "^6.0|^7.0",
-                "symplify/easy-coding-standard": "^12.0"
+                "symfony/error-handler": "^6.4|^7.1|^8.0",
+                "symfony/var-dumper": "^6.4|^7.1|^8.0"
             },
             "suggest": {
                 "ext-bcmath": "GMP or BCMath extensions will drastically improve the library performance. BCMath extension needed to handle the Big Float and Decimal Fraction Tags",
@@ -3782,7 +3653,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Spomky-Labs/cbor-php/issues",
-                "source": "https://github.com/Spomky-Labs/cbor-php/tree/3.1.1"
+                "source": "https://github.com/Spomky-Labs/cbor-php/tree/3.2.3"
             },
             "funding": [
                 {
@@ -3794,44 +3665,45 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2025-06-13T11:57:55+00:00"
+            "time": "2026-04-01T12:15:20+00:00"
         },
         {
             "name": "spomky-labs/pki-framework",
-            "version": "1.3.0",
+            "version": "1.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Spomky-Labs/pki-framework.git",
-                "reference": "eced5b5ce70518b983ff2be486e902bbd15135ae"
+                "reference": "aa576cbd07128075bef97ac2f8af9854e67513d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/eced5b5ce70518b983ff2be486e902bbd15135ae",
-                "reference": "eced5b5ce70518b983ff2be486e902bbd15135ae",
+                "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/aa576cbd07128075bef97ac2f8af9854e67513d8",
+                "reference": "aa576cbd07128075bef97ac2f8af9854e67513d8",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.10|^0.11|^0.12|^0.13",
+                "brick/math": "^0.10|^0.11|^0.12|^0.13|^0.14|^0.15|^0.16|^0.17",
                 "ext-mbstring": "*",
-                "php": ">=8.1"
+                "php": ">=8.1",
+                "psr/clock": "^1.0"
             },
             "require-dev": {
                 "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0",
                 "ext-gmp": "*",
                 "ext-openssl": "*",
-                "infection/infection": "^0.28|^0.29",
+                "infection/infection": "^0.28|^0.29|^0.31|^0.32",
                 "php-parallel-lint/php-parallel-lint": "^1.3",
                 "phpstan/extension-installer": "^1.3|^2.0",
                 "phpstan/phpstan": "^1.8|^2.0",
                 "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
                 "phpstan/phpstan-phpunit": "^1.1|^2.0",
                 "phpstan/phpstan-strict-rules": "^1.3|^2.0",
-                "phpunit/phpunit": "^10.1|^11.0|^12.0",
+                "phpunit/phpunit": "^10.1|^11.0|^12.0|^13.0",
                 "rector/rector": "^1.0|^2.0",
                 "roave/security-advisories": "dev-latest",
-                "symfony/string": "^6.4|^7.0",
-                "symfony/var-dumper": "^6.4|^7.0",
-                "symplify/easy-coding-standard": "^12.0"
+                "symfony/string": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0",
+                "symplify/easy-coding-standard": "^12.0|^13.0"
             },
             "suggest": {
                 "ext-bcmath": "For better performance (or GMP)",
@@ -3891,7 +3763,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Spomky-Labs/pki-framework/issues",
-                "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.3.0"
+                "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.4.2"
             },
             "funding": [
                 {
@@ -3903,51 +3775,51 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2025-06-13T08:35:04+00:00"
+            "time": "2026-03-23T22:56:56+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.25",
+            "version": "v7.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "273fd29ff30ba0a88ca5fb83f7cf1ab69306adae"
+                "reference": "85095d2573eaefaf35e40b9513a9bf09f72cd217"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/273fd29ff30ba0a88ca5fb83f7cf1ab69306adae",
-                "reference": "273fd29ff30ba0a88ca5fb83f7cf1ab69306adae",
+                "url": "https://api.github.com/repos/symfony/console/zipball/85095d2573eaefaf35e40b9513a9bf09f72cd217",
+                "reference": "85095d2573eaefaf35e40b9513a9bf09f72cd217",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/string": "^5.4|^6.0|^7.0"
+                "symfony/string": "^7.2|^8.0"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
-                "symfony/dotenv": "<5.4",
-                "symfony/event-dispatcher": "<5.4",
-                "symfony/lock": "<5.4",
-                "symfony/process": "<5.4"
+                "symfony/dependency-injection": "<6.4",
+                "symfony/dotenv": "<6.4",
+                "symfony/event-dispatcher": "<6.4",
+                "symfony/lock": "<6.4",
+                "symfony/process": "<6.4"
             },
             "provide": {
                 "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^6.4|^7.0",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/lock": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/event-dispatcher": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/lock": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^6.4|^7.0|^8.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/stopwatch": "^6.4|^7.0|^8.0",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -3981,7 +3853,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.25"
+                "source": "https://github.com/symfony/console/tree/v7.4.13"
             },
             "funding": [
                 {
@@ -4001,20 +3873,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-22T10:21:53+00:00"
+            "time": "2026-05-24T08:56:14+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
+                "reference": "50f59d1f3ca46d41ac911f97a78626b6756af35b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
-                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/50f59d1f3ca46d41ac911f97a78626b6756af35b",
+                "reference": "50f59d1f3ca46d41ac911f97a78626b6756af35b",
                 "shasum": ""
             },
             "require": {
@@ -4027,7 +3899,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -4052,7 +3924,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.7.0"
             },
             "funding": [
                 {
@@ -4063,40 +3935,47 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2026-04-13T15:52:40+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v6.4.24",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "30fd0b3cf0e972e82636038ce4db0e4fe777112c"
+                "reference": "8dd79d8af777ee6cba2fd4d98da6ffb839f3c0fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/30fd0b3cf0e972e82636038ce4db0e4fe777112c",
-                "reference": "30fd0b3cf0e972e82636038ce4db0e4fe777112c",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/8dd79d8af777ee6cba2fd4d98da6ffb839f3c0fa",
+                "reference": "8dd79d8af777ee6cba2fd4d98da6ffb839f3c0fa",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
-                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+                "symfony/polyfill-php85": "^1.32",
+                "symfony/var-dumper": "^6.4|^7.0|^8.0"
             },
             "conflict": {
                 "symfony/deprecation-contracts": "<2.5",
                 "symfony/http-kernel": "<6.4"
             },
             "require-dev": {
+                "symfony/console": "^6.4|^7.0|^8.0",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/serializer": "^5.4|^6.0|^7.0"
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/serializer": "^6.4|^7.0|^8.0",
+                "symfony/webpack-encore-bundle": "^1.0|^2.0"
             },
             "bin": [
                 "Resources/bin/patch-type-declarations"
@@ -4127,7 +4006,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v6.4.24"
+                "source": "https://github.com/symfony/error-handler/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -4147,24 +4026,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-24T08:25:04+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/http-client",
-            "version": "v6.4.25",
+            "version": "v7.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "b8e9dce2d8acba3c32af467bb58e0c3656886181"
+                "reference": "e8a112b8415707265a7e614278136a9d92989a6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/b8e9dce2d8acba3c32af467bb58e0c3656886181",
-                "reference": "b8e9dce2d8acba3c32af467bb58e0c3656886181",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/e8a112b8415707265a7e614278136a9d92989a6a",
+                "reference": "e8a112b8415707265a7e614278136a9d92989a6a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/http-client-contracts": "~3.4.4|^3.5.2",
@@ -4172,8 +4051,10 @@
                 "symfony/service-contracts": "^2.5|^3"
             },
             "conflict": {
+                "amphp/amp": "<2.5",
+                "amphp/socket": "<1.1",
                 "php-http/discovery": "<1.15",
-                "symfony/http-foundation": "<6.3"
+                "symfony/http-foundation": "<6.4"
             },
             "provide": {
                 "php-http/async-client-implementation": "*",
@@ -4182,19 +4063,20 @@
                 "symfony/http-client-implementation": "3.0"
             },
             "require-dev": {
-                "amphp/amp": "^2.5",
-                "amphp/http-client": "^4.2.1",
-                "amphp/http-tunnel": "^1.0",
-                "amphp/socket": "^1.1",
+                "amphp/http-client": "^4.2.1|^5.0",
+                "amphp/http-tunnel": "^1.0|^2.0",
                 "guzzlehttp/promises": "^1.4|^2.0",
                 "nyholm/psr7": "^1.0",
                 "php-http/httplug": "^1.0|^2.0",
                 "psr/http-client": "^1.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/messenger": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0"
+                "symfony/amphp-http-client-meta": "^1.0|^2.0",
+                "symfony/cache": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/messenger": "^6.4|^7.0|^8.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/rate-limiter": "^6.4|^7.0|^8.0",
+                "symfony/stopwatch": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -4225,7 +4107,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.4.25"
+                "source": "https://github.com/symfony/http-client/tree/v7.4.13"
             },
             "funding": [
                 {
@@ -4245,20 +4127,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-27T07:01:16+00:00"
+            "time": "2026-05-24T09:57:54+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "75d7043853a42837e68111812f4d964b01e5101c"
+                "reference": "4a2d00c37651c0bdc2b9e1c773487a8bf4edb12d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/75d7043853a42837e68111812f4d964b01e5101c",
-                "reference": "75d7043853a42837e68111812f4d964b01e5101c",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/4a2d00c37651c0bdc2b9e1c773487a8bf4edb12d",
+                "reference": "4a2d00c37651c0bdc2b9e1c773487a8bf4edb12d",
                 "shasum": ""
             },
             "require": {
@@ -4271,7 +4153,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -4307,7 +4189,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.7.0"
             },
             "funding": [
                 {
@@ -4318,40 +4200,42 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-29T11:18:49+00:00"
+            "time": "2026-03-06T13:17:50+00:00"
         },
         {
             "name": "symfony/ldap",
-            "version": "v6.4.24",
+            "version": "v7.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/ldap.git",
-                "reference": "2eda8a14000f804d55adfa189f148f6b1cb020e1"
+                "reference": "bba9e535d29c15bd6842bf85bc341debfbb4bcb3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/ldap/zipball/2eda8a14000f804d55adfa189f148f6b1cb020e1",
-                "reference": "2eda8a14000f804d55adfa189f148f6b1cb020e1",
+                "url": "https://api.github.com/repos/symfony/ldap/zipball/bba9e535d29c15bd6842bf85bc341debfbb4bcb3",
+                "reference": "bba9e535d29c15bd6842bf85bc341debfbb4bcb3",
                 "shasum": ""
             },
             "require": {
                 "ext-ldap": "*",
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/options-resolver": "^5.4|^6.0|^7.0"
+                "php": ">=8.2",
+                "symfony/options-resolver": "^7.3|^8.0"
             },
             "conflict": {
-                "symfony/options-resolver": "<5.4",
-                "symfony/security-core": "<5.4"
+                "symfony/security-core": "<6.4"
             },
             "require-dev": {
-                "symfony/security-core": "^5.4|^6.0|^7.0",
-                "symfony/security-http": "^5.4|^6.0|^7.0"
+                "symfony/security-core": "^6.4|^7.0|^8.0",
+                "symfony/security-http": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -4383,7 +4267,7 @@
                 "ldap"
             ],
             "support": {
-                "source": "https://github.com/symfony/ldap/tree/v6.4.24"
+                "source": "https://github.com/symfony/ldap/tree/v7.4.10"
             },
             "funding": [
                 {
@@ -4403,24 +4287,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-10T08:14:14+00:00"
+            "time": "2026-05-04T13:25:50+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v6.4.25",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "d28e7e2db8a73e9511df892d36445f61314bbebe"
+                "reference": "2888fcdc4dc2fd5f7c7397be78631e8af12e02b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/d28e7e2db8a73e9511df892d36445f61314bbebe",
-                "reference": "d28e7e2db8a73e9511df892d36445f61314bbebe",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/2888fcdc4dc2fd5f7c7397be78631e8af12e02b4",
+                "reference": "2888fcdc4dc2fd5f7c7397be78631e8af12e02b4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3"
             },
             "type": "library",
@@ -4454,7 +4338,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v6.4.25"
+                "source": "https://github.com/symfony/options-resolver/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -4474,20 +4358,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-04T17:06:28+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.33.0",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
-                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/141046a8f9477948ff284fa65be2095baafb94f2",
+                "reference": "141046a8f9477948ff284fa65be2095baafb94f2",
                 "shasum": ""
             },
             "require": {
@@ -4537,7 +4421,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -4557,111 +4441,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
-            "name": "symfony/polyfill-iconv",
-            "version": "v1.33.0",
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.38.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "5f3b930437ae03ae5dff61269024d8ea1b3774aa"
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "e9247d281d694a5120554d9afaf54e070e88a603"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/5f3b930437ae03ae5dff61269024d8ea1b3774aa",
-                "reference": "5f3b930437ae03ae5dff61269024d8ea1b3774aa",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/e9247d281d694a5120554d9afaf54e070e88a603",
+                "reference": "e9247d281d694a5120554d9afaf54e070e88a603",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2"
             },
-            "provide": {
-                "ext-iconv": "*"
-            },
             "suggest": {
-                "ext-iconv": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Iconv\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Iconv extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "iconv",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.33.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-09-17T14:58:18+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.33.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
-                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
+                "ext-intl": "For best performance"
             },
             "type": "library",
             "extra": {
@@ -4703,7 +4503,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.38.1"
             },
             "funding": [
                 {
@@ -4723,20 +4523,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-27T09:58:17+00:00"
+            "time": "2026-05-26T05:58:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.33.0",
+            "version": "v1.38.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
+                "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
-                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/2d446c214bdbe5b71bde5011b060a05fece3ae6b",
+                "reference": "2d446c214bdbe5b71bde5011b060a05fece3ae6b",
                 "shasum": ""
             },
             "require": {
@@ -4788,7 +4588,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.38.0"
             },
             "funding": [
                 {
@@ -4808,20 +4608,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2026-05-25T13:48:31+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.33.0",
+            "version": "v1.38.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
+                "reference": "d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
-                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6",
+                "reference": "d3d318bad5e7a1bfbd026009c8bfb8d8f99ae6b6",
                 "shasum": ""
             },
             "require": {
@@ -4873,7 +4673,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.38.2"
             },
             "funding": [
                 {
@@ -4893,20 +4693,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-23T08:48:59+00:00"
+            "time": "2026-05-27T06:59:30+00:00"
         },
         {
-            "name": "symfony/polyfill-php83",
-            "version": "v1.33.0",
+            "name": "symfony/polyfill-php85",
+            "version": "v1.38.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php83.git",
-                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
+                "url": "https://github.com/symfony/polyfill-php85.git",
+                "reference": "ba2ba04f3352cfa2dcbbcb90aee13ed967f505b1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
-                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php85/zipball/ba2ba04f3352cfa2dcbbcb90aee13ed967f505b1",
+                "reference": "ba2ba04f3352cfa2dcbbcb90aee13ed967f505b1",
                 "shasum": ""
             },
             "require": {
@@ -4924,7 +4724,7 @@
                     "bootstrap.php"
                 ],
                 "psr-4": {
-                    "Symfony\\Polyfill\\Php83\\": ""
+                    "Symfony\\Polyfill\\Php85\\": ""
                 },
                 "classmap": [
                     "Resources/stubs"
@@ -4944,7 +4744,7 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions",
+            "description": "Symfony polyfill backporting some PHP 8.5+ features to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
                 "compatibility",
@@ -4953,7 +4753,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php85/tree/v1.38.1"
             },
             "funding": [
                 {
@@ -4973,20 +4773,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-08T02:45:35+00:00"
+            "time": "2026-05-26T02:25:22+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.33.0",
+            "version": "v1.37.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2"
+                "reference": "26dfec253c4cf3e51b541b52ddf7e42cb0908e94"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
-                "reference": "21533be36c24be3f4b1669c4725c7d1d2bab4ae2",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/26dfec253c4cf3e51b541b52ddf7e42cb0908e94",
+                "reference": "26dfec253c4cf3e51b541b52ddf7e42cb0908e94",
                 "shasum": ""
             },
             "require": {
@@ -5036,7 +4836,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.37.0"
             },
             "funding": [
                 {
@@ -5056,20 +4856,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2026-04-10T16:19:22+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
+                "reference": "d25d82433a80eba6aa0e6c24b61d7370d99e444a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
-                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d25d82433a80eba6aa0e6c24b61d7370d99e444a",
+                "reference": "d25d82433a80eba6aa0e6c24b61d7370d99e444a",
                 "shasum": ""
             },
             "require": {
@@ -5087,7 +4887,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -5123,7 +4923,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.7.0"
             },
             "funding": [
                 {
@@ -5134,31 +4934,36 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-04-25T09:37:31+00:00"
+            "time": "2026-03-28T09:44:51+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v6.4.25",
+            "version": "v7.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "7cdec7edfaf2cdd9c18901e35bcf9653d6209ff1"
+                "reference": "961683010db3b27ec6ebcd7308e6e1ee8fa7ffde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/7cdec7edfaf2cdd9c18901e35bcf9653d6209ff1",
-                "reference": "7cdec7edfaf2cdd9c18901e35bcf9653d6209ff1",
+                "url": "https://api.github.com/repos/symfony/string/zipball/961683010db3b27ec6ebcd7308e6e1ee8fa7ffde",
+                "reference": "961683010db3b27ec6ebcd7308e6e1ee8fa7ffde",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
                 "symfony/polyfill-ctype": "~1.8",
-                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-grapheme": "~1.33",
                 "symfony/polyfill-intl-normalizer": "~1.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
@@ -5166,11 +4971,11 @@
                 "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/error-handler": "^5.4|^6.0|^7.0",
-                "symfony/http-client": "^5.4|^6.0|^7.0",
-                "symfony/intl": "^6.2|^7.0",
+                "symfony/emoji": "^7.1|^8.0",
+                "symfony/http-client": "^6.4|^7.0|^8.0",
+                "symfony/intl": "^6.4|^7.0|^8.0",
                 "symfony/translation-contracts": "^2.5|^3.0",
-                "symfony/var-exporter": "^5.4|^6.0|^7.0"
+                "symfony/var-exporter": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -5209,7 +5014,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.25"
+                "source": "https://github.com/symfony/string/tree/v7.4.13"
             },
             "funding": [
                 {
@@ -5229,20 +5034,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-22T12:33:20+00:00"
+            "time": "2026-05-23T15:23:29+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d"
+                "reference": "0ab302977a952b42fd51475c4ebac81f8da0a95d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/df210c7a2573f1913b2d17cc95f90f53a73d8f7d",
-                "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/0ab302977a952b42fd51475c4ebac81f8da0a95d",
+                "reference": "0ab302977a952b42fd51475c4ebac81f8da0a95d",
                 "shasum": ""
             },
             "require": {
@@ -5255,7 +5060,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -5291,7 +5096,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.7.0"
             },
             "funding": [
                 {
@@ -5302,25 +5107,29 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-27T08:32:26+00:00"
+            "time": "2026-01-05T13:30:16+00:00"
         },
         {
             "name": "symfony/uid",
-            "version": "v6.4.24",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "17da16a750541a42cf2183935e0f6008316c23f7"
+                "reference": "6b973c385f00341b246f697d82dc01a09107acdd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/17da16a750541a42cf2183935e0f6008316c23f7",
-                "reference": "17da16a750541a42cf2183935e0f6008316c23f7",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/6b973c385f00341b246f697d82dc01a09107acdd",
+                "reference": "6b973c385f00341b246f697d82dc01a09107acdd",
                 "shasum": ""
             },
             "require": {
@@ -5365,7 +5174,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.4.24"
+                "source": "https://github.com/symfony/uid/tree/v6.4.32"
             },
             "funding": [
                 {
@@ -5385,20 +5194,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-10T08:14:14+00:00"
+            "time": "2025-12-23T15:07:59+00:00"
         },
         {
             "name": "symfony/validator",
-            "version": "v6.4.25",
+            "version": "v6.4.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/validator.git",
-                "reference": "9352177c0e937793423053846f80bee805552324"
+                "reference": "72cfcf7925746d9950bbdab1362f6bda3b4046cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/9352177c0e937793423053846f80bee805552324",
-                "reference": "9352177c0e937793423053846f80bee805552324",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/72cfcf7925746d9950bbdab1362f6bda3b4046cf",
+                "reference": "72cfcf7925746d9950bbdab1362f6bda3b4046cf",
                 "shasum": ""
             },
             "require": {
@@ -5466,7 +5275,7 @@
             "description": "Provides tools to validate values",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/validator/tree/v6.4.25"
+                "source": "https://github.com/symfony/validator/tree/v6.4.37"
             },
             "funding": [
                 {
@@ -5486,37 +5295,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-27T11:31:57+00:00"
+            "time": "2026-04-29T06:33:37+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v6.4.25",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "c6cd92486e9fc32506370822c57bc02353a5a92c"
+                "reference": "9510c3966f749a1d1ff0059e1eabef6cc621e7fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c6cd92486e9fc32506370822c57bc02353a5a92c",
-                "reference": "c6cd92486e9fc32506370822c57bc02353a5a92c",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9510c3966f749a1d1ff0059e1eabef6cc621e7fd",
+                "reference": "9510c3966f749a1d1ff0059e1eabef6cc621e7fd",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/console": "<5.4"
+                "symfony/console": "<6.4"
             },
             "require-dev": {
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/error-handler": "^6.3|^7.0",
-                "symfony/http-kernel": "^5.4|^6.0|^7.0",
-                "symfony/process": "^5.4|^6.0|^7.0",
-                "symfony/uid": "^5.4|^6.0|^7.0",
-                "twig/twig": "^2.13|^3.0.4"
+                "symfony/console": "^6.4|^7.0|^8.0",
+                "symfony/http-kernel": "^6.4|^7.0|^8.0",
+                "symfony/process": "^6.4|^7.0|^8.0",
+                "symfony/uid": "^6.4|^7.0|^8.0",
+                "twig/twig": "^3.12"
             },
             "bin": [
                 "Resources/bin/var-dump-server"
@@ -5554,7 +5362,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.25"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -5574,20 +5382,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-13T09:41:44+00:00"
+            "time": "2026-03-30T13:44:50+00:00"
         },
         {
             "name": "symfony/web-link",
-            "version": "v6.4.24",
+            "version": "v6.4.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/web-link.git",
-                "reference": "75ffbb304f26a716969863328c8c6a11eadcfa5a"
+                "reference": "636d5e34cd5c4a2538b02ba48a3c02989bfdf06b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/web-link/zipball/75ffbb304f26a716969863328c8c6a11eadcfa5a",
-                "reference": "75ffbb304f26a716969863328c8c6a11eadcfa5a",
+                "url": "https://api.github.com/repos/symfony/web-link/zipball/636d5e34cd5c4a2538b02ba48a3c02989bfdf06b",
+                "reference": "636d5e34cd5c4a2538b02ba48a3c02989bfdf06b",
                 "shasum": ""
             },
             "require": {
@@ -5630,254 +5438,75 @@
             "homepage": "https://symfony.com",
             "keywords": [
                 "dns-prefetch",
-                "http",
-                "http2",
-                "link",
-                "performance",
-                "prefetch",
-                "preload",
-                "prerender",
-                "psr13",
-                "push"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/web-link/tree/v6.4.24"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-07-10T08:14:14+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v6.4.41",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "e8fdf3408c85806198d5826e604ffc6830d33152"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/e8fdf3408c85806198d5826e604ffc6830d33152",
-                "reference": "e8fdf3408c85806198d5826e604ffc6830d33152",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "symfony/console": "<5.4"
-            },
-            "require-dev": {
-                "symfony/console": "^5.4|^6.0|^7.0"
-            },
-            "bin": [
-                "Resources/bin/yaml-lint"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Loads and dumps YAML files",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/yaml/tree/v6.4.41"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2026-05-25T06:03:23+00:00"
-        },
-        {
-            "name": "tobscure/json-api",
-            "version": "dev-joomla-backports",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/joomla-backports/json-api-php.git",
-                "reference": "6ce73102280c9c70b41e3407d2504279fa07d158"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/joomla-backports/json-api-php/zipball/6ce73102280c9c70b41e3407d2504279fa07d158",
-                "reference": "6ce73102280c9c70b41e3407d2504279fa07d158",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0",
-                "yoast/phpunit-polyfills": "^1.0"
-            },
-            "default-branch": true,
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Tobscure\\JsonApi\\": "src/"
-                }
-            },
-            "autoload-dev": {
-                "psr-4": {
-                    "Tobscure\\Tests\\JsonApi\\": "tests/"
-                }
-            },
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Toby Zerner",
-                    "email": "toby.zerner@gmail.com"
-                }
-            ],
-            "description": "JSON-API responses in PHP",
-            "keywords": [
-                "api",
-                "json",
-                "jsonapi",
-                "standard"
-            ],
-            "time": "2025-08-17T07:17:47+00:00"
-        },
-        {
-            "name": "typo3/phar-stream-wrapper",
-            "version": "v3.1.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/TYPO3/phar-stream-wrapper.git",
-                "reference": "a931b28f422a60052db85c0a84a05a366453b2c0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/a931b28f422a60052db85c0a84a05a366453b2c0",
-                "reference": "a931b28f422a60052db85c0a84a05a366453b2c0",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "php": "^7.0 || ~8.0 || ~8.1 || ~8.2 || ~8.3"
-            },
-            "require-dev": {
-                "ext-xdebug": "*",
-                "phpspec/prophecy": "^1.10",
-                "symfony/phpunit-bridge": "^5.1"
-            },
-            "suggest": {
-                "ext-fileinfo": "For PHP builtin file type guessing, otherwise uses internal processing"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "v3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "TYPO3\\PharStreamWrapper\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Interceptors for PHP's native phar:// stream handling",
-            "homepage": "https://typo3.org/",
-            "keywords": [
-                "phar",
-                "php",
-                "security",
-                "stream-wrapper"
+                "http",
+                "http2",
+                "link",
+                "performance",
+                "prefetch",
+                "preload",
+                "prerender",
+                "psr13",
+                "push"
             ],
             "support": {
-                "issues": "https://github.com/TYPO3/phar-stream-wrapper/issues",
-                "source": "https://github.com/TYPO3/phar-stream-wrapper/tree/v3.1.8"
+                "source": "https://github.com/symfony/web-link/tree/v6.4.32"
             },
-            "time": "2024-12-09T23:06:33+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2026-01-01T13:45:34+00:00"
         },
         {
-            "name": "voku/portable-ascii",
-            "version": "2.0.3",
+            "name": "symfony/yaml",
+            "version": "v6.4.41",
             "source": {
                 "type": "git",
-                "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d"
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "e8fdf3408c85806198d5826e604ffc6830d33152"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
-                "reference": "b1d923f88091c6bf09699efcd7c8a1b1bfd7351d",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/e8fdf3408c85806198d5826e604ffc6830d33152",
+                "reference": "e8fdf3408c85806198d5826e604ffc6830d33152",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0"
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-ctype": "^1.8"
             },
-            "require-dev": {
-                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
+            "conflict": {
+                "symfony/console": "<5.4"
             },
-            "suggest": {
-                "ext-intl": "Use Intl for transliterator_transliterate() support"
+            "require-dev": {
+                "symfony/console": "^5.4|^6.0|^7.0"
             },
+            "bin": [
+                "Resources/bin/yaml-lint"
+            ],
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "voku\\": "src/voku/"
-                }
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -5885,125 +5514,94 @@
             ],
             "authors": [
                 {
-                    "name": "Lars Moelleken",
-                    "homepage": "https://www.moelleken.org/"
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
-            "homepage": "https://github.com/voku/portable-ascii",
-            "keywords": [
-                "ascii",
-                "clean",
-                "php"
-            ],
+            "description": "Loads and dumps YAML files",
+            "homepage": "https://symfony.com",
             "support": {
-                "issues": "https://github.com/voku/portable-ascii/issues",
-                "source": "https://github.com/voku/portable-ascii/tree/2.0.3"
+                "source": "https://github.com/symfony/yaml/tree/v6.4.41"
             },
             "funding": [
                 {
-                    "url": "https://www.paypal.me/moelleken",
+                    "url": "https://symfony.com/sponsor",
                     "type": "custom"
                 },
                 {
-                    "url": "https://github.com/voku",
+                    "url": "https://github.com/fabpot",
                     "type": "github"
                 },
                 {
-                    "url": "https://opencollective.com/portable-ascii",
-                    "type": "open_collective"
-                },
-                {
-                    "url": "https://www.patreon.com/voku",
-                    "type": "patreon"
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
                 },
                 {
-                    "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii",
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-21T01:49:47+00:00"
+            "time": "2026-05-25T06:03:23+00:00"
         },
         {
-            "name": "voku/portable-utf8",
-            "version": "dev-joomla-5.3",
+            "name": "tobscure/json-api",
+            "version": "dev-joomla-backports",
             "source": {
                 "type": "git",
-                "url": "https://github.com/joomla-backports/portable-utf8.git",
-                "reference": "eeb3d9e390411cd31af808caa7f7de337ea3a24c"
+                "url": "https://github.com/joomla-backports/json-api-php.git",
+                "reference": "6ce73102280c9c70b41e3407d2504279fa07d158"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-backports/portable-utf8/zipball/eeb3d9e390411cd31af808caa7f7de337ea3a24c",
-                "reference": "eeb3d9e390411cd31af808caa7f7de337ea3a24c",
+                "url": "https://api.github.com/repos/joomla-backports/json-api-php/zipball/6ce73102280c9c70b41e3407d2504279fa07d158",
+                "reference": "6ce73102280c9c70b41e3407d2504279fa07d158",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
-                "symfony/polyfill-iconv": "~1.0",
-                "symfony/polyfill-intl-grapheme": "~1.0",
-                "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php72": "~1.0",
-                "voku/portable-ascii": "~2.0.0"
+                "php": "^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "1.9.*@dev",
-                "phpstan/phpstan-strict-rules": "1.4.*@dev",
-                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0",
-                "thecodingmachine/phpstan-strict-rules": "1.0.*@dev",
-                "voku/phpstan-rules": "3.1.*@dev"
-            },
-            "suggest": {
-                "ext-ctype": "Use Ctype for e.g. hexadecimal digit detection",
-                "ext-fileinfo": "Use Fileinfo for better binary file detection",
-                "ext-iconv": "Use iconv for best performance",
-                "ext-intl": "Use Intl for best performance",
-                "ext-json": "Use JSON for string detection",
-                "ext-mbstring": "Use Mbstring for best performance"
+                "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0",
+                "yoast/phpunit-polyfills": "^1.0"
             },
+            "default-branch": true,
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
-                    "voku\\": "src/voku/"
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
+                    "Tobscure\\JsonApi\\": "src/"
+                }
             },
             "autoload-dev": {
                 "psr-4": {
-                    "voku\\tests\\": "tests/"
+                    "Tobscure\\Tests\\JsonApi\\": "tests/"
                 }
             },
             "license": [
-                "(Apache-2.0 or GPL-2.0)"
+                "MIT"
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Hamid Sarfraz",
-                    "homepage": "http://pageconfig.com/"
-                },
-                {
-                    "name": "Lars Moelleken",
-                    "homepage": "http://www.moelleken.org/"
+                    "name": "Toby Zerner",
+                    "email": "toby.zerner@gmail.com"
                 }
             ],
-            "description": "Portable UTF-8 library - performance optimized (unicode) string functions for php.",
-            "homepage": "https://github.com/voku/portable-utf8",
+            "description": "JSON-API responses in PHP",
             "keywords": [
-                "clean",
-                "php",
-                "unicode",
-                "utf",
-                "utf-8",
-                "utf8"
+                "api",
+                "json",
+                "jsonapi",
+                "standard"
             ],
-            "time": "2024-11-20T09:42:04+00:00"
+            "time": "2025-08-17T07:17:47+00:00"
         },
         {
             "name": "wamania/php-stemmer",
@@ -6056,43 +5654,32 @@
         },
         {
             "name": "web-auth/cose-lib",
-            "version": "4.4.2",
+            "version": "4.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/web-auth/cose-lib.git",
-                "reference": "a93b61c48fb587855f64a9ec11ad7b60e867cb15"
+                "reference": "5b38660f90070a8e45f3dbc9528ade3b608dd77d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/web-auth/cose-lib/zipball/a93b61c48fb587855f64a9ec11ad7b60e867cb15",
-                "reference": "a93b61c48fb587855f64a9ec11ad7b60e867cb15",
+                "url": "https://api.github.com/repos/web-auth/cose-lib/zipball/5b38660f90070a8e45f3dbc9528ade3b608dd77d",
+                "reference": "5b38660f90070a8e45f3dbc9528ade3b608dd77d",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.9|^0.10|^0.11|^0.12|^0.13",
+                "brick/math": "^0.9|^0.10|^0.11|^0.12|^0.13|^0.14|^0.15|^0.16|^0.17",
                 "ext-json": "*",
                 "ext-openssl": "*",
                 "php": ">=8.1",
                 "spomky-labs/pki-framework": "^1.0"
             },
             "require-dev": {
-                "deptrac/deptrac": "^3.0",
-                "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0",
-                "infection/infection": "^0.29",
-                "php-parallel-lint/php-parallel-lint": "^1.3",
-                "phpstan/extension-installer": "^1.3",
-                "phpstan/phpstan": "^1.7|^2.0",
-                "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
-                "phpstan/phpstan-phpunit": "^1.1|^2.0",
-                "phpstan/phpstan-strict-rules": "^1.0|^2.0",
-                "phpunit/phpunit": "^10.1|^11.0|^12.0",
-                "rector/rector": "^2.0",
-                "symfony/phpunit-bridge": "^6.4|^7.0",
-                "symplify/easy-coding-standard": "^12.0"
+                "spomky-labs/cbor-php": "^3.2.2"
             },
             "suggest": {
                 "ext-bcmath": "For better performance, please install either GMP (recommended) or BCMath extension",
-                "ext-gmp": "For better performance, please install either GMP (recommended) or BCMath extension"
+                "ext-gmp": "For better performance, please install either GMP (recommended) or BCMath extension",
+                "spomky-labs/cbor-php": "For COSE Signature support"
             },
             "type": "library",
             "autoload": {
@@ -6122,7 +5709,7 @@
             ],
             "support": {
                 "issues": "https://github.com/web-auth/cose-lib/issues",
-                "source": "https://github.com/web-auth/cose-lib/tree/4.4.2"
+                "source": "https://github.com/web-auth/cose-lib/tree/4.5.2"
             },
             "funding": [
                 {
@@ -6134,7 +5721,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2025-08-14T20:33:29+00:00"
+            "time": "2026-05-03T09:49:50+00:00"
         },
         {
             "name": "web-auth/metadata-service",
@@ -6392,64 +5979,6 @@
             ],
             "time": "2026-06-06T16:30:13+00:00"
         },
-        {
-            "name": "webmozart/assert",
-            "version": "1.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "php": "^7.2 || ^8.0"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.11.0"
-            },
-            "time": "2022-06-03T18:03:27+00:00"
-        },
         {
             "name": "willdurand/negotiation",
             "version": "3.1.0",
@@ -6574,28 +6103,29 @@
         },
         {
             "name": "composer/pcre",
-            "version": "3.3.2",
+            "version": "3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
+                "reference": "d5a341b3fb61f3001970940afb1d332968a183ed"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
-                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/d5a341b3fb61f3001970940afb1d332968a183ed",
+                "reference": "d5a341b3fb61f3001970940afb1d332968a183ed",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.4 || ^8.0"
             },
             "conflict": {
-                "phpstan/phpstan": "<1.11.10"
+                "phpstan/phpstan": "<2.2.2"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1.12 || ^2",
-                "phpstan/phpstan-strict-rules": "^1 || ^2",
-                "phpunit/phpunit": "^8 || ^9"
+                "phpstan/phpstan": "^2",
+                "phpstan/phpstan-deprecation-rules": "^2",
+                "phpstan/phpstan-strict-rules": "^2",
+                "phpunit/phpunit": "^9"
             },
             "type": "library",
             "extra": {
@@ -6633,7 +6163,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/3.3.2"
+                "source": "https://github.com/composer/pcre/tree/3.4.0"
             },
             "funding": [
                 {
@@ -6643,13 +6173,9 @@
                 {
                     "url": "https://github.com/composer",
                     "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2024-11-12T16:29:46+00:00"
+            "time": "2026-06-07T11:47:49+00:00"
         },
         {
             "name": "composer/semver",
@@ -6864,6 +6390,75 @@
             ],
             "time": "2022-12-30T00:23:10+00:00"
         },
+        {
+            "name": "ergebnis/agent-detector",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ergebnis/agent-detector.git",
+                "reference": "e211f17928c8b95a51e06040792d57f5462fb271"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ergebnis/agent-detector/zipball/e211f17928c8b95a51e06040792d57f5462fb271",
+                "reference": "e211f17928c8b95a51e06040792d57f5462fb271",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0 || ~8.6.0"
+            },
+            "require-dev": {
+                "ergebnis/composer-normalize": "^2.51.0",
+                "ergebnis/license": "^2.7.0",
+                "ergebnis/php-cs-fixer-config": "^6.60.2",
+                "ergebnis/phpstan-rules": "^2.13.1",
+                "ergebnis/phpunit-slow-test-detector": "^2.24.0",
+                "ergebnis/rector-rules": "^1.18.1",
+                "fakerphp/faker": "^1.24.1",
+                "infection/infection": "^0.26.6",
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^2.1.54",
+                "phpstan/phpstan-deprecation-rules": "^2.0.4",
+                "phpstan/phpstan-phpunit": "^2.0.16",
+                "phpstan/phpstan-strict-rules": "^2.0.10",
+                "phpunit/phpunit": "^9.6.34",
+                "rector/rector": "^2.4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.2-dev"
+                },
+                "composer-normalize": {
+                    "indent-size": 2,
+                    "indent-style": "space"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Ergebnis\\AgentDetector\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andreas Möller",
+                    "email": "am@localheinz.com",
+                    "homepage": "https://localheinz.com"
+                }
+            ],
+            "description": "Provides a detector for detecting the presence of an agent.",
+            "homepage": "https://github.com/ergebnis/agent-detector",
+            "support": {
+                "issues": "https://github.com/ergebnis/agent-detector/issues",
+                "security": "https://github.com/ergebnis/agent-detector/blob/main/.github/SECURITY.md",
+                "source": "https://github.com/ergebnis/agent-detector"
+            },
+            "time": "2026-05-07T08:19:07+00:00"
+        },
         {
             "name": "evenement/evenement",
             "version": "v3.0.2",
@@ -6974,22 +6569,23 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v3.88.0",
+            "version": "v3.95.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
-                "reference": "f23469674ae50d40e398bfff8018911a2a2b0dbe"
+                "reference": "93e1ab3e1f153024bd3ab23c8a349556063c6f17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/f23469674ae50d40e398bfff8018911a2a2b0dbe",
-                "reference": "f23469674ae50d40e398bfff8018911a2a2b0dbe",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/93e1ab3e1f153024bd3ab23c8a349556063c6f17",
+                "reference": "93e1ab3e1f153024bd3ab23c8a349556063c6f17",
                 "shasum": ""
             },
             "require": {
                 "clue/ndjson-react": "^1.3",
                 "composer/semver": "^3.4",
                 "composer/xdebug-handler": "^3.0.5",
+                "ergebnis/agent-detector": "^1.2",
                 "ext-filter": "*",
                 "ext-hash": "*",
                 "ext-json": "*",
@@ -6998,34 +6594,34 @@
                 "php": "^7.4 || ^8.0",
                 "react/child-process": "^0.6.6",
                 "react/event-loop": "^1.5",
-                "react/promise": "^3.3",
                 "react/socket": "^1.16",
                 "react/stream": "^1.4",
-                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0",
-                "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0",
-                "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0",
-                "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0",
-                "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.0",
-                "symfony/options-resolver": "^5.4.45 || ^6.4.24 || ^7.0",
-                "symfony/polyfill-mbstring": "^1.33",
-                "symfony/polyfill-php80": "^1.33",
-                "symfony/polyfill-php81": "^1.33",
-                "symfony/polyfill-php84": "^1.33",
-                "symfony/process": "^5.4.47 || ^6.4.24 || ^7.2",
-                "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0"
+                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0 || ^8.0 || ^9.0",
+                "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/options-resolver": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0",
+                "symfony/polyfill-mbstring": "^1.37",
+                "symfony/polyfill-php80": "^1.37",
+                "symfony/polyfill-php81": "^1.37",
+                "symfony/polyfill-php84": "^1.37",
+                "symfony/process": "^5.4.47 || ^6.4.24 || ^7.2 || ^8.0",
+                "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "facile-it/paraunit": "^1.3.1 || ^2.7",
-                "infection/infection": "^0.31.0",
-                "justinrainbow/json-schema": "^6.5",
-                "keradus/cli-executor": "^2.2",
+                "facile-it/paraunit": "^1.3.1 || ^2.11.0",
+                "infection/infection": "^0.32.7",
+                "justinrainbow/json-schema": "^6.9.0",
+                "keradus/cli-executor": "^2.3",
                 "mikey179/vfsstream": "^1.6.12",
-                "php-coveralls/php-coveralls": "^2.8",
-                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
-                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
-                "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34",
-                "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2",
-                "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2"
+                "php-coveralls/php-coveralls": "^2.9.1",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.8",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.8",
+                "phpunit/phpunit": "^9.6.34 || ^10.5.63 || ^11.5.55",
+                "symfony/polyfill-php85": "^1.38",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.36 || ^7.4.8 || ^8.1.0",
+                "symfony/yaml": "^5.4.53 || ^6.4.41 || ^7.4.13 || ^8.1.0"
             },
             "suggest": {
                 "ext-dom": "For handling output formats in XML",
@@ -7040,7 +6636,7 @@
                     "PhpCsFixer\\": "src/"
                 },
                 "exclude-from-classmap": [
-                    "src/Fixer/Internal/*"
+                    "src/**/Internal/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -7066,7 +6662,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
-                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.88.0"
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.95.10"
             },
             "funding": [
                 {
@@ -7074,43 +6670,37 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-09-24T21:31:42+00:00"
+            "time": "2026-06-19T14:45:22+00:00"
         },
         {
             "name": "joomla/mediawiki",
-            "version": "3.0.1",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/mediawiki-api.git",
-                "reference": "9db43585a71148b0168e1758c298e09e31c6fef6"
+                "reference": "34f5b81eb61586938df86388fee2236f8fbc7131"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/mediawiki-api/zipball/9db43585a71148b0168e1758c298e09e31c6fef6",
-                "reference": "9db43585a71148b0168e1758c298e09e31c6fef6",
+                "url": "https://api.github.com/repos/joomla-framework/mediawiki-api/zipball/34f5b81eb61586938df86388fee2236f8fbc7131",
+                "reference": "34f5b81eb61586938df86388fee2236f8fbc7131",
                 "shasum": ""
             },
             "require": {
-                "joomla/http": "^3.0",
-                "joomla/registry": "^3.0",
-                "joomla/uri": "^3.0",
-                "php": "^8.1.0"
+                "joomla/http": "^4.0",
+                "joomla/registry": "^4.0",
+                "joomla/uri": "^4.0",
+                "php": "^8.3.0"
             },
             "require-dev": {
                 "ext-simplexml": "*",
-                "joomla/test": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
+                "joomla/test": "^4.0",
+                "phpstan/phpstan": "^2.1.17",
+                "phpstan/phpstan-deprecation-rules": "^2.0.3",
+                "phpunit/phpunit": "^12.2.6",
                 "squizlabs/php_codesniffer": "^3.7.2"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.0-dev": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Mediawiki\\": "src/"
@@ -7129,48 +6719,39 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/mediawiki-api/issues",
-                "source": "https://github.com/joomla-framework/mediawiki-api/tree/3.0.1"
+                "source": "https://github.com/joomla-framework/mediawiki-api/tree/4.0.1"
             },
-            "time": "2025-07-11T23:18:33+00:00"
+            "time": "2025-08-06T10:10:33+00:00"
         },
         {
             "name": "joomla/test",
-            "version": "3.0.4",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/joomla-framework/test.git",
-                "reference": "184bc36c0abeb4fa9471be472ecd5480125f1530"
+                "reference": "cfc3ca98f363dc76c4e3cf7a0cd089eeb93e2480"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/joomla-framework/test/zipball/184bc36c0abeb4fa9471be472ecd5480125f1530",
-                "reference": "184bc36c0abeb4fa9471be472ecd5480125f1530",
+                "url": "https://api.github.com/repos/joomla-framework/test/zipball/cfc3ca98f363dc76c4e3cf7a0cd089eeb93e2480",
+                "reference": "cfc3ca98f363dc76c4e3cf7a0cd089eeb93e2480",
                 "shasum": ""
             },
             "require": {
-                "php": "^8.1.0"
-            },
-            "conflict": {
-                "joomla/database": "<2.0"
+                "php": "^8.3.0"
             },
             "require-dev": {
-                "joomla/database": "^3.0",
-                "phpstan/phpstan": "1.12.27",
-                "phpstan/phpstan-deprecation-rules": "1.2.1",
-                "phpunit/phpunit": "^9.5.28",
-                "squizlabs/php_codesniffer": "^3.7.2"
+                "joomla/database": "^4.0",
+                "phpstan/phpstan": "2.1.17",
+                "phpstan/phpstan-deprecation-rules": "2.0.3",
+                "phpunit/phpunit": "^12.0",
+                "squizlabs/php_codesniffer": "^3.10.2"
             },
             "suggest": {
                 "joomla/database": "To use the database test case, install joomla/database",
                 "phpunit/phpunit": "To use the database test case, install phpunit/phpunit"
             },
             "type": "joomla-package",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev",
-                    "dev-3.x-dev": "3.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Joomla\\Test\\": "src/"
@@ -7191,9 +6772,9 @@
             ],
             "support": {
                 "issues": "https://github.com/joomla-framework/test/issues",
-                "source": "https://github.com/joomla-framework/test/tree/3.0.4"
+                "source": "https://github.com/joomla-framework/test/tree/4.0.1"
             },
-            "time": "2025-10-17T08:19:16+00:00"
+            "time": "2025-10-17T08:21:47+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -7257,16 +6838,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.6.1",
+            "version": "v5.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2"
+                "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
-                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dca41cd15c2ac9d055ad70dbfd011130757d1f82",
+                "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82",
                 "shasum": ""
             },
             "require": {
@@ -7309,9 +6890,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.7.0"
             },
-            "time": "2025-08-13T20:13:15+00:00"
+            "time": "2025-12-06T11:56:16+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -7433,16 +7014,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.29",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpstan/phpstan-phar-composer-source.git",
-                "reference": "git"
-            },
+            "version": "2.2.2",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d618573eed4a1b6b75e37b2e0b65ac65c885d88e",
-                "reference": "d618573eed4a1b6b75e37b2e0b65ac65c885d88e",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e5cc34d491a90e79c216d824f60fe21fd4d93bd6",
+                "reference": "e5cc34d491a90e79c216d824f60fe21fd4d93bd6",
                 "shasum": ""
             },
             "require": {
@@ -7465,6 +7041,17 @@
             "license": [
                 "MIT"
             ],
+            "authors": [
+                {
+                    "name": "Ondřej Mirtes"
+                },
+                {
+                    "name": "Markus Staab"
+                },
+                {
+                    "name": "Vincent Langlet"
+                }
+            ],
             "description": "PHPStan - PHP Static Analysis Tool",
             "keywords": [
                 "dev",
@@ -7487,25 +7074,25 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-09-25T06:58:18+00:00"
+            "time": "2026-06-05T09:00:01+00:00"
         },
         {
             "name": "phpstan/phpstan-deprecation-rules",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan-deprecation-rules.git",
-                "reference": "468e02c9176891cc901143da118f09dc9505fc2f"
+                "reference": "6b5571001a7f04fa0422254c30a0017ec2f2cacc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/468e02c9176891cc901143da118f09dc9505fc2f",
-                "reference": "468e02c9176891cc901143da118f09dc9505fc2f",
+                "url": "https://api.github.com/repos/phpstan/phpstan-deprecation-rules/zipball/6b5571001a7f04fa0422254c30a0017ec2f2cacc",
+                "reference": "6b5571001a7f04fa0422254c30a0017ec2f2cacc",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.4 || ^8.0",
-                "phpstan/phpstan": "^2.1.15"
+                "phpstan/phpstan": "^2.1.39"
             },
             "require-dev": {
                 "php-parallel-lint/php-parallel-lint": "^1.2",
@@ -7530,11 +7117,14 @@
                 "MIT"
             ],
             "description": "PHPStan rules for detecting usage of deprecated classes, methods, properties, constants and traits.",
+            "keywords": [
+                "static analysis"
+            ],
             "support": {
                 "issues": "https://github.com/phpstan/phpstan-deprecation-rules/issues",
-                "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/2.0.3"
+                "source": "https://github.com/phpstan/phpstan-deprecation-rules/tree/2.0.4"
             },
-            "time": "2025-05-14T10:56:57+00:00"
+            "time": "2026-02-09T13:21:14+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -8040,16 +7630,16 @@
         },
         {
             "name": "react/child-process",
-            "version": "v0.6.6",
+            "version": "v0.6.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/child-process.git",
-                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159"
+                "reference": "970f0e71945556422ee4570ccbabaedc3cf04ad3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/child-process/zipball/1721e2b93d89b745664353b9cfc8f155ba8a6159",
-                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159",
+                "url": "https://api.github.com/repos/reactphp/child-process/zipball/970f0e71945556422ee4570ccbabaedc3cf04ad3",
+                "reference": "970f0e71945556422ee4570ccbabaedc3cf04ad3",
                 "shasum": ""
             },
             "require": {
@@ -8103,7 +7693,7 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/child-process/issues",
-                "source": "https://github.com/reactphp/child-process/tree/v0.6.6"
+                "source": "https://github.com/reactphp/child-process/tree/v0.6.7"
             },
             "funding": [
                 {
@@ -8111,20 +7701,20 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2025-01-01T16:37:48+00:00"
+            "time": "2025-12-23T15:25:20+00:00"
         },
         {
             "name": "react/dns",
-            "version": "v1.13.0",
+            "version": "v1.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/dns.git",
-                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5"
+                "reference": "7562c05391f42701c1fccf189c8225fece1cd7c3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
-                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/7562c05391f42701c1fccf189c8225fece1cd7c3",
+                "reference": "7562c05391f42701c1fccf189c8225fece1cd7c3",
                 "shasum": ""
             },
             "require": {
@@ -8179,7 +7769,7 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/dns/issues",
-                "source": "https://github.com/reactphp/dns/tree/v1.13.0"
+                "source": "https://github.com/reactphp/dns/tree/v1.14.0"
             },
             "funding": [
                 {
@@ -8187,20 +7777,20 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-06-13T14:18:03+00:00"
+            "time": "2025-11-18T19:34:28+00:00"
         },
         {
             "name": "react/event-loop",
-            "version": "v1.5.0",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/event-loop.git",
-                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354"
+                "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
-                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
+                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/ba276bda6083df7e0050fd9b33f66ad7a4ac747a",
+                "reference": "ba276bda6083df7e0050fd9b33f66ad7a4ac747a",
                 "shasum": ""
             },
             "require": {
@@ -8251,7 +7841,7 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/event-loop/issues",
-                "source": "https://github.com/reactphp/event-loop/tree/v1.5.0"
+                "source": "https://github.com/reactphp/event-loop/tree/v1.6.0"
             },
             "funding": [
                 {
@@ -8259,7 +7849,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2023-11-13T13:48:05+00:00"
+            "time": "2025-11-17T20:46:25+00:00"
         },
         {
             "name": "react/promise",
@@ -8336,16 +7926,16 @@
         },
         {
             "name": "react/socket",
-            "version": "v1.16.0",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/socket.git",
-                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1"
+                "reference": "ef5b17b81f6f60504c539313f94f2d826c5faa08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
-                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+                "url": "https://api.github.com/repos/reactphp/socket/zipball/ef5b17b81f6f60504c539313f94f2d826c5faa08",
+                "reference": "ef5b17b81f6f60504c539313f94f2d826c5faa08",
                 "shasum": ""
             },
             "require": {
@@ -8404,7 +7994,7 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/socket/issues",
-                "source": "https://github.com/reactphp/socket/tree/v1.16.0"
+                "source": "https://github.com/reactphp/socket/tree/v1.17.0"
             },
             "funding": [
                 {
@@ -8412,7 +8002,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-07-26T10:38:09+00:00"
+            "time": "2025-11-19T20:47:34+00:00"
         },
         {
             "name": "react/stream",
@@ -9505,16 +9095,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.13.4",
+            "version": "3.13.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119"
+                "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ad545ea9c1b7d270ce0fc9cbfb884161cd706119",
-                "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0ca86845ce43291e8f5692c7356fccf3bcf02bf4",
+                "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4",
                 "shasum": ""
             },
             "require": {
@@ -9531,11 +9121,6 @@
                 "bin/phpcs"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
@@ -9585,28 +9170,28 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-09-05T05:47:09+00:00"
+            "time": "2025-11-04T16:30:35+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v6.4.25",
+            "version": "v7.4.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "b0cf3162020603587363f0551cd3be43958611ff"
+                "reference": "e4a2e29753c7801f7a8340e066cfa788f3bc8101"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b0cf3162020603587363f0551cd3be43958611ff",
-                "reference": "b0cf3162020603587363f0551cd3be43958611ff",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e4a2e29753c7801f7a8340e066cfa788f3bc8101",
+                "reference": "e4a2e29753c7801f7a8340e066cfa788f3bc8101",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/event-dispatcher-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<5.4",
+                "symfony/dependency-injection": "<6.4",
                 "symfony/service-contracts": "<2.5"
             },
             "provide": {
@@ -9615,13 +9200,14 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^5.4|^6.0|^7.0",
-                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
-                "symfony/error-handler": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/config": "^6.4|^7.0|^8.0",
+                "symfony/dependency-injection": "^6.4|^7.0|^8.0",
+                "symfony/error-handler": "^6.4|^7.0|^8.0",
+                "symfony/expression-language": "^6.4|^7.0|^8.0",
+                "symfony/framework-bundle": "^6.4|^7.0|^8.0",
+                "symfony/http-foundation": "^6.4|^7.0|^8.0",
                 "symfony/service-contracts": "^2.5|^3",
-                "symfony/stopwatch": "^5.4|^6.0|^7.0"
+                "symfony/stopwatch": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -9649,7 +9235,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.25"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.9"
             },
             "funding": [
                 {
@@ -9669,20 +9255,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-08-13T09:41:44+00:00"
+            "time": "2026-04-18T13:18:21+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.6.0",
+            "version": "v3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "59eb412e93815df44f05f342958efa9f46b1e586"
+                "reference": "ccba7060602b7fed0b03c85bf025257f76d9ef32"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586",
-                "reference": "59eb412e93815df44f05f342958efa9f46b1e586",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/ccba7060602b7fed0b03c85bf025257f76d9ef32",
+                "reference": "ccba7060602b7fed0b03c85bf025257f76d9ef32",
                 "shasum": ""
             },
             "require": {
@@ -9696,7 +9282,7 @@
                     "name": "symfony/contracts"
                 },
                 "branch-alias": {
-                    "dev-main": "3.6-dev"
+                    "dev-main": "3.7-dev"
                 }
             },
             "autoload": {
@@ -9729,7 +9315,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.7.0"
             },
             "funding": [
                 {
@@ -9740,34 +9326,38 @@
                     "url": "https://github.com/fabpot",
                     "type": "github"
                 },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:21:43+00:00"
+            "time": "2026-01-05T13:30:16+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.4.24",
+            "version": "v7.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "75ae2edb7cdcc0c53766c30b0a2512b8df574bd8"
+                "reference": "d721ea61b4a5fba8c5b6e7c1feda19efea144b50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/75ae2edb7cdcc0c53766c30b0a2512b8df574bd8",
-                "reference": "75ae2edb7cdcc0c53766c30b0a2512b8df574bd8",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/d721ea61b4a5fba8c5b6e7c1feda19efea144b50",
+                "reference": "d721ea61b4a5fba8c5b6e7c1feda19efea144b50",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.8"
             },
             "require-dev": {
-                "symfony/process": "^5.4|^6.4|^7.0"
+                "symfony/process": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -9795,7 +9385,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.4.24"
+                "source": "https://github.com/symfony/filesystem/tree/v7.4.11"
             },
             "funding": [
                 {
@@ -9815,27 +9405,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-10T08:14:14+00:00"
+            "time": "2026-05-11T16:38:44+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v6.4.24",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "73089124388c8510efb8d2d1689285d285937b08"
+                "reference": "e0be088d22278583a82da281886e8c3592fbf149"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/73089124388c8510efb8d2d1689285d285937b08",
-                "reference": "73089124388c8510efb8d2d1689285d285937b08",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/e0be088d22278583a82da281886e8c3592fbf149",
+                "reference": "e0be088d22278583a82da281886e8c3592fbf149",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "require-dev": {
-                "symfony/filesystem": "^6.0|^7.0"
+                "symfony/filesystem": "^6.4|^7.0|^8.0"
             },
             "type": "library",
             "autoload": {
@@ -9863,7 +9453,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v6.4.24"
+                "source": "https://github.com/symfony/finder/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -9883,20 +9473,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-15T12:02:45+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "symfony/polyfill-php84",
-            "version": "v1.33.0",
+            "version": "v1.38.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php84.git",
-                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191"
+                "reference": "f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191",
-                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191",
+                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa",
+                "reference": "f4e1dfaee5b74aba5964fe1fd4dfc7ba5e3085fa",
                 "shasum": ""
             },
             "require": {
@@ -9943,7 +9533,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0"
+                "source": "https://github.com/symfony/polyfill-php84/tree/v1.38.1"
             },
             "funding": [
                 {
@@ -9963,24 +9553,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-06-24T13:30:11+00:00"
+            "time": "2026-05-26T12:51:13+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v6.4.33",
+            "version": "v7.4.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "c46e854e79b52d07666e43924a20cb6dc546644e"
+                "reference": "f5804be144caceb570f6747519999636b664f24c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/c46e854e79b52d07666e43924a20cb6dc546644e",
-                "reference": "c46e854e79b52d07666e43924a20cb6dc546644e",
+                "url": "https://api.github.com/repos/symfony/process/zipball/f5804be144caceb570f6747519999636b664f24c",
+                "reference": "f5804be144caceb570f6747519999636b664f24c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1"
+                "php": ">=8.2"
             },
             "type": "library",
             "autoload": {
@@ -10008,7 +9598,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v6.4.33"
+                "source": "https://github.com/symfony/process/tree/v7.4.13"
             },
             "funding": [
                 {
@@ -10028,24 +9618,24 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-01-23T16:02:12+00:00"
+            "time": "2026-05-23T16:05:06+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v6.4.24",
+            "version": "v7.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "b67e94e06a05d9572c2fa354483b3e13e3cb1898"
+                "reference": "70a852d72fec4d51efb1f48dcd968efcaf5ccb89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b67e94e06a05d9572c2fa354483b3e13e3cb1898",
-                "reference": "b67e94e06a05d9572c2fa354483b3e13e3cb1898",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/70a852d72fec4d51efb1f48dcd968efcaf5ccb89",
+                "reference": "70a852d72fec4d51efb1f48dcd968efcaf5ccb89",
                 "shasum": ""
             },
             "require": {
-                "php": ">=8.1",
+                "php": ">=8.2",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "type": "library",
@@ -10074,7 +9664,7 @@
             "description": "Provides a way to profile code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/stopwatch/tree/v6.4.24"
+                "source": "https://github.com/symfony/stopwatch/tree/v7.4.8"
             },
             "funding": [
                 {
@@ -10094,20 +9684,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-10T08:14:14+00:00"
+            "time": "2026-03-24T13:12:05+00:00"
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.3",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
+                "reference": "b7489ce515e168639d17feec34b8847c326b0b3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
-                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c",
+                "reference": "b7489ce515e168639d17feec34b8847c326b0b3c",
                 "shasum": ""
             },
             "require": {
@@ -10136,7 +9726,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
+                "source": "https://github.com/theseer/tokenizer/tree/1.3.1"
             },
             "funding": [
                 {
@@ -10144,34 +9734,26 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-03T12:36:25+00:00"
-        }
-    ],
-    "aliases": [
-        {
-            "package": "voku/portable-utf8",
-            "version": "dev-joomla-5.3",
-            "alias": "6.0.13",
-            "alias_normalized": "6.0.13.0"
+            "time": "2025-11-17T20:03:58+00:00"
         }
     ],
+    "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "tobscure/json-api": 20,
-        "voku/portable-utf8": 20
+        "tobscure/json-api": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": "^8.1.0",
+        "php": "^8.3.0",
         "ext-json": "*",
         "ext-simplexml": "*",
         "ext-gd": "*",
         "ext-dom": "*"
     },
-    "platform-dev": {},
+    "platform-dev": [],
     "platform-overrides": {
-        "php": "8.1.0"
+        "php": "8.3.0"
     },
-    "plugin-api-version": "2.9.0"
+    "plugin-api-version": "2.6.0"
 }
diff --git a/cypress.config.dist.mjs b/cypress.config.dist.mjs
index 612b9e0c1dee8..f1c04e514f47d 100644
--- a/cypress.config.dist.mjs
+++ b/cypress.config.dist.mjs
@@ -25,8 +25,9 @@ export default defineConfig({
     browser: 'firefox',
     screenshotOnRunFailure: true,
     video: false,
+    allowCypressEnv: false,
   },
-  env: {
+  expose: {
     sitename: 'Joomla CMS Test',
     name: 'jane doe',
     email: 'admin@example.com',
diff --git a/includes/incompatible.html b/includes/incompatible.html
index 513d0941d61e5..113843b4b6b14 100644
--- a/includes/incompatible.html
+++ b/includes/incompatible.html
@@ -5,8 +5,8 @@
 	<meta name="robots" content="noindex, nofollow">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<title>Joomla: unsupported PHP version</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
-	<style>html{background:#ee2a00;background:-moz-radial-gradient(center,ellipse cover,#f1f1f1 0,#ee2a00 100%);background:-webkit-radial-gradient(center,ellipse cover,#f1f1f1 0,#ee2a00 100%);background:radial-gradient(#f1f1f1 0,#ee2a00 100%) no-repeat fixed}body{color:#555;background-color:#0000;margin:0;padding:0;font:14px/18px sans-serif}ol,ul{margin:0;padding:0;list-style:none}a{color:#0084b4;text-decoration:none}a:hover,a:focus{text-decoration:underline}p a{line-height:inherit}.container{flex-direction:column;justify-content:center;align-items:center;width:100%;height:100vh;margin:0 auto;display:flex;position:relative;overflow:hidden}.alert-main{background:#fff;border:1px solid #0000001a;border-radius:5px;margin:0 20px;padding:20px 60px;display:block;position:relative;box-shadow:0 0 10px #0000000d}svg{z-index:-1;width:400px;position:absolute;bottom:-120px;right:-70px;transform:rotate(10deg)}h1,p{z-index:10;text-align:center;text-rendering:optimizeLegibility;position:relative}h1{text-shadow:0 1px 2px #0003;margin:18px 0 0;font-size:40px;font-weight:200;line-height:1}p,label{color:#777;margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid #0000001a;border-radius:.25rem;padding:.4rem .85rem;font-size:1rem;font-weight:400;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{text-align:left;margin:8px 20px;font-size:11px}.footer ul{margin-bottom:5px}.footer li{margin:0 5px;line-height:20px;display:inline}.footer li,.footer a{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem;display:block}.links li{margin-top:20px;display:inline-block}@media screen and (width<=480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
-	<script>window.errorLocale={"af-ZA":{"language":"Engels GB","header":"Jammer, jou PHP weergawe word nie ondersteun nie.","text1":"Jou gasheer moet PHP weergawe {{phpversion}} of nuwer hê om hierdie weergawe van Joomla te gebruik.","help-url-text":"Help my om dit op te los"},"ar-AA":{"language":"اللغة العربية بالكود الموحد","header":"عذرًا، إصدار PHP الخاص بك غير مدعوم.","text1":"يحتاج الخادم الخاص بك إلى استخدام إصدار PHP {{phpversion}} أو أحدث لتشغيل هذا الإصدار من جوملا.","help-url-text":"ساعدني في حل هذا"},"be-BY":{"language":"Беларуская BY","header":"Выбачайце, Ваша версія PHP не падтрымліваецца","text1":"Каб запусціць гэтую версію Joomla, Ваш хост мусіць мець PHP {{phpversion}} або навейшы.","help-url-text":"Дапамажыце мне выправіць гэта"},"bg-BG":{"language":"Български","header":"Вашата PHP версия не се поддържа.","text1":"Вашият хост трябва да използва PHP версия {{phpversion}} или по -нова, за да стартира тази версия на Joomla.","help-url-text":"Помогнете ми да разреша това"},"ca-ES":{"language":"Català ca_ES","header":"Ho sentim, la teva versió de PHP no és compatible.","text1":"Cal que el teu servidor utilitzi la versió de PHP {{phpversion}} o posterior per executar aquesta versió de Joomla.","help-url-text":"Ajuda'm a resoldre això"},"cs-CZ":{"language":"Čeština","header":"Omlouváme se, vaše verze PHP není podporována.","text1":"Pro spuštění této verze Joomla musí váš hostitel použít PHP verzi {{phpversion}} nebo novější","help-url-text":"Pomozte mi to vyřešit"},"cy-GB":{"language":"Cymraeg GB","header":"Mae'n ddrwg gennym ond dydi ni ddim yn cefnogi eich fersiwn PHP","text1":"Mae eich lletywr angen defnyddio fersiwn PHP {{phpversion}} neu ddiweddarach i redeg y fersiwn hon o Joomla.","help-url-text":"Helpwch fi i ddatrys hyn"},"da-DK":{"language":"Dansk DK","header":"Beklager, din PHP version er ikke understøttet.","text1":"Din host skal anvende PHP version {{phpversion}} eller nyere for at køre denne version af Joomla.","help-url-text":"Hjælp mig med at løse dette"},"de-AT":{"language":"Deutsch AT","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-CH":{"language":"Deutsch CH","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-DE":{"language":"Deutsch DE","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-LI":{"language":"Deutsch LI","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-LU":{"language":"Deutsch LU","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"el-GR":{"language":"Greek el-GR","header":"Λυπούμαστε, αυτή η έκδοση PHP δεν υποστηρίζεται.","text1":"Ο διακομιστής πρέπει να διαθέτει την έκδοση PHP {{phpversion}} ή νεότερη για την εκτέλεση αυτής της έκδοσης του Joomla.","help-url-text":"Βοήθεια για την επίλυση"},"en-AU":{"language":"English AU","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-CA":{"language":"English CA","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-GB":{"language":"English GB","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-NZ":{"language":"English NZ","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-US":{"language":"English US","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"es-ES":{"language":"Español ES","header":"Lo sentimos, su versión de PHP no es compatible.","text1":"Para poder usar esta versión de Joomla su hospedaje necesita usar la versión {{phpversion}} de PHP o superior.","help-url-text":"Ayúdeme a resolver esto"},"et-EE":{"language":"Estonian","header":"Vabandust, aga sinu PHP versioon ei ole toetatud.","text1":"Sinu veebimajutuse pakkuja peab kasutama PHP versiooni {{phpversion}} või uuemat, et seda Joomla versiooni jooksutada.","help-url-text":"Aita mul seda lahendada"},"eu-ES":{"language":"Euskara ES","header":"Barka, zure PHP bertsioa ez da bateragarria.","text1":"Zure ostalariak PHP bertsio hau {{phpversion}}  edo berriagoa erabili behar du Joomla bertsio honekin funtzionatzeko.","help-url-text":"Lagundu niri hau konpontzen"},"fa-AF":{"language":"فارسی دری","header":"با عرض پوزش، نسخه‌ی PHP شما پشتیبانی نمی‌شود.","text1":"شما برای اجرای این نسخه از جوملا، به نسخه‌ی PHP {{phpversion}} یا بالاتر احتیاج دارید.","help-url-text":"برای حل این مشکل کمک کن"},"fa-IR":{"language":"Persian IR","header":"متأسفیم، نسخه PHP شما پشتیبانی نمی شود.","text1":"میزبان شما برای اجرای این نسخه از جوملا نیاز به استفاده از نسخه PHP {{phpversion}} یا نسخه جدیدتر دارد.","help-url-text":"به من کمک کنید تا این مسئله را حل کنم"},"fi-FI":{"language":"Suomi","header":"PHP-versiotasi ei tueta.","text1":"Palvelimen täytyy käyttää PHP-versiota {{phpversion}} tai uudempaa jotta voit käyttää tätä Joomlan versiota.","help-url-text":"Auta minua ratkaisemaan tämä"},"fr-CA":{"language":"Français FR","header":"Désolé, votre version de PHP n'est pas prise en charge.","text1":"Votre serveur a besoin d'utiliser la version {{phpversion}} de PHP ou supérieure pour exécuter cette version de Joomla.","help-url-text":"Aidez-moi à résoudre ceci"},"fr-FR":{"language":"Français FR","header":"Désolé, votre version de PHP n'est pas prise en charge.","text1":"Votre serveur a besoin d'utiliser la version {{phpversion}} de PHP ou supérieure pour exécuter cette version de Joomla.","help-url-text":"Aidez-moi à résoudre ceci"},"he-IL":{"language":"אנגלית GB","header":"מצטערים, גרסת ה- PHP שלך אינה נתמכת.","text1":"השרת מארח שלך צריך להשתמש בגרסת PHP {{phpversion}} ואילך כדי להריץ גירסה זו של ג'ומלה.","help-url-text":"עזור לי לפתור זאת"},"hr-HR":{"language":"Hrvatski HR","header":"Nažalost, vaša PHP verzija nije podržana.","text1":"Za pokretanje ove Joomla verzije, vaš host treba koristiti PHP verziju {{phpversion}} ili noviju.","help-url-text":"Pomozite mi riješiti ovo"},"hu-HU":{"language":"Magyar","header":"Sajnáljuk, de a PHP verziója nem támogatott.","text1":"Ennek a Joomla! verziónak a futtatásához a kiszolgálónak PHP {{phpversion}} vagy újabb verziót kell használnia.","help-url-text":"Segíts ezt megoldani"},"it-IT":{"language":"Italiano IT","header":"Siamo spiacenti, la tua versione di PHP non è supportata.","text1":"Il tuo host ha bisogno della versione di PHP {{phpversion}} o una più recente per avviare questa versione di Joomla.","help-url-text":"Aiutami a risolvere questo"},"ja-JP":{"language":"Japanese JP","header":"申し訳ありませんが、お使いのPHPバージョンはサポートされていません。","text1":"このバージョンのJoomlaを実行するには、ホストがPHPバージョン {{phpversion}} 以降を使用する必要があります。","help-url-text":"この問題を解決するには"},"ka-GE":{"language":"ქართული GE","header":"უკაცრავად, თქვენს PHP ვერსიას არა აქვს მხარდაჭერა.","text1":"Joomla! ამ ვერსიის დასაყენებლად თქვენი ჰოსტი უნდა იყენებდეს PHP {{phpversion}} ვერსიას ან უფრო ახალს.","help-url-text":"დამეხმარეთ პრობლემის მოგვარებაში"},"kk-KZ":{"language":"English GB","header":"Кешіріңіз, сіздің PHP нұсқаңызға қолдау көрсетілмейді.","text1":"Хостыңыз PHP {{phpversion}} немесе оданда жоғары нұсқасы болғанда ғана бұл нұсқадағы Joomla-ны іске қоса аласыз.","help-url-text":"Бұл мәселені шешуге көмектес"},"ko-KR":{"language":"Korean KO","header":"죄송합니다. 사용 중인 PHP 버전이 지원되지 않습니다.","text1":"해당 버전의 Joomla를 사용하기 위해서는 PHP 버전 {{phpversion}} 또는 그 상위 버전이 필요합니다.","help-url-text":"이 문제를 해결하도록 도와주세요."},"lt-LT":{"language":"Lietuvių LT","header":"Atsiprašome, Jūsų PHP versija yra nepalaikoma.","text1":"Kad paleisti šios versijos Joomla, Jūsų talpinimo serveris turi palaikyti {{phpversion}} arba vėlesnę PHP versiją.","help-url-text":"Padėkite man tai išspręsti"},"lv-LV":{"language":"Latviešu LV","header":"Diemžēl jūsu PHP versija netiek atbalstīta.","text1":"Lai palaistu šo Joomla versiju, serverim ir jāizmanto {{phpversion}} PHP versija vai jaunāka.","help-url-text":"Palīdziet man to atrisināt"},"mk-MK":{"language":"English GB","header":"За жал, вашата верзија на PHP не е поддржана.","text1":"Вашиот хост треба да користи PHP верзија {{phpversion}} или понова за да ја стартува оваа верзија на Joomla.","help-url-text":"Помогни ми да го решам ова"},"nl-BE":{"language":"Vlaams BE","header":"Sorry, uw PHP-versie wordt niet ondersteund.","text1":"Uw host moet PHP versie {{phpversion}} of nieuwer gebruiken om deze versie van Joomla uit te voeren.","help-url-text":"Help dit probleem op te lossen"},"nl-NL":{"language":"Engels GB","header":"Sorry, uw PHP-versie wordt niet ondersteund.","text1":"Uw host moet PHP versie {{phpversion}} of nieuwer gebruiken om deze versie van Joomla uit te voeren.","help-url-text":"Help dit probleem op te lossen"},"pl-PL":{"language":"Polski PL","header":"Niestety, Twoja wersja PHP nie jest obsługiwana.","text1":"Twój serwer musi używać PHP w wersji {{phpversion}} lub nowszej, aby zainstalować tę wersję Joomla.","help-url-text":"Pomoc w rozwiązaniu tego problemu"},"pt-BR":{"language":"Português do Brasil (pt-BR)","header":"Desculpe, sua versão do PHP não é suportada.","text1":"Seu servidor precisa usar a versão {{phpversion}} do PHP ou uma versão mais recente para executar esta versão do Joomla.","help-url-text":"Ajude-me a resolver isto"},"pt-PT":{"language":"Portuguese (pt-PT)","header":"Lamentamos, mas a sua versão de PHP não é suportada.","text1":"O seu alojamento terá de usar PHP na versão {{phpversion}}, ou mais recente, para poder utilizar esta versão do Joomla.","help-url-text":"Ajude-me a resolver isto"},"ro-RO":{"language":"Română RO","header":"Ne pare rău, versiunea dvs de PHP nu este acceptată.","text1":"Gazda dvs. trebuie să folosească versiunea PHP {{phpversion}} sau una mai nouă pentru a rula această versiune Joomla.","help-url-text":"Ajută-mă să rezolv această problemă"},"ru-RU":{"language":"Русский RU","header":"Используемая версия PHP не поддерживается","text1":"Для установки Joomla необходимо наличие PHP {{phpversion}} или более новой версии.","help-url-text":"Подробнее о решении проблемы"},"sk-SK":{"language":"Slovensky","header":"Prepáčte, ale vaša verzia PHP nie je podporovaná.","text1":"Aby táto verzia Joomla fungovala, váš hosting musí používať PHP vo verzii {{phpversion}} alebo novšej.","help-url-text":"Pomôžte mi vyriešiť to"},"sl-SI":{"language":"Slovenščina SI","header":"Žal vaša PHP različica ni podprta.","text1":"Vaš gostitelj mora uporabljati PHP različico  {{phpversion}} ali novejšo za zagon te različice Joomle.","help-url-text":"Pomagajte mi rešiti to težavo"},"sr-YU":{"language":"Srpski Latinica SRB","header":"Žao nam je vaša PHP verzija nije podržana.","text1":"Vaš host mora da koristi PHP verziju {{phpversion}} ili noviju da bi ova vezija Joomla! radila.","help-url-text":"Kako da rešim ovo"},"sv-SE":{"language":"Svensk SE","header":"Tyvärr, din PHP-version stöds inte.","text1":"Ditt webbhotell måste använda PHP-version {{phpversion}} eller nyare för att köra denna version av Joomla.","help-url-text":"Hjälp mig att lösa detta"},"ta-IN":{"language":"தமிழ் இந்தியா","header":"மன்னிக்கவும், உங்கள் PHP பதிப்பு ஆதரிக்கப்படவில்லை.","text1":"Joomla-வின் இந்தப் பதிப்பை இயக்க, தங்கள் புரவலர்-கணினி (host) ஆனது PHP பதிப்பு {{phpversion}} அல்லது அதற்கும் மேலான பதிப்பைப் பயன்படுத்த வேண்டும்.","help-url-text":"இதனைத் தீர்க்க எனக்கு உதவுக"},"th-TH":{"language":"ภาษาไทย","header":"ขออภัย ไม่รองรับเวอร์ชัน PHP ของคุณ","text1":"โฮสต์ของคุณต้องใช้เวอร์ชัน PHP {{phpversion}} หรือใหม่กว่าเพื่อเรียกใช้ Joomla เวอร์ชันนี้","help-url-text":"ช่วยฉันแก้ปัญหานี้"},"tr-TR":{"language":"Turkish TR","header":"Üzgünüz, PHP sürümünüz desteklenmiyor.","text1":"Joomla'nın bu sürümünü çalıştırmak için sunucunuzun PHP {{phpversion}} sürümünü veya daha yenisini kullanması gerekir.","help-url-text":"Bunu çözmeme yardım et"},"uk-UA":{"language":"Українська (UA)","header":"На жаль, ваша версія PHP не підтримується.","text1":"Ваш хост повинен використовувати версію PHP {{phpversion}} або новішу для запуску цієї версії Joomla.","help-url-text":"Допоможіть мені це вирішити"},"ur-PK":{"language":"انگریزی جی-بی","header":"معذرت، آپ کا پی ایچ پی ورژن تعاون یافتہ نہیں ہے۔","text1":"جملہ کے اس ورژن کو چلانے کے لیے آپ کے میزبان کو پی ایچ پی ورژن {{phpversion}} یا اس سے جدید تر استعمال کرنے کی ضرورت ہے۔","help-url-text":"اس کو حل کرنے میں میری مدد کریں۔"},"vi-VN":{"language":"Vietnamese VN","header":"Xin lỗi, phiên bản PHP của bạn không được hỗ trợ.","text1":"Máy chủ của bạn cần sử dụng PHP phiên bản {{phpversion}} hoặc mới hơn để chạy phiên bản Joomla này.","help-url-text":"Giúp tôi giải quyết vấn đề này"},"zh-CN":{"language":"简体中文","header":"抱歉，PHP 版本不支持。","text1":"需要 PHP {{phpversion}} 或更新的版本运行","help-url-text":"帮助我解决这个问题"},"zh-TW":{"language":"中文 台灣繁體","header":"對不起，你的PHP版本並不支援","text1":"您的主機需要PHP版本{{phpversion}}或以上來執行這個版本的Joomla","help-url-text":"協助我解決這個問題"}};</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
+	<style>html{background:#ee2a00 radial-gradient(#f1f1f1 0,#ee2a00 100%) no-repeat fixed}body{color:#555;background-color:#0000;margin:0;padding:0;font:14px/18px sans-serif}ol,ul{margin:0;padding:0;list-style:none}a{color:#0084b4;text-decoration:none}a:hover,a:focus{text-decoration:underline}p a{line-height:inherit}.container{flex-direction:column;justify-content:center;align-items:center;width:100%;height:100vh;margin:0 auto;display:flex;position:relative;overflow:hidden}.alert-main{background:#fff;border:1px solid #0000001a;border-radius:5px;margin:0 20px;padding:20px 60px;display:block;position:relative;box-shadow:0 0 10px #0000000d}svg{z-index:-1;width:400px;position:absolute;bottom:-120px;right:-70px;transform:rotate(10deg)}h1,p{z-index:10;text-align:center;text-rendering:optimizelegibility;position:relative}h1{text-shadow:0 1px 2px #0003;margin:18px 0 0;font-size:40px;font-weight:200;line-height:1}p,label{color:#777;margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid #0000001a;border-radius:.25rem;padding:.4rem .85rem;font-size:1rem;font-weight:400;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{text-align:left;margin:8px 20px;font-size:11px}.footer ul{margin-bottom:5px}.footer li{margin:0 5px;line-height:20px;display:inline}.footer li,.footer a{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem;display:block}.links li{margin-top:20px;display:inline-block}@media screen and (width<=480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
+	<script>window.errorLocale={"af-ZA":{"language":"Engels GB","header":"Jammer, jou PHP weergawe word nie ondersteun nie.","text1":"Jou gasheer moet PHP weergawe {{phpversion}} of nuwer hê om hierdie weergawe van Joomla te gebruik.","help-url-text":"Help my om dit op te los"},"ar-AA":{"language":"اللغة العربية بالكود الموحد","header":"عذرًا ، إصدار PHP الخاص بك غير مدعوم.","text1":"يحتاج مضيفك إلى استخدام إصدار PHP {{phpversion}} أو أحدث لتشغيل هذا الإصدار من جوملا.","help-url-text":"ساعدني في حل هذا"},"be-BY":{"language":"Беларуская BY","header":"Выбачайце, Ваша версія PHP не падтрымліваецца.","text1":"Каб запусціць гэтую версію Joomla, на серверы трэба мець версію PHP {{phpversion}} або навейшую.","help-url-text":"Дапамажыце мне гэта вырашыць"},"bg-BG":{"language":"Български","header":"Вашата PHP версия не се поддържа.","text1":"Вашият хост трябва да използва PHP версия {{phpversion}} или по -нова, за да стартира тази версия на Joomla.","help-url-text":"Помогнете ми да разреша това"},"ca-ES":{"language":"Anglès GB","header":"Ho sentim, la teva versió de PHP no es compatible.","text1":"Cal que el teu servidor utilitzi la versió de PHP {{phpversion}} o posterior per executar aquesta versió de Joomla.","help-url-text":"Ajuda'm a resoldre això"},"cs-CZ":{"language":"Čeština","header":"Omlouváme se, vaše verze PHP není podporována.","text1":"Pro spuštění této verze Joomla musí váš hostitel použít PHP verzi {{phpversion}} nebo novější","help-url-text":"Pomozte mi to vyřešit"},"cy-GB":{"language":"Cymraeg GB","header":"Mae'n ddrwg gennym ond dydi ni ddim yn cefnogi eich fersiwn PHP","text1":"Mae eich lletywr angen defnyddio fersiwn PHP {{phpversion}} neu ddiweddarach i redeg y fersiwn hon o Joomla.","help-url-text":"Helpwch fi i ddatrys hyn"},"da-DK":{"language":"Dansk DK","header":"Beklager, din PHP version er ikke understøttet.","text1":"Din host skal anvende PHP version {{phpversion}} eller nyere for at køre denne version af Joomla.","help-url-text":"Hjælp mig med at løse dette"},"de-AT":{"language":"Deutsch AT","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-CH":{"language":"Deutsch CH","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-DE":{"language":"Deutsch DE","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-LI":{"language":"Deutsch LI","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-LU":{"language":"Deutsch LU","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"el-GR":{"language":"Greek el-GR","header":"Λυπούμαστε, αυτή η έκδοση PHP δεν υποστηρίζεται.","text1":"Ο διακομιστής πρέπει να διαθέτει την έκδοση PHP {{phpversion}} ή νεότερη για την εκτέλεση αυτής της έκδοσης του Joomla.","help-url-text":"Βοήθεια για την επίλυση"},"en-AU":{"language":"English AU","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-CA":{"language":"English CA","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-GB":{"language":"English GB","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-NZ":{"language":"English NZ","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-US":{"language":"English US","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"es-ES":{"language":"English GB","header":"Lo sentimos, su versión de PHP no es compatible.","text1":"Para poder usar esta versión de Joomla su hospedaje necesita usar la versión {{phpversion}} de PHP o superior.","help-url-text":"Ayúdeme a resolver esto"},"et-EE":{"language":"Estonian","header":"Vabandust, aga sinu PHP versioon ei ole toetatud.","text1":"Sinu veebimajutuse pakkuja peab kasutama PHP versiooni {{phpversion}} või uuemat, et seda Joomla versiooni jooksutada.","help-url-text":"Aita mul seda lahendada"},"eu-ES":{"language":"Euskara ES","header":"Barka, zure PHP bertsioa ez da bateragarria.","text1":"Zure ostalariak PHP bertsio hau {{phpversion}}  edo berriagoa erabili behar du Joomla bertsio honekin funtzionatzeko.","help-url-text":"Lagundu niri hau konpontzen"},"fa-AF":{"language":"فارسی دری","header":"با عرض پوزش، نسخه‌ی PHP شما پشتیبانی نمی‌شود.","text1":"شما برای اجرای این نسخه از جوملا، به نسخه‌ی PHP {{phpversion}} یا بالاتر احتیاج دارید.","help-url-text":"برای حل این مشکل کمک کن"},"fa-IR":{"language":"Persian IR","header":"متأسفیم، نسخه PHP شما پشتیبانی نمی شود.","text1":"میزبان شما برای اجرای این نسخه از جوملا نیاز به استفاده از نسخه PHP {{phpversion}} یا نسخه جدیدتر دارد.","help-url-text":"به من کمک کنید تا این مسئله را حل کنم"},"fi-FI":{"language":"Suomi","header":"PHP-versiotasi ei tueta.","text1":"Palvelimen täytyy käyttää PHP-versiota {{phpversion}} tai uudempaa jotta voit käyttää tätä Joomlan versiota.","help-url-text":"Auta minua ratkaisemaan tämä"},"fr-CA":{"language":"Français FR","header":"Désolé, votre version de PHP n'est pas prise en charge.","text1":"Votre serveur a besoin d'utiliser la version {{phpversion}} de PHP ou supérieure pour exécuter cette version de Joomla.","help-url-text":"Aidez-moi à résoudre ceci"},"fr-FR":{"language":"Français FR","header":"Désolé, votre version de PHP n'est pas prise en charge.","text1":"Votre serveur a besoin d'utiliser la version {{phpversion}} de PHP ou supérieure pour exécuter cette version de Joomla.","help-url-text":"Aidez-moi à résoudre ceci"},"he-IL":{"language":"אנגלית GB","header":"מצטערים, גרסת ה- PHP שלך אינה נתמכת.","text1":"השרת מארח שלך צריך להשתמש בגרסת PHP {{phpversion}} ואילך כדי להריץ גירסה זו של ג'ומלה.","help-url-text":"עזור לי לפתור זאת"},"hr-HR":{"language":"Hrvatski HR","header":"Nažalost, vaša PHP verzija nije podržana.","text1":"Za pokretanje ove Joomla verzije, vaš host treba koristiti PHP verziju {{phpversion}} ili noviju.","help-url-text":"Pomozite mi riješiti ovo"},"hu-HU":{"language":"Magyar","header":"Sajnáljuk, de a PHP verziója nem támogatott.","text1":"Ennek a Joomla! verziónak a futtatásához a kiszolgálónak PHP {{phpversion}} vagy újabb verziót kell használnia.","help-url-text":"Segíts ezt megoldani"},"it-IT":{"language":"Italiano IT","header":"Siamo spiacenti, la tua versione di PHP non è supportata.","text1":"Il tuo host ha bisogno della versione di PHP {{phpversion}} o una più recente per avviare questa versione di Joomla.","help-url-text":"Aiutami a risolvere questo"},"ja-JP":{"language":"Japanese JP","header":"申し訳ありませんが、お使いのPHPバージョンはサポートされていません。","text1":"このバージョンのJoomlaを実行するには、ホストがPHPバージョン {{phpversion}} 以降を使用する必要があります。","help-url-text":"この問題を解決するには"},"ka-GE":{"language":"ქართული GE","header":"უკაცრავად, თქვენს PHP ვერსიას არა აქვს მხარდაჭერა.","text1":"Joomla! ამ ვერსიის დასაყენებლად თქვენი ჰოსტი უნდა იყენებდეს PHP {{phpversion}} ვერსიას ან უფრო ახალს.","help-url-text":"დამეხმარეთ პრობლემის მოგვარებაში"},"kk-KZ":{"language":"English GB","header":"Кешіріңіз, сіздің PHP нұсқаңызға қолдау көрсетілмейді.","text1":"Хостыңыз PHP {{phpversion}} немесе оданда жоғары нұсқасы болғанда ғана бұл нұсқадағы Joomla-ны іске қоса аласыз.","help-url-text":"Бұл мәселені шешуге көмектес"},"ko-KR":{"language":"Korean KO","header":"죄송합니다. 사용 중인 PHP 버전은 지원되지 않습니다.","text1":"해당 버전의 Joomla를 사용하기 위해서는 PHP 버전 {{phpversion}} 또는 그 상위 버전이 필요합니다.","help-url-text":"처리해야 하는 문제가 발생했습니다."},"lt-LT":{"language":"Lietuvių LT","header":"Atsiprašome, Jūsų PHP versija yra nepalaikoma.","text1":"Kad paleisti šios versijos Joomla, Jūsų talpinimo serveris turi palaikyti {{phpversion}} arba vėlesnę PHP versiją.","help-url-text":"Padėkite man tai išspręsti"},"lv-LV":{"language":"Latviešu LV","header":"Diemžēl jūsu PHP versija netiek atbalstīta.","text1":"Lai palaistu šo Joomla versiju, serverim ir jāizmanto {{phpversion}} PHP versija vai jaunāka.","help-url-text":"Palīdziet man to atrisināt"},"mk-MK":{"language":"English GB","header":"За жал, вашата верзија на PHP не е поддржана.","text1":"Вашиот хост треба да користи PHP верзија {{phpversion}} или понова за да ја стартува оваа верзија на Joomla.","help-url-text":"Помогни ми да го решам ова"},"nl-BE":{"language":"Engels GB","header":"Sorry, uw PHP-versie wordt niet ondersteund.","text1":"Uw host moet PHP versie {{phpversion}} of nieuwer gebruiken om deze versie van Joomla uit te voeren.","help-url-text":"Help dit probleem op te lossen"},"nl-NL":{"language":"Engels GB","header":"Sorry, uw PHP-versie wordt niet ondersteund.","text1":"Uw host moet PHP versie {{phpversion}} of nieuwer gebruiken om deze versie van Joomla uit te voeren.","help-url-text":"Help dit probleem op te lossen"},"pl-PL":{"language":"Polski PL","header":"Niestety, Twoja wersja PHP nie jest obsługiwana.","text1":"Twój serwer musi używać PHP w wersji {{phpversion}} lub nowszej, aby zainstalować tę wersję Joomla.","help-url-text":"Pomoc w rozwiązaniu tego problemu"},"pt-BR":{"language":"Português do Brasil (pt-BR)","header":"Desculpe, sua versão do PHP não é suportada.","text1":"Seu servidor precisa usar a versão {{phpversion}} do PHP ou uma versão mais recente para executar esta versão do Joomla.","help-url-text":"Ajude-me a resolver isto"},"pt-PT":{"language":"Portuguese (pt-PT)","header":"Lamentamos, mas a sua versão de PHP não é suportada.","text1":"O seu alojamento terá de usar PHP na versão {{phpversion}}, ou mais recente, para poder utilizar esta versão do Joomla.","help-url-text":"Ajude-me a resolver isto"},"ro-RO":{"language":"Română RO","header":"Ne pare rău, versiunea dvs de PHP nu este acceptată.","text1":"Gazda dvs. trebuie să folosească versiunea PHP {{phpversion}} sau una mai nouă pentru a rula această versiune Joomla.","help-url-text":"Ajută-mă să rezolv această problemă"},"ru-RU":{"language":"Русский RU","header":"Используемая версия PHP не поддерживается","text1":"Для установки Joomla необходимо наличие PHP {{phpversion}} или более новой версии.","help-url-text":"Подробнее о решении проблемы"},"sk-SK":{"language":"Slovensky","header":"Prepáčte, ale vaša verzia PHP nie je podporovaná.","text1":"Aby táto verzia Joomla fungovala, váš hosting musí používať PHP vo verzii {{phpversion}} alebo novšej.","help-url-text":"Pomôžte mi vyriešiť to"},"sl-SI":{"language":"Slovenščina SI","header":"Žal vaša PHP različica ni podprta.","text1":"Vaš gostitelj mora uporabljati PHP različico  {{phpversion}} ali novejšo za zagon te različice Joomle.","help-url-text":"Pomagajte mi rešiti to težavo"},"sr-YU":{"language":"Srpski Latinica SRB","header":"Žao nam je vaša PHP verzija nije podržana.","text1":"Vaš host mora da koristi PHP verziju {{phpversion}} ili noviju da bi ova vezija Joomla! radila.","help-url-text":"Kako da rešim ovo"},"sv-SE":{"language":"Svensk SE","header":"Tyvärr, din PHP-version stöds inte.","text1":"Ditt webbhotell måste använda PHP-version {{phpversion}} eller nyare för att köra denna version av Joomla.","help-url-text":"Hjälp mig att lösa detta"},"ta-IN":{"language":"தமிழ் இந்தியா","header":"மன்னிக்கவும், உங்கள் PHP பதிப்பு ஆதரிக்கப்படவில்லை.","text1":"Joomla-வின் இந்தப் பதிப்பை இயக்க, தங்கள் புரவலர்-கணினி (host) ஆனது PHP பதிப்பு {{phpversion}} அல்லது அதற்கும் மேலான பதிப்பைப் பயன்படுத்த வேண்டும்.","help-url-text":"இதனைத் தீர்க்க எனக்கு உதவுக"},"th-TH":{"language":"ภาษาไทย","header":"ขออภัย ไม่รองรับเวอร์ชัน PHP ของคุณ","text1":"โฮสต์ของคุณต้องใช้เวอร์ชัน PHP {{phpversion}} หรือใหม่กว่าเพื่อเรียกใช้ Joomla เวอร์ชันนี้","help-url-text":"ช่วยฉันแก้ปัญหานี้"},"tr-TR":{"language":"Turkish TR","header":"Üzgünüz, PHP sürümünüz desteklenmiyor.","text1":"Joomla'nın bu sürümünü çalıştırmak için sunucunuzun PHP {{phpversion}} sürümünü veya daha yenisini kullanması gerekir.","help-url-text":"Bunu çözmeme yardım et"},"uk-UA":{"language":"Українська (UA)","header":"На жаль, ваша версія PHP не підтримується.","text1":"Ваш хост повинен використовувати версію PHP {{phpversion}} або новішу для запуску цієї версії Joomla.","help-url-text":"Допоможіть мені це вирішити"},"ur-PK":{"language":"انگریزی جی-بی","header":"معذرت، آپ کا پی ایچ پی ورژن تعاون یافتہ نہیں ہے۔","text1":"جملہ کے اس ورژن کو چلانے کے لیے آپ کے میزبان کو پی ایچ پی ورژن {{phpversion}} یا اس سے جدید تر استعمال کرنے کی ضرورت ہے۔","help-url-text":"اس کو حل کرنے میں میری مدد کریں۔"},"vi-VN":{"language":"Vietnamese VN","header":"Xin lỗi, phiên bản PHP của bạn không được hỗ trợ.","text1":"Máy chủ của bạn cần sử dụng PHP phiên bản {{phpversion}} hoặc mới hơn để chạy phiên bản Joomla này.","help-url-text":"Giúp tôi giải quyết vấn đề này"},"zh-CN":{"language":"简体中文","header":"抱歉，PHP 版本不支持。","text1":"需要 PHP {{phpversion}} 或更新的版本运行","help-url-text":"帮助我解决这个问题"},"zh-TW":{"language":"中文 台灣繁體","header":"對不起，你的PHP版本並不支援","text1":"您的主機需要PHP版本{{phpversion}}或以上來執行這個版本的Joomla","help-url-text":"協助我解決這個問題"}};</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
 </head>
 <body>
 <div class="container">
diff --git a/index.php b/index.php
index b070eda182c8c..2798b9482c169 100644
--- a/index.php
+++ b/index.php
@@ -10,14 +10,14 @@
 // NOTE: This file should remain compatible with PHP 5.2 to allow us to run our PHP minimum check and show a friendly error message
 
 // Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
-define('JOOMLA_MINIMUM_PHP', '8.1.0');
+\define('JOOMLA_MINIMUM_PHP', '8.3.0');
 
 if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<')) {
     die(
         str_replace(
             '{{phpversion}}',
             JOOMLA_MINIMUM_PHP,
-            file_get_contents(dirname(__FILE__) . '/includes/incompatible.html')
+            file_get_contents(\dirname(__FILE__) . '/includes/incompatible.html')
         )
     );
 }
@@ -26,7 +26,7 @@
  * Constant that is checked in included files to prevent direct access.
  * define() is used rather than "const" to not error for PHP 5.2 and lower
  */
-define('_JEXEC', 1);
+\define('_JEXEC', 1);
 
 // Load global path definitions
 if (file_exists(__DIR__ . '/defines.php')) {
diff --git a/installation/forms/setup.xml b/installation/forms/setup.xml
index 467d9046571ba..9018395ab466f 100644
--- a/installation/forms/setup.xml
+++ b/installation/forms/setup.xml
@@ -7,6 +7,7 @@
 			label="INSTL_SELECT_LANGUAGE_TITLE"
 			class="required"
 			default="en-GB"
+			labelclass="hidden"
 		/>
 		<field
 			name="site_name"
diff --git a/installation/includes/app.php b/installation/includes/app.php
index ca11a3dbfcf89..127ed83d1863d 100644
--- a/installation/includes/app.php
+++ b/installation/includes/app.php
@@ -29,7 +29,6 @@
 if (is_writable(JPATH_ADMINISTRATOR . '/logs')) {
     \Joomla\CMS\Log\Log::addLogger(
         [
-            'format'    => '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}',
             'text_file' => 'error.php',
         ],
         \Joomla\CMS\Log\Log::ALL,
diff --git a/installation/includes/cli.php b/installation/includes/cli.php
index 4562a6bfaa66b..b9e04e8f3aff3 100644
--- a/installation/includes/cli.php
+++ b/installation/includes/cli.php
@@ -19,7 +19,7 @@
 if (!file_exists(JPATH_LIBRARIES . '/vendor/autoload.php') || !is_dir(JPATH_ROOT . '/media/vendor')) {
     echo 'It looks like you are trying to run Joomla! from our git repository.' . PHP_EOL;
     echo 'To do so requires you complete a couple of extra steps first.' . PHP_EOL;
-    echo 'Please see https://docs.joomla.org/Special:MyLanguage/J5.x:Setting_Up_Your_Local_Environment for further details.' . PHP_EOL;
+    echo 'Please see https://guide.joomla.org/user-manual/hosting/local-environment-setup for further details.' . PHP_EOL;
 
     exit;
 }
@@ -31,7 +31,6 @@
 if (is_writable(JPATH_ADMINISTRATOR . '/logs')) {
     \Joomla\CMS\Log\Log::addLogger(
         [
-            'format'    => '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}',
             'text_file' => 'error.php',
         ],
         \Joomla\CMS\Log\Log::ALL,
diff --git a/installation/index.php b/installation/index.php
index 099e5daf1d835..fb05cf85bbe24 100644
--- a/installation/index.php
+++ b/installation/index.php
@@ -10,7 +10,7 @@
 // NOTE: This file should remain compatible with PHP 5.2 to allow us to run our PHP minimum check and show a friendly error message
 
 // Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
-\define('JOOMLA_MINIMUM_PHP', '8.1.0');
+\define('JOOMLA_MINIMUM_PHP', '8.3.0');
 
 if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<')) {
     die(
diff --git a/installation/joomla.php b/installation/joomla.php
index 50756491049ec..99bb5d23592a3 100644
--- a/installation/joomla.php
+++ b/installation/joomla.php
@@ -14,7 +14,7 @@
 /**
  * Define the application's minimum supported PHP version as a constant so it can be referenced within the application.
  */
-\define('JOOMLA_MINIMUM_PHP', '8.1.0');
+\define('JOOMLA_MINIMUM_PHP', '8.3.0');
 
 if (version_compare(PHP_VERSION, JOOMLA_MINIMUM_PHP, '<')) {
     echo 'Sorry, your PHP version is not supported.' . PHP_EOL;
diff --git a/installation/language/af-ZA/joomla.ini b/installation/language/af-ZA/joomla.ini
index 76a2d184673d6..7822d7e43d613 100644
--- a/installation/language/af-ZA/joomla.ini
+++ b/installation/language/af-ZA/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Jou gasheer moet PHP weergawe {{phpversion}} of nuwer
 BUILD_MIN_PHP_ERROR_URL_TEXT="Help my om dit op te los"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Verander"
 INSTL_SELECT_INSTALL_LANG="Kies Installasietaal"
 INSTL_SELECT_LANGUAGE_TITLE="Kies Taal"
 INSTL_SETUP_LOGIN_DATA="Stel Aanteken Data"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Jou PHP installasie het nodig dat JSON geaktiveerd is vir Joomla
 INSTL_DATABASE_SUPPORT="Databasis Hulp:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Ondersteuning"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Taal is Verstek"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Oorlading Af"
 INSTL_NOTICE_DATABASE_SUPPORT="Geen ondersteunende databasisse is gevind nie."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Jou PHP installasie het nodig dat JSON geaktiveerd is vir Joomla om te installeer!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring taal is nie gestel op neutraal nie. Dit kan lokaal gestel word deur <strong>php_value mbstring.language neutral</strong> in te skryf in jou <code>.htaccess</code> lêer."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring funksie oorlading is gestel. Dit kan lokaal af geskakel word deur <strong>php_value mbstring.func_overload 0</strong> in te skryf in jou <code>.htaccess</code> lêer."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Die vereiste php funksies <code>parse_ini_file</code> en <code>parse_ini_string</code> is gedeaktiveer op jou bediener."
 INSTL_NOTICE_XML_SUPPORT="XML Hulp is nie beskikbaar nie. Dit behoort by verstek geaktiveerd wees in php, maar Ubuntu verbruikers mag nog hê om dit te installeer deur <code>sudo apt-get install php-xml</code> gevolg deur die web bediener te herbegin."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib kompressie in nie gestel nie. Dit kan lokaal aan geskakel word deur <strong>zlib.output_compression = On</strong> in te skryf in jou <code>php.ini</code> lêer."
diff --git a/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml
index ffd6d340c86c5..36f98a5efa56d 100644
--- a/installation/language/af-ZA/langmetadata.xml
+++ b/installation/language/af-ZA/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Afrikaans (Suid-Afrika)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Afrikaans Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/ar-AA/joomla.ini b/installation/language/ar-AA/joomla.ini
index db39e07eb138e..36c6fbedb55a1 100644
--- a/installation/language/ar-AA/joomla.ini
+++ b/installation/language/ar-AA/joomla.ini
@@ -5,55 +5,52 @@
 
 ; Fatal error page
 ; These will be processed by the JavaScript Build
-BUILD_FATAL_HEADER="عذرًا، كانت هناك مشكلة لم نتمكن من تجاوزها."
+BUILD_FATAL_HEADER="عذرًا ، كانت هناك مشكلة لم نتمكن من تجاوزها."
 BUILD_FATAL_LANGUAGE="اللغة العربية بالكود الموحد" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
-BUILD_FATAL_TEXT="أرجع الخادم \"{{statusCode_statusText}}\""
+BUILD_FATAL_TEXT="أعاد الخادم ملف \"{{statusCode_statusText}}\""
 BUILD_FATAL_URL_TEXT="ساعدني في حل هذا"
 
 ; Build incomplete error page
 ; These will be processed by the JavaScript Build
 BUILD_INCOMPLETE_HEADER="إعداد البيئة غير مكتمل"
 BUILD_INCOMPLETE_LANGUAGE="اللغة العربية بالكود الموحد" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
-BUILD_INCOMPLETE_TEXT="يبدو أنك تحاول تشغيل جوملا! من مستودع git الخاص بنا. يتطلب هذا منك إكمال خطوتين إضافيتين أولاً."
-BUILD_INCOMPLETE_URL_TEXT="المزيد من التفاصيل"
+BUILD_INCOMPLETE_TEXT="يبدو أنك تحاول تشغيل جوملا! من مستودع git الخاص بك. للقيام بذلك يتطلب منك إكمال خطوتين إضافيتين أولاً."
+BUILD_INCOMPLETE_URL_TEXT="[ المزيد من التفاصيل %s]"
 
 ; No XML PHP error page
 ; These will be processed by the JavaScript Build
-BUILD_NOXML_HEADER="عذرًا، PHP الخاص بك يفتقد مكتبة حيوية"
+BUILD_NOXML_HEADER="عذرا ، PHP الخاص بك يفتقد مكتبة حيوية"
 BUILD_NOXML_LANGUAGE="اللغة العربية بالكود الموحد" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
-BUILD_NOXML_TEXT="يحتاج الخادم الخاص بك إلى استخدام PHP مع دعم مكتبة XML لتشغيل هذا الإصدار من جوملا!"
+BUILD_NOXML_TEXT="يحتاج مضيفك إلى استخدام PHP مع دعم مكتبة XML لتشغيل هذا الإصدار من جوملا!"
 BUILD_NOXML_URL_TEXT="ساعدني في حل هذا"
 
 ; Minimum PHP error page
 ; These will be processed by the JavaScript Build
-BUILD_MIN_PHP_ERROR_HEADER="عذرًا، إصدار PHP الخاص بك غير مدعوم."
+BUILD_MIN_PHP_ERROR_HEADER="عذرًا ، إصدار PHP الخاص بك غير مدعوم."
 BUILD_MIN_PHP_ERROR_LANGUAGE="اللغة العربية بالكود الموحد" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
-BUILD_MIN_PHP_ERROR_TEXT="يحتاج الخادم الخاص بك إلى استخدام إصدار PHP {{phpversion}} أو أحدث لتشغيل هذا الإصدار من جوملا."
+BUILD_MIN_PHP_ERROR_TEXT="يحتاج مضيفك إلى استخدام إصدار PHP {{phpversion}} أو أحدث لتشغيل هذا الإصدار من جوملا."
 BUILD_MIN_PHP_ERROR_URL_TEXT="ساعدني في حل هذا"
 
 ; Main Config
-INSTL_SELECT_INSTALL_LANG="حدد لغة التثبيت"
-INSTL_SELECT_LANGUAGE_TITLE="اختر اللغة"
+INSTL_CHANGE_INSTALL_LANG_SHORT="تغيير الموضع"
+INSTL_SELECT_INSTALL_LANG="حدد لغة التنصيب"
+INSTL_SELECT_LANGUAGE_TITLE="اختار اللغة"
 INSTL_SETUP_LOGIN_DATA="إعداد بيانات تسجيل الدخول"
-INSTL_WARNJAVASCRIPT="تحذير! يجب تمكين الجافاسكربت لكي يتم تثبيت نظام جوملا! بشكل صحيح."
-INSTL_WARNJSON="يجب تفعيل JSON في نسخة PHP الخاصة بك لتتمكن من تثبيت جوملا!"
+INSTL_WARNJAVASCRIPT="تحذير! يجب تمكين الجافا سكريبت لكي يتم تثبيت نظتم جوملا! بشكل صحيح"
+INSTL_WARNJSON="PHP  خلال تثبيتكم JSON للتمكن من تثيت جوملا . يجب تفعيل"
 
 ; Precheck view
 INSTL_DATABASE_SUPPORT="دعم قاعدة البيانات:"
 INSTL_JSON_SUPPORT_AVAILABLE="دعم JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="استخدام لغة افتراضية متعددة وحدات البايت"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="إيقاف التحميل الزائد للسلسة متعددة وحدات البايت"
 INSTL_NOTICE_DATABASE_SUPPORT="لم يتم العثور على قواعد البيانات المدعومة."
-INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="يجب تفعيل JSON في نسخة PHP الخاصة بك لتتمكن من تثبيت جوملا!"
-INSTL_NOTICE_MBLANG_NOTDEFAULT="لم يتم تعيين لغة PHP mbstring على الحيادية. يمكن تعيين ذلك محليًا عن طريق إدخال <strong> php_value mbstring.languageutral </strong> في مِلَفّ <code>.htaccess </code> الخاص بك."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="تم تعيين overload دالة PHP mbstring. يمكن إيقاف تشغيل هذه محليًا عن طريق إدخال <strong> php_value mbstring.func_overload 0 </strong> في مِلَفّ <code>.htaccess </code> الخاص بك."
+INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="PHP  خلال تثبيتكم JSON للتمكن من تثيت جوملا . يجب تفعيل"
+INSTL_NOTICE_MBLANG_NOTDEFAULT="لم يتم تعيين لغة PHP mbstring على الحيادية. يمكن تعيين ذلك محليًا عن طريق إدخال <strong> php_value mbstring.languageutral </strong> في ملف <code>.htaccess </code> الخاص بك."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="وظائف php المطلوبة <code> parse_ini_file </code> و <code> parse_ini_string </code> معطلة على الخادم الخاص بك."
 INSTL_NOTICE_XML_SUPPORT="دعم XML غير متوفر. يجب تمكين هذا افتراضيًا في php ولكن قد يحتاج مستخدمو Ubuntu إلى تثبيت هذا عن طريق إجراء <code> sudo apt-get install php-xml </code> متبوعًا بإعادة تشغيل خادم الويب."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="لم يتم تعيين ضغط Zlib. يمكن تشغيل هذا محليًا عن طريق إدخال <strong> zlib.output_compression = On </strong> في ملف <code> php.ini </code>."
 INSTL_PARSE_INI_FILE_AVAILABLE="دعم محلل INI"
-INSTL_PRECHECK_ACTUAL="حاليًا"
+INSTL_PRECHECK_ACTUAL="حالياً"
 INSTL_PRECHECK_DESC="إذا كان أي من هذه المناصر غير مدعوم \"أي غير متوفر\" سيكون مكتوب باللون الأحمر <strong class=\"red\">(لا)</strong> عندها يرجى القيام بالإجراءات اللازمة لتصحيحها.<br />لا يمكنك تنصيب جوملا! حتى توفير الإعدادت المطلوبة أدناه."
 INSTL_PRECHECK_DIRECTIVE="التوجيهات"
 INSTL_PRECHECK_RECOMMENDED="ينصح بها"
@@ -135,8 +132,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="اللغة"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="اختار اللغة"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="كود اللغة"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="الاصدار"
-INSTL_LANGUAGES_DESC="واجهة Joomla متاحة بعدة لغات. اختر لغاتك المفضلة عن طريق اختيار خانات الاختيار ثم تثبيتها عن طريق تحديد زر \"تثبيت اللغات المحددة\".<br>ملاحظة: هذه العملية ستستغرق حوالي 10 ثوان لتنزيل وتثبيت كل لغة. لتجنب المهلة الزمنية يرجى تحديد ما لا يزيد عن 3 لغات للتثبيت."
-INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="ستستغرق هذه العملية ما يصل إلى 10 ثوان في كل لغة للإكتمال<br>الرجاء الانتظار بينما نقوم بتنزيل وتثبيت اللغات &hellip;"
+INSTL_LANGUAGES_DESC="واجهة جوملا متاحة بعدة لغات. اختر اللغات المفضلة لديك عن طريق اختيار خانات الاختيار ثم تثبيتها عن طريق تحديد زر \"تثبيت اللغات المحددة\".<br>ملاحظة: ستستغرق هذه العملية حوالي 10 ثوان لتحميل وتثبيت كل لغة. لتجنب المهلة الزمنية الرجاء تحديد ما لا يزيد عن 3 لغات للتثبيت."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="هذه العملية من الممكن ان تحتاج لأكثر من 10 ثوان لتنصيب اللغة<br>لطفاً انتظر بينما يتم تحميل و تنصيب اللغات..."
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="لطفاً, حدد اللغة. إن لم تكن تريد تنصيب المزيد من اللغات فانقر على زر 'السابق' "
 INSTL_LANGUAGES_SELECTED="قم بتثبيت اللغات المحددة"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="العودة للمرحلة الأخيرة من التنصيب"
@@ -222,8 +219,8 @@ INSTL_WRITABLE="%s قابل للكتابة"
 INSTL_ZIP_SUPPORT_AVAILABLE="توفر ZIP خاصية فك الملفات المضغوطة"
 
 ; Global strings
-JADMINISTRATOR="الإدارة"
-JCLOSE="أغلق"
+JADMINISTRATOR="المدير"
+JCLOSE="إغلاق"
 JEMAIL="البريد الإلكتروني"
 JERROR="خطأ"
 JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="لقد حدث خطأ أثناء معالجة طلبك."
@@ -234,7 +231,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="لايوجد نتائج مشابهة"
 JGLOBAL_SELECT_SOME_OPTIONS="حدد بعض الخيارات"
 JHIDEPASSWORD="إخفاء كلمة المرور"
 JINVALID_TOKEN="رمز غير صالح"
-JINVALID_TOKEN_NOTICE="قيم الكود الأمني غير متوافقة. تم رفض الطلب تفاديًا لأي خرق أمني محتمل. لطفاً حاول مرة أخرى."
+JINVALID_TOKEN_NOTICE="لم يتطابق رمز الأمان. تم إلغاء الطلب لمنع أي خرق أمني. يُرجى المحاولة مرة أخرى."
 JNEXT="التالي"
 JNO="ابدا"
 JNOTICE="ملاحظة"
@@ -257,7 +254,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="JFolder: :حذف: المسار لا
 JLIB_FORM_FIELD_INVALID="حقل غير صحيح:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="حقل غير صالح: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="حقل مطلوب: %s"
-JLIB_INSTALLER_ABORT="إيقاف تثبيت اللغة: %s"
+JLIB_INSTALLER_ABORT="إحباط عملية تنصيب اللغة: %s"
 JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="التطبيق %1$s: فشل انشاء الدليل باسم: %2$s"
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="مسار التنصيب غير موجود"
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="الحزمة %1$s: حصل خطأ عند محاولة تنصيب الاضافة: %2$s"
@@ -298,7 +295,7 @@ NOTICE="ملاحظة"
 WARNING="تحذير"
 
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="فشل الاتصال عند محاولة الحصول على بيانات  JSON."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="لقد حدث خطأ في الاتصال أثناء جلب بيانات JSON."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="لايمكن استعادة المحتوى."
 JLIB_JS_AJAX_ERROR_OTHER="حدث خطأ أثناء جلب البيانات JSON: HTTP %s حالة الكود."
 JLIB_JS_AJAX_ERROR_PARSE="حدث خطأ في تحليل أثناء معالجة البيانات JSON التالية:<br/><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
diff --git a/installation/language/ar-AA/langmetadata.xml b/installation/language/ar-AA/langmetadata.xml
index 7aecde22ae94b..30383c15681b5 100644
--- a/installation/language/ar-AA/langmetadata.xml
+++ b/installation/language/ar-AA/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Arabic (اللغة العربية)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Project (Arabic Translation Team)</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
@@ -10,7 +10,7 @@
 		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
-		<name>Arabic (ar-AA)</name>
+		<name>Arabic Unitag (العربية الموحدة)</name>
 		<nativeName>Arabic (اللغة العربية)</nativeName>
 		<tag>ar-AA</tag>
 		<rtl>1</rtl>
diff --git a/installation/language/be-BY/joomla.cli.ini b/installation/language/be-BY/joomla.cli.ini
index b4258e140797d..3551cf61dff23 100644
--- a/installation/language/be-BY/joomla.cli.ini
+++ b/installation/language/be-BY/joomla.cli.ini
@@ -31,8 +31,8 @@ INSTL_DATABASE_TYPE_DESC="Тып базы даных. Падтрымліваюц
 INSTL_DATABASE_TYPE_DESC_SHORT="Тып базы даных. Падтрымліваюцца ў Joomla: mysql (=MySQL (PDO)), mysqli (=MySQLi), pgsql (=PostgreSQL (PDO))"
 INSTL_DATABASE_USER_DESC="Імя карыстальніка базы даных"
 INSTL_DATABASE_USER_DESC_SHORT="Імя карыстальніка базы даных"
-INSTL_PUBLIC_FOLDER_DESC="Адносны або абсалютны шлях да агульнай (публічнай) папкі"
-INSTL_PUBLIC_FOLDER_DESC_SHORT="Адносны або абсалютны шлях да агульнай (публічнай) папкі"
+INSTL_PUBLIC_FOLDER_DESC="Адносны альбо абсалютны шлях да агульнай папкі"
+INSTL_PUBLIC_FOLDER_DESC_SHORT="Адносны альбо абсалютны шлях да агульнай папкі"
 INSTL_SITE_NAME_DESC="Увядзіце назву вашага сайта"
 INSTL_SITE_NAME_DESC_SHORT="Назва вэб-сайта"
 
diff --git a/installation/language/be-BY/joomla.ini b/installation/language/be-BY/joomla.ini
index 49ce48cf401e0..3c98f64b07750 100644
--- a/installation/language/be-BY/joomla.ini
+++ b/installation/language/be-BY/joomla.ini
@@ -5,114 +5,113 @@
 
 ; Fatal error page
 ; These will be processed by the JavaScript Build
-BUILD_FATAL_HEADER="Выбачайце, здарылася непапраўная памылка."
+BUILD_FATAL_HEADER="Выбачце, здарылася крытычная памылка, якой мы ня можам даць рады."
 BUILD_FATAL_LANGUAGE="Беларуская BY" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
-BUILD_FATAL_TEXT="Сервер вярнуў адказ: \"{{statusCode_statusText}}\""
-BUILD_FATAL_URL_TEXT="Дапамажыце мне выправіць гэта"
+BUILD_FATAL_TEXT="Сервер звярнуў адказ \"{{statusCode_statusText}}\""
+BUILD_FATAL_URL_TEXT="Дапамажыце мне гэта вырашыць"
 
 ; Build incomplete error page
 ; These will be processed by the JavaScript Build
-BUILD_INCOMPLETE_HEADER="Працоўнае асяроддзе не наладжанае"
+BUILD_INCOMPLETE_HEADER="Наладжванне працоўнага асяроддзя не завершана"
 BUILD_INCOMPLETE_LANGUAGE="Беларуская BY" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
-BUILD_INCOMPLETE_TEXT="Здаецца, Вы спрабуеце ўсталяваць Joomla з нашага Git-сховішча. Для гэтага спачатку зрабіце некалькі дадатковых крокаў."
-BUILD_INCOMPLETE_URL_TEXT="Падрабязней"
+BUILD_INCOMPLETE_TEXT="Падобна на тое, што вы спрабуеце ўсталяваць Joomla з нашага Git-рэпазітара. Калі ласка, выканайце некалькі дадатковых крокаў перад пачаткам усталявання."
+BUILD_INCOMPLETE_URL_TEXT="Больш дэталяў"
 
 ; No XML PHP error page
 ; These will be processed by the JavaScript Build
-BUILD_NOXML_HEADER="Выбачайце, у Вашай версіі PHP няма важнай бібліятэкі"
+BUILD_NOXML_HEADER="У версіі PHP, якую вы выкарыстоўваеце, адключана падтрымка XML"
 BUILD_NOXML_LANGUAGE="Беларуская BY" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
-BUILD_NOXML_TEXT="Каб запусціць гэтую версію Joomla, Ваш хост мусіць мець PHP з падтрымкай XML."
-BUILD_NOXML_URL_TEXT="Дапамажыце мне выправіць гэта"
+BUILD_NOXML_TEXT="Каб запусціць гэтую версію Joomla, на серверы трэба мець PHP з падтрымкай XML!"
+BUILD_NOXML_URL_TEXT="Дапамажыце мне гэта вырашыць"
 
 ; Minimum PHP error page
 ; These will be processed by the JavaScript Build
-BUILD_MIN_PHP_ERROR_HEADER="Выбачайце, Ваша версія PHP не падтрымліваецца"
+BUILD_MIN_PHP_ERROR_HEADER="Выбачайце, Ваша версія PHP не падтрымліваецца."
 BUILD_MIN_PHP_ERROR_LANGUAGE="Беларуская BY" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
-BUILD_MIN_PHP_ERROR_TEXT="Каб запусціць гэтую версію Joomla, Ваш хост мусіць мець PHP {{phpversion}} або навейшы."
-BUILD_MIN_PHP_ERROR_URL_TEXT="Дапамажыце мне выправіць гэта"
+BUILD_MIN_PHP_ERROR_TEXT="Каб запусціць гэтую версію Joomla, на серверы трэба мець версію PHP {{phpversion}} або навейшую."
+BUILD_MIN_PHP_ERROR_URL_TEXT="Дапамажыце мне гэта вырашыць"
 
 ; Main Config
-INSTL_SELECT_INSTALL_LANG="Мова ў працэсе ўсталявання"
+INSTL_CHANGE_INSTALL_LANG="Змяніць мову ўсталявання"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Выбар пазіцыі"
+INSTL_SELECTED_INSTALL_LANGUAGE="Бягучая мова: %s"
+INSTL_SELECT_INSTALL_LANG="Выберыце мову ўсталёўкі"
 INSTL_SELECT_LANGUAGE_TITLE="Выберыце мову"
 INSTL_SETUP_LOGIN_DATA="Параметры ўліковага запісу"
-INSTL_WARNJAVASCRIPT="Увага! Трэба падлучыць JavaScript у Вашым браўзеры, каб правільна ўсталяваць Joomla."
+INSTL_WARNJAVASCRIPT="Папярэджанне:  Каб правільна ўсталяваць Joomla, у вашым браўзеры павінны быць уключаны JavaScript."
 INSTL_WARNJSON="У Вашай версіі PHP трэба мець падлучаны JSON, каб усталяваць Joomla."
 
 ; Precheck view
-INSTL_DATABASE_SUPPORT="Базы даных якія падтрымліваюцца:"
-INSTL_JSON_SUPPORT_AVAILABLE="JSON падтрымоўваецца:"
+INSTL_DATABASE_SUPPORT="Падтрымка базы дадзеных:"
+INSTL_JSON_SUPPORT_AVAILABLE="Падтрымка JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language выкарыстоўваецца па змаўчанні"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off - адключаная"
-INSTL_NOTICE_DATABASE_SUPPORT="Прыдатная база даных не знойдзеная."
+INSTL_NOTICE_DATABASE_SUPPORT="Не знойдзена базаў дадзеных якія падтрымліваюцца."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="У Вашай версіі PHP трэба мець падлучаны JSON, каб усталяваць Joomla."
-INSTL_NOTICE_MBLANG_NOTDEFAULT="Мова PHP mbstring не ўстаноўлена ў нейтральнае значэнне. Гэта можна ўсталяваць лакальна, увёўшы <strong>php_value mbstring.language neutral</strong> ў вашым файле <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Заданае пераладаванне PHP-функцыі mbstring. Гэта можна лакальна змяніць, дадаўшы <strong>php_value mbstring.func_overload 0</strong> у файл <code>.htaccess</code>."
-INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Абавязковыя функцыі PHP <code>parse_ini_file </code> і <code>parse_ini_string </code> адлучаныя на Вашым серверы."
-INSTL_NOTICE_XML_SUPPORT="Падтрымка XML недаступная. Трэба стандартна падлучыць модуль у PHP, але карыстальнікам Ubuntu можа спатрэбіцца ўсталяваць яго праз тэрмінал. Выканайце <code>sudo apt-get install php-xml</code> і перазапусціце вэб-сервер."
-INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Сцісканне з дапамогай Zlib не заданае. Яго можна лакальна падлучыць, увёўшы <strong>zlib.output_compression = On</strong> у файле <code>php.ini</code>."
-INSTL_PARSE_INI_FILE_AVAILABLE="Падтрымка парсера INI"
-INSTL_PRECHECK_ACTUAL="Фактычна"
-INSTL_PRECHECK_DESC="Калі якісьці з гэтых пунктаў не падтрымоўваецца (метка <strong class=\"label label-important\">Не</strong>), спрабуйце яго выправіць.<br>Вы не зможаце ўсталяваць Joomla, пакуль Вашы налады не будуць адпавядаць патрабаванням."
+INSTL_NOTICE_MBLANG_NOTDEFAULT="Для дырэктывы mbstring.language  ўстаноўлена значэнне не <code>neutral</code>. Гэта можна ўсталяваць лакальна, увёўшы <code>php_value mbstring.language neutral</code> ў вашым файле <code>.htaccess</code>."
+INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Неабходныя функцыі PHP <code>parse_ini_file </code> і<code>parse_ini_string </code> адключаныя на вашым серверы."
+INSTL_NOTICE_XML_SUPPORT="Падтрымка XML недаступная на гэтым серверы. Трэба стандартна падлучыць модуль у PHP, але карыстальнікам Ubuntu можа спатрэбіцца ўсталяваць яго праз тэрмінал. Выканайце <code>sudo apt-get install php-xml</code> і перазапусціце вэб-сервер."
+INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Падтрымка Zlib недаступная на гэтым серверы. Яго можна лакальна падлучыць, увёўшы <strong>zlib.output_compression = On</strong> у файл <code>php.ini</code>."
+INSTL_PARSE_INI_FILE_AVAILABLE="Падтрымка  INI Parser"
+INSTL_PRECHECK_ACTUAL="Фактычны"
+INSTL_PRECHECK_DESC="Калі якісьці з гэтых пунктаў не падтрымліваецца (метка <strong class=\"label label-important\">Не</strong>), спрабуйце яго выправіць.<br>Вы не зможаце ўсталяваць Joomla, пакуль Вашы налады не будуць адпавядаць патрабаванням."
 INSTL_PRECHECK_DIRECTIVE="Параметр"
 INSTL_PRECHECK_RECOMMENDED="Рэкамендуецца"
-INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Гэтыя налады рэкамендуюцца для поўнай сумяшчальнасці PHP з Joomla. Тым не менш Joomla можа працаваць, нават калі фактычныя налады не супадаюць з рэкамендаванымі."
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Гэтыя налады рэкамендуюцца для поўнай сумяшчальнасці PHP з Joomla. Тым не менш Joomla можа працаваць, нават калі бягучыя значэнні не супадаюць з рэкамендаванымі."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Рэкамендаваныя налады"
-INSTL_PRECHECK_TITLE="Кантроль перад усталяваннем"
+INSTL_PRECHECK_TITLE="Праверка перад усталёўкай"
 INSTL_XML_SUPPORT="Падтрымка XML"
-INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib-сцісканне падтрымоўваецца:"
+INSTL_ZLIB_COMPRESSION_SUPPORT="Падтрымка сціску Zlib"
 
 ; Database view
-INSTL_DATABASE="Канфігурацыя базы даных"
+INSTL_DATABASE="Канфігурацыя базы дадзеных"
 INSTL_DATABASE_ENCRYPTION_CA_LABEL="Шлях да файла CA"
 INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Шлях да файла сертыфіката"
-INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="(Неабавязкова.) Набор шыфраў, які падтрымоўваецца"
-INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Шлях да файла сакрэтнага ключа"
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Падтрымліваемы набор шыфраў (неабавязкова)"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Шлях да файла прыватнага ключа"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Шыфраванне злучэння"
-INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="Стандартнае (кіруецца серверам)"
+INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="Па змаўчанні (кіруецца серверам)"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="Аднабаковая аўтэнтыфікацыя"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="Двухбаковая аўтэнтыфікацыя"
-INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="Вы абралі падлучэнне да базы даных з шыфраваннем, і злучэнне можна ўсталяваць, але не зашыфраваць. Прычынай можа быць тое, што сервер базы даных наладжаны на зварот да незашыфраванага злучэння ў выпадку праблемных параметраў шыфравання. Або праверце і выпраўце параметры шыфравання, або змяніце поле \"Шыфраванне злучэння\" назад на \"Стандартнае (кіруецца серверам)\"."
-INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="Файл, пазначаны ў полі \"%s\", не існуе або недаступны."
+INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="Вы абралі падлучэнне да базы дадзеных з шыфраваннем, якое можа быць ўсталяванае, але не зашыфраванае. Прычынай можа быць тое, што сервер базы дадзеных наладжаны на зварот да незашыфраванага злучэння ў выпадку праблемных параметраў шыфравання. Або праверце і выпраўце параметры шыфравання, або змяніце поле \"Шыфраванне злучэння\" назад на \"Стандартнае (кіруецца серверам)\"."
+INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="Файл, уведзены ў поле \" %s\", не існуе або недаступны."
 INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="Поле \"%s\" не запоўненае або не змяшчае дапушчальнага шляху."
-INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="Вы ўвялі \"localhost\" у якасці назвы хоста. У гэтым выпадку падлучэнне да базы даных з шыфраваннем можа не ўдацца. Або замяніце \"localhost\" на \"127.0.0.1\", ці \"::1\", ці іншую назву, або змяніце поле \"Шыфраванне злучэння\"на \"Стандартнае (кіруецца серверам)\"."
-INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="Сервер базы даных не падтрымоўвае шыфравання злучэння. Або дазвольце падтрымка TLS (часта называецца SSL у дакументах) на серверы базы даных, або змяніце поле \"Шыфраванне злучэння\" на \"Стандартнае (кіруецца серверам)\"."
-INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Спраўджваць сертыфікат сервера"
-INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Памылка запыту да базы даных PostgreSQL."
-INSTL_DATABASE_HOST_DESC="Назва хоста, звычайна \"localhost\" або назва, выданая Вашым правайдарам:"
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Памылка стварэння файла. Стварыце файл \"%1$s\" уручную і заладуйце яго ў каталог \"%2$s\" Вашага сайта Joomla. Потым выберыце \"%3$s\", каб працягнуць."
+INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="Вы ўвялі Значэнне \"localhost\" у якасці імя хаста. У такім выпадку падключэнне да базы дадзеных з шыфраваннем злучэння можа завяршыцца памылкай. Неабходна змяніць імя хаста \"localhost\" на \"127.0.0.1\", \"::1\" іншае імя, або змяніць значэнне поля \"Conection Encryption\"на \"Default (server controlled)\"."
+INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="Сервер базы дадзеных не падтрымлівае шыфраванне злучэння. Альбо ўключыце падтрымку TLS (часта званую SSL у дакументах) на вашым серверы базы дадзеных, альбо змяніце поле \"Шыфраванне злучэння\" назад \"Па змаўчанні (кантралюецца серверам)\"."
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Праверка сертыфіката сервера"
+INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Памылка запыту да базы дадзеных PostgreSQL."
+INSTL_DATABASE_HOST_DESC="Увядзіце назву хоста (звычайна \"localhost\" або назва, якую Вам прадаставіў хостынг-правайдар)."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="Памылка стварэння файла. Стварыце файл \"%1$s\" уручную і запампуйце яго ў каталог \"%2$s\" Вашага сайта Joomla. Потым выберыце \"%3$s\", каб працягнуць."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Каб пацвердзіць, што Вы — уладальнік сайта, выдаліце файл \"%1$s\", створаны сістэмай у каталозе \"%2$s\" Вашага сайта Joomla. Потым выберыце \"%3$s\", каб працягнуць."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Вы спрабуеце выкарыстоўваць хост базы даных, якога няма на Вашым лакальным серверы. З прычын бяспекі Вам трэба спраўдзіць уласнасць на Ваш уліковы запіс вэб-хостынгу. <a href=\"%s\"target=\"_blank\"rel=\"noopener noreferrer\">Прачытайце дакументацыю</a>, каб даведацца больш."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Вы спрабуеце выкарыстоўваць хост базы дадзеных, якога няма на Вашым лакальным серверы. З прычын бяспекі Вам трэба спраўдзіць уласнасць на Ваш уліковы запіс вэб-хостынгу. <a href=\"%s\"target=\"_blank\"rel=\"noopener noreferrer\">Прачытайце дакументацыю</a>, каб даведацца больш."
 INSTL_DATABASE_HOST_LABEL="Назва хоста"
-INSTL_DATABASE_NAME_DESC="Назва базы даных:"
-INSTL_DATABASE_NAME_LABEL="Назва базы даных"
-INSTL_DATABASE_NAME_MSG_MYSQL="Памылковая назва базы даных. Яна не можа змяшчаць гэтых знакаў: \ /"
-INSTL_DATABASE_NAME_MSG_POSTGRES="Памылковая назва базы даных. Яна павінна складацца з лічбаў і лацінскіх літар і пачынацца з літары."
-INSTL_DATABASE_NO_SCHEMA="Не існуе схемы базы даных для гэтага тыпу базы."
+INSTL_DATABASE_NAME_DESC="Увядзіце імя базы дадзеных."
+INSTL_DATABASE_NAME_LABEL="Імя базы дадзеных"
+INSTL_DATABASE_NAME_MSG_MYSQL="Памылковая назва базы дадзеных. Яна не можа змяшчаць гэтых знакаў: \ /"
+INSTL_DATABASE_NAME_MSG_POSTGRES="Памылковая назва базы дадзеных. Яна павінна складацца з лічбаў і лацінскіх літар і пачынацца з літары."
+INSTL_DATABASE_NO_SCHEMA="Не існуе схемы базы дадзеных для гэтага тыпу базы."
 INSTL_DATABASE_PASSWORD_DESC="Пароль да базы даных, які створаны Вамі або Вашым хостынг-правайдарам:"
-INSTL_DATABASE_PREFIX_DESC="Прэфікс табліц або скарыстайцеся выпадкова створаным:"
-INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Калі ўжо выкарыстоўваецца база даных з табліцамі з тым жа прэфіксам, Joomla зменіць назву яе табліц, дадаўшы прэфікс \"bak_\"."
+INSTL_DATABASE_PREFIX_DESC="Увядзіце прэфікс табліц БД або скарыстайце выпадкова створаны."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Калі вы выкарыстоўваеце існуючую базу дадзеных з табліцамі з аднолькавымі прэфіксамі, Joomla пераймянуе існуючыя табліцы, дадаўшы прэфікс \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="Прэфікс табліцы павінен пачынацца з літары, пасля чаго могуць ісці літарна-лічбавыя сімвалы, і ён павінен заканчвацца знакам падкрэслівання."
-INSTL_DATABASE_RESPONSE_ERROR="Не ўдалося завяршыць усталяванне."
-INSTL_DATABASE_TYPE_DESC="Выберыце тып базы даных"
+INSTL_DATABASE_RESPONSE_ERROR="Працэс усталёўкі завяршыўся няўдачай."
+INSTL_DATABASE_TYPE_DESC="Выберыце тып базы дадзеных."
 INSTL_DATABASE_USER_DESC="Імя карыстальніка БД, створанае Вамі або Вашым хостынг-правайдарам."
-INSTL_DATABASE_VALIDATION_ERROR="Праверце свае ўліковыя звесткі, а таксама тып і назву базы даных і назву хоста. Калі ў Вас усталяваная MySQL 8, прачытайце гэтую <a href=\"https://docs.joomla.org/Special:MyLanguage/Joomla_and_MySQL_8#Workaround_to_get_Joomla_working_with_MySQL_8\" target=\"_blank\" rel=\"noopener noreferrer\">дакументацыю</a>, каб даведацца больш."
+INSTL_DATABASE_VALIDATION_ERROR="Праверце свае ўліковыя звесткі, а таксама тып і назву базы дадзеных і назву хоста. Калі ў Вас усталявана MySQL 8, прачытайце гэтую <a href=\"https://docs.joomla.org/Special:MyLanguage/Joomla_and_MySQL_8#Workaround_to_get_Joomla_working_with_MySQL_8\" target=\"_blank\" rel=\"noopener noreferrer\">дакументацыю</a>, каб даведацца больш."
 
-INSTL_CONNECT_DB="Канфігурацыя базы даных"
+INSTL_CONNECT_DB="Параметры базы дадзеных"
 INSTL_INSTALL_JOOMLA="Усталяваць Joomla"
 
 ; Site View
-INSTL_ADMIN_EMAIL_DESC="Адрас электроннай пошты суперкарыстальніка"
-INSTL_ADMIN_PASSWORD_DESC="Задайце пароль для ўліковага запісу суперкарыстальніка"
-INSTL_ADMIN_PASSWORD_LENGTH="Пароль павінны быць не менш за 12 знакаў."
-INSTL_ADMIN_USERNAME_DESC="Задайце назву ўліковага запісу суперкарыстальніка (лагін)"
-INSTL_ADMIN_USER_DESC="Сапраўднае імя Вашага суперкарыстальніка"
+INSTL_ADMIN_EMAIL_DESC="Увядзіце E-mail адміністратара."
+INSTL_ADMIN_PASSWORD_DESC="Задайце пароль для ўліковага запісу Суперкарыстальніка."
+INSTL_ADMIN_PASSWORD_LENGTH="Увядзіце не менш за 12 знакаў."
+INSTL_ADMIN_USERNAME_DESC="Задайце назву ўліковага запісу СуперКарыстальніка (лагіну)."
+INSTL_ADMIN_USER_DESC="Увядзіце сапраўднае імя Вашага СуперКарыстальніка."
 INSTL_LOGIN_DATA="Параметры ўліковага запісу"
 INSTL_SETUP_SITE_NAME="Налады сайта"
 INSTL_SITE="Асноўная канфігурацыя"
-INSTL_SITE_DEVMODE_LABEL="Выяўлены рэжым распрацоўвання"
-INSTL_SITE_NAME_DESC="Якая назва будзе ў Вашага сайта"
+INSTL_SITE_DEVMODE_LABEL="Выяўлены рэжым распрацоўкі"
+INSTL_SITE_NAME_DESC="Увядзіце назву Вашага сайта."
 
 ; Expert View
 INSTL_PUBLIC_FOLDER_DESC="Адносны альбо абсалютны шлях да агульнай папкі"
@@ -120,29 +119,29 @@ INSTL_PUBLIC_FOLDER_DESC_SHORT="Адносны альбо абсалютны ш
 
 ; Complete view
 INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Усталяваць дадатковыя моўныя пакеты"
-INSTL_COMPLETE_ADMIN_BTN="Адкрыць панэль адміністратара"
-INSTL_COMPLETE_CONGRAT="Усталяванне скончанае! "
+INSTL_COMPLETE_ADMIN_BTN="Адкрыць панэль кіравання"
+INSTL_COMPLETE_CONGRAT="Усталёўка скончаная! "
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Не ўдалося выдаліць каталог \"%s\". Выдаліце ​​яго ўручную."
-INSTL_COMPLETE_FINAL="Усталяванне завершанае"
-INSTL_COMPLETE_FINAL_DESC="Joomla ўсталяваная і гатовая да выкарыстання."
+INSTL_COMPLETE_FINAL="Усталёўка завершана"
+INSTL_COMPLETE_FINAL_DESC="Joomla паспяхова ўсталявана і гатова да выкарыстання."
 INSTL_COMPLETE_REMOVE_FOLDER="Выдаліць каталог \"%s\""
 INSTL_COMPLETE_SITE_BTN="Адкрыць сайт"
-INSTL_COMPLETE_TITLE="Віншуем! Вы ўсталявалі Joomla! Ваш сайт гатовы да працы."
+INSTL_COMPLETE_TITLE="Віншуем! Вы паспяхова ўсталявалі Joomla! Ваш сайт гатовы да працы."
 INSTL_REMOVE_INST_FOLDER="Вы ўпэўнены? Пацвердзіўшы, Вы незваротна выдаліце каталог \"%s\"."
 
 ; Languages view
 INSTL_LANGUAGES="Усталяваць дадатковыя моўныя пакеты"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Мова"
-INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Выбар мовы"
-INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Цэтлік мовы"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Выберыце мову"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Тэг мовы"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Версія"
-INSTL_LANGUAGES_DESC="Інтэрфейс Joomla даступны на мностве моў. Выберыце патрэбныя моўныя пакеты і націсніце \"Усталяваць выбраныя мовы\".<br><br>Увага: кожны моўны пакет заладоўваецца каля 10 секунд. Не рэкамендуецца ўсталёўваць больш за тры моўныя пакеты адначасова."
-INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Працэс зойме каля 10 секунд для кожнай мовы.<br>Пачакайце, пакуль усе моўныя пакеты ўсталююцца…"
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Калі ласка, выберыце мову. Калі ўсталёўваць іншыя мовы не патрэбна, націсніце \"Прапусціць\"."
-INSTL_LANGUAGES_SELECTED="Усталяваць выбраныя мовы"
-INSTL_LANGUAGES_WARNING_BACK_BUTTON="Назад да папярэдняга кроку ўсталявання"
-INSTL_LANGUAGES_WARNING_NO_INTERNET="Не ўдалося падлучыцца да сервера моўных пакетаў Joomla. Калі ласка, завяршыце ўсталяванне."
-INSTL_LANGUAGES_WARNING_NO_INTERNET2="Увага: Вы зможаце ўсталяваць моўныя пакеты пазней у панэлі адміністратара Joomla."
+INSTL_LANGUAGES_DESC="Інтэрфейс Joomla даступны на мностве моваў. Абярыце неабходныя моўныя пакеты і націсніце \"Далей\".<br><br>На ўсталёўку кожнага моўнага пакета неабходна каля 10 секунд. Не рэкамендуецца выбіраць больш за тры моўныя пакеты адначасова."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="На ўсталёўку кожнага моўнага пакета неабходна каля 10 секунд. Калі ласка, пачакайце пакуль моўныя пакеты будуць загружаны і ўсталяваны."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Калі ласка, абярыце моўныя пакеты для ўстаноўкі."
+INSTL_LANGUAGES_SELECTED="Усталюйце выбраныя мовы"
+INSTL_LANGUAGES_WARNING_BACK_BUTTON="Назад"
+INSTL_LANGUAGES_WARNING_NO_INTERNET="Не ўдалося падключыцца да сервера моўных пакетаў Joomla! Калі ласка, завяршыце працэс усталёўкі."
+INSTL_LANGUAGES_WARNING_NO_INTERNET2="Вы зможаце ўсталяваць моўныя пакеты пазней у панэлі кіравання Joomla."
 
 ; Automated Updates Opt Out
 INSTL_AUTOMATED_UPDATES="Аўтаматычныя абнаўленні"
@@ -152,87 +151,87 @@ INSTL_COMPLETE_ERROR_AUTOMATED_UPDATES_DISABLE="Не атрымалася адк
 INSTL_DISABLE_AUTOUPDATE="Вы ўпэўненыя, што хочаце адключыць аўтаматычныя абнаўленні?"
 
 ; Default language view
-INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Мова панэлі адміністратара"
-INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Не ўдалося задаць мову як стандартную. Англійская мова будзе заданая ў якасці стандартнай для панэлі адміністратара."
-INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Мова \"%s\" заданая стандартнай для панэлі адміністратара."
+INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Мова панэлі кіравання"
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Не ўдалося задаць мову як стандартную. Англійская мова будзе заданая ў якасці стандартнай для панэлі кіравання."
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Мова \"%s\" усталявана па змаўчанні для панэлі кіравання."
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Мова"
-INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Выбар"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Выбраць"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Цэтлік"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Не ўдалося заладаваць ці распакаваць моўны пакет з URL-адраса: %s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Не ўдалося ўсталяваць моўны пакет \"%s\"."
-INSTL_DEFAULTLANGUAGE_DESC="Моўныя пакеты ўсталяваныя. Выберыце стандартную мову для <strong>панэлі адміністратара</strong>."
-INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Моўныя пакеты ўсталяваныя. Выберыце стандартную мову для <strong>сайта</strong>."
-INSTL_DEFAULTLANGUAGE_FRONTEND="Стандартная мова сайта"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Не атрымалася загрузіць ці распакаваць моўны пакет па URL спасылцы: %s."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Не атрымалася ўсталяваць моўны пакет \"%s\"."
+INSTL_DEFAULTLANGUAGE_DESC="Моўныя пакеты ўсталяваны. Калі ласка, абярыце мову па змаўчанні для панэлі кіравання і націсніце \"Усталяваць па змаўчанні\"."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Моўныя пакеты ўсталяваны. Калі ласка, абярыце мову па змаўчанні для сайта і націсніце \"Усталяваць па змаўчанні\"."
+INSTL_DEFAULTLANGUAGE_FRONTEND="Мова сайта па змаўчанні"
 INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Не ўдалося задаць мову як стандартную. Англійская мова будзе заданая ў якасці стандартнай для сайта."
-INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Мова \"%s\" заданая стандартнай для сайта."
-INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Задаць стандартныя мовы"
-INSTL_DEFAULTLANGUAGE_TRY_LATER="Вы зможаце ўсталяваць пакет пазней у панэлі адміністратара Joomla."
+INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Мова \"%s\" усталявана па змаўчанні для сайта."
+INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Усталяваць па змаўчанні"
+INSTL_DEFAULTLANGUAGE_TRY_LATER="Вы зможаце ўсталяваць яе пазней у панэлі кіравання Joomla."
 
-INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Беларуская" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Беларуская (BY)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
 
 ; Database Model
-INSTL_DATABASE_COULD_NOT_CONNECT="Не ўдалося падлучыцца да базы даных. Тэкст памылкі: %s."
-INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Нельга падлучыцца да базы даных, і не ўдалося стварыць базу даных. Cпраўдзіце свае налады і пры патрэбе стварыце базу даных уручную."
-INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Не ўдалося абнавіць кэш маніфеста для пашырэння %s."
-INSTL_DATABASE_ERROR_BACKINGUP="Пры стварэнні рэзервовай копіі базы даных узніклі некаторыя памылкі."
-INSTL_DATABASE_ERROR_CREATE="Узнікла памылка пры спробе стварыць базу даных %s. <br>Можа быць, карыстальніку не стае прывілеяў для стварэння базы даных. Можа спатрэбіцца стварыць гэтую базу даных асобна, перш чым усталёўваць Joomla."
-INSTL_DATABASE_ERROR_DELETE="Пры выдаленні базы даных узніклі некаторыя памылкі."
-INSTL_DATABASE_ERROR_READING_SQL_FILE="Не ўдалося прачытаць файл SQL."
-INSTL_DATABASE_FIELD_VALUE_BACKUP="Рэзерваваць"
+INSTL_DATABASE_COULD_NOT_CONNECT="Не атрымалася падлучыцца да базы дадзеных: %s."
+INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Не атрымалася падлучыцца да базы дадзеных і не ўдалося стварыць базу дадзеных. Калі ласка, праверце параметры і пры неабходнасці стварыце базу дадзеных уручную."
+INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Не ўдалося абнавіць кэш маніфесту для пашырэння: %s"
+INSTL_DATABASE_ERROR_BACKINGUP="Пры стварэнні рэзервовай копіі базы дадзеных адбыліся некаторыя памылкі."
+INSTL_DATABASE_ERROR_CREATE="Адбылася памылка пры спробе стварыць базу дадзеных %s. <br>Магчыма, у карыстальніка недастаткова прывілеяў для стварэння базы дадзеных. Магчыма, спатрэбіцца стварыць неабходную базу дадзеных асобна, перш чым вы зможаце ўсталяваць Joomla"
+INSTL_DATABASE_ERROR_DELETE="Пры выдаленні базы дадзеных адбыліся некаторыя памылкі."
+INSTL_DATABASE_ERROR_READING_SQL_FILE="Не ўдалося прачытаць SQL файл."
+INSTL_DATABASE_FIELD_VALUE_BACKUP="Рэзервовая копія"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Выдаліць"
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Файл %s не існуе."
-INSTL_DATABASE_FIX_LOWERCASE="Прэфікс табліц PostgreSQL мусіць быць у ніжнім рэгістры."
-INSTL_DATABASE_FIX_TOO_LONG="Прэфікс табліц MySQL мусіць змяшчаць не больш за 15 знакаў."
-INSTL_DATABASE_INVALID_DB_DETAILS="Параметры базы даных няправільныя або не ўведзеныя."
+INSTL_DATABASE_FIX_LOWERCASE="Прэфікс табліцы павінен ўтрымліваць сімвалы ў ніжнім рэгістры для PostgreSQL."
+INSTL_DATABASE_FIX_TOO_LONG="Прэфікс табліцы MySQL павінен змяшчаць не больш 15 знакаў."
+INSTL_DATABASE_INVALID_DB_DETAILS="Прадстаўленыя звесткі аб базе дадзеных няслушныя і/або пустыя."
 INSTL_DATABASE_INVALID_MARIADB_VERSION="Каб працягнуць усталяванне, Вам трэба MariaDB версіі %1$s або навейшай. Ваша версія: %2$s."
-INSTL_DATABASE_INVALID_MYSQLI_VERSION="Каб працягнуць усталяванне, Вам трэба MySQL версіі %1$s або навейшай. Ваша версія: %2$s"
-INSTL_DATABASE_INVALID_MYSQL_VERSION="Каб працягнуць усталяванне, Вам трэба MySQL версіі %1$s або навейшай. Ваша версія: %2$s"
-INSTL_DATABASE_INVALID_PGSQL_VERSION="Каб працягнуць усталяванне, Вам трэба PostgreSQL версіі %1$s або навейшай. Ваша версія: %2$s"
-INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Каб працягнуць усталяванне, Вам трэба PostgreSQL версіі %1$s або навейшай. Ваша версія: %2$s"
-INSTL_DATABASE_INVALID_TYPE="Калі ласка, выберыце тып базы даных."
-INSTL_DATABASE_NAME_INVALID_CHAR="Ідэнтыфікатар MySQL не можа змяшчаць NULL ASCII (0x00)."
-INSTL_DATABASE_NAME_INVALID_SPACES="Назвы базы даных і табліц MySQL не могуць пачынацца ці канчацца прабеламі."
-INSTL_DATABASE_NAME_TOO_LONG="Назва базы даных MySQL мусіць змяшчаць не больш за 64 знакі."
+INSTL_DATABASE_INVALID_MYSQLI_VERSION="Каб працягуць усталяванне вам патрэбны MySQL %1$s або вышэй. Ваша версія: %2$s"
+INSTL_DATABASE_INVALID_MYSQL_VERSION="Каб працягуць усталяванне вам патрэбны MySQL %1$s або вышэй. Ваша версія: %2$s"
+INSTL_DATABASE_INVALID_PGSQL_VERSION="Для працягу ўсталёўкі вам спатрэбіцца PostgreSQL %1$s або вышэй. Ваша версія: %2$s"
+INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Для працягу ўсталёўкі вам спатрэбіцца PostgreSQL %1$s або вышэй. Ваша версія: %2$s"
+INSTL_DATABASE_INVALID_TYPE="Выберыце тып базы дадзеных."
+INSTL_DATABASE_NAME_INVALID_CHAR="Ідэнтыфікатар MySQL не можа мець NULL ASCII (0x00)."
+INSTL_DATABASE_NAME_INVALID_SPACES="Імёны баз дадзеных MySQL і імёны табліц не могуць пачынацца або заканчвацца прабеламі."
+INSTL_DATABASE_NAME_TOO_LONG="Імя базы дадзеных MySQL павінна складацца максімум з 64 знакаў."
 
 ; Controllers
-INSTL_COOKIES_NOT_ENABLED="Здаецца, у Вашым браўзеры не дазволеныя файлы cookie або на серверы ўзнікла праблема з інструкцыяй <strong>session.save_path</strong>. У такім разе звярніцеся да свайго хостынг-правайдара, калі Вы не ведаеце, як гэта праверыць ці выправіць самастойна."
+INSTL_COOKIES_NOT_ENABLED="Файлы cookie, напэўна, не ўключаныя ў вашым браўзэры-кліенце. Вы не зможаце ўсталяваць прыкладанне з адключанай гэтай функцыяй. У якасці альтэрнатывы, таксама можа паўстаць праблема з <strong>session.save_path сервера </strong>. Калі гэта так, калі ласка, пракансультуйцеся з вашым хостынг-правайдэрам, калі вы не ведаеце, як праверыць ці выправіць гэта самастойна."
 INSTL_HEADER_ERROR="Памылка"
 
 ; Helpers
-INSTL_PAGE_TITLE="Усталёўнік Joomla"
+INSTL_PAGE_TITLE="Усталёўшчык Joomla"
 
 ; Configuration model
-INSTL_ERROR_CONNECT_DB="Не ўдалося падлучыцца да базы даных. Код памылкі: %d."
-INSTL_STD_OFFLINE_MSG="Сайт закрыты на тэхнічнае абслугоўванне.<br>Калі ласка, зайдзіце пазней."
+INSTL_ERROR_CONNECT_DB="Не атрымалася падлучыцца да базы дадзеных. Тэкст памылкі: %d."
+INSTL_STD_OFFLINE_MSG="Сайт закрыты на тэхнічнае абслугоўванне.<br>Калі ласка, зайдзіце крыху пазней."
 
 ; Languages model
-INSTL_ERROR_INVALID_URL="Некарэктны URL-адрас"
+INSTL_ERROR_INVALID_URL="Некарэктны URL-адрас."
 
 ; Others
-INSTL_CONFPROBLEM="Ваш канфігурацыйны файл ці каталог недаступны для запісу, або ўзнікла праблема пры стварэнні канфігурацыйнага файла. Калі ласка, вылучыце ўвесь прыведзены код у тэкставай пляцоўцы і ўстаўце ў новы тэкставы файл. Назавіце файл \"configuration.php\" і заладуйце яго ў каранёвы каталог Вашага сайта."
-INSTL_DISPLAY_ERRORS="Паказ памылак"
+INSTL_CONFPROBLEM="Ваш канфігурацыйны файл або папка недаступныя для запісу або паўстала праблема са стварэннем канфігурацыйнага файла. Вам прыйдзецца загрузіць наступны код ўручную. Вылучыце ў тэкставай вобласці ўвесь код, а затым устаўце ў новы тэкставы файл. Назавіце гэты файл\"configuration.php \" і загрузіце яго ў каранёвую папку вашага сайта."
+INSTL_DISPLAY_ERRORS="Адлюстраванне памылак"
 INSTL_ERROR="Памылка"
-INSTL_ERROR_DB="Пры запаўненні базы даных узніклі некаторыя памылкі: %s."
-INSTL_ERROR_INITIALISE_SCHEMA="Не ўдаецца ініцыялізаваць схему базы даных."
-INSTL_EXTENSION_AVAILABLE="Даступнае %s"
-INSTL_FILE_UPLOADS="Заладаванне файлаў"
+INSTL_ERROR_DB="Пры запаўненні базы дадзеных адбыліся некаторыя памылкі: %s."
+INSTL_ERROR_INITIALISE_SCHEMA="Не ўдаецца ініцыялізаваць схему базы дадзеных."
+INSTL_EXTENSION_AVAILABLE="%s даступна"
+INSTL_FILE_UPLOADS="Загрузка файлаў"
 INSTL_GNU_GPL_LICENSE="Агульная грамадская ліцэнзія GNU"
-INSTL_HELP_LINK="Дапамога з усталяваннем Joomla"
-INSTL_NOTICE_NEEDSTOBEWRITABLE="Вы ўсё яшчэ можаце працягнуць усталяванне, калі наладзіце дазволы."
+INSTL_HELP_LINK="Дапамога ва ўсталёўцы Joomla"
+INSTL_NOTICE_NEEDSTOBEWRITABLE="Вы ўсё яшчэ можаце працягнуць усталёўку, калі адновіце правы доступу."
 INSTL_OUTPUT_BUFFERING="Буферызацыя вываду"
 INSTL_PHP_VERSION="Версія PHP"
-INSTL_PHP_VERSION_NEWER="Версія PHP >=%s"
-INSTL_PROCESS_BUSY="Працэс ідзе поўным ходам. Калі ласка, пачакайце…"
-INSTL_SESSION_AUTO_START="Аўтаматычны запуск сеанса"
-INSTL_WRITABLE="Няма дазволу на стварэнне файла %s"
+INSTL_PHP_VERSION_NEWER="Версія PHP > = %s"
+INSTL_PROCESS_BUSY="Працэс ідзе поўным ходам. Калі ласка, пачакайце &hellip;"
+INSTL_SESSION_AUTO_START="Аўтаматычны запуск сеансу"
+INSTL_WRITABLE="Недастаткова дазволу для стварэння файла %s."
 INSTL_ZIP_SUPPORT_AVAILABLE="Убудаваная падтрымка ZIP"
 
 ; Global strings
 JADMINISTRATOR="Адміністратар"
 JCLOSE="Закрыць"
-JEMAIL="Электронны адрас"
+JEMAIL="Email"
 JERROR="Памылка"
-JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="Узнікла памылка апрацавання Вашага запыту."
+JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="Падчас апрацоўкі вашага запыту адбылася памылка."
 JGLOBAL_ISFREESOFTWARE="%s - з'яўляецца бясплатным праграмным забеспячэннем, што распаўсюджваецца па ліцэнзіі <a href=\"https://www.gnu.org/licenses/gpl-2.0.html\" target=\"_blank\" rel=\"noopener noreferrer\">GNU General Public License</a>."
 JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Моўны пакет не адпавядае гэтай версіі Joomla!. Некаторыя радкі могуць адсутнічаць і будуць адлюстроўвацца на англійскай мове."
 JGLOBAL_SELECT_AN_OPTION="Выберыце параметр"
@@ -250,42 +249,42 @@ JPREVIOUS="Папярэдні"
 JSHOWPASSWORD="Паказаць пароль"
 JSITE="Сайт"
 JSKIP="Прапусціць"
-JUSERNAME="Імя карыстальніка"
+JUSERNAME="Лагін"
 JYES="Так"
 
 ; Framework strings necessary when no lang pack is available
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="Не атрымалася падлучыцца да MySQL."
-JLIB_DATABASE_ERROR_DATABASE="Узнікла памылка базы даных."
-JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Не атрымалася загрузіць драйвер базы даных: %s"
-JLIB_DATABASE_ERROR_VALID_MAIL="Калі ласка, увядзіце правільны адрас электроннай пошты."
-JLIB_ENVIRONMENT_SESSION_EXPIRED="Тэрмін Вашага сеанса скончыўся. Калі ласка, абнавіце старонку."
-JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Шлях не вядзе да каталога. Шлях: %2$s"
-JLIB_FORM_FIELD_INVALID="Няправільна запоўненае поле:&#160;"
-JLIB_FORM_VALIDATE_FIELD_INVALID="Няправільна запоўненае поле: %s."
-JLIB_FORM_VALIDATE_FIELD_REQUIRED="Абавязковае поле: %s."
-JLIB_INSTALLER_ABORT="Спыненне ўсталявання мовы: %s"
-JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Пашырэнне %1$s: не ўдалося стварыць каталог: %2$s."
-JLIB_INSTALLER_ABORT_NOINSTALLPATH="Шлях усталявання не існуе."
-JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Пакет %1$s: узнікла памылка ўсталявання пашырэння: %2$s."
-JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Пакет %s: няма файлаў для ўсталявання!"
-JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Памылка падлучэння да сервера: %s."
-JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: не ўдалося скапіяваць файл %1$s у %2$s."
+JLIB_DATABASE_ERROR_DATABASE="Адбылася памылка базы дадзеных."
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Не атрымалася загрузіць драйвер базы дадзеных: %s"
+JLIB_DATABASE_ERROR_VALID_MAIL="Уведзены вамі адрас электроннай пошты несапраўдны. Калі ласка, увядзіце іншы адрас электроннай пошты."
+JLIB_ENVIRONMENT_SESSION_EXPIRED="Тэрмін дзеяння вашага сеансу скончыўся, калі ласка, перазагрузіце старонку."
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Шлях не вядзе да каталогу. Шлях: %2$s"
+JLIB_FORM_FIELD_INVALID="Недапушчальнае поле:&#160;"
+JLIB_FORM_VALIDATE_FIELD_INVALID="Некарэктна запоўнена поле: %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="Неабходна запоўніць - абавязковае поле: %s"
+JLIB_INSTALLER_ABORT="Перапыненне ўсталявання моўнага пакету: %s"
+JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Пашырэнне %1$s: не атрымалася стварыць каталог: %2$s"
+JLIB_INSTALLER_ABORT_NOINSTALLPATH="Шлях да усталёўкі не існуе."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Пакет %1$s: Адбылася памылка падчас усталёўкі пашырэння: %2$s."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Пакет %s: не атрымалася знайсці файлы для ўсталёўкі!"
+JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Памылка падключэння да сервера: %s"
+JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Не атрымалася скапіяваць файл %1$s у %2$s."
 JLIB_INSTALLER_INSTALL="Усталяваць"
-JLIB_INSTALLER_NOT_ERROR="Калі памылка звязаная з усталяваннем моўных файлаў TinyMCE, яна не ўплывае на ўсталяванне моў. Некаторыя моўныя пакеты, створаныя раней за Joomla 3.2.0, могуць спрабаваць усталяваць асобныя моўныя файлы TinyMCE. Цяпер яны змешчаныя ў ядры, таму іх больш не трэба ўсталёўваць."
-JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Нельга стварыць мову змесціва для мовы %s: %s."
-JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Дырэктыва PHP allow_url_fopen мусіць быць падлучаная, каб інструмент абнаўлення працаваў."
-JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Абнаўленне: :Collection: не ўдалося адкрыць %s."
-JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Абнаўленне: :Collection: не ўдалося прааналізаваць %s."
+JLIB_INSTALLER_NOT_ERROR="Калі памылка звязана з усталяваннем моўных файлаў TinyMCE, яна не ўплывае на ўсталяванне моваў. Некаторыя моўныя пакеты, створаныя да Joomla 3.2.0, могуць спрабаваць усталяваць асобныя моўныя файлы TinyMCE. Паколькі яны цяпер уключаны ў ядро, іх больш не трэба ўсталёўваць."
+JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="Немагчыма стварыць мову змесціва для мовы %s: %s."
+JLIB_UPDATER_ERROR_COLLECTION_FOPEN="Дырэктыва PHP allow_url_fopen адключаная. Гэты параметр павінен быць уключаны, каб праграма абнаўлення працавала."
+JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: Немагчыма адкрыць %s"
+JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: не атрымалася разабраць %s"
 JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Абнаўленне: не ўдалося адкрыць сайт абнаўлення #%d &quot;%s&quot;, URL: %s."
-JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: не ўдалося падлучыцца да базы даных<br>joomla.library: %1$s — %2$s."
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Немагчыма падключыцца да базы дадзеных.<br>joomla.library: %1$s - %2$s."
 
 ; Strings for the language debugger
-JDEBUG_LANGUAGE_FILES_IN_ERROR="Памылкі аналізу ў моўных файлах"
-JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Неперакладзеныя радкі"
+JDEBUG_LANGUAGE_FILES_IN_ERROR="Памылкі разбору ў моўных файлах"
+JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Не перакладзеныя радкі"
 JNONE="Не"
 
 ; Necessary for errors
-ADMIN_EMAIL="Электронны адрас адміністратара"
+ADMIN_EMAIL="E-mail адміністратара"
 ADMIN_PASSWORD="Пароль адміністратара"
 SITE_NAME="Назва сайта"
 
@@ -305,10 +304,10 @@ WARNING="Папярэджанне"
 
 ; Javascript ajax error messages
 JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Падчас атрымання даных JSON адбылося перапыненне злучэння."
-JLIB_JS_AJAX_ERROR_NO_CONTENT="Ніякае змесціва не вернутае."
-JLIB_JS_AJAX_ERROR_OTHER="Узнікла памылка пры атрыманні даных JSON: код стану HTTP %d."
-JLIB_JS_AJAX_ERROR_PARSE="Узнікла памылка аналізу прыведзеных даных JSON:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
-JLIB_JS_AJAX_ERROR_TIMEOUT="Перавышаны час чакання пры атрыманні даных JSON."
+JLIB_JS_AJAX_ERROR_NO_CONTENT="Змест не вернуты."
+JLIB_JS_AJAX_ERROR_OTHER="Адбылася памылка пры атрыманні даных JSON: код стану HTTP %s."
+JLIB_JS_AJAX_ERROR_PARSE="Падчас апрацоўкі наступных даных JSON адбылася памылка разбору:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
+JLIB_JS_AJAX_ERROR_TIMEOUT="Перавышаны час чакання адказу падчас атрымання даных JSON."
 
 ; Field password messages
 JFIELD_PASSWORD_INDICATE_COMPLETE="Пароль прыняты"
@@ -318,10 +317,10 @@ JFIELD_PASSWORD_TOO_LONG="Пароль занадта доўгі. Паролі 
 JFIELD_PASSWORD_TOO_SHORT_N="Пароль занадта кароткі. Паролі павінны ўтрымліваць не менш %s сімвалаў."
 
 ; Javascript Form Validation Messages
-JLIB_FORM_CONTAINS_INVALID_FIELDS="Форма не можа быць адпраўленая, бо ў ёй не стае патрэбных даных. <br> Выпраўце пазначаныя палі і паўтарыце спробу."
-JLIB_FORM_FIELD_INVALID_VALUE="Гэтае значэнне няправільнае."
+JLIB_FORM_CONTAINS_INVALID_FIELDS="Форма не можа быць адпраўлена, бо ў ёй адсутнічаюць неабходныя даныя. <br> Калі ласка, выпраўце пазначаныя палі і паўтарыце ізноў."
+JLIB_FORM_FIELD_INVALID_VALUE="Гэта значэнне несапраўднае."
 JLIB_FORM_FIELD_REQUIRED_CHECK="Трэба выбраць адзін з варыянтаў."
-JLIB_FORM_FIELD_REQUIRED_VALUE="Калі ласка, запоўніце гэтае поле."
+JLIB_FORM_FIELD_REQUIRED_VALUE="Калі ласка, запоўніце гэта поле."
 
 ; Installation progress screen
 INSTL="Усталёўка"
diff --git a/installation/language/be-BY/langmetadata.xml b/installation/language/be-BY/langmetadata.xml
index fbd0f4ff0cc46..c77631c152f74 100644
--- a/installation/language/be-BY/langmetadata.xml
+++ b/installation/language/be-BY/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
-	<name>Belarusian (Belarus)</name>
-	<version>5.4.8</version>
+	<name>Belarusian (be-BY)</name>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla Belarus Community</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
@@ -11,7 +11,7 @@
 	</files>
 	<metadata>
 		<name>Belarusian (be-BY)</name>
-		<nativeName>Belarusian (Belarus)</nativeName>
+		<nativeName>Belarusian (be-BY)</nativeName>
 		<tag>be-BY</tag>
 		<rtl>0</rtl>
 	</metadata>
diff --git a/installation/language/bg-BG/joomla.cli.ini b/installation/language/bg-BG/joomla.cli.ini
index 63389eb514a2b..08350fd9f72c8 100644
--- a/installation/language/bg-BG/joomla.cli.ini
+++ b/installation/language/bg-BG/joomla.cli.ini
@@ -1,11 +1,11 @@
-INSTL_ADMIN_EMAIL_DESC="Въведете имейл адреса на супер потребителя "_QQ_"Super User"_QQ_" на сайта"
-INSTL_ADMIN_EMAIL_DESC_SHORT="Имейл адрес на акаунта на Супер потребителя на уебсайта"
-INSTL_ADMIN_PASSWORD_DESC="Задайте паролата за вашия акаунт на супер потребител"
-INSTL_ADMIN_PASSWORD_DESC_SHORT="Паролата на вашия Super User акаунт"
+INSTL_ADMIN_EMAIL_DESC="Въведете имейл адреса на супер потребителя на сайта"
+INSTL_ADMIN_EMAIL_DESC_SHORT="Имейл адресът на профила на супер потребителя на уебсайта"
+INSTL_ADMIN_PASSWORD_DESC="Задайте паролата за вашия профил на супер потребител"
+INSTL_ADMIN_PASSWORD_DESC_SHORT="Паролата на вашия профил на супер потребител"
 INSTL_ADMIN_USERNAME_DESC="Задайте потребителското име на вашия профил на супер потребител"
-INSTL_ADMIN_USERNAME_DESC_SHORT="Потребителското име на вашия Super User акаунт"
-INSTL_ADMIN_USER_DESC="Въведете реално име на вашия Super User"
-INSTL_ADMIN_USER_DESC_SHORT="Реалното име на Super User акаунта"
+INSTL_ADMIN_USERNAME_DESC_SHORT="Потребителско име на вашия профил на супер потребител"
+INSTL_ADMIN_USER_DESC="Въведете реалното име на вашия супер потребител"
+INSTL_ADMIN_USER_DESC_SHORT="Реално име на профила на супер потребителя"
 INSTL_DATABASE_COULD_NOT_CONNECT="%s"
 INSTL_DATABASE_ENCRYPTION_CA_LABEL="Път към CA файла за проверка на криптирането"
 INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Път към CA файла за проверка на криптирането"
@@ -15,8 +15,8 @@ INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Поддържан шифър на па
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Поддържан шифър на пакети (по избор)"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL="SSL ключа за връзка с базата данни. Изисква се криптирането да бъде зададено на 2"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="SSL ключа за връзка с базата данни. Изисква се криптирането да бъде зададено на 2"
-INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Кодиране на връзката с базата данни. Стойности: 0=няма, 1=еднопосочно, 2=двупосочно"
-INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Кодиране на връзката с базата данни. Стойности: 0=няма, 1=еднопосочно, 2=двупосочно"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Криптиране на връзката с базата данни. Стойности: 0=няма, 1=еднопосочно, 2=двупосочно"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Криптиране на връзката с базата данни. Стойности: 0=няма, 1=еднопосочно, 2=двупосочно"
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Проверете SSL сертификата за връзка с базата данни. Стойности: 0=Не, 1=Да. Изисква се криптирането да бъде зададено на 1 или 2"
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Проверете SSL сертификата за връзка с базата данни. Стойности: 0=Не, 1=Да. Изисква се криптирането да бъде зададено на 1 или 2"
 INSTL_DATABASE_HOST_DESC="Хост на базата данни"
@@ -33,6 +33,6 @@ INSTL_DATABASE_USER_DESC="Потребител на базата данни"
 INSTL_DATABASE_USER_DESC_SHORT="Потребител на базата данни"
 INSTL_PUBLIC_FOLDER_DESC="Относителен или абсолютен път към публичната папка"
 INSTL_PUBLIC_FOLDER_DESC_SHORT="Относителен или абсолютен път към публичната папка"
-INSTL_SITE_NAME_DESC="Въведете име на Вашия Joomla сайт"
+INSTL_SITE_NAME_DESC="Въведете името на Вашия Joomla сайт"
 INSTL_SITE_NAME_DESC_SHORT="Име на уебсайта"
 
diff --git a/installation/language/bg-BG/joomla.ini b/installation/language/bg-BG/joomla.ini
index 695459299f881..0980c8e1458b2 100644
--- a/installation/language/bg-BG/joomla.ini
+++ b/installation/language/bg-BG/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Вашият хост трябва да използв
 BUILD_MIN_PHP_ERROR_URL_TEXT="Помогнете ми да разреша това"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Промяна"
 INSTL_SELECT_INSTALL_LANG="Изберете език за инсталиране"
 INSTL_SELECT_LANGUAGE_TITLE="Изберете език"
 INSTL_SETUP_LOGIN_DATA="Настройка на данни за вход"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="За да инсталирате Джумла! успешно JS
 INSTL_DATABASE_SUPPORT="Поддръжка на база данни:"
 INSTL_JSON_SUPPORT_AVAILABLE="Поддръжка на JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language е по подразбиране"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="Изключено претоварване на MB String"
 INSTL_NOTICE_DATABASE_SUPPORT="Не бяха намерени поддържани бази данни."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="За да инсталирате Джумла! успешно JSON трябва да бъде активиран в РНР файла!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="Функцията PHP mbstring language не е зададена като неутрална. Тя може да бъде променена локално като добавите следния код: <strong>php_value mbstring.language neutral</strong> във Вашия <code>.htaccess</code> файл."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Функцията PHP mbstring е включена. Тя може да бъде изключена локално като добавите следния код: <strong>php_value mbstring.func_overload 0</strong> във Вашия <code>.htaccess</code> файл."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Необходимите php функции <code>parse_ini_file</code> и <code>parse_ini_strin </code> са деактивирани на вашия сървър."
 INSTL_NOTICE_XML_SUPPORT="Поддръжката на XML не е налична. Това трябва да бъде активирано по подразбиране в php, но потребителите на Ubuntu може да се наложи да го инсталират, като извършат<code>sudo apt-get install php-xml</code> последвано от рестартиране на уеб сървъра."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib компресирането не е настроена. Може да бъде включена локално чрез въвеждане<strong>zlib.output_compression = On</strong> във вашя<code>php.ini</code> файл."
diff --git a/installation/language/bg-BG/langmetadata.xml b/installation/language/bg-BG/langmetadata.xml
index 9797cfb04f98f..cb5791a64ace6 100644
--- a/installation/language/bg-BG/langmetadata.xml
+++ b/installation/language/bg-BG/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Bulgarian (bg-BG)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Bulgaria</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/ca-ES/joomla.ini b/installation/language/ca-ES/joomla.ini
index 9db327b53b32c..a423c85c7813c 100644
--- a/installation/language/ca-ES/joomla.ini
+++ b/installation/language/ca-ES/joomla.ini
@@ -5,56 +5,55 @@
 
 ; Fatal error page
 ; These will be processed by the JavaScript Build
-BUILD_FATAL_HEADER="Ho sentim, hi ha hagut un problema que no hem pogut recuperar."
-BUILD_FATAL_LANGUAGE="Català ca_ES" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
+BUILD_FATAL_HEADER="Ho sentim, hi ha hagut un problema del qual no ens hem pogut recuperar."
+BUILD_FATAL_LANGUAGE="Anglès GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_FATAL_TEXT="El servidor ha retornat \"{{statusCode_statusText}}\""
 BUILD_FATAL_URL_TEXT="Ajuda'm a resoldre això"
 
 ; Build incomplete error page
 ; These will be processed by the JavaScript Build
 BUILD_INCOMPLETE_HEADER="Configuració de l'entorn incomplerta"
-BUILD_INCOMPLETE_LANGUAGE="Català ca_ES" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
-BUILD_INCOMPLETE_TEXT="Sembla que estàs intentant executar Joomla! des del nostre repositori a git. Per a fer-ho, primer has de completar un parell de passos addicionals."
+BUILD_INCOMPLETE_LANGUAGE="Anglès GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
+BUILD_INCOMPLETE_TEXT="Sembla que està intentant executar Joomla! des del nostre repositori en Git. Per a fer-ho, primer has de completar un parell de passos addicionals."
 BUILD_INCOMPLETE_URL_TEXT="Més detalls"
 
 ; No XML PHP error page
 ; These will be processed by the JavaScript Build
 BUILD_NOXML_HEADER="Ho sentim, al PHP li falta una llibreria imprescindible"
-BUILD_NOXML_LANGUAGE="Català ca_ES" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
+BUILD_NOXML_LANGUAGE="Anglès GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_NOXML_TEXT="El teu servidor necessita fer servir PHP amb suport de la llibreria XML per executar aquesta versió de Joomla!"
 BUILD_NOXML_URL_TEXT="Ajuda'm a resoldre això"
 
 ; Minimum PHP error page
 ; These will be processed by the JavaScript Build
-BUILD_MIN_PHP_ERROR_HEADER="Ho sentim, la teva versió de PHP no és compatible."
-BUILD_MIN_PHP_ERROR_LANGUAGE="Català ca_ES" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
+BUILD_MIN_PHP_ERROR_HEADER="Ho sentim, la teva versió de PHP no es compatible."
+BUILD_MIN_PHP_ERROR_LANGUAGE="Anglès GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_MIN_PHP_ERROR_TEXT="Cal que el teu servidor utilitzi la versió de PHP {{phpversion}} o posterior per executar aquesta versió de Joomla."
 BUILD_MIN_PHP_ERROR_URL_TEXT="Ajuda'm a resoldre això"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Canvia l'idioma d'instal·lació"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Canviar"
+INSTL_SELECTED_INSTALL_LANGUAGE="Idioma actual: %s"
 INSTL_SELECT_INSTALL_LANG="Selecciona l'idioma d'instal·lació"
 INSTL_SELECT_LANGUAGE_TITLE="Triar idioma"
 INSTL_SETUP_LOGIN_DATA="Configurar dades d'entrada"
-INSTL_WARNJAVASCRIPT="Avís! Cal que JavaScript estigui habilitat per a la correcta instal·lació de Joomla."
-INSTL_WARNJSON="La teva instal·lació de PHP necessita tenir activat JSON perquè Joomla es pugui instal·lar!"
+INSTL_WARNJAVASCRIPT="Avís! Cal que Javascript estigui habilitat per a la correcta instal·lació de Joomla."
+INSTL_WARNJSON="La teva instal·lació de PHP necessita tenir activat JSON per Joomla per instal·lar-lo."
 
 ; Precheck view
-INSTL_DATABASE_SUPPORT="Base de dades de Suport:"
+INSTL_DATABASE_SUPPORT="Base de dades de suport: "
 INSTL_JSON_SUPPORT_AVAILABLE="Suport JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Idioma MB és l'idioma per defecte"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="Sobrecàrrega Cadena MB deshabilitat"
-INSTL_NOTICE_DATABASE_SUPPORT="No s'ha trobat cap base de dates compatible."
-INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="La teva instal·lació de PHP necessita tenir activat JSON perquè Joomla es pugui instal·lar!"
-INSTL_NOTICE_MBLANG_NOTDEFAULT="L'idioma mbstring de PHP no està definit com a neutre. Això es pot definir localment introduint <strong>php_value mbstring.language neutral</strong> al fitxer <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="La sobrecàrrega de la funció PHP mbstring està quantificada. Això es pot deshabilitar escrivint <strong>php_value mbstring.func_overload 0</strong> al teu arxiu <code>.htaccess</code>."
-INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Les funcions de PHP necessàries <code>parse_ini_file</code> and <code>parse_ini_string</code> estan deshabilitades al teu servidor."
-INSTL_NOTICE_XML_SUPPORT="El suport XML no està disponible. Això hauria d'estar habilitat per defecte a PHP, però els usuaris d'Ubuntu poden necessitar instal·lar això des de la consola amb <code>sudo apt-get install php-xml</code> seguit d'un reinici del servidor web."
+INSTL_NOTICE_DATABASE_SUPPORT="No es va trobar cap base de dates compatible."
+INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="La teva instal·lació de PHP necessita tenir activat JSON per Joomla per instal·lar-lo."
+INSTL_NOTICE_MBLANG_NOTDEFAULT="La cadena de Llenguatge PHP mbstring no s'ajusta a la posició neutral. Això es pot establir a nivell local mitjançant la introducció de <strong> mbstring.language php_value neutral</strong> al teu arxiu <code>.htaccess </code>."
+INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Les funciones de PHP necessàries <code>parse_ini_file</code> and <code>parse_ini_string</code> estan deshabilitades al teu servidor."
+INSTL_NOTICE_XML_SUPPORT="No est'a disponible el suport de XML. Això hauria d'estar habilitat per defecte a PHP però els usuaris d'Ubuntu poden necessitar instal·lar-ho executant <code>sudo apt-get install php-xml</code> seguit d'una reiniciació del servidor."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="La compressió Zlib no està activada. Pot activar-se localment afegint <strong>zlib.output_compression = On</strong> al fitxer <code>php.ini</code>."
 INSTL_PARSE_INI_FILE_AVAILABLE="Suport Parser INI"
 INSTL_PRECHECK_ACTUAL="Actual"
-INSTL_PRECHECK_DESC="Si algun d'aquests elements no està suportat, si us plau, emprèn les accions necessàries per a corregir-ho.<br> No es podrà instal·lar Joomla! fins que es compleixi amb els següents requisits."
+INSTL_PRECHECK_DESC="Si algun d'aquests elements no està suportat, si us plau, emprengui les accions necessàries per a corregir-ho.<br> No podrà instal·lar Joomla! fins que es compleixin amb els següents requisits."
 INSTL_PRECHECK_DIRECTIVE="Directiva"
 INSTL_PRECHECK_RECOMMENDED="Recomanat"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Aquesta configuració de PHP és la recomanada per assegurar una compatibilitat total amb Joomla."
@@ -67,7 +66,7 @@ INSTL_ZLIB_COMPRESSION_SUPPORT="Suport a compressió Zlib"
 INSTL_DATABASE="Configuració de la Base de Dades"
 INSTL_DATABASE_ENCRYPTION_CA_LABEL="Ruta de l'arxiu CA"
 INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Ruta de l'arxiu del certificat"
-INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite Suportada (opcional)"
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Cipher Suite suportat (opcional)"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Ruta a l'arxiu de clau privada"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Encriptació de connexió"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="Per defecte (controlat pel servidor)"
@@ -78,20 +77,20 @@ INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="L'arxiu introduït en el camp \"%s
 INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="El camp \"%s\"\ està buit o no conté una ruta vàlida."
 INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="Has introduït \"localhost\" com a nom de l'amfitrió. La connexió a la base de dades amb xifrat de connexió pot fallar amb això. Si canvies \"localhost\" a \"127.0.0.1\" o \ \"::1\" o un nom d'amfitrió diferent, o canvia el camp \"Encriptació de la connexió\" a \"Default (controlat pel servidor) \". "
 INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="El servidor de bases de dades no admet el xifrat de connexió. O bé activa el suport TLS (sovint anomenat SSL en documents) al servidor de bases de dades, o canvia el camp \"Encriptació de la connexió\ \" de nou a \"Per defecte (controlat per servidor) \"."
-INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verificar Certificat de Servidor"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verificar certificat de servidor"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Ha fallat la consulta de base de dades PostgreSQL."
-INSTL_DATABASE_HOST_DESC="Indiqui el nom del servidor, normalment \"localhost\" o un nom proporcionat pel vostre servei d'allotjament."
+INSTL_DATABASE_HOST_DESC="Indiqui el nom del servidor, normalment \"localhost\" o un nom proporcionat pel seu servei de hospedatge."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="No vam ser capaços de crear l'arxiu. Si us plau, creï manualment un arxiu anomenat \"%1$s\" i pugi-ho a la carpeta \"%2$s\" del seu lloc Joomla i seleccioni \"%3$s\" per continuar."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Per confirmar que ets el propietari d'aquest lloc web, si us plau, esborra el fitxer anomenat \"%1$s\" que s'ha creat a la carpeta \"%2$s\" del teu lloc Joomla i selecciona \"%3$s\" per continuar."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Esteu intentant utilitzar un amfitrió de base de dades que no es troba al vostre servidor local. Per motius de seguretat, heu de verificar la propietat del vostre compte d'allotjament web. <a href=\"%s\" target=\"_blank\" rel=\"noopener noreferrer\">Llegiu la documentació</a> per obtenir més informació."
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Està intentant usar un servidor de base de dades que no està en el seu servidor local. Per raons de seguretat, ha de verificar la propietat del seu compte d'allotjament web. <a href=\"%s\" target=\"_blank\" rel=\"noopener noreferrer\">Si us plau, llegeixi la documentació</a> per a més infomració."
 INSTL_DATABASE_HOST_LABEL="Nom del servidor"
-INSTL_DATABASE_NAME_DESC="Introduïu el nom de la base de dades."
+INSTL_DATABASE_NAME_DESC="Nom de la base de dades."
 INSTL_DATABASE_NAME_LABEL="Nom de la base de dades"
 INSTL_DATABASE_NAME_MSG_MYSQL="El nom de la base de dades no és vàlid, no ha de contenir el següents caràcters: \ /"
 INSTL_DATABASE_NAME_MSG_POSTGRES="El nom de la base de dades no és vàlid. Ha de començar amb una lletra, seguida de caràcters alfanumèrics."
 INSTL_DATABASE_NO_SCHEMA="No hi ha esquema de base de dades per a aquest tipus de base de dades."
 INSTL_DATABASE_PASSWORD_DESC="Introduïu la contrasenya de la base de dades que heu creat o una contrasenya proporcionada pel vostre amfitrió."
-INSTL_DATABASE_PREFIX_DESC="Introduïu un prefix de taula o utilitzeu el generat aleatòriament."
+INSTL_DATABASE_PREFIX_DESC="Introdueix un prefix de taula o utilitza el generat aleatòriament."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="Si utilitzeu una base de dades existent amb taules amb el mateix prefix, Joomla canviarà el nom d'aquestes taules existents afegint el prefix \"bak_\"."
 INSTL_DATABASE_PREFIX_MSG="El prefix de taula ha de començar per una lletra, opcionalment seguit par caràcters alfanumèrics i per un guió baix."
 INSTL_DATABASE_RESPONSE_ERROR="El procés d'instal·lació ha fallat."
@@ -103,13 +102,13 @@ INSTL_CONNECT_DB="Configuració de la connexió de base de dades"
 INSTL_INSTALL_JOOMLA="Instal·lar Joomla"
 
 ; Site View
-INSTL_ADMIN_EMAIL_DESC="Introduïu l'adreça electrònica del superusuari del lloc web."
-INSTL_ADMIN_PASSWORD_DESC="Estableix la contrasenya del teu compte de Superusuari."
+INSTL_ADMIN_EMAIL_DESC="Introdueix l'adreça de correu del superusuari del lloc web."
+INSTL_ADMIN_PASSWORD_DESC="Contrasenya del compte de superusuari."
 INSTL_ADMIN_PASSWORD_LENGTH="Introdueix un mínim de 12 caràcters."
-INSTL_ADMIN_USERNAME_DESC="Estableix el nom d'usuari per al teu compte de Superusuari."
+INSTL_ADMIN_USERNAME_DESC="Pots canviar el nom del Superadministrador per defecte."
 INSTL_ADMIN_USER_DESC="Introdueix el nom real del superusuari."
-INSTL_LOGIN_DATA="Dades d'Inici de Sessió"
-INSTL_SETUP_SITE_NAME="Configurar Nom del Lloc"
+INSTL_LOGIN_DATA="Dades d'entrades"
+INSTL_SETUP_SITE_NAME="Configurar nom del lloc"
 INSTL_SITE="Configuració Principal"
 INSTL_SITE_DEVMODE_LABEL="Hem detectat el mode de desenvolupador"
 INSTL_SITE_NAME_DESC="Introdueix el nom del teu lloc Joomla."
@@ -119,83 +118,83 @@ INSTL_PUBLIC_FOLDER_DESC="Camí relatiu o absolut a la carpeta pública"
 INSTL_PUBLIC_FOLDER_DESC_SHORT="Camí relatiu o absolut a la carpeta pública"
 
 ; Complete view
-INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Instal·la Idiomes Addicionals"
-INSTL_COMPLETE_ADMIN_BTN="Obrir Administrador"
-INSTL_COMPLETE_CONGRAT="Enhorabona!"
+INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Instal·lar idiomes addicionals"
+INSTL_COMPLETE_ADMIN_BTN="Obrir administració"
+INSTL_COMPLETE_CONGRAT="Felicitats!"
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="La carpeta \"%s\" no s'ha pogut esborrar. Si us plau, esborra manualment la carpeta."
 INSTL_COMPLETE_FINAL="S'ha completat la instal·lació"
 INSTL_COMPLETE_FINAL_DESC="S'ha completat la instal·lació de Joomla i està llesta per utilitzar."
 INSTL_COMPLETE_REMOVE_FOLDER="Elimini la carpeta \"%s\""
-INSTL_COMPLETE_SITE_BTN="Obrir Lloc"
-INSTL_COMPLETE_TITLE="Enhorabona! El vostre lloc web Joomla està a punt."
-INSTL_REMOVE_INST_FOLDER="Esteu segur que voleu suprimir? Si ho confirmeu, la carpeta \"%s\" s'esborrarà permanentment."
+INSTL_COMPLETE_SITE_BTN="Obrir lloc"
+INSTL_COMPLETE_TITLE="Felicitats! Joomla! ja està instal·lat."
+INSTL_REMOVE_INST_FOLDER="Estàs segur que vols esborrar? Si confirmes la carpeta \"%s\" s'esborrarà permanentment."
 
 ; Languages view
-INSTL_LANGUAGES="Instal·la Idiomes Addicionals"
+INSTL_LANGUAGES="Instal·lar idiomes addicionals"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Idioma"
-INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Selecciona l'Idioma"
-INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Etiqueta de l'idioma"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Triar idioma"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Etiqueta de l`idioma"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versió"
-INSTL_LANGUAGES_DESC="La interfície de Joomla està disponible en diversos idiomes. Trieu els idiomes que preferiu marcant les caselles de selecció i, a continuació, instal·leu-los seleccionant el botó \"Instal·la els Idiomes Seleccionats\".<br>Nota: Aquesta operació trigarà uns 10 segons a descarregar i instal·lar cada idioma. Per evitar temps d'espera, seleccioneu no més de 3 idiomes per instal·lar."
-INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Aquesta operació trigarà fins a 10 segons per idioma a completar-se.<br>Espereu mentre descarreguem i instal·lem els idiomes &hellip;"
+INSTL_LANGUAGES_DESC="La interfície de Joomla està disponible en diversos idiomes. Triï els idiomes que desitgi seleccionant la seva casella de selecció i després premi el botó \"Instal·lar idioma seleccionat\".<br>Nota: aquesta operació pot trigar uns deu segons per idioma seleccionat a descarregar i instal·lar. Si us plau, no seleccioni més de 3 idiomes a instal·lar per evitar expiracions de temps."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Aquesta operació pot trigar més de 10 segons per idioma per a completar-se.<br>Si us plau, esperi mentre es descarreguen i s'instal·len els idiomes...&hellip;"
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No s'han seleccionat idiomes per instal·lar."
 INSTL_LANGUAGES_SELECTED="Instal·leu els idiomes seleccionats"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Tornar a la darrera etapa de la instal·lació"
-INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla no s'ha pogut connectar al servidor d'idiomes. Si us plau, finalitzeu el procés d'instal·lació."
-INSTL_LANGUAGES_WARNING_NO_INTERNET2="Nota: Podreu instal·lar idiomes més endavant amb l'Administrador de Joomla."
+INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! no ha pogut connectar amb el servidor d'idiomes. Finalitza el procés d'instal·lació."
+INSTL_LANGUAGES_WARNING_NO_INTERNET2="Nota: Després podrà instal·lar altres idiomes des de l'administració de Joomla."
 
 ; Automated Updates Opt Out
-INSTL_AUTOMATED_UPDATES="Actualitzacions Automatitzades"
+INSTL_AUTOMATED_UPDATES="Actualitzacions automatitzades"
 INSTL_AUTOMATED_UPDATES_DESC="Joomla s'actualitza automàticament per a versions menors i de revisions.<br><br><strong>Si us plau, tingueu en compte:</strong> Les actualitzacions automatitzades registraran el vostre lloc al servei respectiu proporcionat pel projecte Joomla!. El registre permet que el projecte Joomla accedeixi a informació sobre el vostre lloc i l'entorn del servidor, concretament l'URL del lloc, la versió de PHP, el tipus i la versió de la base de dades, la versió del CMS i el tipus i la versió del sistema operatiu del servidor. Aquesta informació només s'utilitza per millorar el servei.<br><br>Alternativament, podeu desactivar les actualitzacions automatitzades mitjançant el botó següent."
 INSTL_AUTOMATED_UPDATES_DISABLE="Desactiva les actualitzacions automàtiques"
 INSTL_COMPLETE_ERROR_AUTOMATED_UPDATES_DISABLE="No s'han pogut desactivar les actualitzacions automàtiques."
 INSTL_DISABLE_AUTOUPDATE="Esteu segur que voleu desactivar les actualitzacions automàtiques?"
 
 ; Default language view
-INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Idioma per defecte de l'Administrador"
-INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla no ha pogut establir l'idioma per defecte. L'anglès s'usarà com a predeterminat per a l'administració."
-INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla ha establert %s com a idioma predeterminat de l'ADMINISTRADOR."
+INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Idioma per defecte de l'administrador"
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla no ha pogut assignar l'idioma com a predeterminat. S'usarà l'idioma anglès com a predeterminat per a l'administració."
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla ha establert %s com a idioma per defecte per a la teva administració."
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Idioma"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Selecciona"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Etiqueta"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Joomla ha fallat en descarregar o desempaquetar el paquet d'idiomes de: %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Joomla no va poder descarregar o descomprimir el paquet d'idioma des de: %s"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla no ha pogut instal·lar l'idioma %s."
-INSTL_DEFAULTLANGUAGE_DESC="Joomla ha instal·lat els idiomes següents. Seleccioneu l'idioma predeterminat que vulgueu per a l'<strong>Administrador de Joomla</strong>."
-INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla ha instal·lat els idiomes següents. Seleccioneu l'idioma predeterminat que vulgueu per al <strong>Lloc de Joomla</strong>."
-INSTL_DEFAULTLANGUAGE_FRONTEND="Idioma predeterminat del Lloc Web"
-INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla no ha pogut establir l'idioma per defecte. L'anglès s'utilitzarà com a idioma per defecte per al LLOC WEB."
-INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla ha establert %s com a idioma per defecte pel teu LLOC WEB."
+INSTL_DEFAULTLANGUAGE_DESC="Joomla ha instal·lat els següents idiomes. Si us plau, seleccioni l'idioma que desitja usar com a predeterminat per a <strong>l'administració</strong>."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla ha instal·lat els següents idiomes. Si us plau, seleccioni l'idioma que desitja usar com a predeterminat per a la<strong>web</strong>."
+INSTL_DEFAULTLANGUAGE_FRONTEND="Idioma per defecte del lloc web"
+INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla no ha pogut assignar l'idioma com a predeterminat. S'usarà l'idioma anglès com el predeterminat per al lloc web."
+INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla ha establert %s com a idioma per defecte pel teu lloc web."
 INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Assignar l'idioma predeterminat"
-INSTL_DEFAULTLANGUAGE_TRY_LATER="Podreu instal·lar-lo més endavant amb l'Administrador de Joomla."
+INSTL_DEFAULTLANGUAGE_TRY_LATER="Pots instal·lar-ho més endavant amb l'administració de Joomla."
 
-INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Català (ca-ES)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Català (ES)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
 
 ; Database Model
-INSTL_DATABASE_COULD_NOT_CONNECT="No s'ha pogut connectar a la base de dades. El connector ha retornat el missatge d'error: %s"
-INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="L'instal·lador no s'ha pogut connectar a la base de dades especificada i no ha pogut crear-la. Verifiqueu la configuració i, si cal, creeu la base de dades manualment."
-INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="No s'ha pogut actualitzar la memòria cau del manifest per a l'extensió: %s"
-INSTL_DATABASE_ERROR_BACKINGUP="S'han produït alguns errors en fer una còpia de seguretat de la base de dades."
+INSTL_DATABASE_COULD_NOT_CONNECT="No es pot connectar amb la base de dades. El connector va retornar el missatge d'error %s"
+INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="L'instal·lador no pot connectar a la base de dades especificada i no ha pogut crear la base de dades. Comprova la configuració i si és necessari crea manualment la base de dades."
+INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="No s'ha pogut actualitzar la memòria cau per l'extensió: %s"
+INSTL_DATABASE_ERROR_BACKINGUP="Ha hagut alguns errors en la còpia de seguretat de la base de dades."
 INSTL_DATABASE_ERROR_CREATE="S'ha produït un error quan s'intentava crear la base de dades %s.<br>Pot ser que l'usuari no tingui privilegis suficients per a crear una base de dades. Tal vegada necessita crear la base de dades abans d'intentar instal·lar Joomla"
-INSTL_DATABASE_ERROR_DELETE="S'han produït alguns errors en suprimir la base de dades."
+INSTL_DATABASE_ERROR_DELETE="Ha hagut alguns errors esborrant la base de dades."
 INSTL_DATABASE_ERROR_READING_SQL_FILE="No s'ha pogut llegir el fitxer SQL."
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Còpia de seguretat"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Elimina"
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="El fitxer %s no existeix."
-INSTL_DATABASE_FIX_LOWERCASE="El prefix de la taula ha de ser en minúscula per a PostgreSQL."
-INSTL_DATABASE_FIX_TOO_LONG="El prefix de la taula MySQL ha de tenir un màxim de 15 caràcters."
-INSTL_DATABASE_INVALID_DB_DETAILS="Les dades de la base de dades proporcionades són incorrectes i/o buides."
-INSTL_DATABASE_INVALID_MARIADB_VERSION="Necessiteu MariaDB %1$s o superior per continuar la instal·lació. La vostra versió és: %2$s"
-INSTL_DATABASE_INVALID_MYSQLI_VERSION="Necessiteu MySQL %1$s o superior per continuar la instal·lació. La vostra versió és: %2$s"
-INSTL_DATABASE_INVALID_MYSQL_VERSION="Necessiteu MySQL %1$s o superior per continuar la instal·lació. La vostra versió és: %2$s"
+INSTL_DATABASE_FIX_LOWERCASE="El prefix ha de ser minúscula per Postgresql."
+INSTL_DATABASE_FIX_TOO_LONG="El prefix de taula MySQL ha de tenir un màxim de 15 caràcters."
+INSTL_DATABASE_INVALID_DB_DETAILS="Els detalls de la base de dades proporcionades són incorrectes o inexistents."
+INSTL_DATABASE_INVALID_MARIADB_VERSION="Necessites MariaDB %1$s. o superior per continuar la instal·lació. La teva versió és: %2$s"
+INSTL_DATABASE_INVALID_MYSQLI_VERSION="Necessites MySQL %1$s. o superior per continuar la instal·lació. La teva versió és: %2$s"
+INSTL_DATABASE_INVALID_MYSQL_VERSION="Necessites MySQL %1$s. o superior per continuar la instal·lació. La teva versió és: %2$s"
 INSTL_DATABASE_INVALID_PGSQL_VERSION="Necessites Posrgre %1$s. o superior per continuar la instal·lació. La teva versió és: %2$s"
-INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Necessiteu PostgreSQL %1$s o superior per continuar la instal·lació. La vostra versió és: %2$s"
+INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Necessites Posrgre %1$s. o superior per continuar la instal·lació. La teva versió és: %2$s"
 INSTL_DATABASE_INVALID_TYPE="Si us plau,, selecciona el tipus de base de dades."
-INSTL_DATABASE_NAME_INVALID_CHAR="Cap identificador de MySQL pot tenir un valor NULL ASCII(0x00)."
-INSTL_DATABASE_NAME_INVALID_SPACES="Els noms de les bases de dades i les taules MySQL no poden començar ni acabar amb espais."
-INSTL_DATABASE_NAME_TOO_LONG="El nom de la base de dades MySQL ha de tenir un màxim de 64 caràcters."
+INSTL_DATABASE_NAME_INVALID_CHAR="Cap identificador de MySQL pot contenir un ASCII NUL (0x00)."
+INSTL_DATABASE_NAME_INVALID_SPACES="Els noms de base de dades MySQL i els noms de taules no poden començar ni acabar amb espais."
+INSTL_DATABASE_NAME_TOO_LONG="El nom de base de dades MySQL ha de tenir un màxim de 64 caràcters."
 
 ; Controllers
-INSTL_COOKIES_NOT_ENABLED="Sembla que les galetes no estan habilitades al vostre client de navegador. No podreu instal·lar l'aplicació amb aquesta funció desactivada. Alternativament, també podria haver-hi un problema amb el fitxer <strong>session.save_path</strong> del servidor. Si aquest és el cas, consulteu el vostre proveïdor d'allotjament si no sabeu com comprovar-ho o solucionar-ho vosaltres mateixos."
+INSTL_COOKIES_NOT_ENABLED="Les galetes no semblen estar habilitades al teu navegador. No seràs capaç d'instal·lar Joomla amb aquesta característica desactivada. Alternativament, també podria ser un problema amb <strong>session.save_path</strong> del servidor . Si és aquest el cas, si us plau consulta el teu hostatjament si no saps com comprovar-ho o reparar-ho tu."
 INSTL_HEADER_ERROR="Error"
 
 ; Helpers
@@ -203,27 +202,27 @@ INSTL_PAGE_TITLE="Instal·lador de Joomla"
 
 ; Configuration model
 INSTL_ERROR_CONNECT_DB="No es pot connectar amb la base de dades. El connector va retornar el número %s."
-INSTL_STD_OFFLINE_MSG="Aquest lloc web està fora de servei per manteniment.<br>Torneu-ho a comprovar aviat."
+INSTL_STD_OFFLINE_MSG="Aquest lloc està desactivat per manteniment.<br>Torna més tard, gràcies."
 
 ; Languages model
-INSTL_ERROR_INVALID_URL="URL no vàlida"
+INSTL_ERROR_INVALID_URL="Adreça URL no vàlida"
 
 ; Others
-INSTL_CONFPROBLEM="El fitxer o carpeta de configuració no és escrivible o hi ha hagut un problema en crear el fitxer de configuració. Haureu de carregar el codi següent manualment. Seleccioneu a l'àrea de text per ressaltar tot el codi i, a continuació, enganxeu-lo en un fitxer de text nou. Anomeneu aquest fitxer 'configuration.php' i pengeu-lo a la carpeta arrel del vostre lloc web."
-INSTL_DISPLAY_ERRORS="Mostrar Errors"
+INSTL_CONFPROBLEM="L'arxiu de configuració o directori no té permís d'escriptura o ha hagut un problema en crear el fitxer de configuració. Hauràs de pujar el següent codi a mà. Fes clic a l'àrea de text per ressaltar tot el codi i enganxa'l en un nou fitxer de text. Anomena'l 'configuration.php' i puja'l a la carpeta arrel del lloc."
+INSTL_DISPLAY_ERRORS="Mostrar errors"
 INSTL_ERROR="Error"
-INSTL_ERROR_DB="S'han produït alguns errors en omplir la base de dades: %s."
+INSTL_ERROR_DB="S'ha produït un error en omplir la base de dades. %s."
 INSTL_ERROR_INITIALISE_SCHEMA="No es pot inicialitzar l'esquema de la base de dades."
-INSTL_EXTENSION_AVAILABLE="%s Disponible"
-INSTL_FILE_UPLOADS="Càrregues de Fitxers"
+INSTL_EXTENSION_AVAILABLE="%s disponible"
+INSTL_FILE_UPLOADS="Pujada de fitxers"
 INSTL_GNU_GPL_LICENSE="Llicència General Pública GNU"
 INSTL_HELP_LINK="Ajuda amb la instal·lació de Joomla"
 INSTL_NOTICE_NEEDSTOBEWRITABLE="Encara pots continuar amb la instal·lació si modifiques els permisos."
-INSTL_OUTPUT_BUFFERING="Memòria intermèdia de sortida"
+INSTL_OUTPUT_BUFFERING="buffer de sortida"
 INSTL_PHP_VERSION="Versió PHP"
 INSTL_PHP_VERSION_NEWER="Versió de PHP >= %s"
-INSTL_PROCESS_BUSY="El procés està en curs. Si us plau, espereu &hellip;"
-INSTL_SESSION_AUTO_START="Inici Automàtic de la Sessió"
+INSTL_PROCESS_BUSY="Procés realitzant-se. Espera&hellip;"
+INSTL_SESSION_AUTO_START="Autoinici de sessió"
 INSTL_WRITABLE="Permisos insuficients per crear %s."
 INSTL_ZIP_SUPPORT_AVAILABLE="Suport nadiu ZIP"
 
@@ -238,16 +237,16 @@ JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="El paquet d'idioma no concorda amb aquest
 JGLOBAL_SELECT_AN_OPTION="Selecciona una opció"
 JGLOBAL_SELECT_NO_RESULTS_MATCH="Cap resultat no coincideix"
 JGLOBAL_SELECT_SOME_OPTIONS="Selecciona algunes opcions"
-JHIDEPASSWORD="Amaga la Contrasenya"
-JINVALID_TOKEN="La petició més recent s'ha denegat perquè contenia un codi de seguretat no vàlid. Actualitzeu la pàgina i torneu-ho a provar."
-JINVALID_TOKEN_NOTICE="Els testimonis de seguretat no coincideixen. La sol·licitud ha estat avortada per evitar qualsevol violació de la seguretat. Torna-ho a provar."
+JHIDEPASSWORD="Amagar contrasenya"
+JINVALID_TOKEN="La petició més recent s'ha denegat perquè contenia un codi de seguretat no vàlid. Actualitza la pàgina i torna-ho a provar."
+JINVALID_TOKEN_NOTICE="El testimoni de seguretat no coincideix. La sol·licitud ha estat avortada per evitar qualsevol violació de la seguretat. Torna-ho a provar."
 JNEXT="Següent"
 JNO="No"
-JNOTICE="Avís"
+JNOTICE="Informació"
 JOFF="Desactivat"
 JON="Activat"
 JPREVIOUS="Anterior"
-JSHOWPASSWORD="Mostrar Contrasenya"
+JSHOWPASSWORD="Mostrar contrasenya"
 JSITE="Lloc"
 JSKIP="Ometre"
 JUSERNAME="Nom d'usuari"
@@ -255,39 +254,39 @@ JYES="Sí"
 
 ; Framework strings necessary when no lang pack is available
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="No s'ha pogut connectar a MySQL."
-JLIB_DATABASE_ERROR_DATABASE="S'ha produït un error a la base de dades."
+JLIB_DATABASE_ERROR_DATABASE="Ha hagut un error a la base de dades."
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="No s'ha pogut carregar el controlador de la base de dades: %s"
-JLIB_DATABASE_ERROR_VALID_MAIL="L'adreça electrònica que has introduït no és vàlida. Si us plau, introdueix una altra adreça electrònica."
+JLIB_DATABASE_ERROR_VALID_MAIL="L'adreça de correu que has introduït no és vàlida. Introdueix una adreça de correu electrònic diferent."
 JLIB_ENVIRONMENT_SESSION_EXPIRED="La teva sessió ha expirat, si us plau , recarrega la pàgina."
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: La ruta no és una carpeta. Ruta: %2$s"
-JLIB_FORM_FIELD_INVALID="Camp no vàlid:&#160;"
+JLIB_FORM_FIELD_INVALID="Camp no vàlid:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Camp no vàlid: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Camp requerit: %s"
-JLIB_INSTALLER_ABORT="S'està aturant la instal·lació de l'idioma: %s"
+JLIB_INSTALLER_ABORT="Aturant la instal·lació de l'idioma: %s"
 JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extensió %1$s: No s'ha pogut crear el directori: %2$s"
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="La ruta d'instal·lació no existeix."
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Paquet %1$s: S'ha produït un error en instal·lar una extensió: %2$s."
-JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Paquet %s: No hi ha fitxers per instal·lar!"
+JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="Paquet %s: no hi ha arxius a instal·lar!"
 JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Error connectant al servidor: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Instal·lació: Error en copiar el fitxer %1$s a %2$s."
 JLIB_INSTALLER_INSTALL="Instal·la"
 JLIB_INSTALLER_NOT_ERROR="Si l'error està relacionat amb la instal·lació dels fitxers d'idioma de TinyMCE, no tindrà efecte en la instal·lació dels idiomes. Alguns paquets d'idioma creats abans de Joomla! 3.2.0 poden intentar instal·lar fitxers d'idioma per separat de TinyMCE. Com que ara s'inclouen al nucli, ja no cal instal·lar-los."
 JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="No es pot crear un idioma de contingut per a l'idioma %s: %s."
 JLIB_UPDATER_ERROR_COLLECTION_FOPEN="La configuració de PHP allow_url_fopen està desactivada. Aquesta configuració ha d'estar activada perquè l'actualitzador funcioni."
-JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: No s'ha pogut obrir %s"
+JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: No es pot obrir %s"
 JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: No s'ha pogut analitzar %s"
 JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Actualització: No s'ha pogut obrir el lloc d'actualització #%d &quot;%s&quot;, URL: %s."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: No s'ha pogut connectar amb la base de dades <br>joomla.library: %1$s - %2$s."
 
 ; Strings for the language debugger
-JDEBUG_LANGUAGE_FILES_IN_ERROR="Anàlisi d'errors en fitxers d'idioma"
+JDEBUG_LANGUAGE_FILES_IN_ERROR="Parsejant errors als arxius d`idioma"
 JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Cadenes sense traduir"
 JNONE="Cap"
 
 ; Necessary for errors
-ADMIN_EMAIL="Correu electrònic de l'Administrador"
-ADMIN_PASSWORD="Contrasenya d'Administrador"
-SITE_NAME="Nom del Lloc"
+ADMIN_EMAIL="Email de l'Administrador"
+ADMIN_PASSWORD="Contrasenya d'administrador"
+SITE_NAME="Nom del lloc"
 
 ; Database types (allows for a more descriptive label than the internal name)
 MYSQL="MySQL (DOP)"
diff --git a/installation/language/ca-ES/langmetadata.xml b/installation/language/ca-ES/langmetadata.xml
index 2e2fa30978ff7..87131f805f4c4 100644
--- a/installation/language/ca-ES/langmetadata.xml
+++ b/installation/language/ca-ES/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Catalan (ca-ES)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Catalan [ca-ES] Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
@@ -11,7 +11,7 @@
 	</files>
 	<metadata>
 		<name>Catalan (ca-ES)</name>
-		<nativeName>Català (ca-ES)</nativeName>
+		<nativeName>Catalan (ca-ES)</nativeName>
 		<tag>ca-ES</tag>
 		<rtl>0</rtl>
 	</metadata>
diff --git a/installation/language/cs-CZ/joomla.cli.ini b/installation/language/cs-CZ/joomla.cli.ini
index 0efacc9ea04cb..8caca19b71b12 100644
--- a/installation/language/cs-CZ/joomla.cli.ini
+++ b/installation/language/cs-CZ/joomla.cli.ini
@@ -11,8 +11,8 @@ INSTL_DATABASE_ENCRYPTION_CA_LABEL="Cesta k souboru CA pro ověření šifrován
 INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Cesta k souboru CA pro ověření šifrování"
 INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Cesta k SSL certifikátu pro připojení k databázi. Vyžaduje nastavení šifrování na 2"
 INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Cesta k SSL certifikátu pro připojení k databázi. Vyžaduje nastavení šifrování na 2"
-INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Podporovaná sada šifrovacích kódů (volitelné)"
-INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Podporovaná sada šifrovacích kódů (volitelné)"
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Podporovaná sada Cipher (volitelná)"
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Podporovaná sada Cipher (volitelná)"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL="SSL klíč pro připojení k databázi. Vyžaduje šifrování nastavené na 2"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="SSL klíč pro připojení k databázi. Vyžaduje šifrování nastavené na 2"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Šifrování pro připojení k databázi. Hodnoty: 0=Žádné, 1=Jednosměrné, 2=Obousměrné"
@@ -20,17 +20,17 @@ INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Šifrování pro připojení k datab
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Ověřte SSL certifikát pro připojení k databázi. Hodnoty: 0=Ne, 1=Ano. Vyžaduje nastavení šifrování nastavené na 1 nebo 2"
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Ověřte SSL certifikát pro připojení k databázi. Hodnoty: 0=Ne, 1=Ano. Vyžaduje nastavení šifrování nastavené na 1 nebo 2"
 INSTL_DATABASE_HOST_DESC="Hostitel databáze"
-INSTL_DATABASE_HOST_DESC_SHORT="Host"
+INSTL_DATABASE_HOST_DESC_SHORT="Hostitel databáze"
 INSTL_DATABASE_NAME_DESC="Název databáze"
 INSTL_DATABASE_NAME_DESC_SHORT="Název databáze"
 INSTL_DATABASE_PASSWORD_DESC="Heslo databáze"
 INSTL_DATABASE_PASSWORD_DESC_SHORT="Heslo databáze"
 INSTL_DATABASE_PREFIX_DESC="Předpona databázových tabulek"
-INSTL_DATABASE_PREFIX_DESC_SHORT="Předpona tabulek"
+INSTL_DATABASE_PREFIX_DESC_SHORT="Předpona databázových tabulek"
 INSTL_DATABASE_TYPE_DESC="Typ databáze. Podporováno mysql, mysqli, pgsql"
 INSTL_DATABASE_TYPE_DESC_SHORT="Typ databáze. Podporováno Joomla: mysql (=MySQL (CHOP)), mysqli (=MySQLi), pgsql (=PostgreSQL (CHOP))"
 INSTL_DATABASE_USER_DESC="Uživatelské jméno databáze"
-INSTL_DATABASE_USER_DESC_SHORT="Uživatelské jméno"
+INSTL_DATABASE_USER_DESC_SHORT="Uživatelské jméno databáze"
 INSTL_PUBLIC_FOLDER_DESC="Relativní nebo absolutní cesta do veřejné složky"
 INSTL_PUBLIC_FOLDER_DESC_SHORT="Relativní nebo absolutní cesta do veřejné složky"
 INSTL_SITE_NAME_DESC="Zadejte název vaší stránky Joomla"
diff --git a/installation/language/cs-CZ/joomla.ini b/installation/language/cs-CZ/joomla.ini
index 4ef29d6b2537d..90aa0afdcfb9a 100644
--- a/installation/language/cs-CZ/joomla.ini
+++ b/installation/language/cs-CZ/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Pro spuštění této verze Joomla musí váš hostite
 BUILD_MIN_PHP_ERROR_URL_TEXT="Pomozte mi to vyřešit"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Změnit instalační jazyk"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Změnit"
+INSTL_SELECTED_INSTALL_LANGUAGE="Aktuální jazyk: %s"
 INSTL_SELECT_INSTALL_LANG="Vyberte jazyk pro instalaci"
 INSTL_SELECT_LANGUAGE_TITLE="Zvolte jazyk"
 INSTL_SETUP_LOGIN_DATA="Nastavit přihlašovací údaje"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="Aby mohla být Joomla! nainstalována, je třeba mít v PHP povo
 INSTL_DATABASE_SUPPORT="Podpora databáze:"
 INSTL_JSON_SUPPORT_AVAILABLE="Podpora JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language je Výchozí"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload vypnuto"
 INSTL_NOTICE_DATABASE_SUPPORT="Nebyly nalezeny žádné podporované databáze."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Aby mohla být Joomla! nainstalována, je třeba mít v PHP povolen JSON!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="Proměnná PHP mbstring language není nastavena na hodnotu neutral. Můžete to změnit zadáním hodnoty <strong>php_value mbstring.language neutral</strong> do souboru <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Je zapnuta funkce PHP mbstring. Lokálně ji můžete vypnout zadáním hodnoty <strong>php_value mbstring.func_overload 0</strong> do souboru <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Požadované php funkce <code>parse_ini_file</code> a <code>parse_ini_string</code> jsou na vašem serveru zakázány."
 INSTL_NOTICE_XML_SUPPORT="Podpora XML není k dispozici. Toto by mělo být ve výchozím nastavení povoleno u uživatelů php, ale Ubuntu možná bude třeba nainstalovat tak, že <code>sudo apt-get nainstaluje php-xml</code> a poté restartuje webový server."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib komprese není nastavena. Lze ji lokálně zapnout zadáním <strong>zlib.output_compression = On</strong> do souboru <code>php.ini</code>."
@@ -236,11 +235,11 @@ JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="Při zpracován
 JGLOBAL_ISFREESOFTWARE="%s je svobodný software šířený pod <a href='http://www.gnu.org/licenses/gpl-2.0.html' target='_blank'>GNU General Public License</a>."
 JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Jazykový balíček neodpovídá nainstalované verzi Joomla!, některé řetězce mohou chybět a budou zobrazeny v angličtině."
 JGLOBAL_SELECT_AN_OPTION="Vybrat možnost"
-JGLOBAL_SELECT_NO_RESULTS_MATCH="Nebyly nalezeny žádné odpovídající výsledky"
+JGLOBAL_SELECT_NO_RESULTS_MATCH="Nejsou odpovídající výsledky"
 JGLOBAL_SELECT_SOME_OPTIONS="Vyberte nějaké možnosti"
 JHIDEPASSWORD="Skrýt heslo"
 JINVALID_TOKEN="Nejnovější požadavek byl odmítnut, protože obsahuje neplatný bezpečnostní symbol. Obnovte stránku a zkuste to znovu."
-JINVALID_TOKEN_NOTICE="Bezpečnostní klíče se neshodují. Požadavek byl přerušen, aby se zabránilo narušení bezpečnosti. Opakujte akci."
+JINVALID_TOKEN_NOTICE="Bezpečnostní token se neshodoval. Požadavek byl přerušen, aby se zabránilo jakémukoli narušení bezpečnosti. Zkuste to znovu."
 JNEXT="Následující"
 JNO="Ne"
 JNOTICE="Upozornění"
@@ -263,7 +262,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Cesta není složka. Cesta: %2
 JLIB_FORM_FIELD_INVALID="Neplatné pole: &#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Neplatné pole: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Povinné pole: %s"
-JLIB_INSTALLER_ABORT="Instalace jazyku byla přerušena: %s"
+JLIB_INSTALLER_ABORT="Instalace jazyka byla přerušena: %s"
 JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="%1$s rozšíření: Nepodařilo se vytvořit složku <strong>%2$s</strong>"
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="Cesta pro instalaci neexistuje"
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Balíček %1$s: Došlo k chybě při instalaci rozšíření: %2$s"
@@ -304,7 +303,7 @@ NOTICE="Oznámení"
 WARNING="Varování"
 
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Při načítání dat JSON došlo k přerušení připojení."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Při načítání dat formátu JSON došlo k přerušení spojení."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="Nebyl vrácen žádný obsah."
 JLIB_JS_AJAX_ERROR_OTHER="Při načítání dat JSON došlo k chybě: stavový kód HTTP %d."
 JLIB_JS_AJAX_ERROR_PARSE="Při zpracování následující data JSON došlo k chybě parsování:<br/><code style='color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0; background:inherit;'>%s</code>"
diff --git a/installation/language/cs-CZ/langmetadata.xml b/installation/language/cs-CZ/langmetadata.xml
index ea1a9a305ca69..7f3ac9f8cd6a7 100644
--- a/installation/language/cs-CZ/langmetadata.xml
+++ b/installation/language/cs-CZ/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Czech (Čeština)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Czech Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/cy-GB/joomla.ini b/installation/language/cy-GB/joomla.ini
index f948ff1b7b481..49210ebe52061 100644
--- a/installation/language/cy-GB/joomla.ini
+++ b/installation/language/cy-GB/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Mae eich lletywr angen defnyddio fersiwn PHP {{phpvers
 BUILD_MIN_PHP_ERROR_URL_TEXT="Helpwch fi i ddatrys hyn"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Newid"
 INSTL_SELECT_INSTALL_LANG="Dewiswch Iaith Gosod"
 INSTL_SELECT_LANGUAGE_TITLE="Dewiswch iaith"
 INSTL_SETUP_LOGIN_DATA="Ffurfweddu Data Mewngofnodi"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Mae’n rhaid galluogi JSON yn eich gosodiad o PHP er mwyn gosod
 INSTL_DATABASE_SUPPORT="Cymorth cronfa ddata:"
 INSTL_JSON_SUPPORT_AVAILABLE="Cymorth JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Iaith MB yw'r diofyn"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="Cyfarwyddeb MB String Overload wedi'i ddiffodd"
 INSTL_NOTICE_DATABASE_SUPPORT="Methu canfod cronfa ddata da ni'n gefnogi."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Mae’n rhaid galluogi JSON yn eich gosodiad o PHP er mwyn gosod Joomla!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="Nid yw iaith PHP mbstring wedi ei osod yn niwtral. Mae'n bosibl gosod hwn yn lleol trwy roi <strong>php_value mbstring.language neutral</strong> yng nghod eich ffeil <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Mae swyddogaeth PHP mbstring overload wedi ei osod. Gallwch ddiffodd hwn yn lleol trwy fewnbynnu <strong>php_value mbstring.func_overload 0</strong> yng nghod eich ffeil <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Nid yw'r swyddogaethau php gofynnol <code>parse_ini_file</code> a <code>parse_ini_string</code> wedi eu galluogi ar eich gweinydd."
 INSTL_NOTICE_XML_SUPPORT="Does dim cefnogaeth ar gyfer XML ar gael.  Dylai hyn fod wedi ei alluogi yn ddiofyn yn php ond gall fod angen i ddefnyddwyr Ubuntu ei osod drwy ddefnyddio <code>sudo apt-get install php-xml</code> ac yna ail gychwyn y gweinydd gwe."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Nid yw cywasgu Zlib wedi ei ffurfweddu.  Gelir rhoi hyn ymlaen yn lleol drwy roi <strong>zlib.output_compression = On</strong> yn eich ffeil <code>php.ini</code>."
diff --git a/installation/language/cy-GB/langmetadata.xml b/installation/language/cy-GB/langmetadata.xml
index 77cc9ab916620..eb10056410377 100644
--- a/installation/language/cy-GB/langmetadata.xml
+++ b/installation/language/cy-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Welsh (United Kingdom)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Project - Welsh Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
@@ -11,7 +11,7 @@
 	</files>
 	<metadata>
 		<name>Welsh (cy-GB)</name>
-		<nativeName>Welsh (United Kingdom)</nativeName>
+		<nativeName>Cymraeg</nativeName>
 		<tag>cy-GB</tag>
 		<rtl>0</rtl>
 	</metadata>
diff --git a/installation/language/da-DK/joomla.cli.ini b/installation/language/da-DK/joomla.cli.ini
index 0ccf3112f4424..980a88d0b8253 100644
--- a/installation/language/da-DK/joomla.cli.ini
+++ b/installation/language/da-DK/joomla.cli.ini
@@ -1,5 +1,5 @@
 INSTL_ADMIN_EMAIL_DESC="Angiv e-mail adressen på webstedets superbruger"
-INSTL_ADMIN_EMAIL_DESC_SHORT="E-mailadressen til webstedts super bruger konto"
+INSTL_ADMIN_EMAIL_DESC_SHORT="E-mailadressen til webstedts superbruger konto"
 INSTL_ADMIN_PASSWORD_DESC="Angiv adgangskoden til din superbruger konto"
 INSTL_ADMIN_PASSWORD_DESC_SHORT="Adgangskode på din superbruger konto"
 INSTL_ADMIN_USERNAME_DESC="Sæt brugernavnet for din Superbruger konto"
diff --git a/installation/language/da-DK/joomla.ini b/installation/language/da-DK/joomla.ini
index c5ef87ec4f1f9..f94c25db8e954 100644
--- a/installation/language/da-DK/joomla.ini
+++ b/installation/language/da-DK/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Din host skal anvende PHP version {{phpversion}} eller
 BUILD_MIN_PHP_ERROR_URL_TEXT="Hjælp mig med at løse dette"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Skift installationssprog"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Skift"
+INSTL_SELECTED_INSTALL_LANGUAGE="Aktuelt sprog: %s"
 INSTL_SELECT_INSTALL_LANG="Vælg installationssprog"
 INSTL_SELECT_LANGUAGE_TITLE="Vælg sprog"
 INSTL_SETUP_LOGIN_DATA="Setup log på data"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="Din PHP installation skal have JSON aktiveret for at Joomla kan
 INSTL_DATABASE_SUPPORT="Database understøttelse:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON understøttelse"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB sprog er standard"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB strenge overload off"
 INSTL_NOTICE_DATABASE_SUPPORT="Ingen understøttet database blev fundet."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Din PHP installation skal have JSON aktiveret for at Joomla kan installeres!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring sprog er ikke sat til neutral. Dette kan indstilles lokalt ved at indtaste <strong>php_value mbstring.language neutral</strong> i <code>.htaccess</code>"
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload er indstillet. Dette kan deaktiveres lokalt ved at indtaste <strong>php_value mbstring.func_overload 0</strong> i <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="De krævede php funktioner <code>parse_ini_file</code> og <code>parse_ini_string</code> er deaktiverede på din server."
 INSTL_NOTICE_XML_SUPPORT="XML understøttelse er ikke tilgængelig. Dette burde være aktiveret som standard i php, men Ubuntu brugere skal måske installere det, ved at køre <code>sudo apt-get install php-xml</code> efterfulgt af en genstart af  webserveren."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib komprimering er ikke sat. Dette kan aktiveres lokalt ved at indsætte <strong>zlib.output_compression = On</strong> i din <code>php.ini</code> fil."
diff --git a/installation/language/da-DK/langmetadata.xml b/installation/language/da-DK/langmetadata.xml
index 46bbe14af2c5a..988c634001991 100644
--- a/installation/language/da-DK/langmetadata.xml
+++ b/installation/language/da-DK/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Danish (Danmark)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Danish Translation Team (Transl.: Ronny Buelund)</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/de-AT/joomla.ini b/installation/language/de-AT/joomla.ini
index 5744da08c7e7d..3cf125503c3e9 100644
--- a/installation/language/de-AT/joomla.ini
+++ b/installation/language/de-AT/joomla.ini
@@ -33,6 +33,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Der Webserver muss die PHP-Version {{phpversion}} oder
 BUILD_MIN_PHP_ERROR_URL_TEXT="Weitere Informationen sind in der Dokumentation zu finden."
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Installationssprache ändern"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Ändern"
+INSTL_SELECTED_INSTALL_LANGUAGE="Aktuelle Sprache: %s"
 INSTL_SELECT_INSTALL_LANG="Installationssprache auswählen"
 INSTL_SELECT_LANGUAGE_TITLE="Sprachauswahl"
 INSTL_SETUP_LOGIN_DATA="Zugangsdaten einrichten"
@@ -43,13 +46,9 @@ INSTL_WARNJSON="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla insta
 INSTL_DATABASE_SUPPORT="Datenbankunterstützung:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON-Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="PHPs mbstring Spracheinstellung ist neutral"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="PHPs „mbstring function overload“ ist deaktiviert"
 INSTL_NOTICE_DATABASE_SUPPORT="Es wurden keine unterstützten Datenbanken gefunden."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla installiert werden kann."
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHPs mbstring Spracheinstellung ist nicht auf „neutral“ gesetzt. Dies kann lokal aktiviert werden, indem eine neue Zeile mit <strong>php_value mbstring.language neutral</strong> in die <code>.htaccess</code> Datei eingefügt wird."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHPs „mbstring function overload“ ist aktiviert. Dies kann lokal deaktiviert werden, indem eine neue Zeile mit <strong>php_value mbstring.func_overload 0</strong> in die <code>.htaccess</code> Datei eingefügt wird."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Die erforderlichen php-Funktionen <code>parse_ini_file</code> und <code>parse_ini_string</code> sind auf dem Webserver deaktiviert."
 INSTL_NOTICE_XML_SUPPORT="Die XML-Unterstützung ist nicht verfügbar. Dies sollte standardmäßig in php aktiviert sein, Ubuntu-Benutzer müssen möglicherweise durch Ausführen von <code>sudo apt-get install php-xml</code> die benötigten Pakete installieren, gefolgt von einem Neustart des Webservers."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Die Zlib-Kompression ist nicht aktiviert. Dies kann lokal aktiviert werden, indem eine neue Zeile mit <strong>zlib.output_compression = On</strong> in die <code>php.ini</code> Datei eingefügt wird."
@@ -166,7 +165,7 @@ INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla hat folgende Sprachen installiert. B
 INSTL_DEFAULTLANGUAGE_FRONTEND="Standard-Sprache: Website"
 INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla war es nicht möglich die Sprache als Standard festzulegen. Englisch wird daher als Standard-Sprache für die WEBSITE (Frontend) verwendet."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Die Sprache mit dem Sprach-Tag „%s“ wurde zur Standard-Sprache für die WEBSITE festgelegt."
-INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standardsprache konfigurieren"
+INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standardsprache festlegen"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Weitere Sprachen können auch noch später in der Administration von Joomla installiert werden."
 
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Deutsch (Österreich)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
diff --git a/installation/language/de-AT/langmetadata.xml b/installation/language/de-AT/langmetadata.xml
index 938288898b513..5c77b315fe049 100644
--- a/installation/language/de-AT/langmetadata.xml
+++ b/installation/language/de-AT/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Austria)</name>
-	<version>5.4.3</version>
-	<creationDate>2026-02</creationDate>
+	<version>6.1.0</version>
+	<creationDate>2026-04</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/installation/language/de-CH/joomla.ini b/installation/language/de-CH/joomla.ini
index 8681abcefd93c..01425cd2c87e1 100644
--- a/installation/language/de-CH/joomla.ini
+++ b/installation/language/de-CH/joomla.ini
@@ -33,6 +33,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Der Webserver muss die PHP-Version {{phpversion}} oder
 BUILD_MIN_PHP_ERROR_URL_TEXT="Weitere Informationen sind in der Dokumentation zu finden."
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Installationssprache ändern"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Ändern"
+INSTL_SELECTED_INSTALL_LANGUAGE="Aktuelle Sprache: %s"
 INSTL_SELECT_INSTALL_LANG="Installationssprache auswählen"
 INSTL_SELECT_LANGUAGE_TITLE="Sprachauswahl"
 INSTL_SETUP_LOGIN_DATA="Zugangsdaten einrichten"
@@ -43,13 +46,9 @@ INSTL_WARNJSON="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla insta
 INSTL_DATABASE_SUPPORT="Datenbankunterstützung:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON-Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="PHPs mbstring Spracheinstellung ist neutral"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="PHPs „mbstring function overload“ ist deaktiviert"
 INSTL_NOTICE_DATABASE_SUPPORT="Es wurden keine unterstützten Datenbanken gefunden."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla installiert werden kann."
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHPs mbstring Spracheinstellung ist nicht auf „neutral“ gesetzt. Dies kann lokal aktiviert werden, indem eine neue Zeile mit <strong>php_value mbstring.language neutral</strong> in die <code>.htaccess</code> Datei eingefügt wird."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHPs „mbstring function overload“ ist aktiviert. Dies kann lokal deaktiviert werden, indem eine neue Zeile mit <strong>php_value mbstring.func_overload 0</strong> in die <code>.htaccess</code> Datei eingefügt wird."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Die erforderlichen php-Funktionen <code>parse_ini_file</code> und <code>parse_ini_string</code> sind auf dem Webserver deaktiviert."
 INSTL_NOTICE_XML_SUPPORT="Die XML-Unterstützung ist nicht verfügbar. Dies sollte standardmässig in php aktiviert sein, Ubuntu-Benutzer müssen möglicherweise durch Ausführen von <code>sudo apt-get install php-xml</code> die benötigten Pakete installieren, gefolgt von einem Neustart des Webservers."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Die Zlib-Kompression ist nicht aktiviert. Dies kann lokal aktiviert werden, indem eine neue Zeile mit <strong>zlib.output_compression = On</strong> in die <code>php.ini</code> Datei eingefügt wird."
@@ -166,7 +165,7 @@ INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla hat folgende Sprachen installiert. B
 INSTL_DEFAULTLANGUAGE_FRONTEND="Standard-Sprache: Website"
 INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla war es nicht möglich die Sprache als Standard festzulegen. Englisch wird daher als Standard-Sprache für die WEBSITE (Frontend) verwendet."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Die Sprache mit dem Sprach-Tag „%s“ wurde zur Standard-Sprache für die WEBSITE festgelegt."
-INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standardsprache konfigurieren"
+INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standardsprache festlegen"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Weitere Sprachen können auch noch später in der Administration von Joomla installiert werden."
 
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Deutsch (Schweiz)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
diff --git a/installation/language/de-CH/langmetadata.xml b/installation/language/de-CH/langmetadata.xml
index 704724b5e1365..22078e82315f5 100644
--- a/installation/language/de-CH/langmetadata.xml
+++ b/installation/language/de-CH/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Switzerland)</name>
-	<version>5.4.3</version>
-	<creationDate>2026-02</creationDate>
+	<version>6.1.0</version>
+	<creationDate>2026-04</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/installation/language/de-DE/joomla.ini b/installation/language/de-DE/joomla.ini
index db57e43c9fb47..8e4297eb6faa4 100644
--- a/installation/language/de-DE/joomla.ini
+++ b/installation/language/de-DE/joomla.ini
@@ -33,6 +33,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Der Webserver muss die PHP-Version {{phpversion}} oder
 BUILD_MIN_PHP_ERROR_URL_TEXT="Weitere Informationen sind in der Dokumentation zu finden."
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Installationssprache ändern"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Ändern"
+INSTL_SELECTED_INSTALL_LANGUAGE="Aktuelle Sprache: %s"
 INSTL_SELECT_INSTALL_LANG="Installationssprache auswählen"
 INSTL_SELECT_LANGUAGE_TITLE="Sprachauswahl"
 INSTL_SETUP_LOGIN_DATA="Zugangsdaten einrichten"
@@ -43,13 +46,9 @@ INSTL_WARNJSON="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla insta
 INSTL_DATABASE_SUPPORT="Datenbankunterstützung:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON-Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="PHPs mbstring Spracheinstellung ist neutral"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="PHPs „mbstring function overload“ ist deaktiviert"
 INSTL_NOTICE_DATABASE_SUPPORT="Es wurden keine unterstützten Datenbanken gefunden."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla installiert werden kann."
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHPs mbstring Spracheinstellung ist nicht auf „neutral“ gesetzt. Dies kann lokal aktiviert werden, indem eine neue Zeile mit <strong>php_value mbstring.language neutral</strong> in die <code>.htaccess</code> Datei eingefügt wird."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHPs „mbstring function overload“ ist aktiviert. Dies kann lokal deaktiviert werden, indem eine neue Zeile mit <strong>php_value mbstring.func_overload 0</strong> in die <code>.htaccess</code> Datei eingefügt wird."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Die erforderlichen php-Funktionen <code>parse_ini_file</code> und <code>parse_ini_string</code> sind auf dem Webserver deaktiviert."
 INSTL_NOTICE_XML_SUPPORT="Die XML-Unterstützung ist nicht verfügbar. Dies sollte standardmäßig in php aktiviert sein, Ubuntu-Benutzer müssen möglicherweise durch Ausführen von <code>sudo apt-get install php-xml</code> die benötigten Pakete installieren, gefolgt von einem Neustart des Webservers."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Die Zlib-Kompression ist nicht aktiviert. Dies kann lokal aktiviert werden, indem eine neue Zeile mit <strong>zlib.output_compression = On</strong> in die <code>php.ini</code> Datei eingefügt wird."
@@ -166,7 +165,7 @@ INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla hat folgende Sprachen installiert. B
 INSTL_DEFAULTLANGUAGE_FRONTEND="Standard-Sprache: Website"
 INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla war es nicht möglich die Sprache als Standard festzulegen. Englisch wird daher als Standard-Sprache für die WEBSITE (Frontend) verwendet."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Die Sprache mit dem Sprach-Tag „%s“ wurde zur Standard-Sprache für die WEBSITE festgelegt."
-INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standardsprache konfigurieren"
+INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standardsprache festlegen"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Weitere Sprachen können auch noch später in der Administration von Joomla installiert werden."
 
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Deutsch (Deutschland)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
diff --git a/installation/language/de-DE/langmetadata.xml b/installation/language/de-DE/langmetadata.xml
index 484356e498de9..40cf7bd342333 100644
--- a/installation/language/de-DE/langmetadata.xml
+++ b/installation/language/de-DE/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Germany)</name>
-	<version>5.4.3</version>
-	<creationDate>2026-02</creationDate>
+	<version>6.1.0</version>
+	<creationDate>2026-04</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/installation/language/de-LI/joomla.ini b/installation/language/de-LI/joomla.ini
index 303eca95ea53f..d167e53f9d5b0 100644
--- a/installation/language/de-LI/joomla.ini
+++ b/installation/language/de-LI/joomla.ini
@@ -33,6 +33,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Der Webserver muss die PHP-Version {{phpversion}} oder
 BUILD_MIN_PHP_ERROR_URL_TEXT="Weitere Informationen sind in der Dokumentation zu finden."
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Installationssprache ändern"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Ändern"
+INSTL_SELECTED_INSTALL_LANGUAGE="Aktuelle Sprache: %s"
 INSTL_SELECT_INSTALL_LANG="Installationssprache auswählen"
 INSTL_SELECT_LANGUAGE_TITLE="Sprachauswahl"
 INSTL_SETUP_LOGIN_DATA="Zugangsdaten einrichten"
@@ -43,13 +46,9 @@ INSTL_WARNJSON="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla insta
 INSTL_DATABASE_SUPPORT="Datenbankunterstützung:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON-Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="PHPs mbstring Spracheinstellung ist neutral"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="PHPs „mbstring function overload“ ist deaktiviert"
 INSTL_NOTICE_DATABASE_SUPPORT="Es wurden keine unterstützten Datenbanken gefunden."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla installiert werden kann."
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHPs mbstring Spracheinstellung ist nicht auf „neutral“ gesetzt. Dies kann lokal aktiviert werden, indem eine neue Zeile mit <strong>php_value mbstring.language neutral</strong> in die <code>.htaccess</code> Datei eingefügt wird."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHPs „mbstring function overload“ ist aktiviert. Dies kann lokal deaktiviert werden, indem eine neue Zeile mit <strong>php_value mbstring.func_overload 0</strong> in die <code>.htaccess</code> Datei eingefügt wird."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Die erforderlichen php-Funktionen <code>parse_ini_file</code> und <code>parse_ini_string</code> sind auf dem Webserver deaktiviert."
 INSTL_NOTICE_XML_SUPPORT="Die XML-Unterstützung ist nicht verfügbar. Dies sollte standardmässig in php aktiviert sein, Ubuntu-Benutzer müssen möglicherweise durch Ausführen von <code>sudo apt-get install php-xml</code> die benötigten Pakete installieren, gefolgt von einem Neustart des Webservers."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Die Zlib-Kompression ist nicht aktiviert. Dies kann lokal aktiviert werden, indem eine neue Zeile mit <strong>zlib.output_compression = On</strong> in die <code>php.ini</code> Datei eingefügt wird."
@@ -166,7 +165,7 @@ INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla hat folgende Sprachen installiert. B
 INSTL_DEFAULTLANGUAGE_FRONTEND="Standard-Sprache: Website"
 INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla war es nicht möglich die Sprache als Standard festzulegen. Englisch wird daher als Standard-Sprache für die WEBSITE (Frontend) verwendet."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Die Sprache mit dem Sprach-Tag „%s“ wurde zur Standard-Sprache für die WEBSITE festgelegt."
-INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standardsprache konfigurieren"
+INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standardsprache festlegen"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Weitere Sprachen können auch noch später in der Administration von Joomla installiert werden."
 
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Deutsch (Liechtenstein)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
diff --git a/installation/language/de-LI/langmetadata.xml b/installation/language/de-LI/langmetadata.xml
index 4282b03d9cb4e..c5ec5d316999a 100644
--- a/installation/language/de-LI/langmetadata.xml
+++ b/installation/language/de-LI/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Liechtenstein)</name>
-	<version>5.4.3</version>
-	<creationDate>2026-02</creationDate>
+	<version>6.1.0</version>
+	<creationDate>2026-04</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/installation/language/de-LU/joomla.ini b/installation/language/de-LU/joomla.ini
index adfe834dab380..0633b8bc928b8 100644
--- a/installation/language/de-LU/joomla.ini
+++ b/installation/language/de-LU/joomla.ini
@@ -33,6 +33,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Der Webserver muss die PHP-Version {{phpversion}} oder
 BUILD_MIN_PHP_ERROR_URL_TEXT="Weitere Informationen sind in der Dokumentation zu finden."
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Installationssprache ändern"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Ändern"
+INSTL_SELECTED_INSTALL_LANGUAGE="Aktuelle Sprache: %s"
 INSTL_SELECT_INSTALL_LANG="Installationssprache auswählen"
 INSTL_SELECT_LANGUAGE_TITLE="Sprachauswahl"
 INSTL_SETUP_LOGIN_DATA="Zugangsdaten einrichten"
@@ -43,13 +46,9 @@ INSTL_WARNJSON="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla insta
 INSTL_DATABASE_SUPPORT="Datenbankunterstützung:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON-Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="PHPs mbstring Spracheinstellung ist neutral"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="PHPs „mbstring function overload“ ist deaktiviert"
 INSTL_NOTICE_DATABASE_SUPPORT="Es wurden keine unterstützten Datenbanken gefunden."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="In der PHP-Umgebung muss JSON aktiviert sein, damit Joomla installiert werden kann."
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHPs mbstring Spracheinstellung ist nicht auf „neutral“ gesetzt. Dies kann lokal aktiviert werden, indem eine neue Zeile mit <strong>php_value mbstring.language neutral</strong> in die <code>.htaccess</code> Datei eingefügt wird."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHPs „mbstring function overload“ ist aktiviert. Dies kann lokal deaktiviert werden, indem eine neue Zeile mit <strong>php_value mbstring.func_overload 0</strong> in die <code>.htaccess</code> Datei eingefügt wird."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Die erforderlichen php-Funktionen <code>parse_ini_file</code> und <code>parse_ini_string</code> sind auf dem Webserver deaktiviert."
 INSTL_NOTICE_XML_SUPPORT="Die XML-Unterstützung ist nicht verfügbar. Dies sollte standardmäßig in php aktiviert sein, Ubuntu-Benutzer müssen möglicherweise durch Ausführen von <code>sudo apt-get install php-xml</code> die benötigten Pakete installieren, gefolgt von einem Neustart des Webservers."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Die Zlib-Kompression ist nicht aktiviert. Dies kann lokal aktiviert werden, indem eine neue Zeile mit <strong>zlib.output_compression = On</strong> in die <code>php.ini</code> Datei eingefügt wird."
@@ -166,7 +165,7 @@ INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla hat folgende Sprachen installiert. B
 INSTL_DEFAULTLANGUAGE_FRONTEND="Standard-Sprache: Website"
 INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla war es nicht möglich die Sprache als Standard festzulegen. Englisch wird daher als Standard-Sprache für die WEBSITE (Frontend) verwendet."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Die Sprache mit dem Sprach-Tag „%s“ wurde zur Standard-Sprache für die WEBSITE festgelegt."
-INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standardsprache konfigurieren"
+INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standardsprache festlegen"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Weitere Sprachen können auch noch später in der Administration von Joomla installiert werden."
 
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Deutsch (Luxemburg)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
diff --git a/installation/language/de-LU/langmetadata.xml b/installation/language/de-LU/langmetadata.xml
index 3712504e0c10b..726e786948dd8 100644
--- a/installation/language/de-LU/langmetadata.xml
+++ b/installation/language/de-LU/langmetadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>German (Luxembourg)</name>
-	<version>5.4.3</version>
-	<creationDate>2026-02</creationDate>
+	<version>6.1.0</version>
+	<creationDate>2026-04</creationDate>
 	<author>J!German</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
diff --git a/installation/language/el-GR/joomla.ini b/installation/language/el-GR/joomla.ini
index 40bd7949bff33..1c422c8eb6882 100644
--- a/installation/language/el-GR/joomla.ini
+++ b/installation/language/el-GR/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Ο διακομιστής πρέπει να διαθέ
 BUILD_MIN_PHP_ERROR_URL_TEXT="Βοήθεια για την επίλυση"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Αλλαγή Θέσης"
 INSTL_SELECT_INSTALL_LANG="Επιλέξτε Γλώσσα Εγκατάστασης"
 INSTL_SELECT_LANGUAGE_TITLE="Επιλογή γλώσσας"
 INSTL_SETUP_LOGIN_DATA="Ρύθμιση Δεδομένων Σύνδεσης"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Η εγκατάσταση PHP πρέπει να έχει ενε
 INSTL_DATABASE_SUPPORT="Υποστήριξη Βάσης Δεδομένων:"
 INSTL_JSON_SUPPORT_AVAILABLE="Υποστήριξη JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Η γλώσσα MB είναι προεπιλεγμένη"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload απενεργοποιημένο"
 INSTL_NOTICE_DATABASE_SUPPORT="Δεν βρέθηκαν βάσεις δεδομένων που υποστηρίζονται."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Η εγκατάσταση PHP πρέπει να έχει ενεργοποιημένη την JSON για να εγκατασταθεί το Joomla!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="Η γλώσσα PHP mbstring δεν ορίστηκε σαν ουδέτερη. Αυτό μπορεί να οριστεί τοπικά γράφοντας <strong>php_value mbstring.language neutral</strong> στο αρχείο <code>.htaccess</code> ."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Η λειτουργία υπερφόρτωσης για την PHP mbstring έχει οριστεί. Αυτή μπορεί να απενεργοποιηθεί γράφοντας <strong>php_value mbstring.func_overload 0</strong> στο αρχείο <code>.htaccess</code> ."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Οι απαιτούμενες php συναρτήσεις <code>parse_ini_file</code> και <code>parse_ini_string</code> είναι απενεργοποιημένες στον διακομιστή σας."
 INSTL_NOTICE_XML_SUPPORT="XML υποστήριξη δεν είναι διαθέσιμη. Αυτό πρέπει να είναι ενεργοποιημένο από προεπιλογή στην php, αλλά οι χρήστες Ubuntu μπορεί να χρειαστεί να το εγκαταστήσουν κάνοντας <code>sudo apt-get εγκατάσταση php-xml</code> και στη συνέχεια επανεκκίνηση του διακομιστή ιστού."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Η συμπίεση Zlib δεν έχει οριστεί. Αυτό μπορεί να ενεργοποιηθεί τοπικά εισάγοντας <strong>zlib.output_compression = On</strong> στο αρχείο <code>php.ini</code>."
@@ -222,7 +219,7 @@ INSTL_WRITABLE="Ανεπαρκή δικαιώματα για τη δημιουρ
 INSTL_ZIP_SUPPORT_AVAILABLE="Ενσωματωμένη υποστήριξη ZIP"
 
 ; Global strings
-JADMINISTRATOR="Περιοχή Διαχείρισης"
+JADMINISTRATOR="Διαχειριστής"
 JCLOSE="Κλείσιμο"
 JEMAIL="Email"
 JERROR="Σφάλμα"
@@ -236,7 +233,7 @@ JHIDEPASSWORD="Απόκρυψη κωδικού"
 JINVALID_TOKEN="Το πιο πρόσφατο αίτημα απορρίφθηκε επειδή περιείχε μη έγκυρο διακριτικό ασφαλείας. Ανανεώστε τη σελίδα και ξαναπροσπαθήστε."
 JINVALID_TOKEN_NOTICE="Το διακριτικό ασφαλείας δεν ταιριάζει. Το αίτημα ματαιώθηκε για την αποφυγή οποιασδήποτε παραβίασης ασφαλείας. Παρακαλώ δοκιμάστε ξανά."
 JNEXT="Επόμενο"
-JNO="Όχι"
+JNO="Ποτέ"
 JNOTICE="Ειδοποίηση"
 JOFF="Απενεργοποιημένο"
 JON="Ενεργοποιημένο"
@@ -257,7 +254,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Η διαδρομή δεν ε
 JLIB_FORM_FIELD_INVALID="Μη έγκυρο πεδίο:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Άκυρο πεδίο: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Υποχρεωτικό πεδίο: %s"
-JLIB_INSTALLER_ABORT="Η εγκατάσταση τη γλώσσας διακόπηκε: %s"
+JLIB_INSTALLER_ABORT="Η εγκατάσταση τη γλωσσας ματαιώθηκε: %s"
 JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Επέκταση %1$s: Αποτυχία δημιουργίας καταλόγου: %2$s"
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="Η διαδρομή εγκατάστασης δεν υπάρχει"
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Πακέτο %1$s: Προέκυψε σφάλμα κατά την εγκατάσταση μιας επέκτασης: %2$s."
diff --git a/installation/language/el-GR/langmetadata.xml b/installation/language/el-GR/langmetadata.xml
index 033501ca44f22..c59cd69b3e020 100644
--- a/installation/language/el-GR/langmetadata.xml
+++ b/installation/language/el-GR/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Greek (el-GR)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Ομάδα Μετάφρασης: joomla. gr</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/en-AU/joomla.ini b/installation/language/en-AU/joomla.ini
index be52437d6c519..d66e6bc6942d0 100644
--- a/installation/language/en-AU/joomla.ini
+++ b/installation/language/en-AU/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Your host needs to use PHP version {{phpversion}} or n
 BUILD_MIN_PHP_ERROR_URL_TEXT="Help me resolve this"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Change"
 INSTL_SELECT_INSTALL_LANG="Select Installation Language"
 INSTL_SELECT_LANGUAGE_TITLE="Select Language"
 INSTL_SETUP_LOGIN_DATA="Setup Login Data"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to b
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="No supported databases were found."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Your PHP installation needs to have JSON enabled for Joomla to be installed!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="The required php functions <code>parse_ini_file</code> and <code>parse_ini_string</code> are disabled on your server."
 INSTL_NOTICE_XML_SUPPORT="XML Support is not available. This should be enabled by default in php but Ubuntu users may need to install this by doing <code>sudo apt-get install php-xml</code> followed by web server restart."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression is not set. This can be turned on locally by entering <strong>zlib.output_compression = On</strong> in your <code>php.ini</code> file."
diff --git a/installation/language/en-AU/langmetadata.xml b/installation/language/en-AU/langmetadata.xml
index 7e9919aaaff6b..65d398297cc83 100644
--- a/installation/language/en-AU/langmetadata.xml
+++ b/installation/language/en-AU/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (Australia)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/en-CA/joomla.ini b/installation/language/en-CA/joomla.ini
index dea34bbe498ca..3b6f824d0e94f 100644
--- a/installation/language/en-CA/joomla.ini
+++ b/installation/language/en-CA/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Your host needs to use PHP version {{phpversion}} or n
 BUILD_MIN_PHP_ERROR_URL_TEXT="Help me resolve this"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Change"
 INSTL_SELECT_INSTALL_LANG="Select Installation Language"
 INSTL_SELECT_LANGUAGE_TITLE="Select Language"
 INSTL_SETUP_LOGIN_DATA="Setup Login Data"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to b
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="No supported databases were found."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Your PHP installation needs to have JSON enabled for Joomla to be installed!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="The required php functions <code>parse_ini_file</code> and <code>parse_ini_string</code> are disabled on your server."
 INSTL_NOTICE_XML_SUPPORT="XML Support is not available. This should be enabled by default in php but Ubuntu users may need to install this by doing <code>sudo apt-get install php-xml</code> followed by web server restart."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression is not set. This can be turned on locally by entering <strong>zlib.output_compression = On</strong> in your <code>php.ini</code> file."
diff --git a/installation/language/en-CA/langmetadata.xml b/installation/language/en-CA/langmetadata.xml
index a995a8d7ed8a5..24345eb98f59e 100644
--- a/installation/language/en-CA/langmetadata.xml
+++ b/installation/language/en-CA/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (Canada)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini
index d11f18d0ea0d2..1dab713f8d58c 100644
--- a/installation/language/en-GB/joomla.ini
+++ b/installation/language/en-GB/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Your host needs to use PHP version {{phpversion}} or n
 BUILD_MIN_PHP_ERROR_URL_TEXT="Help me resolve this"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Change Installation Language"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Change"
+INSTL_SELECTED_INSTALL_LANGUAGE="Current language: %s"
 INSTL_SELECT_INSTALL_LANG="Select Installation Language"
 INSTL_SELECT_LANGUAGE_TITLE="Select Language"
 INSTL_SETUP_LOGIN_DATA="Setup Login Data"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to b
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="No supported databases were found."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Your PHP installation needs to have JSON enabled for Joomla to be installed!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="The required php functions <code>parse_ini_file</code> and <code>parse_ini_string</code> are disabled on your server."
 INSTL_NOTICE_XML_SUPPORT="XML Support is not available. This should be enabled by default in php but Ubuntu users may need to install this by doing <code>sudo apt-get install php-xml</code> followed by web server restart."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression is not set. This can be turned on locally by entering <strong>zlib.output_compression = On</strong> in your <code>php.ini</code> file."
diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml
index 9fad925d682ae..51ddea2a6deab 100644
--- a/installation/language/en-GB/langmetadata.xml
+++ b/installation/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (United Kingdom)</name>
-	<version>5.4.8</version>
+	<version>6.2.0</version>
 	<creationDate>2026-08</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/en-NZ/joomla.ini b/installation/language/en-NZ/joomla.ini
index 381447fc911f4..5073ec443417c 100644
--- a/installation/language/en-NZ/joomla.ini
+++ b/installation/language/en-NZ/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Your host needs to use PHP version {{phpversion}} or n
 BUILD_MIN_PHP_ERROR_URL_TEXT="Help me resolve this"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Change"
 INSTL_SELECT_INSTALL_LANG="Select Installation Language"
 INSTL_SELECT_LANGUAGE_TITLE="Select Language"
 INSTL_SETUP_LOGIN_DATA="Setup Login Data"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to b
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="No supported databases were found."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Your PHP installation needs to have JSON enabled for Joomla to be installed!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="The required php functions <code>parse_ini_file</code> and <code>parse_ini_string</code> are disabled on your server."
 INSTL_NOTICE_XML_SUPPORT="XML Support is not available. This should be enabled by default in php but Ubuntu users may need to install this by doing <code>sudo apt-get install php-xml</code> followed by web server restart."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression is not set. This can be turned on locally by entering <strong>zlib.output_compression = On</strong> in your <code>php.ini</code> file."
diff --git a/installation/language/en-NZ/langmetadata.xml b/installation/language/en-NZ/langmetadata.xml
index bcfc6fff69de1..0b3205462e423 100644
--- a/installation/language/en-NZ/langmetadata.xml
+++ b/installation/language/en-NZ/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (New Zealand)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/en-US/joomla.ini b/installation/language/en-US/joomla.ini
index bdca6ea745c12..46904ba170ea4 100644
--- a/installation/language/en-US/joomla.ini
+++ b/installation/language/en-US/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Your host needs to use PHP version {{phpversion}} or n
 BUILD_MIN_PHP_ERROR_URL_TEXT="Help me resolve this"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Change"
 INSTL_SELECT_INSTALL_LANG="Select Installation Language"
 INSTL_SELECT_LANGUAGE_TITLE="Select Language"
 INSTL_SETUP_LOGIN_DATA="Setup Login Data"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to b
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="No supported databases were found."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Your PHP installation needs to have JSON enabled for Joomla to be installed!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="The required php functions <code>parse_ini_file</code> and <code>parse_ini_string</code> are disabled on your server."
 INSTL_NOTICE_XML_SUPPORT="XML Support is not available. This should be enabled by default in php but Ubuntu users, may need to install by doing <code>sudo apt-get install php-xml</code> followed by web server restart."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression is not set. This can be turned on locally by entering <strong>zlib.output_compression = On</strong> in your <code>php.ini</code> file."
@@ -240,9 +237,9 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="Select some options"
 JGLOBAL_SELECT_SOME_OPTIONS="Select some options"
 JHIDEPASSWORD="Hide Password"
 JINVALID_TOKEN="The most recent request was denied because it contained an invalid security token. Please refresh the page and try again."
-JINVALID_TOKEN_NOTICE="The security token did not match. The request was cancelled to prevent any security breach. Please try again."
+JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
 JNEXT="Next"
-JNO="No"
+JNO="Never"
 JNOTICE="Notice"
 JOFF="Off"
 JON="On"
@@ -263,7 +260,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Path is not a folder. Path: %2
 JLIB_FORM_FIELD_INVALID="Invalid field:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Invalid field: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s"
-JLIB_INSTALLER_ABORT="Stopping language installation: %s"
+JLIB_INSTALLER_ABORT="Aborting language installation: %s"
 JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extension %1$s: Failed to create folder: %2$s"
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="Install path does not exist."
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Package %1$s: There was an error installing an extension: %2$s"
@@ -304,7 +301,7 @@ NOTICE="Notice"
 WARNING="Warning"
 
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection error has occurred while fetching the JSON data."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A connection abort has occured while fetching the JSON data."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="No content was returned."
 JLIB_JS_AJAX_ERROR_OTHER="An error has occurred while fetching the JSON data: HTTP %d status code."
 JLIB_JS_AJAX_ERROR_PARSE="A parse error has occurred while processing the following JSON data:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
diff --git a/installation/language/en-US/langmetadata.xml b/installation/language/en-US/langmetadata.xml
index a9db4e0137c1c..6d93257a79f93 100644
--- a/installation/language/en-US/langmetadata.xml
+++ b/installation/language/en-US/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>English (United States)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/es-ES/joomla.cli.ini b/installation/language/es-ES/joomla.cli.ini
index c93e3f8039a57..898e59bccd2ee 100644
--- a/installation/language/es-ES/joomla.cli.ini
+++ b/installation/language/es-ES/joomla.cli.ini
@@ -1,19 +1,19 @@
 INSTL_ADMIN_EMAIL_DESC="Introduzca una dirección de correo electrónico. Debe ser la dirección de correo electrónico del súper administrador del sitio"
-INSTL_ADMIN_EMAIL_DESC_SHORT="Dirección de correo electrónico de la cuenta de Superusuario del sitio web"
+INSTL_ADMIN_EMAIL_DESC_SHORT="Dirección de correo electrónico de la cuenta Super Usuario del sitio web"
 INSTL_ADMIN_PASSWORD_DESC="Asigne la contraseña de la cuenta del súper administrador y confírmela en el campo de más abajo"
-INSTL_ADMIN_PASSWORD_DESC_SHORT="Contraseña de la cuenta de superusuario"
+INSTL_ADMIN_PASSWORD_DESC_SHORT="Contraseña de su cuenta de Super Usuario"
 INSTL_ADMIN_USERNAME_DESC="Establezca el nombre de usuario para su cuenta de superusuario"
-INSTL_ADMIN_USERNAME_DESC_SHORT="Nombre de usuario de su cuenta de superusuario"
+INSTL_ADMIN_USERNAME_DESC_SHORT="Nombre de usuario de su cuenta de Super Usuario"
 INSTL_ADMIN_USER_DESC="Asigna el nombre de usuario para su cuenta de súper administrador"
-INSTL_ADMIN_USER_DESC_SHORT="Nombre real de la cuenta de superusuario"
+INSTL_ADMIN_USER_DESC_SHORT="Nombre real de la cuenta de Super Usuario"
 INSTL_DATABASE_COULD_NOT_CONNECT="%s"
-INSTL_DATABASE_ENCRYPTION_CA_LABEL="Ruta al archivo CA para verificar el cifrado"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL="Ruta al archivo CA contra el que verificar el cifrado"
 INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Ruta al archivo CA contra el que verificar el cifrado"
-INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Ruta al certificado SSL para la conexión con la base de datos. Requiere que el cifrado esté establecido en 2"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Ruta al certificado SSL para la conexión a la base de datos. Requiere que el cifrado se establezca en 2"
 INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Ruta al certificado SSL para la conexión a la base de datos. Requiere que el cifrado se establezca en 2"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Paquete de cifrado soportado (opcional)"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Paquete de cifrado soportado (opcional)"
-INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Clave SSL para la conexión con la base de datos. Requiere que el cifrado esté establecido en 2"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Clave SSL para la conexión a la base de datos. Requiere que el cifrado se establezca en 2"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="Clave SSL para la conexión a la base de datos. Requiere que el cifrado se establezca en 2"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Cifrado para la conexión a la base de datos. Valores: 0=Ninguno, 1=Unidireccional, 2=Bidireccional"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Cifrado para la conexión a la base de datos. Valores: 0=Ninguno, 1=Unidireccional, 2=Bidireccional"
diff --git a/installation/language/es-ES/joomla.ini b/installation/language/es-ES/joomla.ini
index 650f222970ec4..b9805c22ba487 100644
--- a/installation/language/es-ES/joomla.ini
+++ b/installation/language/es-ES/joomla.ini
@@ -6,49 +6,46 @@
 ; Fatal error page
 ; These will be processed by the JavaScript Build
 BUILD_FATAL_HEADER="Lo sentimos, hubo un problema del que no pudimos recuperarnos."
-BUILD_FATAL_LANGUAGE="Español ES" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
+BUILD_FATAL_LANGUAGE="English GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_FATAL_TEXT="El servidor devuelve un \"{{statusCode_statusText}}\""
 BUILD_FATAL_URL_TEXT="Ayúdeme a resolver esto"
 
 ; Build incomplete error page
 ; These will be processed by the JavaScript Build
 BUILD_INCOMPLETE_HEADER="Configuración del entorno de trabajo incompleta"
-BUILD_INCOMPLETE_LANGUAGE="Español ES" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
+BUILD_INCOMPLETE_LANGUAGE="English GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_INCOMPLETE_TEXT="Parece que está intentando ejecutar Joomla! desde nuestro repositorio en Git. Para hacerlo, primero debe completar un par de pasos adicionales."
 BUILD_INCOMPLETE_URL_TEXT="Más detalles"
 
 ; No XML PHP error page
 ; These will be processed by the JavaScript Build
 BUILD_NOXML_HEADER="Lo sentimos, a su PHP le falta una biblioteca esencial"
-BUILD_NOXML_LANGUAGE="Español ES" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
+BUILD_NOXML_LANGUAGE="English GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_NOXML_TEXT="Su hospedaje necesita usar PHP con soporte para la biblioteca XML y así poder ejecutar esta versión de Joomla!"
 BUILD_NOXML_URL_TEXT="Ayúdeme a resolver esto"
 
 ; Minimum PHP error page
 ; These will be processed by the JavaScript Build
 BUILD_MIN_PHP_ERROR_HEADER="Lo sentimos, su versión de PHP no es compatible."
-BUILD_MIN_PHP_ERROR_LANGUAGE="Español ES" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
+BUILD_MIN_PHP_ERROR_LANGUAGE="English GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_MIN_PHP_ERROR_TEXT="Para poder usar esta versión de Joomla su hospedaje necesita usar la versión {{phpversion}} de PHP o superior."
 BUILD_MIN_PHP_ERROR_URL_TEXT="Ayúdeme a resolver esto"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Cambiar"
 INSTL_SELECT_INSTALL_LANG="Seleccione el idioma de instalación"
 INSTL_SELECT_LANGUAGE_TITLE="Seleccione el idioma"
 INSTL_SETUP_LOGIN_DATA="Configurar los datos de inicio de sesión"
 INSTL_WARNJAVASCRIPT="¡Advertencia! JavaScript debe estar habilitado para una correcta instalación de Joomla."
-INSTL_WARNJSON="¡Para que se pueda instalar Joomla su instalación de PHP necesita tener habilitado JSON!"
+INSTL_WARNJSON="Para que se pueda instalar Joomla su instalacción de PHP necesita tener habilitado JSON."
 
 ; Precheck view
 INSTL_DATABASE_SUPPORT="Soporte de la base de datos:"
 INSTL_JSON_SUPPORT_AVAILABLE="Soporte JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="El idioma de MB es el predeterminado"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="'MB String Overload' desactivado"
 INSTL_NOTICE_DATABASE_SUPPORT="No se encontraron bases de datos compatibles."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Para que se pueda instalar Joomla su instalacción de PHP necesita tener habilitado JSON."
 INSTL_NOTICE_MBLANG_NOTDEFAULT="El lenguaje de PHP mbstring no está configurado como neutral. Esto se puede configurar localmente introduciendo <strong>php_value mbstring.language neutral</strong> en su archivo <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="La sobrecarga de la función PHP mbstring está configurada. Esto se puede desactivar localmente introduciendo <strong>php_value mbstring.func_overload 0</strong> en su archivo <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Las funciones requeridas <code>parse_ini_file</code> y <code>parse_ini_string</code> están deshabilitadas en su servidor."
 INSTL_NOTICE_XML_SUPPORT="El soporte XML no está disponible. Esto debería estar habilitado de forma predeterminada en php, pero los usuarios de Ubuntu pueden necesitar instalar esto desde la consola con <code>sudo apt-get install php-xml</code> seguido del reinicio del servidor web."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="La compresión Zlib no está activada. Esto se puede activar localmente añadiendo <strong>zlib.output_compression = On</strong> en su archivo <code>.htaccess</code>."
@@ -242,7 +239,7 @@ JHIDEPASSWORD="Ocultar contraseña"
 JINVALID_TOKEN="Las solicitudes recientes han sido denegadas porque tenían un 'token' de seguridad inválido. Por favor, actualice la página e inténtelo de nuevo."
 JINVALID_TOKEN_NOTICE="El token de seguridad no coincidía. La solicitud se abortó para evitar cualquier violación de seguridad. Vuelve a intentarlo."
 JNEXT="Siguiente"
-JNO="No"
+JNO="Nunca"
 JNOTICE="Notificación"
 JOFF="Desactivado"
 JON="Activado"
diff --git a/installation/language/es-ES/langmetadata.xml b/installation/language/es-ES/langmetadata.xml
index 8878081d4cce9..db570206e0696 100644
--- a/installation/language/es-ES/langmetadata.xml
+++ b/installation/language/es-ES/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Spanish (es-ES)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Spanish [es-ES] Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
@@ -11,7 +11,7 @@
 	</files>
 	<metadata>
 		<name>Spanish (es-ES)</name>
-		<nativeName>Español (España)</nativeName>
+		<nativeName>Spanish (es-ES)</nativeName>
 		<tag>es-ES</tag>
 		<rtl>0</rtl>
 	</metadata>
diff --git a/installation/language/et-EE/joomla.ini b/installation/language/et-EE/joomla.ini
index 3ad5ece347458..8958d120484a5 100644
--- a/installation/language/et-EE/joomla.ini
+++ b/installation/language/et-EE/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Sinu veebimajutuse pakkuja peab kasutama PHP versiooni
 BUILD_MIN_PHP_ERROR_URL_TEXT="Aita mul seda lahendada"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Muuda"
 INSTL_SELECT_INSTALL_LANG="Vali paigalduse keel"
 INSTL_SELECT_LANGUAGE_TITLE="Vali keel"
 INSTL_SETUP_LOGIN_DATA="Sisesta sisselogimise info"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Et Joomlat saaks installida, peab sinu PHP-s olema JSON sisse l
 INSTL_DATABASE_SUPPORT="Andmebaasi tugi:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON tugi"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language on vaikeväärtus"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload on välja lülitatud"
 INSTL_NOTICE_DATABASE_SUPPORT="Ühtegi toetatud andmebaasi ei leitud."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Et Joomlat saaks installida, peab sinu PHP-s olema JSON sisse lülitatud!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language funktsioon pole pandud neutraalseks. Seda saab teha sisestades faili <code>.htaccess</code> rea <strong>php_value mbstring.language neutral</strong>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring overload funktsioon on sisse lülitatud. Selle saab välja sisestades faili <code>.htaccess</code> rida <strong>php_value mbstring.func_overload 0</strong>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Nõutud PHP funktsioonid <code>parse_ini_file</code> ja <code>parse_ini_string</code> on sinu serveris keelatud."
 INSTL_NOTICE_XML_SUPPORT="XML tugi pole saadaval. See peaks olema vaikimisi lubatud, aga Ubuntu serveris tuleb seda paigaldada käsuga <code>sudo apt-get install php-xml</code> ja siis server taaskäivitada."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib pakkimismeetod on määramata. Selle saab sisse lülitada sisestades <strong>zlib.output_compression = On</strong> sinu <code>php.ini</code> faili."
@@ -145,7 +142,6 @@ INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ei suutnud keelte serveriga ühendu
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Märkus: Sa saad keeled hiljem Joomla! adminiliidesest paigaldada."
 
 ; Automated Updates Opt Out
-INSTL_AUTOMATED_UPDATES="Automaatsed uuendused"
 INSTL_AUTOMATED_UPDATES_DESC="Joomla uuendab end automaatselt väikeste väljalasete ja parandusväljalasete korral.<br><br><strong>Palun pane tähele:</strong> automaatsed uuendused registreerivad sinu lehe Joomla! projekti hallatavas teenuses. See registreerimine võimaldab Joomla projektil saada teavet sinu lehe ja serveri keskkonna kohta, sealhulgas lehe URL, PHP versioon, andmebaasi tüüp ja versioon, CMS-i versioon ning serveri operatsioonisüsteemi tüüp ja versioon. Seda teavet kasutatakse ainult teenuse parandamiseks.<br><br>Soovi korral saad automaatsed uuendused alloleva nupu abil keelata."
 INSTL_AUTOMATED_UPDATES_DISABLE="Keela automaatsed uuendused"
 INSTL_COMPLETE_ERROR_AUTOMATED_UPDATES_DISABLE="Ei suutnud keelata automaatset uuendamist."
diff --git a/installation/language/et-EE/langmetadata.xml b/installation/language/et-EE/langmetadata.xml
index 0e186f0276e53..dbb787217aeee 100644
--- a/installation/language/et-EE/langmetadata.xml
+++ b/installation/language/et-EE/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Estonian</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/eu-ES/joomla.ini b/installation/language/eu-ES/joomla.ini
index 4302a87c0e689..be839c0f2d583 100644
--- a/installation/language/eu-ES/joomla.ini
+++ b/installation/language/eu-ES/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Zure ostalariak PHP bertsio hau {{phpversion}}  edo be
 BUILD_MIN_PHP_ERROR_URL_TEXT="Lagundu niri hau konpontzen"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Aldatu"
 INSTL_SELECT_INSTALL_LANG="Hautatu Instalazio Hizkuntza"
 INSTL_SELECT_LANGUAGE_TITLE="Hautatu Hizkuntza"
 INSTL_SETUP_LOGIN_DATA="Konfiguratu Saio-hasierako Datuak"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Zure PHP instalazioak JSON gaituta eduki behar du Joomla! instal
 INSTL_DATABASE_SUPPORT="Datu-base Laguntza:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Laguntza"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Hizkuntza da Lehenetsia"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload desgaituta"
 INSTL_NOTICE_DATABASE_SUPPORT="Ez da aurkitu datu-base bateragarririk."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Zure PHP instalazioak JSON gaituta eduki behar du Joomla! instalatu ahal izateko!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language ez dago jarrita neutral gisa jarrita. Hau ezar daiteke gunean bertan idatziz <strong>php_value mbstring.language neutral</strong> zure <code>.htaccess</code> fitxategian."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP 'mbstring function overload' gaituta dago. Hau desgaitu daiteke gunean bertan idatziz <strong>php_value mbstring.func_overload 0</strong> zure <code>.htaccess</code> fitxategian."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Beharrezko php funtzioak <code>parse_ini_file</code> eta <code>parse_ini_string</code> desgaituta daude zure zerbitzarian."
 INSTL_NOTICE_XML_SUPPORT="XML laguntza ez dago erabilgarri. Hau lehenetsita gaitu beharko litzateke php-n, baina Ubuntu erabiltzaileek instalatu beharko dute <code>sudo apt-get install php-xml</code> eginez eta ondoren web zerbitzaria berrabiarazteko."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib konpresioa ez dago ezarrita. Hau lokalki aktiba daiteke <strong>zlib.output_compression = On</strong> ezarrita zure <code>php.ini</code> fitxategian."
diff --git a/installation/language/eu-ES/langmetadata.xml b/installation/language/eu-ES/langmetadata.xml
index eef0198a374da..2ac11f84df959 100644
--- a/installation/language/eu-ES/langmetadata.xml
+++ b/installation/language/eu-ES/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Basque</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Basque Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/fa-AF/joomla.ini b/installation/language/fa-AF/joomla.ini
index 4a3318f6b882c..5d53f8d29b55d 100644
--- a/installation/language/fa-AF/joomla.ini
+++ b/installation/language/fa-AF/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="شما برای اجرای این نسخه از جوم
 BUILD_MIN_PHP_ERROR_URL_TEXT="برای حل این مشکل کمک کن"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="تغییر"
 INSTL_SELECT_INSTALL_LANG="زبان نصب را انتخاب کنید"
 INSTL_SELECT_LANGUAGE_TITLE="انتخاب لسان"
 INSTL_SETUP_LOGIN_DATA="تنظیمات اطلاعات ورود"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="برای نصب جوملا ، تابع JSON باید در PHP س
 INSTL_DATABASE_SUPPORT="پشتیبانی از دیتابیس:"
 INSTL_JSON_SUPPORT_AVAILABLE="پشتیبانی از JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language پیش‌فرض است"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload خاموش است"
 INSTL_NOTICE_DATABASE_SUPPORT="هیچ دیتابیسی که توسط جوملا پشتیبانی شود پیدا نشد."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="برای نصب جوملا ، تابع JSON باید در PHP سرور شما فعال باشد!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="متغیر  MB String در پی اچ پی تنظیم نشده است.می‌توانید این مورد را با وارد کردن  <strong>php_value mbstring.language neutral</strong> در فایل <code>.htaccess>/code> خود تنظیم کنید."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="متغییر mbstring overload در پی اچ پی تنظیم شده است. و می‌توانید با وارد کردن <strong>php_value mbstring.func_overload 0</storng> در فایل <code>.htaccess</code> آنرا غیر فعال کنید."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="توابع الزامی <code>parse_ini_file</code> و <code>parse_ini_string</code> باید روی سرور غیرفعال باشند."
 INSTL_NOTICE_XML_SUPPORT="پشتیبانی از XML در دسترس نیست. این مورد باید بصورت پیش‌فرض فعال باشد اما برای کاربران اوبونتو می‌توانید با دستور <code>sudo apt-get install php-xml</code> و ری‌استارت سرور این مورد را در php خود نصب کنید."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="قابلیت Zlib compression تعیین نشده است. شما می‌توانید بصورت محلی با وارد کردن <strong>zlib.output_compression = On</strong>در <code>php.ini</code> این قابلیت را فعال کنید."
@@ -74,10 +71,6 @@ INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="پیش‌فرض (کنترل شده‌
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="احراز هویت تک مرحله‌ای"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="احراز هویت دو مرحله‌ای"
 INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="شما رمزنگاری اتصال به دیتابیس را انتخاب کرده‌اید، و می‌توان این اتصال را برقرار کرد، اما این اتصال رمزنگاری نشده است. دلیل این اتفاق ممکن است از پیکربندی نادرست برای بازگشت یک اتصال رمزنگاری نشده از طرف سرور بابت پارامترهای رمزنگاری باشد. به همین منظور پارامترهای رمزنگاری دیتابیس را چک کنید یا فیلد مربوط به «رمزنگاری اتصال» را به حالت «پیش‌فرض (کنترل شده توسط سرور)» تغییر دهید."
-INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="فایل وارد شده در فیلد «%s» وجود ندارد یا در دسترس نیست."
-INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="فیلد \"%s\" خالی است یا شامل مسیر معتبر نیست."
-INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="شما نام هاست را «localhost» وارد کرده‌اید. اتصال به پایگاه داده با رمزگذاری اتصال ممکن است ناموفق باشد. برای این کار می‌توانید به جای عبارت «localhost» از «127.0.0.1» یا «::1» یا سایر نام هاست‌ها استفاده کنید یا اینکه «رمرزنگاری اتصال» را به حالت «پیش‌فرض (کنترل شده توسط سرور)» برگردانید."
-INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="سرور دیتابیس، از رمزنگاری اتصال پشتیبانی نمی‌کند. با فعالسازی TLS (که در مستندات به SSL از آن یاد شده) ممکن است مشکل حل شود، یا اینکه فیلد «رمزنگاری اتصال» را به «پیش‌فرض (کنترل توسط سرور)» تغییر دهید."
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="نمایش گواهینامه‌های سرور"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="کوئری پایگاه داده PostgreSQ ناموفق بود."
 INSTL_DATABASE_HOST_DESC="نام هاست را وارد کنید، معمولا «localhost» یا نامی که توسط هاست معرفی می‌شود است."
@@ -249,7 +242,6 @@ JYES="بلی"
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="اتصال به MYSQL ناموفق بود."
 JLIB_DATABASE_ERROR_DATABASE="خطایی در دیتابیس رخ داده است."
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="بارگذاری درایور دیتابیس امکان پذیر نیست: %s"
-JLIB_DATABASE_ERROR_VALID_MAIL="آدرس ایمیل وارد شده نامعتبر است. لطفاً از یک ایمیل دیگر استفاده کنید."
 JLIB_ENVIRONMENT_SESSION_EXPIRED="نشست شما منقضی شده است، لطفا صفحه را (Reload) مجدداً بارگزاری کنید."
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: مسیر شامل پوشه نیست. مسیر: %2$s"
 JLIB_FORM_FIELD_INVALID="فیلد نامعتبر: &#160;"
@@ -310,7 +302,6 @@ JFIELD_PASSWORD_TOO_LONG="رمزعبور خیلی طولانیست. رمزعبو
 JFIELD_PASSWORD_TOO_SHORT_N="رمزعبور خیلی کوتاه است. رمزعبور حداقل باید %d حرف داشته باشد."
 
 ; Javascript Form Validation Messages
-JLIB_FORM_CONTAINS_INVALID_FIELDS="فرم را نمی‌توان ارسال کرد زیرا فاقد اطلاعات مورد نیاز است. <br> لطفاً فیلدهایی که ستاره‌دار هستند را با دقت پر کنید و مجدداً تلاش کنید."
 JLIB_FORM_FIELD_INVALID_VALUE="این مقدار معتبر نیست."
 JLIB_FORM_FIELD_REQUIRED_CHECK="یک گزینه باید انتخاب شود."
 JLIB_FORM_FIELD_REQUIRED_VALUE="این فیلد را پر کنید."
diff --git a/installation/language/fa-AF/langmetadata.xml b/installation/language/fa-AF/langmetadata.xml
index 997eae287668c..5212e0e0338c9 100644
--- a/installation/language/fa-AF/langmetadata.xml
+++ b/installation/language/fa-AF/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>فارسی (دری)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>JoomlaPersian Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/fa-IR/joomla.ini b/installation/language/fa-IR/joomla.ini
index fc597004f0d43..6c766ca9c278a 100644
--- a/installation/language/fa-IR/joomla.ini
+++ b/installation/language/fa-IR/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="میزبان شما برای اجرای این نسخ
 BUILD_MIN_PHP_ERROR_URL_TEXT="به من کمک کنید تا این مسئله را حل کنم"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="تغییر"
 INSTL_SELECT_INSTALL_LANG="زبان نصب را انتخاب کنید"
 INSTL_SELECT_LANGUAGE_TITLE="انتخاب زبان"
 INSTL_SETUP_LOGIN_DATA="داده ورود به سیستم را تنظیم کنید"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="برای نصب PHP شما باید JSON فعال باشد تا
 INSTL_DATABASE_SUPPORT="پشتیبانی پایگاه داده:"
 INSTL_JSON_SUPPORT_AVAILABLE="پشتیبانی از JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB زبان پیش فرض است"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB اضافه بار رشته خاموش است"
 INSTL_NOTICE_DATABASE_SUPPORT="هیچ پایگاه داده پشتیبانی شده یافت نشد."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="برای نصب PHP شما باید JSON فعال باشد تا جوملا نصب شود!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="زبان PHP mbstring روی حالت خنثی تنظیم نشده است. می توانید بصورت دستی با وارد کردن <strong>php_value mbstring.language neutral</strong> در فایل <code>.htaccess</code> خود تنظیم کنید."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="اضافه بار تابع PHP mbstring تنظیم شده است. می توانید با وارد کردن به صورت محلی <strong>php_value mbstring.func_overload 0</strong> در فایل <code>.htaccess</code> خاموش کرد."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="توابع مورد نیاز <code>parse_ini_file</code> و <code>parse_ini_string</code> در سرور شما غیر فعال هستند."
 INSTL_NOTICE_XML_SUPPORT="پشتیبانی XML در دسترس نیست. این مورد باید به صورت پیش فرض در php فعال باشد اما ممکن است کاربران اوبونتو با انجام <code>sudo apt-get install php-xml</code> و سپس اه اندازی مجدد وب سرور، این مورد را نصب کنند."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="فشرده سازی Zlib تنظیم نشده است. با وارد کردن <strong>zlib.output_compression = روشن</strong> در پرونده <code>php.ini</code> خود، می توانید این مورد را به صورت محلی فعال کنید."
diff --git a/installation/language/fa-IR/langmetadata.xml b/installation/language/fa-IR/langmetadata.xml
index bec6d31b25a93..8b0fcef2f2295 100644
--- a/installation/language/fa-IR/langmetadata.xml
+++ b/installation/language/fa-IR/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Persian (fa-IR)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Persian Translation Team: joomlafarsi.com</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/fi-FI/joomla.ini b/installation/language/fi-FI/joomla.ini
index fef53acd61a1c..23b280bb963e9 100644
--- a/installation/language/fi-FI/joomla.ini
+++ b/installation/language/fi-FI/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Palvelimen täytyy käyttää PHP-versiota {{phpversio
 BUILD_MIN_PHP_ERROR_URL_TEXT="Auta minua ratkaisemaan tämä"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Muuta asennuskieltä"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Vaihda"
+INSTL_SELECTED_INSTALL_LANGUAGE="Käytössä oleva kieli: %s"
 INSTL_SELECT_INSTALL_LANG="Valitse asennuskieli"
 INSTL_SELECT_LANGUAGE_TITLE="Valitse kieli"
 INSTL_SETUP_LOGIN_DATA="Aseta kirjautumistiedot"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="PHP-asennuksessasi tulee olla JSON käytössä, jotta Joomla ase
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON-tuki"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language on oletus"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="Tuettuja tietokantoja ei löytynyt."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="PHP-asennuksessasi tulee olla JSON käytössä, jotta Joomla asentuu!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring kieli ei ole asetettu arvoon neutral. Tämä voidaan tehdä paikallisesti kirjoittamalla <strong>php_value mbstring.language neutral</strong> tiedostoon <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload -asetus on käytössä. Tämä voidaan estää paikallisesti kirjoittamalla <strong>php_value mbstring.func_overload 0</strong> tiedostoon <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Vaaditut php-funktiot <code>parse_ini_file</code> ja <code>parse_ini_string</code> eivät ole käytettävissä palvelimellasi."
 INSTL_NOTICE_XML_SUPPORT="XML-tuki ei ole käytettävissä. Tämän pitäisi olla oletusarvoisesti käytössä php:ssä, mutta Ubuntu käyttäjät saattavat joutua asentamaan tämän komennolla <code>sudo apt-get install php-xml</code> sekä tehdä web-palvelimen uudelleenkäynnistys."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib-pakkaus ei ole käytettävissä. Tämän voi ottaa käyttöön paikallisesti lisäämällä teksti <strong>zlib.output_compression = On</strong><code>php.ini</code>-tiedostoon."
diff --git a/installation/language/fi-FI/langmetadata.xml b/installation/language/fi-FI/langmetadata.xml
index 28a506981fe9e..0f200a70b513d 100644
--- a/installation/language/fi-FI/langmetadata.xml
+++ b/installation/language/fi-FI/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Finnish (Finland)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Finnish translation team: Joomla.fi</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/fr-CA/joomla.ini b/installation/language/fr-CA/joomla.ini
index c3a7086440124..9754358fd80ad 100644
--- a/installation/language/fr-CA/joomla.ini
+++ b/installation/language/fr-CA/joomla.ini
@@ -14,7 +14,7 @@ BUILD_FATAL_URL_TEXT="Aidez-moi à résoudre ceci"
 ; These will be processed by the JavaScript Build
 BUILD_INCOMPLETE_HEADER="Configuration de l'environnement incomplète"
 BUILD_INCOMPLETE_LANGUAGE="Français FR" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
-BUILD_INCOMPLETE_TEXT="Il semble que vous essayez d'exécuter Joomla! depuis notre dépôt git. Pour cela vous devez d'abord compléter quelques étapes supplémentaires."
+BUILD_INCOMPLETE_TEXT="Il semble que vous essayez d'exécuter Joomla! depuis notre dépôt git. Pour ce faire, vous devez d'abord compléter quelques étapes supplémentaires."
 BUILD_INCOMPLETE_URL_TEXT="Plus de détails"
 
 ; No XML PHP error page
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Votre serveur a besoin d'utiliser la version {{phpvers
 BUILD_MIN_PHP_ERROR_URL_TEXT="Aidez-moi à résoudre ceci"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Changer la langue d'installation"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Sélectionnez la position"
+INSTL_SELECTED_INSTALL_LANGUAGE="Langue actuelle : %s"
 INSTL_SELECT_INSTALL_LANG="Choix de la langue d’installation"
 INSTL_SELECT_LANGUAGE_TITLE="Choix de la langue"
 INSTL_SETUP_LOGIN_DATA="Configuration des données de connexion"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="JSON doit être activé sur le serveur PHP pour pouvoir installe
 INSTL_DATABASE_SUPPORT="Bases de données supportées :"
 INSTL_JSON_SUPPORT_AVAILABLE="Support JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Directive Mbstring langage par défaut"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="Directive Mbstring overload désactivée"
 INSTL_NOTICE_DATABASE_SUPPORT="Aucune base de données prise en charge n’a été trouvée."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="JSON doit être activé sur le serveur PHP pour pouvoir installer Joomla."
 INSTL_NOTICE_MBLANG_NOTDEFAULT="La directive PHP mbstring language n'est pas paramétrée à 'neutral'. Cela peut être fait en rajoutant <strong>php_value mbstring.language neutral</strong> dans le fichier <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="La directive PHP mbstring overload est activée. Vous pouvez la désactiver en ajoutant <strong>php_value mbstring.func_overload 0</strong> dans le fichier .<code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Les fonctions <code>parse_ini_file</code> et <code>parse_ini_string</code> sont requises mais elles sont déactivées sur votre serveur PHP."
 INSTL_NOTICE_XML_SUPPORT="Le support XML n'est pas activé dans PHP. Les utilisateurs d'Ubuntu peuvent l'installer avec la commande <code>sudo apt-get install php-xml</code> suivi d'un redémarrage du serveur web."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="La compression Zlib n'est pas définie. Elle peut être activée localement en saisissant la ligne <strong>zlib.output_compression = On</strong> dans le fichier <code>php.ini</code>."
@@ -240,9 +239,9 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="Aucun résultat correspondant"
 JGLOBAL_SELECT_SOME_OPTIONS="Sélectionnez certaines options"
 JHIDEPASSWORD="Masquer le mot de passe"
 JINVALID_TOKEN="La dernière requête a été refusée car elle contenait un marqueur de sécurité invalide. Rafraîchissez la page et réessayez."
-JINVALID_TOKEN_NOTICE="L'identifiant de sécurité ne correspond pas. La requête a été annulée pour éviter toute violation de sécurité. Veuillez réessayer."
+JINVALID_TOKEN_NOTICE="L'identifiant de sécurité ne correspondait pas. La demande a été interrompue pour empêcher toute violation de la sécurité. Veuillez réessayer."
 JNEXT="Suivant"
-JNO="Non"
+JNO="Jamais"
 JNOTICE="Annonce"
 JOFF="Désactivé"
 JON="Activé"
@@ -263,7 +262,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s : Le chemin n'est pas un dossie
 JLIB_FORM_FIELD_INVALID="Champ invalide :&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Champ invalide: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Champ requis: %s"
-JLIB_INSTALLER_ABORT="Arrêt de l'installation de la langue : %s"
+JLIB_INSTALLER_ABORT="Interruption de l'installation de la langue : %s"
 JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extension %1$s&#160;: Impossible de créer le répertoire %2$s"
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="Le chemin d'installation n'existe pas"
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Pack %1$s&#160;: erreur lors de l'installation de l'extension %2$s."
@@ -304,7 +303,7 @@ NOTICE="Annonce"
 WARNING="Alerte"
 
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Une erreur de connexion a eu lieu lors de la récupération des données JSON."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Une interruption de connexion est survenue lors de la récupération des données JSON."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="Aucun contenu n'a été retourné."
 JLIB_JS_AJAX_ERROR_OTHER="Une erreur s'est produite lors de la récupération des données JSON : HTTP %d status code."
 JLIB_JS_AJAX_ERROR_PARSE="Une erreur d'analyse s'est produite lors du traitement des données JSON suivantes :<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
diff --git a/installation/language/fr-CA/langmetadata.xml b/installation/language/fr-CA/langmetadata.xml
index d8d4e09290a16..9d9a0fb45340f 100644
--- a/installation/language/fr-CA/langmetadata.xml
+++ b/installation/language/fr-CA/langmetadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>French (Canada)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
-	<author>Joomla! Project - French translation team</author>
+	<author>Joomla! Project - Canadian translation team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<files>
diff --git a/installation/language/fr-FR/joomla.ini b/installation/language/fr-FR/joomla.ini
index 2a96496f5e2a6..edc89f17177c7 100644
--- a/installation/language/fr-FR/joomla.ini
+++ b/installation/language/fr-FR/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Votre serveur a besoin d'utiliser la version {{phpvers
 BUILD_MIN_PHP_ERROR_URL_TEXT="Aidez-moi à résoudre ceci"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Changer la langue d'installation"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Sélectionnez la position"
+INSTL_SELECTED_INSTALL_LANGUAGE="Langue actuelle : %s"
 INSTL_SELECT_INSTALL_LANG="Choix de la langue d’installation"
 INSTL_SELECT_LANGUAGE_TITLE="Choix de la langue"
 INSTL_SETUP_LOGIN_DATA="Configuration des données de connexion"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="JSON doit être activé sur le serveur PHP pour pouvoir installe
 INSTL_DATABASE_SUPPORT="Bases de données supportées :"
 INSTL_JSON_SUPPORT_AVAILABLE="Support JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Directive Mbstring langage par défaut"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="Directive Mbstring overload désactivée"
 INSTL_NOTICE_DATABASE_SUPPORT="Aucune base de données prise en charge n’a été trouvée."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="JSON doit être activé sur le serveur PHP pour pouvoir installer Joomla."
 INSTL_NOTICE_MBLANG_NOTDEFAULT="La directive PHP mbstring language n'est pas paramétrée à 'neutral'. Cela peut être fait en rajoutant <strong>php_value mbstring.language neutral</strong> dans le fichier <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="La directive PHP mbstring overload est activée. Vous pouvez la désactiver en ajoutant <strong>php_value mbstring.func_overload 0</strong> dans le fichier .<code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Les fonctions <code>parse_ini_file</code> et <code>parse_ini_string</code> sont requises mais elles sont déactivées sur votre serveur PHP."
 INSTL_NOTICE_XML_SUPPORT="Le support XML n'est pas activé dans PHP. Les utilisateurs d'Ubuntu peuvent l'installer avec la commande <code>sudo apt-get install php-xml</code> suivi d'un redémarrage du serveur web."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="La compression Zlib n'est pas définie. Elle peut être activée localement en saisissant la ligne <strong>zlib.output_compression = On</strong> dans le fichier <code>php.ini</code>."
@@ -145,7 +144,7 @@ INSTL_LANGUAGES_WARNING_NO_INTERNET="Le système d'installation ne peut pas se c
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note : vous pourrez installer d’autres langues plus tard depuis l’administration de Joomla."
 
 ; Automated Updates Opt Out
-INSTL_AUTOMATED_UPDATES="Mises à jour automatiques"
+INSTL_AUTOMATED_UPDATES="Mises à jour automatisées"
 INSTL_AUTOMATED_UPDATES_DESC="Joomla se met à jour automatiquement pour les versions mineures et les correctifs.<br><br><strong>Veuillez noter que :</strong> les mises à jour automatisées enregistrent votre site auprès du service fourni par le projet Joomla, ce qui lui permet d'accéder aux informations suivantes sur votre site web et votre environnement serveur : Url du site, version PHP, version et type de base de données, version du CMS et version du système d'exploitation du serveur. Ces informations ne sont utilisées que pour améliorer le service.<br><br>Si vous ne souhaitez pas communiquer ces informations, vous pouvez désactiver les mises à jour automatisées en cliquant sur le bouton ci-dessous."
 INSTL_AUTOMATED_UPDATES_DISABLE="Désactiver les mises à jour automatisées"
 INSTL_COMPLETE_ERROR_AUTOMATED_UPDATES_DISABLE="Impossible de désactiver les mises à jour automatisées."
@@ -240,7 +239,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="Aucun résultat correspondant"
 JGLOBAL_SELECT_SOME_OPTIONS="Sélectionnez certaines options"
 JHIDEPASSWORD="Masquer le mot de passe"
 JINVALID_TOKEN="La dernière requête a été refusée car elle contenait un marqueur de sécurité invalide. Rafraîchissez la page et réessayez."
-JINVALID_TOKEN_NOTICE="L'identifiant de sécurité ne correspond pas. La requête a été annulée pour éviter toute violation de sécurité. Veuillez réessayer."
+JINVALID_TOKEN_NOTICE="L'identifiant de sécurité ne correspondait pas. La demande a été interrompue pour empêcher toute violation de la sécurité. Veuillez réessayer."
 JNEXT="Suivant"
 JNO="Non"
 JNOTICE="Annonce"
@@ -263,7 +262,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s : Le chemin n'est pas un dossie
 JLIB_FORM_FIELD_INVALID="Champ invalide :&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Champ invalide: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Champ requis: %s"
-JLIB_INSTALLER_ABORT="Arrêt de l'installation de la langue : %s"
+JLIB_INSTALLER_ABORT="Interruption de l'installation de la langue : %s"
 JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extension %1$s&#160;: Impossible de créer le répertoire %2$s"
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="Le chemin d'installation n'existe pas"
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Pack %1$s&#160;: erreur lors de l'installation de l'extension %2$s."
@@ -304,7 +303,7 @@ NOTICE="Annonce"
 WARNING="Alerte"
 
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Une erreur de connexion a eu lieu lors de la récupération des données JSON."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Une interruption de connexion est survenue lors de la récupération des données JSON."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="Aucun contenu n'a été retourné."
 JLIB_JS_AJAX_ERROR_OTHER="Une erreur s'est produite lors de la récupération des données JSON : HTTP %d status code."
 JLIB_JS_AJAX_ERROR_PARSE="Une erreur d'analyse s'est produite lors du traitement des données JSON suivantes :<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
diff --git a/installation/language/fr-FR/langmetadata.xml b/installation/language/fr-FR/langmetadata.xml
index de6578feb1d9b..7bf8bdbeed298 100644
--- a/installation/language/fr-FR/langmetadata.xml
+++ b/installation/language/fr-FR/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>French (fr-FR)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Project - French translation team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/he-IL/joomla.ini b/installation/language/he-IL/joomla.ini
index 5d0f76362c9dc..2da54ba162a8e 100644
--- a/installation/language/he-IL/joomla.ini
+++ b/installation/language/he-IL/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="השרת מארח שלך צריך להשתמש בגר
 BUILD_MIN_PHP_ERROR_URL_TEXT="עזור לי לפתור זאת"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="שינוי מיקום"
 INSTL_SELECT_INSTALL_LANG="בחר שפת התקנה"
 INSTL_SELECT_LANGUAGE_TITLE="בחירת שפה"
 INSTL_SETUP_LOGIN_DATA="הגדרת נתוני התחברות"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="גרסת ה-PHP המותקנת, מחייבת JSON במצב מא
 INSTL_DATABASE_SUPPORT="תמיכה בבסיסי נתונים:"
 INSTL_JSON_SUPPORT_AVAILABLE="תמיכת JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="שפת (קידוד) מרובת בתים היא ברירת המחדל"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="העמסת מחרוזת בשפת (קידוד) מרובת בתים כבויה"
 INSTL_NOTICE_DATABASE_SUPPORT="לא נמצאו בסיסי נתונים נתמכים."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="גרסת ה-PHP המותקנת, מחייבת JSON במצב מאופשר, כדי להתקין את ג'ומלה!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP שפת (קידוד) מרובת בתים אינה מוגדרת למצב טבעי.ניתן להגדיר זאת על ידי הכנסת <strong>php_value mbstring.language neutral</strong> בקובץ <code>.htaccess</code> שלכם."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP שפת (קידוד) מרובת בתים - פונקציית טעינת יתר מוגדרת. ניתן לבטל את ההגדרה בעזרת הכנסת <strong>php_value mbstring.func_overload 0</strong> בקובץ <code>.htaccess</code> שלכם."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="The required php functions <code>parse_ini_file</code> and <code>parse_ini_string</code> are disabled on your server."
 INSTL_NOTICE_XML_SUPPORT="XML Support is not available. This should be enabled by default in php but Ubuntu users may need to install this by doing <code>sudo apt-get install php-xml</code> followed by web server restart."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression is not set. This can be turned on locally by entering <strong>zlib.output_compression = On</strong> in your <code>php.ini</code> file."
diff --git a/installation/language/he-IL/langmetadata.xml b/installation/language/he-IL/langmetadata.xml
index 1124444bfb345..a9bc1ce45039b 100644
--- a/installation/language/he-IL/langmetadata.xml
+++ b/installation/language/he-IL/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Hebrew (Israel)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>פרוייקט ג'ומלה</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/hr-HR/joomla.ini b/installation/language/hr-HR/joomla.ini
index a58ef269d9dd2..9643cd3a0d721 100644
--- a/installation/language/hr-HR/joomla.ini
+++ b/installation/language/hr-HR/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Za pokretanje ove Joomla verzije, vaš host treba kori
 BUILD_MIN_PHP_ERROR_URL_TEXT="Pomozite mi riješiti ovo"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Promjena pozicije"
 INSTL_SELECT_INSTALL_LANG="Odaberite jezik instalacije"
 INSTL_SELECT_LANGUAGE_TITLE="Odaberite jezik"
 INSTL_SETUP_LOGIN_DATA="Postavke podataka za pristup"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Vaša PHP instalacija mora imati podršku za JSON da bi se Jooml
 INSTL_DATABASE_SUPPORT="Podrška baze podataka:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON podrška"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB jezik je osnovni"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload isključen"
 INSTL_NOTICE_DATABASE_SUPPORT="Nije pronađena podržana baza podataka."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Vaša PHP instalacija mora imati podršku za JSON da bi se Joomla! mogla instalirati!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring jezik nije neutralan. Ovo možete namjestiti lokalno unošenjem <strong>php_value mbstring.language neutral</strong> u <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload je uključen. Ovo može biti isključeno lokalno unošenjem <strong>php_value mbstring.func_overload 0</strong> u <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Potrebne php funkcije <code>parse_ini_file</code> i <code>parse_ini_string</code> onemogućene su na vašem serveru."
 INSTL_NOTICE_XML_SUPPORT="XML podrška nije dostupna. Ovo bi trebalo biti omogućeno prema zadanim postavkama u php-u, ali korisnici Ubuntu-a možda će to trebati instalirati izvedbom <code>sudo apt-get install php-xml</code> nakon čega je potrebno resetirati web server."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib kompresija nije postavljena. To se može lokalno uključiti unosom <strong>zlib.output_compression = On</strong> u datoteku <code>php.ini</code>."
@@ -67,7 +64,6 @@ INSTL_ZLIB_COMPRESSION_SUPPORT="Podrška za Zlib kompresiju"
 INSTL_DATABASE="Konfiguracija baze podataka"
 INSTL_DATABASE_ENCRYPTION_CA_LABEL="Putanja do CA datoteke"
 INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Putanja do datoteke certifikata"
-INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Podržani Cipher Suite - paket šifriranja (opcionalno)"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Putanja do datoteke privatnog ključa"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Enkripcija konekcije"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="Standardno (kontrolira poslužitelj)"
@@ -76,7 +72,6 @@ INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="Dvosmjerna autentifikacija"
 INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="Odabrano je korištenje šifrirane veze s bazom podataka i veza bi se mogla uspostaviti, ali nije šifrirana. Razlog bi mogao biti taj što je poslužitelj baze podataka konfiguriran da se vrati na nešifriranu vezu u slučaju loših parametara šifriranja. Provjeri i ispravi parametre šifriranja baze podataka ili promijeni polje \"Šifriranje veze\" natrag na \"Zadano (kontrolira poslužitelj)\"."
 INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="Datoteka unesena u polje \"%s\" ne postoji ili joj nije moguće pristupiti."
 INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="Polje \"%s\" je prazno ili ne sadrži važeću putanju."
-INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="Upisali ste \"localhost\" kao naziv hosta. Povezivanje s bazom podataka pomoću šifrirane veze moglo bi dovesti do neuspjeha. Ili promijenite \"localhost\" u \"127.0.0.1\" ili \":: 1\" ili drugi naziv hosta ili promijenite polje \"Šifriranje veze\" natrag na \"Zadano (kontrolira poslužitelj) \"."
 INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="Poslužitelj baze podataka ne podržava šifriranje veze. Ili omogući podršku za TLS (često se naziva SSL u dokumentima) na svom poslužitelju baze podataka ili promijeni polje \"Šifriranje veze\" natrag na \"Zadano (kontrolira poslužitelj)\"."
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Provjeri certifikat servera"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL upit na bazu nije uspio."
@@ -114,7 +109,7 @@ INSTL_SITE_DEVMODE_LABEL="Detektiran je razvojni način rada"
 INSTL_SITE_NAME_DESC="Upišite ime vašeg Joomla sitea."
 
 ; Expert View
-INSTL_PUBLIC_FOLDER_DESC="Relativna ili absolutna putanja do javnog direktorija"
+INSTL_PUBLIC_FOLDER_DESC="Relativna ili apsolutna putanja do javnog direktorja"
 INSTL_PUBLIC_FOLDER_DESC_SHORT="Relativna ili apsolutna putanja do javnog direktorja"
 
 ; Complete view
@@ -234,9 +229,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="Nijedan rezultat se ne poklapa"
 JGLOBAL_SELECT_SOME_OPTIONS="Odaberi neke opcije"
 JHIDEPASSWORD="Sakrij lozinku"
 JINVALID_TOKEN="Posljednji zahtjev je odbijen jer je sadržavao neispravan sigurnosni token. Molimo osvježite stranicu i pokušajte ponovo."
-JINVALID_TOKEN_NOTICE="Sigurnosni "_QQ_"token"_QQ_" ne odgovara. Zahtjev je prekinut kako bi se spriječila bilo kakva povreda sigurnosti. Molimo pokušajte ponovno."
 JNEXT="Sljedeće"
-JNO="Ne"
 JNOTICE="Napomena"
 JOFF="Isključeno"
 JON="Uključeno"
diff --git a/installation/language/hr-HR/langmetadata.xml b/installation/language/hr-HR/langmetadata.xml
index 178fd87de4f86..61183bda0c70e 100644
--- a/installation/language/hr-HR/langmetadata.xml
+++ b/installation/language/hr-HR/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Hrvatski (Hrvatska)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Hrvatska team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/hu-HU/joomla.ini b/installation/language/hu-HU/joomla.ini
index 30d7cf5a3e709..b769c7814c56a 100644
--- a/installation/language/hu-HU/joomla.ini
+++ b/installation/language/hu-HU/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Ennek a Joomla! verziónak a futtatásához a kiszolg
 BUILD_MIN_PHP_ERROR_URL_TEXT="Segíts ezt megoldani"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Módosítás"
 INSTL_SELECT_INSTALL_LANG="Telepítési nyelv kiválasztása"
 INSTL_SELECT_LANGUAGE_TITLE="Válasszon nyelvet"
 INSTL_SETUP_LOGIN_DATA="Bejelentkezési adatok beállítása"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="A PHP-telepítés a JSON engedélyezését igényli a Joomla tel
 INSTL_DATABASE_SUPPORT="Adatbázis-támogatás:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON-támogatás"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB nyelv az alapértelmezett"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String túlterhelés ki"
 INSTL_NOTICE_DATABASE_SUPPORT="Nem találtunk támogatott adatbázisokat."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="A PHP-telepítés a JSON engedélyezését igényli a Joomla telepítéséhez!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="A PHP mbstring nyelvet nem semlegesre állították. Ezt a <code>.htaccess</code> fájlba a <strong>php_value mbstring.language neutral</strong> beírásával helyben is ki tudja kapcsolni."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="A PHP mbstring függvény túlterhelését állították be. Ezt a <code>.htaccess</code> fájlba a <strong>php_value mbstring.func_overload 0</strong> beírásával helyben is ki tudja kapcsolni."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="A szükséges <code>parse_ini_file</code> és <code>parse_ini_string</code> php függvények le vannak tiltva a kiszolgálóján."
 INSTL_NOTICE_XML_SUPPORT="Az XML támogatás nem érhető el. Ezt alapértelmezés szerint engedélyezni kell a php-ban, de előfordulhat, hogy az Ubuntu felhasználóknak ezt telepíteniük kell a <code>sudo apt-get install php-xml</code> paranccsal és a kiszolgáló újraindításával."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="A Zlib tömörítés nincs beállítva. Ezt helyileg kapcsolhatja be, ha beírja a <strong>zlib.output_compression = On</strong> parancsot a <code>php.ini</code> fájlba."
@@ -240,7 +237,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="Nincs találat"
 JGLOBAL_SELECT_SOME_OPTIONS="Válasszon néhány lehetőséget"
 JHIDEPASSWORD="Jelszó elrejtése"
 JINVALID_TOKEN="A legutolsó kérés visszautasításra került, mert érvénytelen biztonsági vezérjelet tartalmazott. Frissítse az oldalt, és próbálja meg újra."
-JINVALID_TOKEN_NOTICE="Nem egyezik a biztonsági vezérjel. A kérést eldobtuk a lehetséges biztonsági problémák megelőzése érdekében. Kérjük, próbálja meg újra."
+JINVALID_TOKEN_NOTICE="Nem egyezik a biztonsági vezérjel. A kérést eldobtuk a lehetséges biztonsági problémák megelőzése érdekében. Kérjük, hogy próbálja meg újra."
 JNEXT="Következő"
 JNO="Nem"
 JNOTICE="Megjegyzés"
@@ -263,7 +260,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: az elérési út nem könyvtá
 JLIB_FORM_FIELD_INVALID="Érvénytelen mező:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Érvénytelen mező: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Kötelező mező: %s"
-JLIB_INSTALLER_ABORT="A(z) %s nyelv telepítésének leállítása."
+JLIB_INSTALLER_ABORT="A nyelv telepítésének leállítása: %s"
 JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Bővítmény %1$s: Hiba a következő mappa létrehozásánál: %2$s."
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="A telepítés elérési útja nem létezik"
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Csomag %1$s: Hiba volt egy bővítmény telepítésekor: %2$s"
diff --git a/installation/language/hu-HU/langmetadata.xml b/installation/language/hu-HU/langmetadata.xml
index 0d25349e907f7..41ebb231f2b64 100644
--- a/installation/language/hu-HU/langmetadata.xml
+++ b/installation/language/hu-HU/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Hungarian (Magyar)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Magyarország</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/id-ID/joomla.ini b/installation/language/id-ID/joomla.ini
index 398127804c02c..d2627a9526c3b 100644
--- a/installation/language/id-ID/joomla.ini
+++ b/installation/language/id-ID/joomla.ini
@@ -27,6 +27,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Host anda memerlukan PHP versi {{phpversion}} atau yan
 BUILD_MIN_PHP_ERROR_URL_TEXT="Bantu saya menyelesaikan masalah ini"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Ganti Posisi"
 INSTL_SELECT_INSTALL_LANG="Pilih Bahasa Instalasi"
 INSTL_SELECT_LANGUAGE_TITLE="Pilih Bahasa"
 INSTL_SETUP_LOGIN_DATA="Setelan Data Login"
@@ -37,12 +38,8 @@ INSTL_WARNJSON="Konfigurasi JSON harus diaktifkan pada pemasangan PHP Anda untuk
 INSTL_DATABASE_SUPPORT="Dukungan Database:"
 INSTL_JSON_SUPPORT_AVAILABLE="Dukungan JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Bahasa MB adalah Bawaan"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Padam"
 INSTL_NOTICE_DATABASE_SUPPORT="Tidak ada database mendukung yang ditemukan."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Konfigurasi JSON harus diaktifkan pada pemasangan PHP Anda untuk melanjutkan proses pemasangan Joomla!"
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Fungsi PHP mbstring overload telah diaktifkan. Hal ini dapat dimatikan secara lokal dengan memasukkan <strong>php_value mbstring.func_overload 0</strong> di berkas <code>.htaccess</code> Anda."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Fungsi php yang diperlukan <code>parse_ini_file</code> dan <code>parse_ini_string</code> dinonaktifkan di server Anda."
 INSTL_NOTICE_XML_SUPPORT="Dukungan XML tidak tersedia. Ini harus diaktifkan secara default di php tetapi pengguna Ubuntu mungkin perlu menginstal ini dengan melakukan <code>Sudo apt-get install php-xml</code> diikuti dengan restart server web."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Kompresi Zlib tidak disetel. Ini dapat diaktifkan secara lokal dengan memasukkan <strong>zlib.output_compression = On</strong> di file <code>php.ini</code> Anda."
diff --git a/installation/language/id-ID/langmetadata.xml b/installation/language/id-ID/langmetadata.xml
index 62625875d2047..53c4853863e1e 100644
--- a/installation/language/id-ID/langmetadata.xml
+++ b/installation/language/id-ID/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Bahasa Indonesia (id-ID)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Indonesia</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/it-IT/joomla.ini b/installation/language/it-IT/joomla.ini
index ab781c55d5a2c..00c6993bbd9f8 100644
--- a/installation/language/it-IT/joomla.ini
+++ b/installation/language/it-IT/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Il tuo host ha bisogno della versione di PHP {{phpvers
 BUILD_MIN_PHP_ERROR_URL_TEXT="Aiutami a risolvere questo"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Cambia lingua di installazione"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Cambia"
+INSTL_SELECTED_INSTALL_LANGUAGE="Lingua corrente: %s"
 INSTL_SELECT_INSTALL_LANG="Seleziona la Lingua di Installazione"
 INSTL_SELECT_LANGUAGE_TITLE="Seleziona la lingua"
 INSTL_SETUP_LOGIN_DATA="Configura dati di accesso"
@@ -41,14 +44,10 @@ INSTL_WARNJSON="La tua installazione di PHP deve avere JSON abilitato perchè Jo
 ; Precheck view
 INSTL_DATABASE_SUPPORT="Supporto Database:"
 INSTL_JSON_SUPPORT_AVAILABLE="Supporto JSON"
-INSTL_MB_LANGUAGE_IS_DEFAULT="MB Lingua Predefinita"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
+INSTL_MB_LANGUAGE_IS_DEFAULT="MB language è predefinito"
 INSTL_NOTICE_DATABASE_SUPPORT="Nessun database supportato trovato."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="La tua installazione di PHP deve avere JSON abilitato perchè Joomla!® venga installato!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language non è configurato su 'neutral'. Questo può essere configurato in locale inserendo <strong>php_value mbstring.language neutral</strong> nel file <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="E' attiva la funzione PHP mbstring overload. Questa può essere disattivata in locale inserendo <strong>php_value mbstring.func_overload 0</strong> nel file <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Le funzioni php <code>parse_ini_file</code> e <code>parse_ini_string</code> richieste sono disabilitate sul tuo server."
 INSTL_NOTICE_XML_SUPPORT="Il supporto XML non è disponibile. Dovrebbe venire abilitato di default in php ma gli utenti Ubuntu potrebbero aver bisogno di installarlo eseguendo <code>sudo apt-get install php-xml</code> seguito dal riavvio del server web."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="La compressione Zlib non è impostata. Può essere attivata localmente inserendo <strong>zlib.output_compression = On</strong> nel tuo file <code>php.ini</code>."
@@ -56,12 +55,12 @@ INSTL_PARSE_INI_FILE_AVAILABLE="Supporto INI Parser"
 INSTL_PRECHECK_ACTUAL="Attuali"
 INSTL_PRECHECK_DESC="Se qualcuno di questi elementi non è supportato si prega di intervenire per correggerlo.<br>Non è possibile installare Joomla fino a che la configurazione non soddisfi questi requisiti."
 INSTL_PRECHECK_DIRECTIVE="Direttiva"
-INSTL_PRECHECK_RECOMMENDED="Raccomandato"
+INSTL_PRECHECK_RECOMMENDED="Raccomandati"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Queste impostazioni sono raccomandate per assicurare l'assoluta compatibilità di PHP con Joomla."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Impostazioni raccomandate"
 INSTL_PRECHECK_TITLE="Controlli pre-installazione"
 INSTL_XML_SUPPORT="Supporto XML"
-INSTL_ZLIB_COMPRESSION_SUPPORT="Supporto Zlib Compression"
+INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib Compression Support"
 
 ; Database view
 INSTL_DATABASE="Configurazione database"
@@ -76,8 +75,8 @@ INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="Autenticazione a due fattori"
 INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="Hai selezionato una connessione al database cifrata ma è stata stabilita una connessione non cifrata. Il motivo potrebbe essere dovuto da una settaggio del database impostato per restituire una connessione non cifrata in caso di errata configurazione dei parametri. Controlla e correggi i parametri di crittografia del database, o cambia l'impostazione da \"Connessione cifrata\" a \"Predefinita\"."
 INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="Il file inserito nel campo \"%s\" non esiste o non è accessibile."
 INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="Il campo \"%s\" è vuoto o non contiene un percorso valido."
-INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="Hai inserito \"localhost\" come nome host. Una connessione cifrata verso il database potrebbe non andare a buon fine. Cambia \"localhost\" in \"127.0.0.1\" o \"::1\" o usa un nome host differente. Altrimenti, cambia il parametro \"Connessione cifrata\" in \"Predefinita (controllata dal server)\"."
-INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="Il server del database non supporta la connessione cifrata. Abilita il supporto TLS (altrimenti chiamato SSL nelle documentazioni) sul server del tuo database, oppure cambia il parametro \"Connessione cifrata\" a \"Predefinita (controllata dal server)\"."
+INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="Hai inserito \"localhost\" come nome host. Una connessione cifrata verso il database potrebbe non andare a buon fine. Cambia \"localhost\" in \"127.0.0.1\" o \"::1\" o usa un nome host differente. Altrimenti, cambia il parametro \"Connessione cifrata\" in \"Predefinito (controllato dal server)\"."
+INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="Il server del database non supporta la connessione cifrata. Abilita il supporto TLS (altrimenti chiamato SSL nelle documentazioni) sul server del tuo database, oppure cambia il parametro \"Connessione cifrata\" a \"Predefinito (controllato dal server)\"."
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verifica certificato server "
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="Query del database PostgreSQL fallita."
 INSTL_DATABASE_HOST_DESC="Immetti il nome dell'host, solitamente \"localhost\" o un nome fornito dal tuo host."
@@ -86,7 +85,7 @@ INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="Per confermare che sei il prop
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="Stai cercando di utilizzare un host di database che non si trova sul tuo server locale. Per motivi di sicurezza, devi verificare la proprietà del tuo account di web hosting. <a href=\"%s\" target=\"_blank\" rel=\"noopener noreferrer\">Leggi la documentazione</a> per ulteriori informazioni."
 INSTL_DATABASE_HOST_LABEL="Nome Host"
 INSTL_DATABASE_NAME_DESC="Immetti il nome del database."
-INSTL_DATABASE_NAME_LABEL="Nome del database"
+INSTL_DATABASE_NAME_LABEL="Nome database"
 INSTL_DATABASE_NAME_MSG_MYSQL="Il nome del database non è valido. Non deve continuare i seguenti caratteri: \ / ."
 INSTL_DATABASE_NAME_MSG_POSTGRES="Il nome del database non è valido. Deve iniziare con una lettera, seguita da caratteri alfanumerici."
 INSTL_DATABASE_NO_SCHEMA="Non esiste nessun schema di database per questo tipo di database."
@@ -203,14 +202,14 @@ INSTL_PAGE_TITLE="Installazione di Joomla"
 
 ; Configuration model
 INSTL_ERROR_CONNECT_DB="Impossibile connettersi al database. Il connettore ha restituito il messaggio di errore numero: %d."
-INSTL_STD_OFFLINE_MSG="Sito fuori servizio per manutenzione.<br> Riprovare più tardi."
+INSTL_STD_OFFLINE_MSG="Sito fuori servizio per manutenzione.<br /> Riprovare più tardi."
 
 ; Languages model
 INSTL_ERROR_INVALID_URL="URL invalido"
 
 ; Others
 INSTL_CONFPROBLEM="Il file di configurazione o la cartella non è scrivibile, oppure si sono verificati problemi durante la creazione del file configuration.php. Clicca nell'area di testo sottostante per evidenziare tutto il codice e copialo in un nuovo file di testo. Nomina questo file configuration.php e caricalo nella root del tuo sito."
-INSTL_DISPLAY_ERRORS="Mostra Errori"
+INSTL_DISPLAY_ERRORS="Display Errors"
 INSTL_ERROR="Errore"
 INSTL_ERROR_DB="Si sono verificati alcuni errori durante il popolamento del database: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Impossibile inizializzare lo schema del database"
@@ -225,12 +224,12 @@ INSTL_PHP_VERSION_NEWER="Versione di PHP >= %s"
 INSTL_PROCESS_BUSY="Processo in esecuzione. Attendere &hellip;"
 INSTL_SESSION_AUTO_START="Auto start sessione"
 INSTL_WRITABLE="Permessi non sufficienti per creare %s"
-INSTL_ZIP_SUPPORT_AVAILABLE="Supporto nativo per ZIP"
+INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP support"
 
 ; Global strings
 JADMINISTRATOR="Amministratore"
 JCLOSE="Chiudi"
-JEMAIL="E-mail"
+JEMAIL="Email"
 JERROR="Errore"
 JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="si è verificato un errore durante l'esecuzione della richiesta."
 JGLOBAL_ISFREESOFTWARE="%s è un software libero rilasciato sotto licenza %s."
@@ -280,9 +279,9 @@ JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Aggiornamento: Non è possibile accedere al
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Non è stato possibile connettersi al database<br>joomla.library:%1$s - %2$s."
 
 ; Strings for the language debugger
-JDEBUG_LANGUAGE_FILES_IN_ERROR="Errori nell'analisi nei file di lingua"
+JDEBUG_LANGUAGE_FILES_IN_ERROR="Errori nei file di lingua da analizzare"
 JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Stringhe non tradotte"
-JNONE="Nessuno"
+JNONE="Nessuna"
 
 ; Necessary for errors
 ADMIN_EMAIL="Email amministratore"
diff --git a/installation/language/it-IT/langmetadata.xml b/installation/language/it-IT/langmetadata.xml
index c1a2dafd60e4d..d856ca3dc551c 100644
--- a/installation/language/it-IT/langmetadata.xml
+++ b/installation/language/it-IT/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Italiano (it-IT)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Project (Italian Translation Team)</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/ja-JP/joomla.ini b/installation/language/ja-JP/joomla.ini
index 79a5c92fecbae..22443df9fce33 100644
--- a/installation/language/ja-JP/joomla.ini
+++ b/installation/language/ja-JP/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="このバージョンのJoomlaを実行するには、
 BUILD_MIN_PHP_ERROR_URL_TEXT="この問題を解決するには"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="インストール言語の変更"
+INSTL_CHANGE_INSTALL_LANG_SHORT="変更"
+INSTL_SELECTED_INSTALL_LANGUAGE="現在の言語: %s"
 INSTL_SELECT_INSTALL_LANG="インストール言語の選択"
 INSTL_SELECT_LANGUAGE_TITLE="言語を選択"
 INSTL_SETUP_LOGIN_DATA="ログインデータの設定"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="Joomlaをインストールするには、PHPインストール
 INSTL_DATABASE_SUPPORT="データベースのサポート："
 INSTL_JSON_SUPPORT_AVAILABLE="JSON サポート"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language デフォルト"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String オーバーロード オフ"
 INSTL_NOTICE_DATABASE_SUPPORT="サポートされているデータベースが見つかりませんでした。"
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Joomlaをインストールするには、PHPインストールでJSONを有効にする必要があります。"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring 言語がニュートラルに設定されていません。<code>.htaccess</code> ファイルに <strong>php_value mbstring.language neutral</strong>を入力することでローカルで設定できます。"
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring 関数のオーバーロード機能が設定されています。<code>.htaccess</code> ファイルに <strong>php_value mbstring.func_overload 0</strong>を入力することでローカルでオフにすることができます。"
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="必要なphp関数 <code>parse_ini_file</code> と <code>parse_ini_string</code> サーバーで無効になっています。"
 INSTL_NOTICE_XML_SUPPORT="XMLサポートは利用できません。これはphpでデフォルトで有効になっているはずですが、Ubuntuユーザーは <code>sudo apt-get install php-xml</code> を実行してからWebサーバーを再起動することでこれをインストールする必要がある場合があります。"
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib圧縮が設定されていません。これは<code>php.ini</code> ファイルに <strong>zlib.output_compression = On</strong> と入力することでローカルでオンにできます。"
@@ -92,7 +91,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="データベース名が無効です。文字
 INSTL_DATABASE_NO_SCHEMA="このデータベースタイプのデータベーススキーマは存在しません。"
 INSTL_DATABASE_PASSWORD_DESC="作成したデータベースパスワード、またはホストから提供されたパスワードを入力します。"
 INSTL_DATABASE_PREFIX_DESC="テーブルプレフィックスを入力するか、ランダムに生成されたプレフィックスを使用"
-INSTL_DATABASE_PREFIX_DUPLICATE_DESC="同じプレフィックスを持つテーブルを持つ既存のデータベースを使用している場合、Joomlaはこれらの既存プレフィックスに\"bak_\"を加えて別名に変更します。"
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="同じプレフィックスを持つテーブルを持つ既存のデータベースを使用している場合、Joomlaは接頭辞 「bak_」を追加することで、既存のテーブルの名前を変更します。"
 INSTL_DATABASE_PREFIX_MSG="テーブル接頭辞は文字で始まり、任意で英数字も使えますが、最後はアンダースコアで終わらなければなりません。"
 INSTL_DATABASE_RESPONSE_ERROR="インストールプロセスが失敗しました。"
 INSTL_DATABASE_TYPE_DESC="データベースタイプを選択"
diff --git a/installation/language/ja-JP/langmetadata.xml b/installation/language/ja-JP/langmetadata.xml
index c6c0e82b6d75d..076e33bca8370 100644
--- a/installation/language/ja-JP/langmetadata.xml
+++ b/installation/language/ja-JP/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Japanese (Japan)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla!じゃぱん</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/ka-GE/joomla.ini b/installation/language/ka-GE/joomla.ini
index 7698e572b2d23..083a29c636754 100644
--- a/installation/language/ka-GE/joomla.ini
+++ b/installation/language/ka-GE/joomla.ini
@@ -15,7 +15,7 @@ BUILD_FATAL_URL_TEXT="დამეხმარეთ პრობლემის
 BUILD_INCOMPLETE_HEADER="გარემოს კონფიგურირება არ არის დასულებული"
 BUILD_INCOMPLETE_LANGUAGE="ქართული GE" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_INCOMPLETE_TEXT="როგორც ჩანს, თქვენ ცდილობთ Joomla! დაყენებას ჩვენი Git-რეპოზიტორიდან. ამისათვის საჭიროა ჯერ შეასრულოთ რამოდენიმე დამატებითი ნაბიჯი."
-BUILD_INCOMPLETE_URL_TEXT="ვრცლად"
+BUILD_INCOMPLETE_URL_TEXT="დეტალურად"
 
 ; No XML PHP error page
 ; These will be processed by the JavaScript Build
@@ -32,8 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Joomla! ამ ვერსიის დასაყ
 BUILD_MIN_PHP_ERROR_URL_TEXT="დამეხმარეთ პრობლემის მოგვარებაში"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="პოზიციის შეცვლა"
 INSTL_SELECT_INSTALL_LANG="აირჩიეთ დაყენების ენა"
-INSTL_SELECT_LANGUAGE_TITLE="აირჩიეთ ენა"
+INSTL_SELECT_LANGUAGE_TITLE="ენის არჩევა"
 INSTL_SETUP_LOGIN_DATA="შესვლის პარამეტრები"
 INSTL_WARNJAVASCRIPT="ყურადღება! Joomla! სწორად ინსტალაციისთვის ბრაუზერში ჩართული უნდა იყოს JavaScript!"
 INSTL_WARNJSON="Joomla! ინსტალაციისთვის PHP-ში ჩართული უნდა იყოს JSON!"
@@ -41,14 +42,10 @@ INSTL_WARNJSON="Joomla! ინსტალაციისთვის PHP-ში
 ; Precheck view
 INSTL_DATABASE_SUPPORT="მონაცემთა ბაზის მხარდაჭერა:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON მხარდაჭერა"
-INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language არის ავტომატური"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload გამორთულია"
+INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language ავტომატური"
 INSTL_NOTICE_DATABASE_SUPPORT="მხარდაჭერილი მონაცემთა ბაზები ვერ მოიძებნა."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Joomla! ინსტალაციისთვის PHP-ში ჩართული უნდა იყოს JSON!"
-INSTL_NOTICE_MBLANG_NOTDEFAULT="ენა PHP mbstring არ არის დაყენებული <code>neutral</code>. ეს შეგიძლიათ შეცვალოთ ლოკალურად, <strong>php_value mbstring.language neutral</strong> სტრიქონის დამატებით თქვენს <code>.htaccess</code> ფაილში."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring ფუნქციის გადატვირთვა ჩართულია. ეს შეგიძლიათ გამორთოთ ლოკალურად, <strong>php_value mbstring.func_overload 0</strong> სტრიქონის დამატებით თქვენს <code>.htaccess</code> ფაილში."
+INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring ენა არ არის <code>neutral</code>. თქვენ შეგიძლიათ შეცვალოთ მნიშვნელობა ლოკალურად, თუ დაამატებთ სტრიქონს <strong>php_value mbstring.language neutral</strong> თქვენს <code>.htaccess</code> ფაილში."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="საჭირო php ფუნქციები <code>parse_ini_file</code> და <code>parse_ini_string</code> გამორთულია თქვენს სერვერზე."
 INSTL_NOTICE_XML_SUPPORT="XML მხარდაჭერა არ არის ხელმისაწვდომი. ეს ავტომატურად უნდა იყოს ჩართული php-ში, თუმცა Ubuntu მომხმარებლებს შეიძლება დასჭირდეთ მისი დაყენება <code>sudo apt-get install php-xml</code> ბრძანების შესრულებით, რის შემდეგაც უნდა გადაიტვირთოს ვებ-სერვერი."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib შეკუმშვა არ არის დაყენებული. ეს შეგიძლიათ ჩართოთ ლოკალურად, <strong>zlib.output_compression = On</strong> სტრიქონის დამატებით თქვენს <code>php.ini</code> ფაილში."
@@ -61,23 +58,23 @@ INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="ეს პარამეტრებ
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="რეკომენდებული პარამეტრები:"
 INSTL_PRECHECK_TITLE="წინა-საინსტალაციო შემოწმება"
 INSTL_XML_SUPPORT="XML მხარდაჭერა"
-INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib შეკუმშვის მხარდაჭერა"
+INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib Compression მხადაჭერა"
 
 ; Database view
 INSTL_DATABASE="მონაცემთა ბაზის კონფიგურაცია"
 INSTL_DATABASE_ENCRYPTION_CA_LABEL="CA ფაილის გზა"
 INSTL_DATABASE_ENCRYPTION_CERT_LABEL="სერთიფიკატის ფაილის გზა"
-INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="მხარდაჭერილი შიფრების კრებული (არასავალდებულო)"
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="მხარდაჭერილი შიფრების ნაკრები (ნებაყოფლობითი)"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL="პრივატული გასაღების ფაილის გზა"
-INSTL_DATABASE_ENCRYPTION_MODE_LABEL="შეერთების დაშიფრვა"
-INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="ავტომატური (კონტროლდება სერვერით)"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL="მიერთების დაშიფრვა"
+INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="ავტორი (კონტროლდება სერვერით)"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="ერთმხრივი ავთენტიფიკაცია"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="ორმხრივი ავთენტიფიკაცია"
 INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="თქვენ აირჩიეთ მონაცემთა ბაზასთან მიერთება დაშიფრვით, რომელიც შეიძლება დამყარდეს, მაგრამ არ იქნება დაშიფრული. მიზეზი შეიძლება იყოს იმაში, რომ სერვერი კონფიგურირებულია არადაშიფრულ შეერთებასთან დაბრუნებაზე, არასწორი დაშიფრვის პარამეტრების შემთხვევაში. საჭიროა შემოწნდეს და გასწორდეს შეერთების დაშიფრვის პარამეტრები, ან შეიცვალოს ველის მნიშვნელობა \"შეერთების დაშიფრვა\" მნიშვნელობით \"ავტომატური (კონტროლდება სერვერით)\"."
-INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="ფაილი, რომელიც შეყვანილი ველში \"%s\" არ არსებობს ან არ არის წვდომადი."
-INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="ველი \"%s\" არ არის შევსებული ან არ შეიცავს სწორ გზას."
-INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="თქვენ შეიყვანეთ \"localhost\" როგორც ჰოსტის სახელი. ასეთ შემთხვევაში მიერთება მონაცემთა ბაზასთან შეერთების დაშიფრვით შეიძლება დასრულდეს შეცდომით. საჭირო შეიცვალოს ჰოსტის სახელი \"localhost\" მნიშვნელობით \"127.0.0.1\" ან \"::1\" ან სხვა სახელით, ან შეიცვალოს ველს მნიშვნელობა \"შეერთების დაშიფრვა\" მნიშვნელობით \"ავტომატური (კონტროლდება სერვერით)\"."
-INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="მონაცემთა ბაზის სერვერს არა აქვს შეერთების დაშიფრვის მხარდაჭერა. საჭიროა ჩაირთოს TLS (ხშირად ეძახიან SSL დოკუმენტაციაში) მხარდაჭერა თქვენს მონაცემთა ბაზის სერვერზე, ან ან შეიცვალოს ველს მნიშვნელობა \"შეერთების დაშიფრვა\" მნიშვნელობით \"ავტომატური (კონტროლდება სერვერით)\"."
+INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="ფაილი, რომელიც შეყვანილია ველში \"%s\" არ არსებობს ან არ არის წვდომადი."
+INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="ველი \"%s\" არ არის შევსებული ან ფაილის გზა არასწორია."
+INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="თქვენ შეიყვანეთ \"localhost\" როგორც ჰოსტის სახელი. ასეთ შემთხვევაში მონაცემთა ბაზასთან შეერთება მიერთების დაშიფრვით შეიძლება დასრულდეს შეცდომით. საჭიროა შეიცვალოს ჰოსტის სახელი \"localhost\" მნიშვნელობით \"127.0.0.1\" ან \"::1\" ან სხვა ჰოსტის სახელით, ან შეიცვალოს ველის მნიშვნელობა \"შეერთების დაშიფრვა\" მნიშვნელობით \"ავტომატური (კონტროლდება სერვერით)\"."
+INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="მონაცემთა ბაზის სერვერს არა აქვს შეერთების დაშიფრვის მხარდაჭერა. საჭიროა სერვერზე ჩაირთოს TLS (ხშირად უწოდებენ SSL დოკუმენტაციაში) მხარდაჭერა, ან შეიცვალოს ველის მნიშვნელობა \"შეერთების დაშიფრვა\" მნიშვნელობით \"ავტომატური (კონტროლდება სერვერით)\"."
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="სერვერის სერთიფიკატის შემოწმება"
 INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL მონაცემთა ბაზაზე მოთხოვნა ვერ მოხერხდა."
 INSTL_DATABASE_HOST_DESC="შეიყვანეთ ჰოსტის სახელი, როგორც წესი \"localhost\" ან ჰოსტის მიერ მოწოდებული სახელი."
@@ -145,7 +142,6 @@ INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ენის პაკეტებ
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="შენიშვნა: თქვენ შეძლებთ დააყენოთ სასურველი ენების პაკეტები მოგვიანებით, Joomla! მართვის პანელიდან."
 
 ; Automated Updates Opt Out
-INSTL_AUTOMATED_UPDATES="ავტომატური განახლებები"
 INSTL_AUTOMATED_UPDATES_DESC="Joomla! ავტომატურად განაახლებს თავის მცირე და პატჩის გამოცემებს.<br><br><strong>გთხოვთ მიაქციოთ ყურადღება:</strong> ავტომატური განახლებები დაარეგისტრირებს თქვენს საიტს Joomla! მიერ მოწოდებულ შესაბამის სერვისზე. რეგისტრაცია საშუალებას აძლევს Joomla! პროექტს თქვენი საიტისა და სერვერის გარემოს შესახებ ინფორმაცაზე წვდომის, კონკრეტულად საიტის Url, PHP ვერსია, მონაცემთა ბაზის ტიპი და ვერსია, CMS ვერსია და სერვერის OS ტიპი და ვერსია. ეს ინფორმაცია გამოიყენება მხოლოდ მომსახურების გასაუმჯობესებლად.<br><br>გარდა ამისა, თქვენ შეგიძლიათ გამორთოთ ავტომატური განახლებები ქვემოთ მოცემული ღილაკის გამოყენებით."
 INSTL_AUTOMATED_UPDATES_DISABLE="გამორთეთ ავტომატური განახლებები"
 INSTL_COMPLETE_ERROR_AUTOMATED_UPDATES_DISABLE="ავტომატური განახლებების გამორთვა შეუძლებელია."
@@ -157,7 +153,7 @@ INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="ავტომატური
 INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="ენა %s მოინიშნა Joomla!-ს მართვის პანელის ავტომატურ ენად."
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="ენა"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="არჩევა"
-INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="ტეგი"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="თაგი"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_DOWNLOAD_PACKAGE="Joomla! ენის პაკეტის ჩამოტვირთვა ან გაშლა ვერ მოხერხდა მისამართიდან: %s"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla! ენის პაკეტის %s დაყენება ვერ მოხერხდა."
 INSTL_DEFAULTLANGUAGE_DESC="Joomla! ენის პაკეტები დაყენებულია. გთხოვთ აირჩიოთ ავტომატური ენის პაკეტი მართვის პანელისთვის და დააჭირეთ ღილაკს \"დააყენე ავტომატურად\"."
@@ -203,10 +199,10 @@ INSTL_PAGE_TITLE="Joomla! ვებ ინსტალატორი"
 
 ; Configuration model
 INSTL_ERROR_CONNECT_DB="მონაცემთა ბაზასთან დაკავშირება ვერ მოხერხდა. დამაკავშირებელმა დააბრუნა ნომერი: %d."
-INSTL_STD_OFFLINE_MSG="საიტი დროებით დახურულია ტექნიკური მიზეზების გამო.<br>გთხოვთ შემოხვიდეთ მოგვიანებით."
+INSTL_STD_OFFLINE_MSG="საიტი გამორთულია ტექნიკური სამუშაოების გამო.<br>გთხოვთ სცადოთ მოგვიანებით."
 
 ; Languages model
-INSTL_ERROR_INVALID_URL="Invalid URL"
+INSTL_ERROR_INVALID_URL="არასწორი URL"
 
 ; Others
 INSTL_CONFPROBLEM="თქვენი კონფიგურაციის ფაილი ან საქაღალდე არ არის ჩაწერადი ან კონფიგურაციის ფაილის შექმნისას წარმოიშვა შეცდომა. საჭიროა ხელით შექმნათ ტექსტური ფაილი, დაარქვათ სახელი 'configuration.php', გამოყოთ/დააკოპიროთ გამოსახული კოდი და ჩასვათ მასში, და ამმის შემდეგ მოათავსოთ კონფიგურაციის ფაილი საიტის ძირეულ საქაღალდეში."
@@ -219,31 +215,31 @@ INSTL_FILE_UPLOADS="ფაილების ატვირთვა"
 INSTL_GNU_GPL_LICENSE="GNU საერთო სახალხო ლიცენზია"
 INSTL_HELP_LINK="Joomla! დაყენებაზე დახმარება"
 INSTL_NOTICE_NEEDSTOBEWRITABLE="თქვენ მაინც შეგიძლიათ გააგრძელოთ Joomla! დაყენება, თუ აღადგენთ ნებართვას."
-INSTL_OUTPUT_BUFFERING="გამოყვანის ბუფერიზაცია"
+INSTL_OUTPUT_BUFFERING="შედეგების ბუფერიზაცია"
 INSTL_PHP_VERSION="PHP ვერსია"
 INSTL_PHP_VERSION_NEWER="PHP ვერსია >= %s"
 INSTL_PROCESS_BUSY="მიმდინარეობს დაყენების პროცესი. გთხოვთ მოიცადოთ &hellip;"
-INSTL_SESSION_AUTO_START="Session Auto Start"
+INSTL_SESSION_AUTO_START="სესიის ავტომატური გაშვება"
 INSTL_WRITABLE="%s ფაილის შესაქმნელად არ გვაქვს საკმარისი უფლება."
 INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP მხარდაჭერა"
 
 ; Global strings
-JADMINISTRATOR="მართვის პანელი"
+JADMINISTRATOR="ადმინისტრატორი"
 JCLOSE="დახურვა"
 JEMAIL="ელ-ფოსტა"
 JERROR="შეცდომა"
 JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="თქვენი მოთხოვნის დამუშავებისას მოხდა შეცდომა."
 JGLOBAL_ISFREESOFTWARE="%s არის თავისუფალი პროგრამული უზრუნველყოფა, რომელიც ვრცელდება ლიცენზიით %s."
 JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="ენის პაკეტი არ შეესაბამება Joomla! ამ ვერსიას. ზოგიერთი ენის კონსტანტა შეიძლება იყოს გამოტოვებული და ნაჩვენები იქნება ინგლისურად."
-JGLOBAL_SELECT_AN_OPTION="აირჩიეთ მნიშვნელობა"
-JGLOBAL_SELECT_NO_RESULTS_MATCH="შედეგები არ დაემთხვა"
-JGLOBAL_SELECT_SOME_OPTIONS="აირჩიეთ რამოდენიმე მნიშვნელობა"
-JHIDEPASSWORD="პარილის დამალვა"
+JGLOBAL_SELECT_AN_OPTION="აირჩიეთ პარამეტრი"
+JGLOBAL_SELECT_NO_RESULTS_MATCH="შედეგები არ ემთხვევა"
+JGLOBAL_SELECT_SOME_OPTIONS="აირჩიეთ რამოდენიმე პარამეტრი"
+JHIDEPASSWORD="პაროლის დამალვა"
 JINVALID_TOKEN="უკანასკნელი მოთხოვნა უარყოფილი იქნა, რადგან შეიცავდა არასწორ უსაფრთხოების ტოკენს. გთხოვთ განაახლოთ გვერდი და სცადოთ კიდევ ერთხელ."
-JINVALID_TOKEN_NOTICE="უსაფრთხოების ტოკენმა ვერ გაიარა შემოწმება. მოთხოვნა გაუქმდა უსაფრთხოების დარღვევის თავიდან ასაცილებლად. გთხოვთ სცადოთ ხელახლა."
+JINVALID_TOKEN_NOTICE="უსაფრთხოების ტოკენი არ ემთხვევა. მოთხოვნა გაუქმდა უსაფრთხოების დარღვევის თავიდან ასაცილებლად. გთხოვთ, სცადოთ თავიდან."
 JNEXT="შემდეგი"
 JNO="არა"
-JNOTICE="ყურადღება"
+JNOTICE="შეტყობინება"
 JOFF="გამორთული"
 JON="ჩართული"
 JPREVIOUS="წინა"
@@ -254,40 +250,40 @@ JUSERNAME="მომხმარებლის სახელი"
 JYES="კი"
 
 ; Framework strings necessary when no lang pack is available
-JLIB_DATABASE_ERROR_CONNECT_MYSQL="MySQL-თან დაკავშირება ვერ მოხერხდა."
+JLIB_DATABASE_ERROR_CONNECT_MYSQL="ვერ ვუკავშირდები MySQL-ს."
 JLIB_DATABASE_ERROR_DATABASE="მოხდა მონაცემთა ბაზის შეცდომა"
-JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="ვერ მოხერხდა მონაცემთა ბაზის დრაივერის ჩატვირთვა: %s"
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="მონაცემთა ბაზის დრაივერის ჩატვირთვა ვერ მოხერხდა: %s."
 JLIB_DATABASE_ERROR_VALID_MAIL="თქვენს მიერ შეყვანილი ელ-ფოსტის მისამართი არასწორია. გთხოვთ შეიყვანოთ სხვა ელ-ფოსტის მისამართი."
 JLIB_ENVIRONMENT_SESSION_EXPIRED="თქვენი სესიისთვის განკუთვნილი დრო ამოიწურა, გთხოვთ განაახლოთ გვერდი."
-JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: გზა არ წარმოადგენს საქაღალდეს. გზა: %2$s"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: გზა არ არის საქაღალდე. გზა: %2$s"
 JLIB_FORM_FIELD_INVALID="ველი არასწორად არის შევსებული:&#160;"
-JLIB_FORM_VALIDATE_FIELD_INVALID="ველი არასწორად არის შევსებული: %s"
-JLIB_FORM_VALIDATE_FIELD_REQUIRED="აუცილებელია შეივსოს ველი: %s"
+JLIB_FORM_VALIDATE_FIELD_INVALID="არასწორად შევსებული ველი: %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="აუცილებელი ველი: %s"
 JLIB_INSTALLER_ABORT="ენის ინსტალაციის შეჩერება: %s"
-JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="გაფართოება %1$s: ვერ მოხერხდა საქაღალეს შექმნა: %2$s"
-JLIB_INSTALLER_ABORT_NOINSTALLPATH="ინსტალაციის მისამართი არ არსებობს."
+JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="გაფართოება %1$s: შცდომა საქაღალდის შექმნისას: %2$s"
+JLIB_INSTALLER_ABORT_NOINSTALLPATH="ინსტალაციის გზა არ არსებობს."
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="პაკეტი %1$s: გაფართოების ინსტალაციისას მოხდა შეცდომა: %2$s."
-JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="პაკეტი %s: ინსტალაციისთვის არ გვაქვს ფაილები!"
+JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="პაკეტი %s: არ იყო დასაინსტალირებელი ფაილები!"
 JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="სერვერთან დაკავშირების შეცდომა: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: ფაილის %1$s ასლის შექმნის დროს წარმოიშვა შეცდომა %2$s-ში."
 JLIB_INSTALLER_INSTALL="ინსტალაცია"
 JLIB_INSTALLER_NOT_ERROR="ენის ფაილების TinyMCE დაყენების დროს მომხდარი შეცდომები არანაირად არ აისახება ენის პაკეტის ინსტალაციაზე. ენის ზოგიერთი პაკეტი, რომელიც შექმნილია Joomla! 3.2.0-ზე ქვედა ვერსიებისთვის, შესაძლოა შეეცადოს დააყენოს TinyMCE ენის ფაილები. თუმცა, TinyMCE ენის ფაილები უკვე გათვალისწინებულია და შედის ძირითად ბირთვში, ამიტომ მისი დამატებით დაყენება საჭირო არ არის."
 JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="ვერ მოხერხდა კონტენტის ენის შექმნა ენისთვის %s: %s."
-JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP allow_url_fopen პარამეტრი გამორთულია. განახლების მუშაობისთვის ეს პარამეტრი უნდა იყოს ჩართული."
-JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: ვერ მოხერხდა გახსნა %s"
+JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP კოფიგურაციაში პარამეტრი allow_url_fopen გამორთულია. განახლების ფუნქციის გამოსაყენებლად ეს პარამეტრი უნდა იყოს ჩართული."
+JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="Update: :Collection: ვერ ვხსნი %s-ს"
 JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="Update: :Collection: ვერ მოხერხდა დამუშავება %s"
 JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="Update: ვერ მოხერხდა განახლების სერვერის გახსნა #%d &quot;%s&quot;, URL: %s."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: ვერ მოხერხდა მონაცემთა ბაზასთან მიერთება <br>joomla.library: %1$s - %2$s."
 
 ; Strings for the language debugger
-JDEBUG_LANGUAGE_FILES_IN_ERROR="შეცდომები ენის ფაილებში"
+JDEBUG_LANGUAGE_FILES_IN_ERROR="გარჩევის შეცდომები ენის ფაილებში"
 JDEBUG_LANGUAGE_UNTRANSLATED_STRING="სათარგმნი სტრიქონები"
 JNONE="არცერთი"
 
 ; Necessary for errors
 ADMIN_EMAIL="ადმინისტრატორის ელ-ფოსტა"
 ADMIN_PASSWORD="ადმინისტრატორის პაროლი"
-SITE_NAME="საიტის დასახელება"
+SITE_NAME="საიტის სახელი"
 
 ; Database types (allows for a more descriptive label than the internal name)
 MYSQL="MySQL (PDO)"
@@ -300,25 +296,25 @@ SQLITE="SQLite"
 ; Javascript message titles
 ERROR="შეცდომა"
 MESSAGE="შეტყობინება"
-NOTICE="ყურადღება"
+NOTICE="შეტყობინება"
 WARNING="გაფრთხილება"
 
 ; Javascript ajax error messages
 JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="JSON მონაცემების მიღებისას მოხდა კავშირის შეცდომა."
-JLIB_JS_AJAX_ERROR_NO_CONTENT="კონტენტი არ დაბრუნებულა."
+JLIB_JS_AJAX_ERROR_NO_CONTENT="კონტენტი ვერ დაბრუნდა."
 JLIB_JS_AJAX_ERROR_OTHER="შეხდომა მოხდა JSON მონაცემების მიღებისას: HTTP %d სტატუსის კოდი."
-JLIB_JS_AJAX_ERROR_PARSE="შეცდომა მოხდა სინტაქსური ანალიზისას შემდეგი JSON მონაცემების დამუშავების დროს:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
-JLIB_JS_AJAX_ERROR_TIMEOUT="JSON მონაცემების მიღებისას მოხდა ლოდინის დროის გადაჭარბება (timeout)."
+JLIB_JS_AJAX_ERROR_PARSE="სინტაქსური ანალიზისას (parse) მოხდა შეცდომა, შემდეგი JSON მონაცემების დამუშავების დროს:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
+JLIB_JS_AJAX_ERROR_TIMEOUT="JSON მონაცემების მიღებისას მოხდა შეყოვნება (timeout)."
 
 ; Field password messages
 JFIELD_PASSWORD_INDICATE_COMPLETE="პაროლი მიღებულია"
 JFIELD_PASSWORD_INDICATE_INCOMPLETE="პაროლი არ შეესაბამება საიტის მოთხოვნებს."
-JFIELD_PASSWORD_SPACES_IN_PASSWORD="პაროლი არ უნდა შეიცავდეს პრობელებს სტრიქონის დასაწყისში ან ბოლოში."
-JFIELD_PASSWORD_TOO_LONG="პაროლი საკმაოდ გრძელია. პაროლის სიგრძე უნდა იყოს 100 სიმბოლოზე ნაკლები."
+JFIELD_PASSWORD_SPACES_IN_PASSWORD="პაროლი არ უნდა შეიცავდეს პრობელს სტრიქონის დასაწყისში ან ბოლოში."
+JFIELD_PASSWORD_TOO_LONG="პაროლი ძალინ გრძელია. ის უნდა შეიცავდეს არაუმეტეს 100 სიმბოლოსა."
 JFIELD_PASSWORD_TOO_SHORT_N="პაროლი საკმაოდ მოკლეა. პაროლის სიგრძე უნდა იყოს არანაკლები %d სიმბოლოსი."
 
 ; Javascript Form Validation Messages
-JLIB_FORM_CONTAINS_INVALID_FIELDS="ფორმა ვერ გაიგზავნება, რადგან ერთი ან რამოდენიმე ველი არ არის შევსებული სწორად. <br> გთხოვთ გაასწოროთ მონიშნული ველები და სცადეთ ხელახლა."
+JLIB_FORM_CONTAINS_INVALID_FIELDS="ფორმის გაგზავნა ვერ ხერხდება, ერთი ან რამოდენიმე ველი არ არის სწორად შევსებული. <br> გთხოვთ გაასწოროთ მონიშნული ველები და სცადეთ ხელახლა."
 JLIB_FORM_FIELD_INVALID_VALUE="გთხოვთ შეიყვანოთ სწორი მნიშვნელობა."
 JLIB_FORM_FIELD_REQUIRED_CHECK="გთხოვთ აირჩიოთ მნიშვნელობა."
 JLIB_FORM_FIELD_REQUIRED_VALUE="გთხოვთ შეავსოთ ველი."
diff --git a/installation/language/ka-GE/langmetadata.xml b/installation/language/ka-GE/langmetadata.xml
index d8a5116ee6728..2699e37e0ec48 100644
--- a/installation/language/ka-GE/langmetadata.xml
+++ b/installation/language/ka-GE/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Georgian (Georgia)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Georgian Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/kk-KZ/joomla.ini b/installation/language/kk-KZ/joomla.ini
index 58a19859f6867..72fba50b42464 100644
--- a/installation/language/kk-KZ/joomla.ini
+++ b/installation/language/kk-KZ/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Хостыңыз PHP {{phpversion}} немесе од
 BUILD_MIN_PHP_ERROR_URL_TEXT="Бұл мәселені шешуге көмектес"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Өзгерту"
 INSTL_SELECT_INSTALL_LANG="Орнату тілін таңдау"
 INSTL_SELECT_LANGUAGE_TITLE="Тілді таңдаңыз"
 INSTL_SETUP_LOGIN_DATA="Логин туралы мәліметтер орнату"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Joomla-ді орнату үшін сіздің PHP орнаты
 INSTL_DATABASE_SUPPORT="Деректер базасын қолдау:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON қолдауы"
 INSTL_MB_LANGUAGE_IS_DEFAULT="МБ тілі әдепкі"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="МБ жолды шамадан тыс жүктеу өшірулі"
 INSTL_NOTICE_DATABASE_SUPPORT="Дерекқор табылмады."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Joomla-ді орнату үшін сіздің PHP орнатылымыңыз JSON функциясын қажет етеді!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring тілі бейтарап күйге орнатылмаған. Мұны <code>.htaccess</code> файлыңызға <strong>php_value mbstring.language бейтарап</strong> енгізу арқылы жергілікті түрде орнатуға болады."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring функциясының шамадан тыс жүктелуі орнатылды. Мұны <code>.htaccess</code> файлыңызға <strong>php_value mbstring.func_overload 0</strong> енгізу арқылы жергілікті түрде өшіруге болады."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Қажетті PHP функциялары <code>parse_ini_file</code> және <code>parse_ini_string</code> серверде өшірілген."
 INSTL_NOTICE_XML_SUPPORT="XML қолдауы қол жетімді емес. Мұны php-де әдепкі бойынша қосу керек, бірақ Ubuntu пайдаланушыларына оны орнату қажет болуы мүмкін <code>sudo apt-get install php-xml</code>, содан кейін веб-сервер қайта іске қосылады."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib қысу орнатылмаған. Мұны <code>php.ini</code> файлыңызға <strong>zlib.output_compression = On</strong> енгізу арқылы жергілікті түрде қосуға болады."
@@ -263,7 +260,7 @@ JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION=" %1$s пакеті: кеңе
 JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="%s бумасы: Орнатылатын файлдар жоқ!"
 JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Серверге қосылу қатесі: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE=" JInstaller:: Install: %1$s файлын %2$s ішіне көшіру мүмкін емес."
-JLIB_INSTALLER_INSTALL="Орнату"
+JLIB_INSTALLER_INSTALL="Орнатуы"
 JLIB_INSTALLER_NOT_ERROR="Егер қате TinyMCE тіл файлдарын орнатумен байланысты болса, ол тілді(тілдерді) орнатуға әсер етпейді. Кейбір тіл бумалары дейін құрылған Joomla! 3.2.0 жеке TinyMCE тіл файлдарын орнатуға тырысуы мүмкін. Олар енді ядроға енгізілгендіктен, оларды орнату қажет емес."
 JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="%s тілі үшін мазмұн тілін жасау мүмкін емес: %s."
 JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP allow_url_fopen параметрі өшірілген. Жаңартқыш жұмыс істеуі үшін бұл параметрді қосу керек."
diff --git a/installation/language/kk-KZ/langmetadata.xml b/installation/language/kk-KZ/langmetadata.xml
index 36c1cd87025a5..a1e454c59cb9c 100644
--- a/installation/language/kk-KZ/langmetadata.xml
+++ b/installation/language/kk-KZ/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Kazakh (Kazakhstan)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Sarvarov Akylkerey</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/ko-KR/joomla.cli.ini b/installation/language/ko-KR/joomla.cli.ini
index 0bcc1164ee31a..b2c66ab8355a7 100644
--- a/installation/language/ko-KR/joomla.cli.ini
+++ b/installation/language/ko-KR/joomla.cli.ini
@@ -1,4 +1,5 @@
 INSTL_ADMIN_EMAIL_DESC="웹사이트 최고 관리자의 이메일 주소를 입력합니다"
+INSTL_ADMIN_EMAIL_DESC_SHORT="웹사이트의 최고 관리자 계정 이메일 주소"
 INSTL_ADMIN_PASSWORD_DESC="최고 관리자 계정의 비밀번호를 설정합니다"
 INSTL_ADMIN_PASSWORD_DESC_SHORT="최고 관리자 계정의 비밀번호"
 INSTL_ADMIN_USERNAME_DESC="슈퍼 유저 계정의 사용자 아이디를 설정하세요"
@@ -8,9 +9,16 @@ INSTL_ADMIN_USER_DESC_SHORT="최고 관리자 계정의 실명"
 INSTL_DATABASE_COULD_NOT_CONNECT="%s"
 INSTL_DATABASE_ENCRYPTION_CA_LABEL="암호화 검증용 CA 파일 경로"
 INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="암호화 검증용 CA 파일 경로"
-INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="데이터베이스 연결을 위한 SSL 인증서 경로. 암호화를 2로 설정해야 함"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL="데이터베이스 연결용 SSL 인증서 경로. 암호화를 2로 설정해야 함"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="데이터베이스 연결용 SSL 인증서 경로. 암호화를 2로 설정해야 함"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="지원되는 암호 스위트(선택 사항)"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="지원되는 암호 스위트(선택 사항)"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL="데이터베이스 연결용 SSL 키. 암호화를 2으로 설정해야 함"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="데이터베이스 연결용 SSL 키. 암호화를 2으로 설정해야 함"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL="데이터베이스 연결 암호화. 값: 0=없음, 1=단방향, 2=양방향"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="데이터베이스 연결 암호화. 값: 0=없음, 1=단방향, 2=양방향"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="데이터베이스 연결 시 SSL 인증서 확인. 값: 0=아니오, 1=예. 암호화가 1 또는 2로 설정되어야 함"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="데이터베이스 연결 시 SSL 인증서 확인. 값: 0=아니오, 1=예. 암호화가 1 또는 2로 설정되어야 함"
 INSTL_DATABASE_HOST_DESC="데이터베이스 호스트"
 INSTL_DATABASE_HOST_DESC_SHORT="데이터베이스 호스트"
 INSTL_DATABASE_NAME_DESC="데이터베이스 이름"
@@ -19,6 +27,8 @@ INSTL_DATABASE_PASSWORD_DESC="데이터베이스 비밀번호"
 INSTL_DATABASE_PASSWORD_DESC_SHORT="데이터베이스 비밀번호"
 INSTL_DATABASE_PREFIX_DESC="데이터베이스 테이블 접두사"
 INSTL_DATABASE_PREFIX_DESC_SHORT="데이터베이스 테이블 접두사"
+INSTL_DATABASE_TYPE_DESC="데이터베이스 유형. 지원됨: mysql, mysqli, pgsql"
+INSTL_DATABASE_TYPE_DESC_SHORT="데이터베이스 유형. Joomla에서 지원되는 데이터베이스: mysql (=MySQL (PDO)), mysqli (=MySQLi), pgsql (=PostgreSQL (PDO))"
 INSTL_DATABASE_USER_DESC="데이터베이스 사용자이름"
 INSTL_DATABASE_USER_DESC_SHORT="데이터베이스 사용자이름"
 INSTL_PUBLIC_FOLDER_DESC="공용 폴더의 상대 또는 절대 경로"
diff --git a/installation/language/ko-KR/joomla.ini b/installation/language/ko-KR/joomla.ini
index fadfe59d13502..7ecba579a3461 100644
--- a/installation/language/ko-KR/joomla.ini
+++ b/installation/language/ko-KR/joomla.ini
@@ -7,14 +7,14 @@
 ; These will be processed by the JavaScript Build
 BUILD_FATAL_HEADER="자동 복구될 수 없는 문제가 발생했습니다."
 BUILD_FATAL_LANGUAGE="Korean KO" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
-BUILD_FATAL_TEXT="서버가 \"{{statusCode_statusText}}\" 를 리턴했습니다."
-BUILD_FATAL_URL_TEXT="이 문제를 해결하도록 도와주세요."
+BUILD_FATAL_TEXT="서버 리턴 값은 \"{{statusCode_statusText}}\" 입니다."
+BUILD_FATAL_URL_TEXT="처리해야 하는 문제가 발생했습니다."
 
 ; Build incomplete error page
 ; These will be processed by the JavaScript Build
-BUILD_INCOMPLETE_HEADER="환경 설정 불완전"
+BUILD_INCOMPLETE_HEADER="환경 설정이 완료되지 않았습니다."
 BUILD_INCOMPLETE_LANGUAGE="Korean KO" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
-BUILD_INCOMPLETE_TEXT="Joomla가 git repository에서 작동되기 위해서는 추가 설정이 필요합니다."
+BUILD_INCOMPLETE_TEXT="Git 저장소에서 Joomla!를 설치하려는 것 같습니다. 이렇게 하려면 먼저 몇 가지 추가 단계를 완료해야 합니다."
 BUILD_INCOMPLETE_URL_TEXT="자세히 보기"
 
 ; No XML PHP error page
@@ -22,17 +22,18 @@ BUILD_INCOMPLETE_URL_TEXT="자세히 보기"
 BUILD_NOXML_HEADER="PHP에 필수 라이브러리를 찾을 수 없습니다."
 BUILD_NOXML_LANGUAGE="Korean KO" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_NOXML_TEXT="해당 Joomla 버전을 사용하기 위해서는 호스트가 XML 라이브러리가 지원되는 PHP를 사용해야 합니다."
-BUILD_NOXML_URL_TEXT="이 문제를 해결하도록 도와주세요."
+BUILD_NOXML_URL_TEXT="처리해야 하는 문제가 발생했습니다."
 
 ; Minimum PHP error page
 ; These will be processed by the JavaScript Build
-BUILD_MIN_PHP_ERROR_HEADER="죄송합니다. 사용 중인 PHP 버전이 지원되지 않습니다."
+BUILD_MIN_PHP_ERROR_HEADER="죄송합니다. 사용 중인 PHP 버전은 지원되지 않습니다."
 BUILD_MIN_PHP_ERROR_LANGUAGE="Korean KO" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_MIN_PHP_ERROR_TEXT="해당 버전의 Joomla를 사용하기 위해서는 PHP 버전 {{phpversion}} 또는 그 상위 버전이 필요합니다."
-BUILD_MIN_PHP_ERROR_URL_TEXT="이 문제를 해결하도록 도와주세요."
+BUILD_MIN_PHP_ERROR_URL_TEXT="처리해야 하는 문제가 발생했습니다."
 
 ; Main Config
-INSTL_SELECT_INSTALL_LANG="설치될 언어를 선택해 주세요."
+INSTL_CHANGE_INSTALL_LANG_SHORT="위치 변경"
+INSTL_SELECT_INSTALL_LANG="설치할 언어를 선택해 주세요."
 INSTL_SELECT_LANGUAGE_TITLE="언어 선택"
 INSTL_SETUP_LOGIN_DATA="로그인 정보 설정"
 INSTL_WARNJAVASCRIPT="경고! Joomla를 정상적으로 설치하기 위해서는 JavaScript가 반드시 필요합니다."
@@ -42,19 +43,15 @@ INSTL_WARNJSON="Joomla가 설치되기 위해서는 PHP 설치에서 JSON 사용
 INSTL_DATABASE_SUPPORT="데이터베이스 지원:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON 지원"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB 언어가 기본값 입니다."
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB 문자열(스트링) 오버로드 끄기"
-INSTL_NOTICE_DATABASE_SUPPORT="지원되는 데이터베이스가 발견되지 않았습니다."
+INSTL_NOTICE_DATABASE_SUPPORT="지원되는 데이터베이스를 찾을 수 없습니다."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Joomla가 설치되기 위해서는 PHP 설치에서 JSON 사용이 활성화되어야 합니다."
-INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring 언어가 중립(neutral)으로 설정되어있지 않습니다. 이는 로컬에서 <code>.htaccess</code> 파일에 <strong>php_value mbstring.language neutral</strong>를 입력하여 설정할 수 있습니다."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring 함수 오버로드가 설정되어 있습니다. 이는 로컬에서 <code>.htaccess</code> 파일에 <strong>php_value mbstring.func_overload 0</strong>을 입력하여 설정을 해제할수있습니다."
-INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="필수 PHP 함수인 <code>parse_ini_file</code>과 <code>parse_ini_string</code>이(가) 서버에 비활성화되어 있습니다."
+INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring 언어가 중립으로 설정되지 않았습니다. 이 값은 <code>.htaccess</code> 파일에 <strong>php_value mbstring.language neutral</strong> 을 입력하여 로컬에서 설정할 수 있습니다."
+INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="필수 PHP 함수인 <code>parse_ini_file</code>과 <code>parse_ini_string</code>이(가) 서버에서 비활성화되어 있습니다."
 INSTL_NOTICE_XML_SUPPORT="XML 지원이 사용 불가능합니다. 이는 PHP에서 기본적으로 활성화되어야 하지만, Ubuntu 사용자는 <code>sudo apt-get install php-xml</code> 명령어를 실행한 후 웹 서버를 재시작해야 합니다."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib 압축이 설정되어 있지 않습니다. 이를 로컬에서 활성화하려면 <code>php.ini</code> 파일에 <strong>zlib.output_compression = On</strong>을 입력하면 됩니다."
 INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser 지원"
 INSTL_PRECHECK_ACTUAL="최신"
-INSTL_PRECHECK_DESC="지원되지 않는 아이템이 있다면 서버의 설정을 고치기 위한 조치를 취해야합니다.<br>아래의 요구 사항이 충족되지 않으면 Joomla를 설치할 수 없습니다."
+INSTL_PRECHECK_DESC="지원되지 않는 항목에 대한 조치가 필요합니다.<br>요구 사항이 충족되지 않으면 Joomla를 설치할 수 없습니다."
 INSTL_PRECHECK_DIRECTIVE="지시문"
 INSTL_PRECHECK_RECOMMENDED="추천"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="PHP에서 Joomla와의 완전한 호환성을 보장하려면 이러한 설정을 권장합니다."
@@ -64,13 +61,13 @@ INSTL_XML_SUPPORT="XML 지원"
 INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib 압축 지원"
 
 ; Database view
-INSTL_DATABASE="데이터베이스 구성"
+INSTL_DATABASE="데이터베이스 설정"
 INSTL_DATABASE_ENCRYPTION_CA_LABEL="CA 파일 경로"
 INSTL_DATABASE_ENCRYPTION_CERT_LABEL="인증서 파일 경로"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="지원되는 암호 스위트(선택 사항)"
-INSTL_DATABASE_ENCRYPTION_KEY_LABEL="개인키 파일 경로"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL="개인 키 파일 경로"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL="연결 암호화"
-INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="디폴트 (서버 조작)"
+INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="표준(서버 제어)"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="사용자 인증(single factor)"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="2단계 보안 인증(2FA)"
 INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="데이터베이스 연결 암호화를 사용하도록 선택했으며 연결이 설정될 수 있지만 암호화되지 않았습니다. 그 이유는 데이터베이스 서버가 암호화 매개변수가 잘못된 경우 암호화되지 않은 연결로 되돌아가도록 구성되어 있기 때문일 수 있습니다. 데이터베이스 암호화 매개변수를 확인하여 수정하거나 \"연결 암호화\" 필드를 \"기본값(서버 제어)\"으로 다시 변경합니다."
@@ -83,12 +80,12 @@ INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL 데이터베이스 쿼리에 
 INSTL_DATABASE_HOST_DESC="호스트 이름(일반적으로 \"localhost\" 또는 호스트가 제공한 이름)을 입력하세요."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="파일을 만들 수 없습니다. "_QQ_"\"%1$s\"라는 파일을 수동으로 생성하여 Joomla 사이트의 \"%2$s\"폴더에 업로드하세요. 그런 다음 \"%3$s\"를 선택하여 계속하세요."
 INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="이 웹 사이트의 소유자임을 확인하려면 Joomla 사이트의 \"%2$s\"폴더에 생성된 \"%1$s\"라는 파일을 삭제하십시오. 그런 다음 \"%3$s\"를 선택하여 계속하세요."
-INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="로컬 서버에 없는 데이터베이스 호스트를 사용하려고 합니다. 보안 상의 이유로 웹 호스팅 계정의 소유권을 확인해야 합니다. 자세한 내용은 <a href=\"%s\" target=\"_blank\" rel=\"noopener noreferrer\">이 문서에서 참조하세요. </a>"
+INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="로컬 서버에 없는 데이터베이스 호스트를 사용하려고 합니다. 보안상의 이유로 웹 호스팅 계정의 소유권을 확인해야 합니다. 자세한 내용은 <a href=\"%s\" target=\"_blank\" rel=\"noopener noreferrer\">이 문서에서 참조하세요. </a>"
 INSTL_DATABASE_HOST_LABEL="호스트 이름"
 INSTL_DATABASE_NAME_DESC="데이터베이스 이름을 입력하세요."
 INSTL_DATABASE_NAME_LABEL="데이타베이스 이름"
 INSTL_DATABASE_NAME_MSG_MYSQL="데이터베이스 이름이 잘못되었습니다. 다음 문자를 포함해서는 안 됩니다: \ /"
-INSTL_DATABASE_NAME_MSG_POSTGRES="데이터베이스 이름이 잘못되었습니다. 데이터베이스 이름은 반드시 문자로 시작하고 그 뒤에 영문자와 숫자가 와야 합니다."
+INSTL_DATABASE_NAME_MSG_POSTGRES="데이터베이스 이름이 잘못되었습니다. 문자로 시작하고 그 뒤에 영문자와 숫자가 와야 합니다."
 INSTL_DATABASE_NO_SCHEMA="이 데이터베이스 유형에 대한 데이터베이스 스키마가 존재하지 않습니다."
 INSTL_DATABASE_PREFIX_DESC="테이블 접두사를 입력하거나 무작위로 생성된 접두사를 사용합니다."
 INSTL_DATABASE_PREFIX_DUPLICATE_DESC="접두사가 같은 테이블이 있는 기존 데이터베이스를 사용하는 경우 Joomla는 접두사 \"bak_\"를 추가하여 기존 테이블의 이름을 바꿉니다."
@@ -119,13 +116,13 @@ INSTL_PUBLIC_FOLDER_DESC_SHORT="공용 폴더의 상대 또는 절대 경로"
 INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="추가 언어 설치"
 INSTL_COMPLETE_ADMIN_BTN="관리자 열기"
 INSTL_COMPLETE_CONGRAT="축하드립니다!"
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="\"%s\" 폴더는 삭제될 수 없습니다. 폴더를 수동으로 삭제해 주세요."
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="\"%s\" 폴더는 삭제될 수 없습니다. 직접 삭제해 주세요."
 INSTL_COMPLETE_FINAL="설치 완료되었습니다."
 INSTL_COMPLETE_FINAL_DESC="Joomla 설치가 완료되었고, 지금 바로 사용 가능합니다."
 INSTL_COMPLETE_REMOVE_FOLDER="\"%s\" 폴더 삭제"
 INSTL_COMPLETE_SITE_BTN="사이트 열기"
 INSTL_COMPLETE_TITLE="축하드립니다! Joomla 사이트가 준비되었습니다."
-INSTL_REMOVE_INST_FOLDER="정말로 지우겠습니까? 삭제 시 \"%s\" 는 복구 불가합니다."
+INSTL_REMOVE_INST_FOLDER="정말로 지우겠습니까? 삭제시 \"%s\" 는 복구 불가합니다."
 
 ; Languages view
 INSTL_LANGUAGES="추가 언어 설치"
@@ -133,11 +130,11 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="언어"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="언어 선택"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="언어 태그"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="버전"
-INSTL_LANGUAGES_DESC="Joomla 인터페이스는 여러 언어로 이용 가능합니다. 원하는 언어의 체크박스를 선택 후, 버튼 \"I선택한 언어 설치\" 을 클릭해 주세요.<br>참고로, 각 언어당 약 10 초 정도의 설치 시간이 소요됩니다. 오류 가능성을 줄이기 위해, 4개 이상의 언어팩을 동시에 설치하지 말아 주세요."
+INSTL_LANGUAGES_DESC="Joomla 인터페이스는 여러 언어로 이용 가능합니다. 원하는 언어의 체크박스를 선택 후, \"선택한 언어 설치\" 버튼을 클릭해 주세요. <br>참고로, 각 언어당 약 10 초 정도의 설치 시간이 소요됩니다. 오류 가능성을 줄이기 위해, 4개 이상의 언어팩을 동시에 설치하지 말아 주세요."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="이 작업을 완료하는 데 언어당 최대 10초가 소요됩니다<br>언어를 다운로드하고 설치하는 동안 잠시 기다려 주세요 &hellip;"
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="설치할 언어가 선택되지 않았습니다."
 INSTL_LANGUAGES_SELECTED="선택된 언어 설치하기"
-INSTL_LANGUAGES_WARNING_BACK_BUTTON="이전 설치 단계로 돌아가기"
+INSTL_LANGUAGES_WARNING_BACK_BUTTON="마지막 설치 단계로 돌아가기"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla가 언어 서버에 연결하지 못했습니다. 설치 프로세스를 완료해 주십시오."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="참고: 나중에 Joomla 관리자에서 언어를 설치할 수 있습니다."
 
@@ -163,7 +160,7 @@ INSTL_DEFAULTLANGUAGE_TRY_LATER="나중에 Joomla 관리자에서 설치할 수
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="한국어 (Korean)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
 
 ; Database Model
-INSTL_DATABASE_COULD_NOT_CONNECT="데이터베이스에 연결할 수 없습니다. 커넥터로부터 반환받은 번호: %s"
+INSTL_DATABASE_COULD_NOT_CONNECT="데이터베이스에 연결할 수 없습니다. 커넥터 에러 메시지: %s"
 INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="설치 프로그램이 지정한 데이터베이스에 연결할 수 없어 데이터베이스를 만들 수 없습니다. 설정을 다시 확인하고 필요한 경우 데이터베이스를 수동으로 생성하세요."
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="확장 프로그램을 위한 manifest 캐시를 새로 고치지 못했습니다: %s"
 INSTL_DATABASE_ERROR_BACKINGUP="데이터베이스 백업 중 오류가 발생했습니다."
@@ -173,9 +170,9 @@ INSTL_DATABASE_ERROR_READING_SQL_FILE="SQL 파일을 읽을 수 없습니다."
 INSTL_DATABASE_FIELD_VALUE_BACKUP="백업"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="삭제"
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="파일 %s이(가) 존재하지 않습니다."
-INSTL_DATABASE_FIX_LOWERCASE="PostgreSQL의 테이블 접두사는 반드시 소문자여야 합니다."
+INSTL_DATABASE_FIX_LOWERCASE="PostgreSQL의 테이블 접두사는 소문자여야 합니다."
 INSTL_DATABASE_FIX_TOO_LONG="MySQL 테이블 접두사는 최대 15자까지만 입력할 수 있습니다."
-INSTL_DATABASE_INVALID_DB_DETAILS="입력한 데이터베이스 세부 정보가 잘못되었거나 비어 있습니다."
+INSTL_DATABASE_INVALID_DB_DETAILS="데이터베이스 세부 정보가 잘못되었거나 비어 있습니다."
 INSTL_DATABASE_INVALID_MARIADB_VERSION="설치를 계속하려면 MariaDB %1$s 혹은 그 이상이 필요합니다. 사용 중인 버전: %2$s"
 INSTL_DATABASE_INVALID_MYSQLI_VERSION="설치를 계속하려면 MySQL %1$s 혹은 그 이상이 필요합니다. 사용 중인 버전: %2$s"
 INSTL_DATABASE_INVALID_MYSQL_VERSION="설치를 계속하려면 MySQL %1$s 혹은 그 이상이 필요합니다. 사용 중인 버전: %2$s"
@@ -195,15 +192,15 @@ INSTL_PAGE_TITLE="Joomla 설치 프로그램"
 
 ; Configuration model
 INSTL_ERROR_CONNECT_DB="데이터베이스에 연결할 수 없습니다. 커넥터로부터 반환받은 번호: %d."
-INSTL_STD_OFFLINE_MSG="이 사이트는 유지보수를 위해 닫혀 있습니다.<br>잠시 후 다시 확인해 주세요."
+INSTL_STD_OFFLINE_MSG="이 사이트는 유지보수를 위해 닫혀 있습니다.<br />잠시 후 다시 확인해 주세요."
 
 ; Languages model
-INSTL_ERROR_INVALID_URL="유효하지 않은 URL"
+INSTL_ERROR_INVALID_URL="잘못된 URL"
 
 ; Others
-INSTL_CONFPROBLEM="구성 파일 또는 폴더를 작성 수 없거나 구성 파일을 만드는 데 문제가 있습니다. 다음 코드를 수동으로 업로드해야 합니다. 텍스트 영역에서 선택하여 모든 코드를 강조 표시한 다음 새 텍스트 파일에 붙여넣습니다. 이 파일의 이름을 'configuration.php'로 지정하고 사이트 루트 폴더에 업로드합니다."
+INSTL_CONFPROBLEM="구성 파일 또는 폴더를 쓸 수 없거나 구성 파일을 만드는 데 문제가 있습니다. 다음 코드를 직접 업로드해야 합니다. 텍스트 영역에서 선택하여 모든 코드를 강조 표시한 다음 새 텍스트 파일에 붙여넣습니다. 이 파일의 이름을 'configuration.php'로 지정하고 사이트 루트 폴더에 업로드합니다."
 INSTL_DISPLAY_ERRORS="디스플레이 오류"
-INSTL_ERROR="오류"
+INSTL_ERROR="에러"
 INSTL_ERROR_DB="데이터베이스를 채우는 동안 오류가 발생했습니다: %s."
 INSTL_ERROR_INITIALISE_SCHEMA="데이터베이스 스키마를 초기화할 수 없습니다."
 INSTL_EXTENSION_AVAILABLE="%s 사용 가능"
@@ -223,23 +220,23 @@ INSTL_ZIP_SUPPORT_AVAILABLE="기본 ZIP 지원"
 JADMINISTRATOR="관리자"
 JCLOSE="닫기"
 JEMAIL="이메일"
-JERROR="오류"
+JERROR="에러"
 JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="요청 처리 도중 오류가 발생했습니다."
 JGLOBAL_ISFREESOFTWARE="%s은(는) <a href="_QQ_"https://www.gnu.org/licenses/gpl-2.0.html"_QQ_">GNU 일반 공중 사용 허가서</a>로 릴리즈된 자유 소프트웨어 입니다."
-JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="언어팩이 이 Joomla!버전과 일치하지 않습니다. 몇몇 문자열이 누락되어 영어로 표시될 것입니다."
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="언어 팩이 설치된 Joomla! 버전과 일치하지 않습니다. 따라서 일부 번역이 누락되어 영어로 표시될 수 있습니다."
 JGLOBAL_SELECT_AN_OPTION="옵션을 선택하세요."
 JGLOBAL_SELECT_NO_RESULTS_MATCH="일치하는 결과가 없습니다."
 JGLOBAL_SELECT_SOME_OPTIONS="몇개의 옵션을 선택하세요."
 JHIDEPASSWORD="비밀번호 숨기기"
-JINVALID_TOKEN="가장 최근의 요청이 잘못된 보안 토큰을 가지고 있어서 거부되었습니다. 페이지를 새로 고침하여 다시 시도하세요."
-JINVALID_TOKEN_NOTICE="보안 토큰이 일치하지 않습니다. 보안 침해를 방지하기 위해 요청이 취소되었습니다. 다시 시도해 주세요."
+JINVALID_TOKEN="요청이 잘못된 토큰을 가지고 있어서 거부되었습니다. 페이지를 새로 고침하여 다시 시도하세요."
+JINVALID_TOKEN_NOTICE="토큰이 일치하지 않습니다. 보안 위반을 막기 위해 요청이 중단되었습니다. 다시 시도해 주세요."
 JNEXT="다음"
 JNO="Never"
-JNOTICE="공지"
+JNOTICE="공지사항"
 JOFF="비활성"
 JON="활성"
 JPREVIOUS="이전"
-JSHOWPASSWORD="비밀번호 보기"
+JSHOWPASSWORD="비밀번호 보이기"
 JSITE="사이트"
 JSKIP="건너뛰기"
 JUSERNAME="사용자 이름"
@@ -251,29 +248,29 @@ JLIB_DATABASE_ERROR_DATABASE="데이터베이스 오류가 발생했습니다."
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="%s 데이터베이스 드라이버를 불러올 수 없습니다."
 JLIB_DATABASE_ERROR_VALID_MAIL="유효한 이메일 주소를 입력하세요."
 JLIB_ENVIRONMENT_SESSION_EXPIRED="세션이 만료되었습니다. 페이지를 새로 고침하세요."
-JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: 경로는 폴더가 아닙니다. 경로: %2$s"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="JFolder: :삭제: 경로는 폴더가 아닙니다. 경로: %s"
 JLIB_FORM_FIELD_INVALID="유효하지 않은 필드:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="유효하지 않은 필드: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="필드 요구사항: %s"
 JLIB_INSTALLER_ABORT="언어 설치 중단: %s"
-JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="확장기능 %1$s: 폴더 생성 실패: %2$s"
+JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="확장 프로그램 %1$s: 폴더 생성 실패: %2$s"
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="설치 경로가 존재하지 않습니다."
-JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="패키지 %1$s: 확장기능 설치중에 에러가 발생했습니다.: %2$s."
+JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="패키지 %1$s: 확장 프로그램 설치중에 에러가 발생했습니다.: %2$s."
 JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="패키지 %s: 설치할 파일이 없습니다!"
 JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="서버 접속 오류: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: %1$s 파일을 %2$s로 복사하는데 실패했습니다."
 JLIB_INSTALLER_INSTALL="설치"
 JLIB_INSTALLER_NOT_ERROR="오류가 TinyMCE 언어 파일의 설치와 연관되어 있다면 그것은 언어의 설치에 아무런 영향을 미치지 않습니다. 몇몇 언어 팩은 Joomla 3.2.0 이전 버전에 만들어져서, 별도로 TimyMCE 언어파일을 설치하려고 할 수도 있습니다. 이러한 경우, 줌라의 핵심 파일로 포함되어 있기 때문에, 더이상 설치할 필요가 없습니다."
-JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="%s 언어를 위한 콘텐츠 언어를 만들 수 없음: %s."
-JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP의 allow_url_fopen 설정이 비활성화되어 있습니다. 이 설정은 작동 업데이트를 위해 활성화되어 있어야합니다."
-JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="업데이트: :Collection: %s을(를) 열수 없습니다."
-JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="업데이트: :Collection: %s를(을) parse할 수 없습니다."
+JLIB_INSTALLER_WARNING_UNABLE_TO_INSTALL_CONTENT_LANGUAGE="%s 언어를 위한 컨텐츠 언어를 생성할 수 없음: %s."
+JLIB_UPDATER_ERROR_COLLECTION_FOPEN="PHP의 allow_url_fopen 설정이 비활성화되어 있습니다. 이 설정은 작동 업데이를 활성화해야합니다."
+JLIB_UPDATER_ERROR_COLLECTION_OPEN_URL="업데이트: :수집: %s을 열수 없습니다."
+JLIB_UPDATER_ERROR_COLLECTION_PARSE_URL="업데이트: :수집: %s를 parse 할수 없습니다."
 JLIB_UPDATER_ERROR_OPEN_UPDATE_SITE="업데이트: 업데이트 사이트 #%d &quot;%s&quot;를(을) 열 수 없음, URL: %s."
-JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: 데이터베이스에 접속할 수 없습니다. <br />joomla.library: %1$s - %2$s."
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: ::getInstance: 데이터베이스에 접속할 수 없습니다. <br/>joomla.library: %1$s - %2$s."
 
 ; Strings for the language debugger
-JDEBUG_LANGUAGE_FILES_IN_ERROR="언어 파일에서 Parsing 오류"
-JDEBUG_LANGUAGE_UNTRANSLATED_STRING="번역되지 않은 문자열"
+JDEBUG_LANGUAGE_FILES_IN_ERROR="언어 파일에서 파실(Parsing)오류"
+JDEBUG_LANGUAGE_UNTRANSLATED_STRING="번역되지 않은 스트링"
 JNONE="없음"
 
 ; Necessary for errors
@@ -282,7 +279,7 @@ ADMIN_PASSWORD="관리자 비밀번호"
 SITE_NAME="사이트 이름"
 
 ; Database types (allows for a more descriptive label than the internal name)
-MYSQL="MySQL (PDO)"
+MYSQL="MySQL"
 MYSQLI="MySQLi"
 ORACLE="Oracle"
 PGSQL="PostgreSQL (PDO)"
@@ -290,20 +287,20 @@ POSTGRESQL="PostgreSQL"
 SQLITE="SQLite"
 
 ; Javascript message titles
-ERROR="오류"
+ERROR="에러"
 MESSAGE="메시지"
-NOTICE="공지"
+NOTICE="공지사항"
 WARNING="경고"
 
 ; Javascript ajax error messages
 JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="JSON 데이터 수신 중 연결 중단이 발생했습니다."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="콘텐츠가 없습니다."
-JLIB_JS_AJAX_ERROR_OTHER="JSON 데이터를 가져오는 중 오류 발생: HTTP %d 상태 코드."
-JLIB_JS_AJAX_ERROR_PARSE="JSON 데이터 처리 파싱 에러 발생:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
+JLIB_JS_AJAX_ERROR_OTHER="JSON 데이터를 가져오는 동안 오류가 발생했습니다: HTTP %d 상태 코드입니다."
+JLIB_JS_AJAX_ERROR_PARSE="JSON 데이터 처리 파싱 에러 발생:<br/><code style="_QQ_"color:inherit;white-space:prewrap;padding:0;margin:0;border:0;background:inherit;"_QQ_">%s</code>"
 JLIB_JS_AJAX_ERROR_TIMEOUT="JSON 데이터 수신에 타임아웃 오류가 발생했습니다."
 
 ; Field password messages
-JFIELD_PASSWORD_INDICATE_COMPLETE="비밀번호가 허용됨"
+JFIELD_PASSWORD_INDICATE_COMPLETE="비밀번호가 수락됨"
 JFIELD_PASSWORD_INDICATE_INCOMPLETE="비밀번호가 사이트 요구 사항을 충족하지 않습니다."
 JFIELD_PASSWORD_SPACES_IN_PASSWORD="비밀번호는 앞이나 뒤에 공백이 없어야 합니다."
 JFIELD_PASSWORD_TOO_LONG="비밀번호가 너무 깁니다. 비밀번호는 100자 미만이어야 합니다."
@@ -313,7 +310,7 @@ JFIELD_PASSWORD_TOO_SHORT_N="비밀번호가 너무 짧습니다. 비밀번호
 JLIB_FORM_CONTAINS_INVALID_FIELDS="필수 데이터가 누락되어 양식을 제출할 수 없습니다. <br> 표시된 필드를 수정하고 다시 시도하십시오."
 JLIB_FORM_FIELD_INVALID_VALUE="이 값은 유효하지 않습니다."
 JLIB_FORM_FIELD_REQUIRED_CHECK="옵션 중 하나를 반드시 선택해야 합니다."
-JLIB_FORM_FIELD_REQUIRED_VALUE="이 필드를 작성하십시오."
+JLIB_FORM_FIELD_REQUIRED_VALUE="이 필드를 작성하세요."
 
 ; Installation progress screen
 INSTL="설치"
diff --git a/installation/language/ko-KR/langmetadata.xml b/installation/language/ko-KR/langmetadata.xml
index 9d314767c13f0..54141d821a8b9 100644
--- a/installation/language/ko-KR/langmetadata.xml
+++ b/installation/language/ko-KR/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
-	<name>Korean (Republic of Korea)</name>
-	<version>5.4.8</version>
+	<name>Korean (ko-KR)</name>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! 프로젝트</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
@@ -11,7 +11,7 @@
 	</files>
 	<metadata>
 		<name>Korean (ko-KR)</name>
-		<nativeName>Korean (Republic of Korea)</nativeName>
+		<nativeName>Korean (ko-KR)</nativeName>
 		<tag>ko-KR</tag>
 		<rtl>0</rtl>
 	</metadata>
diff --git a/installation/language/lt-LT/joomla.cli.ini b/installation/language/lt-LT/joomla.cli.ini
index b38426e26ad39..a25cf90c33182 100644
--- a/installation/language/lt-LT/joomla.cli.ini
+++ b/installation/language/lt-LT/joomla.cli.ini
@@ -1,11 +1,38 @@
 INSTL_ADMIN_EMAIL_DESC="Įveskite svetainės Super User el. pašto adresą"
+INSTL_ADMIN_EMAIL_DESC_SHORT="Svetainės SuperVartotojo paskyros el. pašto adresas"
 INSTL_ADMIN_PASSWORD_DESC="Nustatykite Super User paskyros slaptažodį"
+INSTL_ADMIN_PASSWORD_DESC_SHORT="Jūsų supervartotojo paskyros slaptažodis"
 INSTL_ADMIN_USERNAME_DESC="Įveskite jūsų Super Administratoriaus paskyros prisijungimo vardą"
+INSTL_ADMIN_USERNAME_DESC_SHORT="Jūsų supervartotojo paskyros vartotojo vardas"
 INSTL_ADMIN_USER_DESC="Įveskite tikrąjį Super User vardą"
+INSTL_ADMIN_USER_DESC_SHORT="Tikrasis supervartotojo paskyros vardas"
 INSTL_DATABASE_COULD_NOT_CONNECT="%s"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL="Kelias į CA failą, pagal kurį reikia patikrinti šifravimą"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Kelias į CA failą, pagal kurį reikia patikrinti šifravimą"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Kelias į SSL sertifikatą duomenų bazės ryšiui. Reikalingas šifravimo nustatymas į 2"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Kelias į SSL sertifikatą duomenų bazės ryšiui. Reikalingas šifravimo nustatymas į 2"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Palaikomas „Cipher Suite“ (neprivaloma)"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Palaikomas „Cipher Suite“ (neprivaloma)"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL="SSL raktas duomenų bazės ryšiui. Reikalingas šifravimo nustatymas į 2"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="SSL raktas duomenų bazės ryšiui. Reikalingas šifravimo nustatymas į 2"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Duomenų bazės ryšio šifravimas. Reikšmės: 0 = nėra, 1 = vienpusis, 2 = dvipusis"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Duomenų bazės ryšio šifravimas. Reikšmės: 0 = nėra, 1 = vienpusis, 2 = dvipusis"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Patikrinkite SSL sertifikatą duomenų bazės ryšiui. Reikšmės: 0 = Ne, 1 = Taip. Reikalingas šifravimo nustatymas į 1 arba 2"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Patikrinkite SSL sertifikatą duomenų bazės ryšiui. Reikšmės: 0 = Ne, 1 = Taip. Reikalingas šifravimo nustatymas į 1 arba 2"
+INSTL_DATABASE_HOST_DESC="Duomenų bazės priegloba"
+INSTL_DATABASE_HOST_DESC_SHORT="Duomenų bazės priegloba"
+INSTL_DATABASE_NAME_DESC="Duomenų bazės pavadinimas"
+INSTL_DATABASE_NAME_DESC_SHORT="Duomenų bazės pavadinimas"
+INSTL_DATABASE_PASSWORD_DESC="Duomenų bazės slaptažodis"
+INSTL_DATABASE_PASSWORD_DESC_SHORT="Duomenų bazės slaptažodis"
+INSTL_DATABASE_PREFIX_DESC="Duomenų bazės lentelių prefiksas"
+INSTL_DATABASE_PREFIX_DESC_SHORT="Duomenų bazės lentelių prefiksas"
+INSTL_DATABASE_TYPE_DESC="Duomenų bazės tipas. Palaikomi: mysql, mysqli, pgsql"
+INSTL_DATABASE_TYPE_DESC_SHORT="Duomenų bazės tipas. Palaikoma „Joomla“: mysql (=MySQL (PDO)), mysqli (=MySQLi), pgsql (=PostgreSQL (PDO))"
+INSTL_DATABASE_USER_DESC="Duomenų bazės vartotojo vardas"
+INSTL_DATABASE_USER_DESC_SHORT="Duomenų bazės vartotojo vardas"
 INSTL_PUBLIC_FOLDER_DESC="Santykinis arba absoliutus kelias į viešąjį aplanką"
 INSTL_PUBLIC_FOLDER_DESC_SHORT="Santykinis arba absoliutus kelias į viešąjį aplanką"
 INSTL_SITE_NAME_DESC="Įveskite savo Joomla svetainės pavadinimą"
+INSTL_SITE_NAME_DESC_SHORT="Svetainės pavadinimas"
 
diff --git a/installation/language/lt-LT/joomla.ini b/installation/language/lt-LT/joomla.ini
index 1574f81a53e26..c86fd13e545ad 100644
--- a/installation/language/lt-LT/joomla.ini
+++ b/installation/language/lt-LT/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Kad paleisti šios versijos Joomla, Jūsų talpinimo s
 BUILD_MIN_PHP_ERROR_URL_TEXT="Padėkite man tai išspręsti"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Pakeisti"
 INSTL_SELECT_INSTALL_LANG="Pasirinkite diegimo kalbą"
 INSTL_SELECT_LANGUAGE_TITLE="Pasirinkite kalbą"
 INSTL_SETUP_LOGIN_DATA="Nustatykite prisijungimo duomenis"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Jūsų PHP diegimui turi būti įgalintas JSON, kad Joomla! būt
 INSTL_DATABASE_SUPPORT="Duomenų bazės palaikymas:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON palaikymas"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB kalba yra numatytoji"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Išjungta"
 INSTL_NOTICE_DATABASE_SUPPORT="Nerasta jokių palaikomų duomenų bazių."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Jūsų PHP diegimui turi būti įgalintas JSON, kad Joomla! būtų tinkamai įdiegta!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring kalba nėra nustatyta į neutralią. Tai galima nustatyti lokaliai, įrašant <strong>php_value mbstring.language neutral</strong> vertę <code>.htaccess</code> faile."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring funkcijos perkrovą yra įjungta. Tai galima išjungti lokaliai, įrašant <strong>php_value mbstring.func_overload 0</strong> vertę <code>.htaccess</code> faile."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Reikalingos php funkcijos <code> parse_ini_file </code> ir <code> parse_ini_string </code> jūsų serveryje yra išjungtos."
 INSTL_NOTICE_XML_SUPPORT="XML palaikymas negalimas. Tai turėtų būti įjungta pagal numatytuosius nustatymus „php“, tačiau „Ubuntu“ vartotojams gali tekti tai įdiegti įvykdžius <code> sudo apt-get install php-xml </code>, ir po to iš naujo paleidus žiniatinklio serverį."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="„Zlib“ suspaudimas nenustatytas. Tai galima įjungti byloje, <code> php.ini </code> faile įvedus <strong> zlib.output_compression = On </strong>."
@@ -298,7 +295,7 @@ NOTICE="Pranešimas"
 WARNING="Įspėjimas"
 
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Gaunant JSON duomenis įvyko ryšio klaida."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Ryšys nutrauktas išrenkant JSON duomenis."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="Rezultatų negrąžinta."
 JLIB_JS_AJAX_ERROR_OTHER="Klaida išrenkant JSON duomenis: HTTP %s būsenos kodas."
 JLIB_JS_AJAX_ERROR_PARSE="Apdorojant šiuos JSON duomenis įvyko analizavimo klaida:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
diff --git a/installation/language/lt-LT/langmetadata.xml b/installation/language/lt-LT/langmetadata.xml
index 7d840c7decbf0..1676a65c27dad 100644
--- a/installation/language/lt-LT/langmetadata.xml
+++ b/installation/language/lt-LT/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Lietuvių (lt-LT)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Oskaras Jankauskas</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/lv-LV/joomla.cli.ini b/installation/language/lv-LV/joomla.cli.ini
index 9391a1ace70c4..7092dd9ee3c5f 100644
--- a/installation/language/lv-LV/joomla.cli.ini
+++ b/installation/language/lv-LV/joomla.cli.ini
@@ -21,8 +21,8 @@ INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verificēt SSL sertifikātu
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Verificēt SSL sertifikātu datubāzes savienojumam. Vērtības: 0=Nē, 1=Jā. Nepieciešams, lai šifrēšana būtu iestatīta uz 1 vai 2"
 INSTL_DATABASE_HOST_DESC="Datubāzes serveris"
 INSTL_DATABASE_HOST_DESC_SHORT="Datubāzes serveris"
-INSTL_DATABASE_NAME_DESC="Datubāzes nosaukums"
-INSTL_DATABASE_NAME_DESC_SHORT="Datubāzes nosaukums"
+INSTL_DATABASE_NAME_DESC="Datu bāzes nosaukums"
+INSTL_DATABASE_NAME_DESC_SHORT="Datu bāzes nosaukums"
 INSTL_DATABASE_PASSWORD_DESC="Datubāzes parole"
 INSTL_DATABASE_PASSWORD_DESC_SHORT="Datubāzes parole"
 INSTL_DATABASE_PREFIX_DESC="Datubāzes tabulas prefikss tabulām"
diff --git a/installation/language/lv-LV/joomla.ini b/installation/language/lv-LV/joomla.ini
index 09dd7abd782be..28cb0d13f4966 100644
--- a/installation/language/lv-LV/joomla.ini
+++ b/installation/language/lv-LV/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Lai palaistu šo Joomla versiju, serverim ir jāizmant
 BUILD_MIN_PHP_ERROR_URL_TEXT="Palīdziet man to atrisināt"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Mainīt pozīciju"
 INSTL_SELECT_INSTALL_LANG="Izvēlieties instalācijas valodu"
 INSTL_SELECT_LANGUAGE_TITLE="Izvēlieties valodu"
 INSTL_SETUP_LOGIN_DATA="Iestatīt pievienošanās datus"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="PHP dzinējā jābūt ieslēgtam JSON funkciju atbalstam, lai va
 INSTL_DATABASE_SUPPORT="Datu bāzu atbalsts:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON atbalsts"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Daudz bitu kodējums ir noklusētais"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="Daudz bitu virkņu pārlādēšana atslēgta"
 INSTL_NOTICE_DATABASE_SUPPORT="Netika atrasta neviena atbalstīta datu bāze."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="PHP dzinējā jābūt ieslēgtam JSON funkciju atbalstam, lai varētu instalēt Joomla!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring valoda nav iestatīta kā 'neutral'. To var iestatīt ierakstot <strong>php_value mbstring.language neutral</strong> <code>.htaccess</code> failā, kas atrodas vietnes saknes direktorijā.<0>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring valoda ir ieslēgta. To var atslēgt ierakstot 'php_value mbstring.func_overload 0' .htaccess failā, kas atrodas vietnes saknes direktorijā."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Nepieciešamās php funkcijas <code>parse_ini_file</code> un <code>parse_ini_string</code> uz servera ir izslēgtas."
 INSTL_NOTICE_XML_SUPPORT="XML atbalsts nav pieejams. Tas ir jāiespējo pēc noklusējuma programmā php, bet Ubuntu lietotājiem tas, iespējams, būs jāinstalē, veicot <code>sudo apt-get install php-xml </code>, pēc tam jāveic web servisa pārstarēšana."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib kompresija nav ieslēgta. To var ieslēgt ievadot <strong>zlib.output_compression = On</strong> servera <code>php.ini</code> failā."
@@ -236,7 +233,7 @@ JHIDEPASSWORD="Slēpt paroli"
 JINVALID_TOKEN="Pēdējais pieprasījums netika apstrādāts, jo nebija pareizs drošības kods. Lūdzu atjaunojiet lapu un mēģiniet vēlreiz."
 JINVALID_TOKEN_NOTICE="Neatbilstoša drošības atpazīšana. Pieprasījums ir pārtraukts lai novērstu drošības apdraudējumu. Mēģiniet vēlreiz."
 JNEXT="Nākamā"
-JNO="Nē"
+JNO="Nekad"
 JNOTICE="Paziņojums"
 JOFF="Izslēgts"
 JON="Ieslēgts"
diff --git a/installation/language/lv-LV/langmetadata.xml b/installation/language/lv-LV/langmetadata.xml
index a99096f60aa32..abe63d34ae097 100644
--- a/installation/language/lv-LV/langmetadata.xml
+++ b/installation/language/lv-LV/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Latvian (Latvia)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Projekts</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/mk-MK/joomla.ini b/installation/language/mk-MK/joomla.ini
index dfa37b08bd3b3..dc56348b77f48 100644
--- a/installation/language/mk-MK/joomla.ini
+++ b/installation/language/mk-MK/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Вашиот хост треба да користи P
 BUILD_MIN_PHP_ERROR_URL_TEXT="Помогни ми да го решам ова"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Смени"
 INSTL_SELECT_INSTALL_LANG="Изберете јазик за инсталација"
 INSTL_SELECT_LANGUAGE_TITLE="Одбери јазик"
 INSTL_SETUP_LOGIN_DATA="Поставете податоци за најавување"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Вашата PHP -инсталација треба да има
 INSTL_DATABASE_SUPPORT="Поддршка за база на податоци:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON поддршка"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language е поставено"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload исклучено"
 INSTL_NOTICE_DATABASE_SUPPORT="Не беа пронајдени поддржани бази на податоци."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Вашата PHP -инсталација треба да има овозможено JSON за да се инсталира Joomla!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring јазикот не е поставен на neutral. Ова може да биде поставено и локално со внесување на <strong>php_value mbstring.language neutral</strong> во вашиот <code>.htaccess</code> документ."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring функцијата overload е поставена. Ова може да биде исклучено и локално со внесување на <strong>php_value mbstring.func_overload 0</strong> во вашиот <code>.htaccess</code> документ."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Потребните php функции <code>parse_ini_file</code> и <code>parse_ini_string</code> се оневозможени на вашиот сервер."
 INSTL_NOTICE_XML_SUPPORT="Поддршката за XML не е достапна. Ова треба да биде стандардно овозможено во php, но корисниците на Ubuntu можеби ќе треба да го инсталираат ова со правење <code>sudo apt-get install php-xml</code> проследено со рестартирање на веб-серверот."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Компресијата на Zlib не е поставена. Ова може да се вклучи локално со внесување <strong>zlib.output_compression = On</strong> во вашата датотека <code>php.ini</code>."
diff --git a/installation/language/mk-MK/langmetadata.xml b/installation/language/mk-MK/langmetadata.xml
index 575a239939bd3..2e2960d0f1310 100644
--- a/installation/language/mk-MK/langmetadata.xml
+++ b/installation/language/mk-MK/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Macedonian (mk-MK)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/ms-MY/joomla.ini b/installation/language/ms-MY/joomla.ini
index cd9f7f1f11283..76c922dcdd70b 100644
--- a/installation/language/ms-MY/joomla.ini
+++ b/installation/language/ms-MY/joomla.ini
@@ -90,7 +90,7 @@ JLOGIN="Log Masuk"
 JLOGOUT="Log Keluar"
 JMONTH="Bulan"
 JNEVER="Tidak Pernah"
-JNEW="Baharu"
+JNEW="Baru"
 JNEXT="Seterusnya"
 JNEXT_TITLE="Artikel seterusnya: %s"
 JNO="Tidak"
@@ -138,10 +138,10 @@ JVISIT_WEBSITE="Lawati Laman Web"
 JYEAR="Tahun"
 JYES="Ya"
 
-JBROWSERTARGET_DOWNLOAD="Muat turun %s dalam tetingkap baharu"
+JBROWSERTARGET_DOWNLOAD="Muat turun %s dalam tetingkap baru"
 JBROWSERTARGET_MODAL="Modal"
-JBROWSERTARGET_NEW="Buka dalam tetingkap baharu"
-JBROWSERTARGET_NEW_TITLE="Buka %s dalam tetingkap baharu"
+JBROWSERTARGET_NEW="Buka dalam tetingkap baru"
+JBROWSERTARGET_NEW_TITLE="Buka %s dalam tetingkap baru"
 JBROWSERTARGET_PARENT="Buka dalam tetingkap induk"
 JBROWSERTARGET_POPUP="Buka dalam popup"
 
@@ -156,7 +156,7 @@ JERROR_LAYOUT_AN_OUT_OF_DATE_BOOKMARK_FAVOURITE="<strong>penanda buku/kegemaran
 JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="Satu ralat telah berlaku semasa memproses permintaan anda."
 JERROR_LAYOUT_GO_TO_THE_HOME_PAGE="Pergi ke Halaman Utama"
 JERROR_LAYOUT_HOME_PAGE="Halaman Utama"
-; deprecated will be removed in 6.0
+; deprecated will be removed in 7.0
 JERROR_LAYOUT_MIS_TYPED_ADDRESS="<strong>alamat yang salah taip</strong>"
 JERROR_LAYOUT_MISTYPED_ADDRESS="<strong>alamat yang salah taip</strong>"
 JERROR_LAYOUT_NOT_ABLE_TO_VISIT="Anda mungkin tidak dapat melawat halaman ini kerana:"
@@ -203,7 +203,7 @@ JFIELD_MEDIA_CLASS_LABEL="Kelas Imej"
 JFIELD_MEDIA_FIGURE_CAPTION_LABEL="Kapsyen Rajah"
 JFIELD_MEDIA_FIGURE_CLASS_LABEL="Kelas Rajah"
 JFIELD_MEDIA_HEIGHT_LABEL="Tinggi"
-JFIELD_MEDIA_LAZY_LABEL="Imej akan dimuatkan secara malas"
+JFIELD_MEDIA_LAZY_LABEL="Imej akan dimuatkan secara leka"
 JFIELD_MEDIA_SUMMARY_LABEL="Data Tambahan"
 JFIELD_MEDIA_WIDTH_LABEL="Lebar"
 JFIELD_MEDIA_TITLE_LABEL="Tajuk"
@@ -239,7 +239,7 @@ JFIELD_PASSWORD_TOO_SHORT_N="Kata laluan terlalu pendek. Kata laluan mestilah se
 JFIELD_PUBLISHED_DESC="Tetapkan status penerbitan."
 JFIELD_TITLE_DESC="Tajuk untuk artikel."
 
-JGLOBAL_ADD_CUSTOM_CATEGORY="Tambah Kategori baharu"
+JGLOBAL_ADD_CUSTOM_CATEGORY="Tambah Kategori baru"
 JGLOBAL_ARTICLES="Artikel"
 JGLOBAL_AUTH_ACCESS_DENIED="Akses Ditolak"
 JGLOBAL_AUTH_ACCESS_GRANTED="Akses Diberikan"
@@ -267,7 +267,7 @@ JGLOBAL_CLICK_TO_SORT_THIS_COLUMN="Pilih untuk menyusun mengikut lajur ini"
 JGLOBAL_COLLAPSE_CATEGORIES="Tunjukkan kurang kategori"
 JGLOBAL_CONFIRM_DELETE="Adakah anda pasti mahu memadam? Mengesahkan akan memadam item yang dipilih secara kekal!"
 JGLOBAL_CREATED_DATE_ON="Dicipta pada %s"
-JGLOBAL_CUSTOM_CATEGORY="Kategori Baharu"
+JGLOBAL_CUSTOM_CATEGORY="Kategori Baru"
 JGLOBAL_DESCRIPTION="Penerangan"
 JGLOBAL_DISPLAY_NUM="Papar #"
 JGLOBAL_EDIT="Sunting"
@@ -337,7 +337,7 @@ JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT="Saiz muat naik maksimum: <strong>%s</strong>"
 JGLOBAL_MAXLEVEL_LABEL="Tahap Subkategori"
 JGLOBAL_NAME_ASC="Nama menaik"
 JGLOBAL_NAME_DESC="Nama menurun"
-JGLOBAL_NEWITEMSLAST_DESC="Item baharu akan diletakkan di kedudukan terakhir secara lalai. Susunan boleh diubah selepas item ini disimpan."
+JGLOBAL_NEWITEMSLAST_DESC="Item baru akan diletakkan di kedudukan terakhir secara lalai. Susunan boleh diubah selepas item ini disimpan."
 JGLOBAL_NO_MATCHING_RESULTS="Tiada Keputusan Sepadan"
 JGLOBAL_NUM="#"
 JGLOBAL_OTPMETHOD_NONE="Lumpuhkan Pengesahan Pelbagai Faktor"
diff --git a/installation/language/ms-MY/langmetadata.xml b/installation/language/ms-MY/langmetadata.xml
index 9799a799f2eb8..e41d3d053d249 100644
--- a/installation/language/ms-MY/langmetadata.xml
+++ b/installation/language/ms-MY/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Malay (Malaysia)</name>
-	<version>5.4.7</version>
+	<version>6.1.2</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/nl-BE/joomla.cli.ini b/installation/language/nl-BE/joomla.cli.ini
index e4a4b84890d4e..f253e78176a06 100644
--- a/installation/language/nl-BE/joomla.cli.ini
+++ b/installation/language/nl-BE/joomla.cli.ini
@@ -1,7 +1,7 @@
 INSTL_ADMIN_EMAIL_DESC="Voer het e-mailadres in van de website Super gebruiker"
 INSTL_ADMIN_EMAIL_DESC_SHORT="E-mailadres van de supergebruiker van de website"
 INSTL_ADMIN_PASSWORD_DESC="Stel het wachtwoord in voor uw Super Gebruiker account"
-INSTL_ADMIN_PASSWORD_DESC_SHORT="Wachtwoord van uw Super User account"
+INSTL_ADMIN_PASSWORD_DESC_SHORT="Stel het wachtwoord in voor uw Super Gebruiker account"
 INSTL_ADMIN_USERNAME_DESC="Stel de gebruikersnaam in voor uw Supergebruiker account"
 INSTL_ADMIN_USERNAME_DESC_SHORT="Gebruikersnaam van uw supergebruiker account"
 INSTL_ADMIN_USER_DESC="Voer de echte naam in van uw supergebruiker"
diff --git a/installation/language/nl-BE/joomla.ini b/installation/language/nl-BE/joomla.ini
index 07665adc73df8..7e9be9cfb76f0 100644
--- a/installation/language/nl-BE/joomla.ini
+++ b/installation/language/nl-BE/joomla.ini
@@ -6,32 +6,35 @@
 ; Fatal error page
 ; These will be processed by the JavaScript Build
 BUILD_FATAL_HEADER="Sorry, er deed zich een probleem voor dat we niet konden herstellen."
-BUILD_FATAL_LANGUAGE="Vlaams BE" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
+BUILD_FATAL_LANGUAGE="Engels GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_FATAL_TEXT="De server heeft een \"{{statusCode_statusText}} \" teruggestuurd"
 BUILD_FATAL_URL_TEXT="Help dit probleem op te lossen"
 
 ; Build incomplete error page
 ; These will be processed by the JavaScript Build
 BUILD_INCOMPLETE_HEADER="Omgeving instellen onvolledig"
-BUILD_INCOMPLETE_LANGUAGE="Vlaams BE" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
+BUILD_INCOMPLETE_LANGUAGE="Engels GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_INCOMPLETE_TEXT="Het lijkt erop dat u probeert Joomla! uit te voeren vanuit onze git repository. Hiervoor is vereist dat u eerst een aantal extra stappen heeft voltooid."
 BUILD_INCOMPLETE_URL_TEXT="Meer details"
 
 ; No XML PHP error page
 ; These will be processed by the JavaScript Build
 BUILD_NOXML_HEADER="Sorry, uw PHP mist een noodzakelijke library"
-BUILD_NOXML_LANGUAGE="Vlaams BE" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
+BUILD_NOXML_LANGUAGE="Engels GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_NOXML_TEXT="Om deze versie van Joomla! uit te kunnen voeren moet uw host PHP gebruiken met ondersteuning voor de XML-library"
 BUILD_NOXML_URL_TEXT="Help dit probleem op te lossen"
 
 ; Minimum PHP error page
 ; These will be processed by the JavaScript Build
 BUILD_MIN_PHP_ERROR_HEADER="Sorry, uw PHP-versie wordt niet ondersteund."
-BUILD_MIN_PHP_ERROR_LANGUAGE="Vlaams BE" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
+BUILD_MIN_PHP_ERROR_LANGUAGE="Engels GB" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_MIN_PHP_ERROR_TEXT="Uw host moet PHP versie {{phpversion}} of nieuwer gebruiken om deze versie van Joomla uit te voeren."
 BUILD_MIN_PHP_ERROR_URL_TEXT="Help dit probleem op te lossen"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Verander de installatietaal"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Verander"
+INSTL_SELECTED_INSTALL_LANGUAGE="Huidige taal: %s"
 INSTL_SELECT_INSTALL_LANG="Installatietaal selecteren"
 INSTL_SELECT_LANGUAGE_TITLE="Selecteer taal"
 INSTL_SETUP_LOGIN_DATA="Inloggegevens instellen"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="Uw PHP installatie moet JSON geactiveerd hebben om Joomla! te ku
 INSTL_DATABASE_SUPPORT="Database ondersteuning:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON ondersteuning"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is standaard"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String overload uit"
 INSTL_NOTICE_DATABASE_SUPPORT="Er zijn geen ondersteunde databases gevonden."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Uw PHP installatie moet JSON geactiveerd hebben om Joomla! te kunnen installeren!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language is niet ingesteld op neutraal. Dit kan lokaal ingesteld worden door het ingeven van <strong>php_value mbstring.language neutral</strong> in uw <code>.htaccess</code> bestand."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload is ingesteld. Dit kan lokaal uitgeschakeld worden door het ingeven van <strong>php_value mbstring.func_overload 0</strong> in uw <code>.htaccess</code> bestand."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="De vereiste php-functies <code>parse_ini_file</code> en <code>parse_ini_string</code> zijn uitgeschakeld op uw server."
 INSTL_NOTICE_XML_SUPPORT="XML-ondersteuning is niet beschikbaar. Dit moet standaard worden ingeschakeld in php, maar Ubuntu-gebruikers moeten <code>sudo apt-get install php-xml</code> installeren gevolgd door opnieuw opstarten van de webserver."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib-compressie is niet ingesteld. Dit kan lokaal worden ingeschakeld door <strong>zlib.output_compression = On </strong> in uw <code>php.ini</code> -bestand in te voeren."
@@ -168,7 +167,7 @@ INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla heeft %s ingesteld als uw sta
 INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Standaardtaal instellen"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="U kunt het later installeren met behulp van Joomla beheer."
 
-INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Flemish (BE)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Vlaams (BE)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
 
 ; Database Model
 INSTL_DATABASE_COULD_NOT_CONNECT="Kan geen verbinding maken met de database. Foutmelding: %s"
@@ -222,7 +221,7 @@ INSTL_NOTICE_NEEDSTOBEWRITABLE="U kunt de installatie laten doorgaan als u de re
 INSTL_OUTPUT_BUFFERING="Uitvoer buffering"
 INSTL_PHP_VERSION="PHP versie"
 INSTL_PHP_VERSION_NEWER="PHP versie >= %s"
-INSTL_PROCESS_BUSY="Verwerking is bezig. Even geduld &hellip;"
+INSTL_PROCESS_BUSY="Proces in verwerking. Even wachten &hellip;"
 INSTL_SESSION_AUTO_START="Sessie auto start"
 INSTL_WRITABLE="Niet voldoende rechten voor het aanmaken van %s."
 INSTL_ZIP_SUPPORT_AVAILABLE="Ingebakken ZIP ondersteuning"
diff --git a/installation/language/nl-BE/langmetadata.xml b/installation/language/nl-BE/langmetadata.xml
index 99fefc95aa986..42d6481159e9c 100644
--- a/installation/language/nl-BE/langmetadata.xml
+++ b/installation/language/nl-BE/langmetadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
-	<name>Vlaams (België)</name>
-	<version>5.4.8</version>
+	<name>Dutch (Belgium)</name>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
-	<author>Vlaams (BE) translation team</author>
+	<author>Dutch (BE) translation team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<files>
 		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
-		<name>Vlaams (nl-BE)</name>
-		<nativeName>Vlaams (België)</nativeName>
+		<name>Dutch (nl-BE)</name>
+		<nativeName>Dutch (Belgium)</nativeName>
 		<tag>nl-BE</tag>
 		<rtl>0</rtl>
 	</metadata>
diff --git a/installation/language/nl-NL/joomla.ini b/installation/language/nl-NL/joomla.ini
index a8b25b9e3bd2b..d0b8b93af3e39 100644
--- a/installation/language/nl-NL/joomla.ini
+++ b/installation/language/nl-NL/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Uw host moet PHP versie {{phpversion}} of nieuwer gebr
 BUILD_MIN_PHP_ERROR_URL_TEXT="Help dit probleem op te lossen"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Verander installatietaal"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Wijzigen"
+INSTL_SELECTED_INSTALL_LANGUAGE="Huidige taal: %s"
 INSTL_SELECT_INSTALL_LANG="Installatietaal selecteren"
 INSTL_SELECT_LANGUAGE_TITLE="Selecteer taal"
 INSTL_SETUP_LOGIN_DATA="Inloggegevens instellen"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="In de PHP installatie dient JSON ingeschakeld te zijn om Joomla
 INSTL_DATABASE_SUPPORT="Database ondersteuning:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON ondersteuning"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB taal is standaard"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB string overload uitgeschakeld"
 INSTL_NOTICE_DATABASE_SUPPORT="Er zijn geen ondersteunde databases gevonden."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="In de PHP installatie dient JSON ingeschakeld te zijn om Joomla te kunnen installeren!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring taal is niet ingesteld op neutral. Voeg de regel <strong>php_value mbstring.language neutral</strong> toe aan het <code>.htaccess</code> bestand."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload is ingesteld. Dit kan lokaal uitgeschakeld worden door de regel <strong>php_value mbstring.func_overload 0</strong> in het <code>.htaccess</code> bestand op te nemen."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="De vereiste php-functies <code>parse_ini_file</code> en <code>parse_ini_string</code> zijn uitgeschakeld op uw server."
 INSTL_NOTICE_XML_SUPPORT="XML-ondersteuning is niet beschikbaar. Dit moet standaard worden ingeschakeld in php, maar Ubuntu-gebruikers moeten <code>sudo apt-get install php-xml</code> installeren gevolgd door opnieuw opstarten van de webserver."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib-compressie is niet ingesteld. Dit kan lokaal worden ingeschakeld door <strong>zlib.output_compression = On </strong> in uw <code>php.ini</code> -bestand in te voeren."
@@ -240,7 +239,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="Geen overeenkomende resultaten"
 JGLOBAL_SELECT_SOME_OPTIONS="Selecteer enkele opties"
 JHIDEPASSWORD="Wachtwoord verbergen"
 JINVALID_TOKEN="Het laatste verzoek is geweigerd omdat het een ongeldig veiligheidsteken bevat. Vernieuw de pagina en probeer het opnieuw."
-JINVALID_TOKEN_NOTICE="Het beveiligingstoken komt niet overeen. Het verzoek is geannuleerd om een inbreuk op de beveiliging te voorkomen. Probeer het opnieuw."
+JINVALID_TOKEN_NOTICE="Het beveiligingstoken komt niet overeen. Het verzoek is afgebroken om een inbreuk op de beveiliging te voorkomen. Probeer het opnieuw."
 JNEXT="Volgende"
 JNO="Nee"
 JNOTICE="Attentie"
diff --git a/installation/language/nl-NL/langmetadata.xml b/installation/language/nl-NL/langmetadata.xml
index 20ff3ceb4e76a..0767980352266 100644
--- a/installation/language/nl-NL/langmetadata.xml
+++ b/installation/language/nl-NL/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
-	<name>Dutch (Netherlands)</name>
-	<version>5.4.8</version>
+	<name>Dutch (nl-NL)</name>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Dutch Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/pl-PL/joomla.ini b/installation/language/pl-PL/joomla.ini
index 2077e539abb09..c327b76700fe8 100644
--- a/installation/language/pl-PL/joomla.ini
+++ b/installation/language/pl-PL/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Twój serwer musi używać PHP w wersji {{phpversion}}
 BUILD_MIN_PHP_ERROR_URL_TEXT="Pomoc w rozwiązaniu tego problemu"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Zmień język instalacji"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Zmień"
+INSTL_SELECTED_INSTALL_LANGUAGE="Obecny język: %s"
 INSTL_SELECT_INSTALL_LANG="Wybierz język instalacji"
 INSTL_SELECT_LANGUAGE_TITLE="Wybierz język"
 INSTL_SETUP_LOGIN_DATA="Ustawienia danych logowania"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="Aby zainstalować Joomla, w ustawieniach PHP na serwerze musi by
 INSTL_DATABASE_SUPPORT="Obsługiwane bazy danych:"
 INSTL_JSON_SUPPORT_AVAILABLE="Obsługa JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Język wielobajtowy - neutralny"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="Nadpisywanie funkcji MB - wyłączone"
 INSTL_NOTICE_DATABASE_SUPPORT="Nie znaleziono obsługiwanych baz danych."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Aby zainstalować Joomla, w ustawieniach PHP na serwerze musi być włączona obsługa JSON."
 INSTL_NOTICE_MBLANG_NOTDEFAULT="Wartość dyrektywy PHP mb_language nie została ustawiona na \"neutral\". Można zmienić to ustawienie poprzez dopisanie <strong>php_value mbstring.language neutral</strong> w pliku <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Funkcja PHP przeciążania mbstring jest włączona. Można ją lokalnie wyłączyć poprzez dopisanie <strong>php_value mbstring.func_overload 0</strong> w pliku <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Wymagane funkcje php <code>parse_ini_file</code> i <code>parse_ini_string</code> są wyłączone na twoim serwerze."
 INSTL_NOTICE_XML_SUPPORT="Obsługa plików XML jest niedostępna. Powinna być domyślnie włączona w php. W przypadku korzystania z Ubuntu wymagana może być dodatkowa instalacja mechanizmu obsługi z wykorzystaniem <code>sudo apt-get install php-xml</code>. Po zakończeniu instalacji należy wykonać restart serwera www."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Kompresja Zlib nie jest uruchomiona. Można ją włączyć lokalnie, wpisując <strong>zlib.output_compression = On</strong> w pliku <code>php.ini</code>."
diff --git a/installation/language/pl-PL/langmetadata.xml b/installation/language/pl-PL/langmetadata.xml
index c5405a90cae20..c9eb25a820e23 100644
--- a/installation/language/pl-PL/langmetadata.xml
+++ b/installation/language/pl-PL/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Polski (PL)</name>
-	<version>5.4.0</version>
+	<version>6.0.0</version>
 	<creationDate>2025-10-13</creationDate>
 	<author>Projekt Joomla!</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/pt-BR/joomla.cli.ini b/installation/language/pt-BR/joomla.cli.ini
index 966cebb5bac61..18b15570f2d25 100644
--- a/installation/language/pt-BR/joomla.cli.ini
+++ b/installation/language/pt-BR/joomla.cli.ini
@@ -1,38 +1,38 @@
 INSTL_ADMIN_EMAIL_DESC="Informe o endereço de e-mail do Super Usuário do site"
-INSTL_ADMIN_EMAIL_DESC_SHORT="Endereço de e-mail da conta de Superusuário do site"
+INSTL_ADMIN_EMAIL_DESC_SHORT="Endereço de email da conta Super Usuário do site"
 INSTL_ADMIN_PASSWORD_DESC="Defina a senha para sua conta do Super Usuário"
-INSTL_ADMIN_PASSWORD_DESC_SHORT="Senha da sua conta de Superusuário"
+INSTL_ADMIN_PASSWORD_DESC_SHORT="Senha da sua conta de Super Usuário"
 INSTL_ADMIN_USERNAME_DESC="Defina o nome de usuário para a conta do Super Usuário"
-INSTL_ADMIN_USERNAME_DESC_SHORT="Nome de usuário da sua conta de Superusuário"
+INSTL_ADMIN_USERNAME_DESC_SHORT="Nome de usuário da sua conta de Super Usuário"
 INSTL_ADMIN_USER_DESC="Digite o nome real do seu Super Usuário"
-INSTL_ADMIN_USER_DESC_SHORT="Nome real da conta de Superusuário"
+INSTL_ADMIN_USER_DESC_SHORT="Nome real da conta do Super Usuário"
 INSTL_DATABASE_COULD_NOT_CONNECT="%s"
-INSTL_DATABASE_ENCRYPTION_CA_LABEL="Caminho para o arquivo CA a ser usado para verificar a criptografia."
-INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Caminho para o arquivo CA a ser usado para verificar a criptografia."
-INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Caminho para o certificado SSL da conexão com o banco de dados. Requer que a criptografia esteja definida como 2."
-INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Caminho para o certificado SSL da conexão com o banco de dados. Requer que a criptografia esteja definida como 2."
+INSTL_DATABASE_ENCRYPTION_CA_LABEL="Caminho para o arquivo CA para verificar a criptografia"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Caminho para o arquivo CA para verificar a criptografia"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Caminho para o certificado SSL para a conexão de banco de dados. Requer criptografia para ser definida como 2"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Caminho para o certificado SSL para a conexão de banco de dados. Requer criptografia para ser definida como 2"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Suporte a Cipher Suite (opcional)"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Suporte a Cipher Suite (opcional)"
-INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Chave SSL para a conexão com o banco de dados. Requer que a criptografia esteja definida como 2."
-INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="Chave SSL para a conexão com o banco de dados. Requer que a criptografia esteja definida como 2."
-INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Criptografia para a conexão com o banco de dados. Valores: 0 = Nenhuma, 1 = Unidirecional, 2 = Bidirecional"
-INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Criptografia para a conexão com o banco de dados. Valores: 0 = Nenhuma, 1 = Unidirecional, 2 = Bidirecional"
-INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verificar certificado SSL para conexão com o banco de dados. Valores: 0 = Não, 1 = Sim. Requer que a criptografia esteja definida como 1 ou 2."
-INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Verificar certificado SSL para conexão com o banco de dados. Valores: 0 = Não, 1 = Sim. Requer que a criptografia esteja definida como 1 ou 2."
-INSTL_DATABASE_HOST_DESC="Hospedagem do banco de dados"
-INSTL_DATABASE_HOST_DESC_SHORT="Hospedagem do banco de dados"
-INSTL_DATABASE_NAME_DESC="Nome do banco de dados"
-INSTL_DATABASE_NAME_DESC_SHORT="Nome do banco de dados"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Caminho para o certificado SSL para a conexão de banco de dados. Requer criptografia para ser definida como 2"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="Caminho para o certificado SSL para a conexão de banco de dados. Requer criptografia para ser definida como 2"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Criptografia para a conexão do banco de dados. Valores: 0=Nenhum, 1=Uma via, 2=Duas vias"
+INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Criptografia para a conexão do banco de dados. Valores: 0=Nenhum, 1=Uma via, 2=Duas vias"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verifique o certificado SSL para conexão com o banco de dados. Valores: 0=Não, 1=Sim. Requer criptografia para ser definida como 1 ou 2"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Verifique o certificado SSL para conexão com o banco de dados. Valores: 0=Não, 1=Sim. Requer criptografia para ser definida como 1 ou 2"
+INSTL_DATABASE_HOST_DESC="Host do banco de dados"
+INSTL_DATABASE_HOST_DESC_SHORT="Host do banco de dados"
+INSTL_DATABASE_NAME_DESC="Nome do Banco de Dados"
+INSTL_DATABASE_NAME_DESC_SHORT="Nome do Banco de Dados"
 INSTL_DATABASE_PASSWORD_DESC="Senha do banco de dados"
 INSTL_DATABASE_PASSWORD_DESC_SHORT="Senha do banco de dados"
-INSTL_DATABASE_PREFIX_DESC="Prefixo para as tabelas do banco de dados"
-INSTL_DATABASE_PREFIX_DESC_SHORT="Prefixo para as tabelas do banco de dados"
+INSTL_DATABASE_PREFIX_DESC="Prefixo para as tabelas da base de dados"
+INSTL_DATABASE_PREFIX_DESC_SHORT="Prefixo para as tabelas da base de dados"
 INSTL_DATABASE_TYPE_DESC="Tipo de banco de dados. Suportado: mysql, mysqli, pgsql"
-INSTL_DATABASE_TYPE_DESC_SHORT="Tipo de banco de dados. Compatível com Joomla: mysql (=MySQL (PDO)), mysqli (=MySQLi), pgsql (=PostgreSQL (PDO))"
-INSTL_DATABASE_USER_DESC="Nome de usuário do banco de dados"
-INSTL_DATABASE_USER_DESC_SHORT="Nome de usuário do banco de dados"
+INSTL_DATABASE_TYPE_DESC_SHORT="Tipo de banco de dados. Suportado pelo Joomla: mysql (=MySQL (PDO)), mysqli (=MySQLi), pgsql (=PostgreSQL (PDO))"
+INSTL_DATABASE_USER_DESC="Nome de Usuário do Banco de Dados"
+INSTL_DATABASE_USER_DESC_SHORT="Nome de Usuário do Banco de Dados"
 INSTL_PUBLIC_FOLDER_DESC="Caminho relativo ou absoluto para a pasta pública"
 INSTL_PUBLIC_FOLDER_DESC_SHORT="Caminho relativo ou absoluto para a pasta pública"
 INSTL_SITE_NAME_DESC="Insira o nome do seu site Joomla"
-INSTL_SITE_NAME_DESC_SHORT="Nome do site"
+INSTL_SITE_NAME_DESC_SHORT="Nome do website"
 
diff --git a/installation/language/pt-BR/joomla.ini b/installation/language/pt-BR/joomla.ini
index 53158b8b1b7f7..75ea834211268 100644
--- a/installation/language/pt-BR/joomla.ini
+++ b/installation/language/pt-BR/joomla.ini
@@ -5,7 +5,7 @@
 
 ; Fatal error page
 ; These will be processed by the JavaScript Build
-BUILD_FATAL_HEADER="Desculpe, houve um problema que não pôde ser recuperado."
+BUILD_FATAL_HEADER="Desculpe, houve um problema do qual não pudemos nos recuperar."
 BUILD_FATAL_LANGUAGE="Português do Brasil (pt-BR)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_FATAL_TEXT="O servidor retornou um \"{{statusCode_statusText}}\""
 BUILD_FATAL_URL_TEXT="Ajude-me a resolver isto"
@@ -15,7 +15,7 @@ BUILD_FATAL_URL_TEXT="Ajude-me a resolver isto"
 BUILD_INCOMPLETE_HEADER="Configuração do Ambiente Incompleta"
 BUILD_INCOMPLETE_LANGUAGE="Português do Brasil (pt-BR)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_INCOMPLETE_TEXT="Parece que você está tentando executar o Joomla! do nosso repositório git. Para fazer isso, primeiro é necessário que você conclua alguns passos adicionais."
-BUILD_INCOMPLETE_URL_TEXT="Mais detalhes"
+BUILD_INCOMPLETE_URL_TEXT="[ Mais Detalhe %s ]"
 
 ; No XML PHP error page
 ; These will be processed by the JavaScript Build
@@ -32,8 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Seu servidor precisa usar a versão {{phpversion}} do
 BUILD_MIN_PHP_ERROR_URL_TEXT="Ajude-me a resolver isto"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Alterar Posição"
 INSTL_SELECT_INSTALL_LANG="Selecione o Idioma de Instalação"
-INSTL_SELECT_LANGUAGE_TITLE="Selecionar idioma"
+INSTL_SELECT_LANGUAGE_TITLE="Selecionar a linguagem"
 INSTL_SETUP_LOGIN_DATA="Configuração dos Dados de Autenticação"
 INSTL_WARNJAVASCRIPT="Atenção! O JavaScript deve estar ativado para a instalação correta do Joomla."
 INSTL_WARNJSON="A sua instalação do PHP no servidor precisa ter o JSON ativado para instalar o Joomla!"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="A sua instalação do PHP no servidor precisa ter o JSON ativado
 INSTL_DATABASE_SUPPORT="Suporte a Banco de dados:"
 INSTL_JSON_SUPPORT_AVAILABLE="Suporte a JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language é padrão"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="Não foram encontrados bancos de dados suportados."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="A sua instalação do PHP no servidor precisa ter o JSON ativado para instalar o Joomla!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring não está configurado como neutro. Isto pode ser configurado localmente mediante a inserção de <strong>php_value mbstring.language neutral</strong> no seu arquivo <code>. htaccess </code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Sobrecarga de função PHP mbstring está ativada. Isto pode ser desativado localmente mediante a inserção de <strong>php_value mbstring.func_overload 0</strong> no seu arquivo <code>.htaccess </code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="As funções do php necessárias <code>parse_ini_file</code> e <code>parse_ini_string</code> estão desativadas no seu servidor."
 INSTL_NOTICE_XML_SUPPORT="O suporte a XML não está disponível. Isto deve ser habilitado por padrão no php, mas usuários do Ubuntu podem precisar instalar isso através do comando <code>sudo apt-get install php-xml</code> seguido de reinicialização do servidor web."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="A compressão Zlib não está configurada. Isso pode ser ativado localmente digitando <strong>zlib.output_compression = On</strong> no seu arquivo <code>php.ini</code>."
@@ -136,7 +133,7 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Selecionar a linguagem"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Código do idioma"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versão"
 INSTL_LANGUAGES_DESC="A interface do Joomla está disponível em vários idiomas. Escolha o seu idioma através das caixas de seleção e, em seguida instale-os, selecionando o botão \"Instalar Idiomas Selecionados\".<br>Nota: Esta operação levará cerca de 10 segundos para baixar e instalar cada idioma. Para evitar timeouts por favor, selecione não mais do que 3 idiomas para instalar."
-INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Esta operação levará até 10 segundos por idioma para completar<br>Por favor espere enquanto baixamos e instalamos os idiomas"
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Esta operação levará até 10 segundos por idioma para completar<br>Por favor espere enquanto baixamos e instalamos os idiomas..."
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nenhum idioma foi selecionado para instalação."
 INSTL_LANGUAGES_SELECTED="Instalar Idiomas Selecionados"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Retornar à última etapa da instalação"
@@ -234,9 +231,9 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="Sem resultados correspondentes"
 JGLOBAL_SELECT_SOME_OPTIONS="Selecione algumas opções"
 JHIDEPASSWORD="Ocultar senha"
 JINVALID_TOKEN="A requisição mais recente foi negada por conter um token de segurança inválido. Recarregue a página e tente novamente."
-JINVALID_TOKEN_NOTICE="O token de segurança não corresponde. A solicitação foi cancelada para evitar qualquer violação de segurança. Tente novamente."
+JINVALID_TOKEN_NOTICE="O token de segurança não corresponde. A solicitação foi abortada para prevenir qualquer violação de segurança. Tente novamente."
 JNEXT="Próximo"
-JNO="Não"
+JNO="Nunca"
 JNOTICE="Aviso"
 JOFF="Desativado"
 JON="Ativado"
diff --git a/installation/language/pt-BR/langmetadata.xml b/installation/language/pt-BR/langmetadata.xml
index 2282b5ce1db76..f3e09f2bdfe0c 100644
--- a/installation/language/pt-BR/langmetadata.xml
+++ b/installation/language/pt-BR/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Português do Brasil (pt-BR)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Projeto Joomla!</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
@@ -10,8 +10,8 @@
 		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
-		<name>Português do Brasil (pt-BR)</name>
-		<nativeName>Portuguese (Brazil)</nativeName>
+		<name>Brazilian Portuguese (pt-BR)</name>
+		<nativeName>Português do Brasil (pt-BR)</nativeName>
 		<tag>pt-BR</tag>
 		<rtl>0</rtl>
 	</metadata>
diff --git a/installation/language/pt-PT/joomla.cli.ini b/installation/language/pt-PT/joomla.cli.ini
index d78916111ed0e..2b1ab55e04139 100644
--- a/installation/language/pt-PT/joomla.cli.ini
+++ b/installation/language/pt-PT/joomla.cli.ini
@@ -3,7 +3,7 @@ INSTL_ADMIN_EMAIL_DESC_SHORT="Endereço de email da conta de superutilizador do
 INSTL_ADMIN_PASSWORD_DESC="Defina a senha para a sua conta de superutilizador"
 INSTL_ADMIN_PASSWORD_DESC_SHORT="Senha da sua conta de superutilizador"
 INSTL_ADMIN_USERNAME_DESC="Defina o nome de utilizador para a sua conta de superutilizador"
-INSTL_ADMIN_USERNAME_DESC_SHORT="Nome de utilizador da sua conta de superutilizador"
+INSTL_ADMIN_USERNAME_DESC_SHORT="Endereço de email da sua conta de superutilizador"
 INSTL_ADMIN_USER_DESC="Digite o nome real para o seu superutilizador"
 INSTL_ADMIN_USER_DESC_SHORT="Nome real da conta de superutilizador"
 INSTL_DATABASE_COULD_NOT_CONNECT="%s"
diff --git a/installation/language/pt-PT/joomla.ini b/installation/language/pt-PT/joomla.ini
index ddf8d007d84e1..71dd6f303468e 100644
--- a/installation/language/pt-PT/joomla.ini
+++ b/installation/language/pt-PT/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="O seu alojamento terá de usar PHP na versão {{phpver
 BUILD_MIN_PHP_ERROR_URL_TEXT="Ajude-me a resolver isto"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Alterar posição"
 INSTL_SELECT_INSTALL_LANG="Selecionar idioma de instalação"
 INSTL_SELECT_LANGUAGE_TITLE="Selecionar idioma"
 INSTL_SETUP_LOGIN_DATA="Configuração de dados de autenticação"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="É necessário ter o JSON autorizado na sua instalação PHP de
 INSTL_DATABASE_SUPPORT="Suporte a bases de dados:"
 INSTL_JSON_SUPPORT_AVAILABLE="Suporte a JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Idioma predefinido de MB"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="Definição OVERLOAD de MB desligada"
 INSTL_NOTICE_DATABASE_SUPPORT="Não foram encontradas bases de dados suportadas."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="É necessário ter o JSON autorizado na sua instalação PHP de forma a poder instalar o Joomla. Contacte o gestor do seu alojamento!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="A 'mbstring' do PHP não está definida como neutra para idioma. Pode efetuar essa definição localmente colocando <strong>php_value mbstring.language neutral</strong> no ficheiro <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="A 'mbstring' do PHP de função 'overload' está ligada. Pode ser desligada localmente inserindo <strong>php_value mbstring.func_overload 0</strong> no ficheiro <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="As funções de Php <code>parse_ini_file</code> e <code>parse_ini_string</code> são obrigatórias, mas estão desativadas no seu servidor."
 INSTL_NOTICE_XML_SUPPORT="O suporte a XML não está disponível. Isto deve estar autorizado, por predefinição, no PHP, mas os utilizadores do Ubuntu podem precisar de o instalar fazendo <code>sudo apt-get install php-xml</code> seguido de um reinício do servidor web."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Compressão Zlib não definida. Pode ser ativada adicionando a linha <strong>zlib.output_compression = On</strong> no seu ficheiro <code>php.ini</code>."
@@ -151,7 +148,7 @@ INSTL_AUTOMATED_UPDATES_DISABLE="Desativar atualizações automatizadas"
 ; Default language view
 INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Idioma predefinido da área administrativa"
 INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Não foi possível definir este idioma como predefinido. Será utilizado o inglês como idioma predefinido para a interface da área administrativa do sítio."
-INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="O idioma %s foi definido como predefinido para a área administrativa."
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="O idioma %s foi definido como predefinido para a administração."
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Idioma"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Selecionar"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Etiqueta"
diff --git a/installation/language/pt-PT/langmetadata.xml b/installation/language/pt-PT/langmetadata.xml
index 80a2fa576419e..bbef891907435 100644
--- a/installation/language/pt-PT/langmetadata.xml
+++ b/installation/language/pt-PT/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Português (Portugal)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Comunidade JoomlaPortugal</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/ro-RO/joomla.ini b/installation/language/ro-RO/joomla.ini
index 9ac1a5aa13989..99f686015b987 100644
--- a/installation/language/ro-RO/joomla.ini
+++ b/installation/language/ro-RO/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Gazda dvs. trebuie să folosească versiunea PHP {{php
 BUILD_MIN_PHP_ERROR_URL_TEXT="Ajută-mă să rezolv această problemă"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Schimbare"
 INSTL_SELECT_INSTALL_LANG="Selectaţi limba de instalare"
 INSTL_SELECT_LANGUAGE_TITLE="Selectare limbă"
 INSTL_SETUP_LOGIN_DATA="Configurare date de autentificare"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Pentru a instala Joomla, instalarea dvs PHP trebuie să aibă JS
 INSTL_DATABASE_SUPPORT="Suport bază de date:"
 INSTL_JSON_SUPPORT_AVAILABLE="Suport JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language este implicit"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="Nu au fost găsite baze de date acceptate."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Pentru a instala Joomla, instalarea dvs PHP trebuie să aibă JSON activat!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="Funcţia PHP mbstring nu este setată cu valoare neutră. Acest parametru poate fi setat local prin introducerea <strong>php_value mbstring.language neutral</strong> în fişierul <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Setarea privind supraîncărcarea funcţiei PHP mbstring a fost activată. Aceasta poate fi dezactivată local prin introducerea <strong>php_value mbstring.func_overload 0</strong> în <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Funcțiile php necesare <code>parse_ini_file</code> și <code>parse_ini_string</code> sunt dezactivate pe serverul dvs."
 INSTL_NOTICE_XML_SUPPORT="Suportul XML nu este disponibil. Ar trebui activat în mod implicit în php, dar utilizatorii Ubuntu ar putea avea nevoie să instaleze acest pachet prin <code>sudo apt-get install php-xml</code> urmat de repornirea serverului web."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Compresia Zlib nu este setată. Aceasta poate fi activată local prin introducerea <strong>zlib.output_compression = On</strong> în fișierul dvs. <code>php.ini</code>."
@@ -234,7 +231,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="Nici un rezultat nu se potriveste"
 JGLOBAL_SELECT_SOME_OPTIONS="Selectați niște opțiuni"
 JHIDEPASSWORD="Ascunde parola"
 JINVALID_TOKEN="Ultima solicitare a fost refuzată pentru că aceasta conținea un token invalid. Vă rugăm să reîmprospătați pagina și să încercați din nou."
-JINVALID_TOKEN_NOTICE="Token-ul de securitate nu s-a potrivit. Solicitarea a fost anulată pentru a preveni orice încălcare a securității. Vă rugăm să încercați din nou."
+JINVALID_TOKEN_NOTICE="Token-ul de securitate nu se potrivește. Solicitarea a fost anulată pentru a preveni orice problemă de securitate. Vă rugăm să încercați din nou."
 JNEXT="Următor"
 JNO="Nu"
 JNOTICE="Observație"
@@ -257,7 +254,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Calea nu este un director. Cal
 JLIB_FORM_FIELD_INVALID="Câmpul:&#160; este invalid"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Câmp invalid: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Câmp necesar: %s"
-JLIB_INSTALLER_ABORT="Oprire instalare limbă: %s"
+JLIB_INSTALLER_ABORT="Renunțare la instalarea limbii: %s"
 JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Extensia %1$s: Nu s-a putut crea directorul: %2$s"
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="Calea de instalare nu există."
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Pachetul %1$s: A apărut o eroare la instalarea unei extensii: %2$s."
@@ -298,7 +295,7 @@ NOTICE="Observație"
 WARNING="Avertizare"
 
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A apărut o eroare de conectare în timpul preluării datelor JSON."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="A apărut o eroare de conectare în timpul obținerii datelor JSON."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="Nici un conținut nu a fost returnat"
 JLIB_JS_AJAX_ERROR_OTHER="A apărut o eroare în timpul obținerii datelor JSON: cod de status HTTP %d."
 JLIB_JS_AJAX_ERROR_PARSE="A apărut o eroare la procesarea următoarelor date JSON:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
diff --git a/installation/language/ro-RO/langmetadata.xml b/installation/language/ro-RO/langmetadata.xml
index f850987c279f7..1a8618e317e2d 100644
--- a/installation/language/ro-RO/langmetadata.xml
+++ b/installation/language/ro-RO/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Română (România)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Horia Negura - Quanta</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/ru-RU/joomla.ini b/installation/language/ru-RU/joomla.ini
index c73cfab99e292..cb1979cd0090d 100644
--- a/installation/language/ru-RU/joomla.ini
+++ b/installation/language/ru-RU/joomla.ini
@@ -31,7 +31,10 @@ BUILD_MIN_PHP_ERROR_LANGUAGE="Русский RU" ; IMPORTANT NOTE FOR TRANSLATOR
 BUILD_MIN_PHP_ERROR_TEXT="Для установки Joomla необходимо наличие PHP {{phpversion}} или более новой версии."
 BUILD_MIN_PHP_ERROR_URL_TEXT="Подробнее о решении проблемы"
 
-; Main Config
+; Main config
+INSTL_CHANGE_INSTALL_LANG="Изменить язык"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Изменить"
+INSTL_SELECTED_INSTALL_LANGUAGE="Язык: %s"
 INSTL_SELECT_INSTALL_LANG="Параметры языка"
 INSTL_SELECT_LANGUAGE_TITLE="Язык установки"
 INSTL_SETUP_LOGIN_DATA="Параметры учетной записи"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="Для установки Joomla в PHP должен быть в
 INSTL_DATABASE_SUPPORT="Поддержка баз данных"
 INSTL_JSON_SUPPORT_AVAILABLE="Поддержка JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language по умолчанию"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Выкл"
 INSTL_NOTICE_DATABASE_SUPPORT="Поддерживаемые базы данных не найдены."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Для установки Joomla в PHP должен быть включен JSON."
 INSTL_NOTICE_MBLANG_NOTDEFAULT="Для директивы mbstring.language установлено значение не <code>neutral</code>. Измените значение, добавив в файл .htaccess строку <code>php_value mbstring.language neutral</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Для директивы mbstring.func_overload установлено значение <code>1</code> (включено). Измените значение, добавив в файл .htaccess строку <code>php_value mbstring.func_overload 0</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Функции PHP <code>parse_ini_file</code> и <code>parse_ini_string</code> отключены на сервере."
 INSTL_NOTICE_XML_SUPPORT="Поддержка XML недоступна на сервере. Модуль должен быть включен в PHP по умолчанию, но пользователям Ubuntu может потребоваться его установка. Пожалуйста, выполните команду <code>sudo apt-get install php-xml</code> и перезапустите сервер."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Поддержка Zlib недоступна на сервере. Измените значение, добавив в файл php.ini строку <code>zlib.output_compression = On</code>."
@@ -115,8 +114,8 @@ INSTL_SITE_DEVMODE_LABEL="Обнаружен режим разработки"
 INSTL_SITE_NAME_DESC="Название сайта"
 
 ; Expert view
-INSTL_PUBLIC_FOLDER_DESC="Путь к общему каталогу"
 INSTL_PUBLIC_FOLDER_DESC_SHORT="Путь к общему каталогу"
+INSTL_PUBLIC_FOLDER_LABEL="Путь к общему каталогу"
 
 ; Complete view
 INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="Установить языки"
@@ -170,7 +169,7 @@ INSTL_DEFAULTLANGUAGE_TRY_LATER="Вы можете установить его 
 
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Русский (RU)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
 
-; Database Model
+; Database model
 INSTL_DATABASE_COULD_NOT_CONNECT="Не удалось подключиться к базе данных: %s."
 INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Не удалось подключиться к базе данных. Пожалуйста, проверьте параметры и при необходимости создайте базу данных вручную."
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Не удалось обновить кэш манифеста: %s."
@@ -299,8 +298,9 @@ SQLITE="SQLite"
 
 ; Javascript message titles
 ERROR="Ошибка"
-MESSAGE="Сообщение"
+MESSAGE="Уведомление"
 NOTICE="Внимание"
+SUCCESS="Успех"
 WARNING="Предупреждение"
 
 ; Javascript ajax error messages
diff --git a/installation/language/ru-RU/langmetadata.xml b/installation/language/ru-RU/langmetadata.xml
index 9c14284dba500..b8a1e93f98fa1 100644
--- a/installation/language/ru-RU/langmetadata.xml
+++ b/installation/language/ru-RU/langmetadata.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<metafile client="installation">
-	<name>Russian (Russia)</name>
-	<version>5.4.6</version>
-	<creationDate>2026-05</creationDate>
-	<author>Russian Translation Team</author>
-	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
-	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<files>
-		<filename>joomla.ini</filename>
-	</files>
-	<metadata>
-		<name>Russian (ru-RU)</name>
-		<nativeName>Русский (Россия)</nativeName>
-		<tag>ru-RU</tag>
-		<rtl>0</rtl>
-	</metadata>
-	<params />
-</metafile>
+<?xml version="1.0" encoding="utf-8"?>
+<metafile client="installation">
+	<name>Russian (Russia)</name>
+	<version>6.1.2</version>
+	<creationDate>2026-07</creationDate>
+	<author>Russian Translation Team</author>
+	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<files>
+		<filename>joomla.ini</filename>
+	</files>
+	<metadata>
+		<name>Russian (ru-RU)</name>
+		<nativeName>Русский (Россия)</nativeName>
+		<tag>ru-RU</tag>
+		<rtl>0</rtl>
+	</metadata>
+	<params />
+</metafile>
diff --git a/installation/language/sk-SK/joomla.ini b/installation/language/sk-SK/joomla.ini
index b05c77ed65a45..08e84443de28e 100644
--- a/installation/language/sk-SK/joomla.ini
+++ b/installation/language/sk-SK/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Aby táto verzia Joomla fungovala, váš hosting musí
 BUILD_MIN_PHP_ERROR_URL_TEXT="Pomôžte mi vyriešiť to"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Zmeniť jazyk inštalácie"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Zmeniť"
+INSTL_SELECTED_INSTALL_LANGUAGE="Aktuálny jazyk: %s"
 INSTL_SELECT_INSTALL_LANG="Vyberte jazyk inštalácie"
 INSTL_SELECT_LANGUAGE_TITLE="Vyberte jazyk"
 INSTL_SETUP_LOGIN_DATA="Nastavenie prihlasovacích údajov"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="Vaša inštalácia PHP musí mať zapnuté JSON, aby Joomla! moh
 INSTL_DATABASE_SUPPORT="Podpora databázy:"
 INSTL_JSON_SUPPORT_AVAILABLE="Podpora JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Predvolené MB Language"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="Neboli nájdené žiadne podporované databázy."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Vaša inštalácia PHP musí mať zapnuté JSON, aby Joomla! mohla byť nainštalovaná!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language nie je nastavený na neutrálny. Môžete tak urobiť lokálne pridaním riadku <strong>php_value mbstring.language neutral</strong> do vášho súboru <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Je nastavené preťaženie funkcie PHP mbstring. Nastavenie môžete vypnúť lokálne pridaním riadku <strong>php_value mbstring.func_overload 0</strong> do vášho súboru <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Požadované funkcie php <code>parse_ini_file</code> a <code>parse_ini_string</code> sú na serveri vypnuté."
 INSTL_NOTICE_XML_SUPPORT="Podpora XML nie je k dispozícii. Štandardne sa zapína v php, ale používatelia Ubuntu ju musia nainštalovať pomocou príkazu <code>sudo apt-get install php-xml</code> s následným reštartom webového servera."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib kompresia nie je nastavená. Lokálne môže byť zapnutá zadaním <strong>zlib.output_compression = On</strong> do vášho súboru <code>php.ini</code>."
diff --git a/installation/language/sk-SK/langmetadata.xml b/installation/language/sk-SK/langmetadata.xml
index d55cef04e2344..568b5d540aa95 100644
--- a/installation/language/sk-SK/langmetadata.xml
+++ b/installation/language/sk-SK/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Slovak (Slovakia)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Slovak translation team : Peter Michnica</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/sl-SI/joomla.ini b/installation/language/sl-SI/joomla.ini
index f882b1c15bb40..3f4da74f3f610 100644
--- a/installation/language/sl-SI/joomla.ini
+++ b/installation/language/sl-SI/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Vaš gostitelj mora uporabljati PHP različico  {{phpv
 BUILD_MIN_PHP_ERROR_URL_TEXT="Pomagajte mi rešiti to težavo"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Spremenite jezik namestitve"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Spremenite pozicijo"
+INSTL_SELECTED_INSTALL_LANGUAGE="Trenutni jezik: %s"
 INSTL_SELECT_INSTALL_LANG="Izberite jezik namestitve"
 INSTL_SELECT_LANGUAGE_TITLE="Izberite jezik"
 INSTL_SETUP_LOGIN_DATA="Nastavitev prijavnih podatkov"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="Vaša PHP namestitev mora imeti JSON omogočeno, za namestitev
 INSTL_DATABASE_SUPPORT="Baza podatkov Podpora:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Podpora"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Jezik je privzeti"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB Niz preobremenitve izklopljen"
 INSTL_NOTICE_DATABASE_SUPPORT="Nobena podprta zbirka podatkov ni najdena."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Vaša PHP namestitev mora imeti JSON omogočeno, za namestitev  Joomla!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring jezik ni nastavljen v nevtralni položaj. To je mogoče nastaviti na lokalni ravni z vnosom <strong> php_value mbstring.language neutral </strong> v vaši <code>.htaccess </code> datoteki."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring preobremenitev funkcija je nastavljena. To je mogoče izklopiti lokalno z vnosom <strong> php_value mbstring.func_overload 0 </strong> v vaši <code>.htaccess </code> datoteki."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Zahtevane php funkcije <code>parse_ini_file</code> in <code>parse_ini_string</code> so onemogočene na vašem strežniku."
 INSTL_NOTICE_XML_SUPPORT="Podpora za XML ni na voljo. To bi moralo biti privzeto omogočeno v php, vendar ga bodo uporabniki Ubuntuja morda morali namestiti tako, da izvedejo <code>sudo apt-get install php-xml</code> čemur sledi ponovni zagon spletnega strežnika."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib stiskanje ni nastavljeno. To je mogoče vklopiti lokalno, tako da v datoteko <strong>zlib.output_compression = On</strong> v vaši <code>php.ini</code> datoteki."
@@ -240,7 +239,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="Noben rezultat se ne ujema"
 JGLOBAL_SELECT_SOME_OPTIONS="Izberite nekaj možnosti"
 JHIDEPASSWORD="Skrijte geslo"
 JINVALID_TOKEN="Najnovejša zahteva zavrnjena, ker je imela neveljaven varnostni žeton. Prosimo, osvežite stran in poskusite znova."
-JINVALID_TOKEN_NOTICE="Varnostni žeton se ne ujema. Zahteva je bila preklicana, da se prepreči kakršno koli kršitev varnosti. Prosim poskusite ponovno."
+JINVALID_TOKEN_NOTICE="Varnostni žeton se ni ujemal. Zahteva je bila preklicana, da se prepreči morebitna kršitev varnosti. Prosim poskusite ponovno."
 JNEXT="Naprej"
 JNO="Ne"
 JNOTICE="Obvestilo"
@@ -304,7 +303,7 @@ NOTICE="Obvestilo"
 WARNING="Opozorilo"
 
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Pri pridobivanju JSON podatkov je prišlo do napake pri povezavi."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Pri pridobivanju podatkov JSON je prišlo do napake pri povezavi."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="Vsebina ni vrnjena."
 JLIB_JS_AJAX_ERROR_OTHER="Prišlo je do napake pri pridobivanju JSON podatkov: HTTP %d status code."
 JLIB_JS_AJAX_ERROR_PARSE="Prišlo je do napake pri razčlenjevanju med obdelavo naslednjih JSON podatkov:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
diff --git a/installation/language/sl-SI/langmetadata.xml b/installation/language/sl-SI/langmetadata.xml
index 2cee2f9f2918e..655a6bfbb3781 100644
--- a/installation/language/sl-SI/langmetadata.xml
+++ b/installation/language/sl-SI/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Slovenščina (Slovenija)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Slovenska prevajalska ekipa</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/sr-YU/joomla.cli.ini b/installation/language/sr-YU/joomla.cli.ini
index 532b3c2f7d26c..e964a17bc46fc 100644
--- a/installation/language/sr-YU/joomla.cli.ini
+++ b/installation/language/sr-YU/joomla.cli.ini
@@ -8,17 +8,17 @@ INSTL_ADMIN_USER_DESC="Unesite pravo ime super korisnika"
 INSTL_ADMIN_USER_DESC_SHORT="Pravo ime Super User naloga"
 INSTL_DATABASE_COULD_NOT_CONNECT="%s"
 INSTL_DATABASE_ENCRYPTION_CA_LABEL="Putanja do CA datoteke za proveru enkripcije"
-INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Putanja do CA datoteke za proveru enkripcije"
+INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Putanja do CA fajla za proveru enkripcije"
 INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Putanja do SSL sertifikata za konekciju sa bazom podataka. Zahteva da enkripcija bude podešena na 2"
-INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Putanja do SSL sertifikata za konekciju sa bazom podataka. Zahteva da enkripcija bude podešena na 2"
+INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Putanja do SSL sertifikata za vezu sa bazom podataka. Zahteva da enkripcija bude podešena na 2"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Podržani Cipher Suite (opcionalno)"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Podržani Cipher Suite (opcionalno)"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL="SSL ključ za vezu sa bazom podataka. Zahteva da enkripcija bude podešena na 2"
-INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="SSL ključ za vezu sa bazom podataka. Zahteva da enkripcija bude podešena na 2"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="SSL ključ za konekciju sa bazom podataka. Zahteva da enkripcija bude podešena na 2"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Enkripcija za konekciju sa bazom podataka. Vrednosti: 0=Bez enkripcije, 1=Jednosmerna, 2=Dvosmerna"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Enkripcija za konekciju sa bazom podataka. Vrednosti: 0=Bez enkripcije, 1=Jednosmerna, 2=Dvosmerna"
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Proveri SSL sertifikat za konekciju sa bazom podataka. Vrednosti: 0=Ne, 1=Da. Zahteva da enkripcija bude podešena na 1 ili 2"
-INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Proveri SSL sertifikat za konekciju sa bazom podataka. Vrednosti: 0=Ne, 1=Da. Zahteva da enkripcija bude podešena na 1 ili 2"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="Proveri SSL sertifikat za vezu sa bazom podataka. Vrednosti: 0=Ne, 1=Da. Zahteva da enkripcija bude podešena na 1 ili 2"
 INSTL_DATABASE_HOST_DESC="Host baze podataka"
 INSTL_DATABASE_HOST_DESC_SHORT="Host baze podataka"
 INSTL_DATABASE_NAME_DESC="Ime baze podataka"
diff --git a/installation/language/sr-YU/joomla.ini b/installation/language/sr-YU/joomla.ini
index 6863a2d95131e..950b75cec8b9e 100644
--- a/installation/language/sr-YU/joomla.ini
+++ b/installation/language/sr-YU/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Vaš host mora da koristi PHP verziju {{phpversion}} i
 BUILD_MIN_PHP_ERROR_URL_TEXT="Kako da rešim ovo"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Promeni poziciju"
 INSTL_SELECT_INSTALL_LANG="Izaberite jezik instalacije"
 INSTL_SELECT_LANGUAGE_TITLE="Odaberite jezik"
 INSTL_SETUP_LOGIN_DATA="Podesite podatke za prijavu"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Za Joomla! instalaciju PHP mora imati omogućenu JSON ekstenziju
 INSTL_DATABASE_SUPPORT="Podrška baze:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON podrška"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB jezik je podrazumevan"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload isključen"
 INSTL_NOTICE_DATABASE_SUPPORT="Nepodržana baza je detektovana."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Za Joomla! instalaciju PHP mora imati omogućenu JSON ekstenziju"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring jezik nije neutralan. Ovo možete namestiti lokalno unošenjem <strong>php_value mbstring.language neutral</strong> u <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload je podešen. Ovo može biti isključeno lokalno unošenjem <strong>php_value mbstring.func_overload 0</strong> u <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Potrebne php funkcije <code>parse_ini_file</code> i <code>parse_ini_string</code> su isključene na serveru."
 INSTL_NOTICE_XML_SUPPORT="XML podrška nije dostupna. Treba je omogućiti u php-u, Ubuntu korisnici treba da instaliraju pokretanjem komande <code>sudo apt-get install php-xml</code> prateći restartovanje servera."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib kompresija nije podešena. Može se uključiti setovanjem <strong>zlib.output_compression = On</strong> u <code>php.ini</code> datoteci."
@@ -298,7 +295,7 @@ NOTICE="Obaveštenje"
 WARNING="Upozorenje"
 
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Prekid konekcije u toku preuzimanja JSON podataka."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Došlo je do prekida veze tokom dohvaćanja JSON podataka."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="Sadržaj nije vraćen."
 JLIB_JS_AJAX_ERROR_OTHER="Greška pri preuzimanju JSON podataka: HTTP %d status kod."
 JLIB_JS_AJAX_ERROR_PARSE="Greška pri parsiranju JSON podataka:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
diff --git a/installation/language/sr-YU/langmetadata.xml b/installation/language/sr-YU/langmetadata.xml
index 63a687d46b8ed..b211217b23c06 100644
--- a/installation/language/sr-YU/langmetadata.xml
+++ b/installation/language/sr-YU/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Srpski (Republika Srbija)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Goran Nešić &amp; Saša Matić</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/sv-SE/joomla.cli.ini b/installation/language/sv-SE/joomla.cli.ini
index a544e57a119f9..3bb2a0265429d 100644
--- a/installation/language/sv-SE/joomla.cli.ini
+++ b/installation/language/sv-SE/joomla.cli.ini
@@ -14,7 +14,7 @@ INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Sökväg till SSL-certifikatet för
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Shiffersviter som stöds (frivillig)"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Shiffersviter som stöds (frivillig)"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Sökväg till SSL-certifikatet för databasanslutningen. Kräver kryptering för att sättas till 2"
-INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="Sökväg till SSL-certifikat för databasanslutning. Kräver kryptering för att sättas till 2"
+INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="Sökväg till SSL-certifikatet för databasanslutningen. Kräver kryptering för att sättas till 2"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Kryptering för databasanslutningen. Värden: 0=Ingen, 1=Ett sätt, 2=Tvåvägs"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="Kryptering för databasanslutningen. Värden: 0=Ingen, 1=Ett sätt, 2=Tvåvägs"
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verifiera SSL-certifikat för databasanslutning. Värden: 0=Nej, 1=Ja. Kräver kryptering för att sättas till 1 eller 2"
diff --git a/installation/language/sv-SE/joomla.ini b/installation/language/sv-SE/joomla.ini
index 3d4227cf973c7..eccfceab550ac 100644
--- a/installation/language/sv-SE/joomla.ini
+++ b/installation/language/sv-SE/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Ditt webbhotell måste använda PHP-version {{phpversi
 BUILD_MIN_PHP_ERROR_URL_TEXT="Hjälp mig att lösa detta"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Ändra installationsspråk"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Ändra position"
+INSTL_SELECTED_INSTALL_LANGUAGE="Nuvarande språk: %s"
 INSTL_SELECT_INSTALL_LANG="Välj installationsspråk"
 INSTL_SELECT_LANGUAGE_TITLE="Välj språk"
 INSTL_SETUP_LOGIN_DATA="Ställ in inloggningsdata"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="Din PHP-installation måste ha JSON aktiverat för att Joomla sk
 INSTL_DATABASE_SUPPORT="Databas som stöds:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB language är standard"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload är avstängd"
 INSTL_NOTICE_DATABASE_SUPPORT="Hittade databaser som inte stöds."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Din PHP-installation måste ha JSON aktiverat för att Joomla ska kunna installeras!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language är inte satt till neutral. Detta kan ställas in lokalt genom att skriva in <strong>php_value mbstring.language neutral</strong> i <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload är aktiverat. Detta kan stängas av lokalt genom att skriva in <strong>php_value mbstring.func_overload 0</strong> i <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="De php funktioner som krävs <code>parse_ini_file</code> och <code>parse_ini_string</code> är inaktiverade på din server."
 INSTL_NOTICE_XML_SUPPORT="XML-stöd är inte tillgänglig. Detta bör vara aktiverat som standard i php men Ubuntu-användare, kan behöva installera det genom att göra <code>sudo apt-get install php-xml</code> följt av web server omstart."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib komprimering är inte inställd. Detta kan slås på lokalt genom att ange <strong>zlib.output_compression = On</strong> i din <code>php.ini</code> fil."
@@ -242,7 +241,7 @@ JHIDEPASSWORD="Dölj lösenord"
 JINVALID_TOKEN="Det senaste anropet nekades för att det innehåller ett ogiltigt igenkänningstecken för säkerhet. Uppdatera sidan och försök igen. Tips: ta bort 'index.php' i URL:en."
 JINVALID_TOKEN_NOTICE="Säkerhetstecknen matchar inte. Begäran har avbrutits för att förhindra säkerhetsöverträdelser. Försök igen."
 JNEXT="Nästa"
-JNO="Nej"
+JNO="Aldrig"
 JNOTICE="Observera"
 JOFF="Av"
 JON="På"
@@ -263,7 +262,7 @@ JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER="%1$s: Sökvägen är inte en mapp. S
 JLIB_FORM_FIELD_INVALID="Ogiltigt fält:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Ogiltigt fält: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Fältet krävs: %s"
-JLIB_INSTALLER_ABORT="Stoppar språkinstallationen: %s"
+JLIB_INSTALLER_ABORT="Avbryter språkinstallation: %s"
 JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="Tillägg %1$s: Kan inte skapa mapp: %2$s"
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="Installationssökvägen finns inte"
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="Paket %1$s: Det uppstod ett fel när tillägget %2$s installerades."
@@ -304,7 +303,7 @@ NOTICE="Observera"
 WARNING="Varning"
 
 ; Javascript ajax error messages
-JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="Ett anslutningsfel uppstod vid hämtningen av JSON-data."
+JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="En anslutning avbröts när JSON-data hämtades."
 JLIB_JS_AJAX_ERROR_NO_CONTENT="Inget innehåll har returnerats."
 JLIB_JS_AJAX_ERROR_OTHER="Ett fel uppstod när JSON-data hämtades: HTTP %d statuskod."
 JLIB_JS_AJAX_ERROR_PARSE="Ett parsningsfel har uppstått medan följande JSON-data behandlades:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
diff --git a/installation/language/sv-SE/langmetadata.xml b/installation/language/sv-SE/langmetadata.xml
index 505b0d9ee0c26..61c6cc239203b 100644
--- a/installation/language/sv-SE/langmetadata.xml
+++ b/installation/language/sv-SE/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Swedish (Sweden)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Swedish Translation Team - SvenskJoomla</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/ta-IN/joomla.ini b/installation/language/ta-IN/joomla.ini
index 2f40c76297964..973ea3dc562af 100644
--- a/installation/language/ta-IN/joomla.ini
+++ b/installation/language/ta-IN/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Joomla-வின் இந்தப் பதிப்
 BUILD_MIN_PHP_ERROR_URL_TEXT="இதனைத் தீர்க்க எனக்கு உதவுக"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="நிறுவல் மொழி மாற்றுக"
+INSTL_CHANGE_INSTALL_LANG_SHORT="மாற்றுக"
+INSTL_SELECTED_INSTALL_LANGUAGE="தற்போதைய மொழி: %s"
 INSTL_SELECT_INSTALL_LANG="நிறுவல் மொழித் தேர்வு"
 INSTL_SELECT_LANGUAGE_TITLE="மொழி தேர்வுசெய்யவும்"
 INSTL_SETUP_LOGIN_DATA="உள்நுழைவு தரவு அமைத்தல்"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="Joomla-வை நிறுவுவதற்கு, தங்க
 INSTL_DATABASE_SUPPORT="தரவுத்தள ஆதரவு:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="ஆதரிக்கப்படும் தரவுத்தளங்கள் (databases) எதுவும் காணப்படவில்லை."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Joomla-வை நிறுவுவதற்கு, தங்கள் PHP நிறுவலில் JSON ஆனது இயலுமைப்படுத்தப்பட்டிருக்க வேண்டும்!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language நடு நிலையாக (neutral) அமைக்கப்படவில்லை. இதனைத் தங்கள் தளத்தில் <strong>php_value mbstring.language neutral</strong> என்ற சொற்றொடரைத் தங்கள் <code>.htaccess</code> கோப்பில் எழுதுவதின் மூலம் உள்ளகத்தில் அமைக்க (locally set) முடியும்."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload அமைக்கப்பட்டுள்ளது. இதனைத் தங்கள் தளத்தில் <strong>php_value mbstring.func_overload 0</strong> என்ற சொற்றொடரைத் தங்கள் <code>.htaccess</code> கோப்பில் எழுதுவதின் மூலம் உள்ளகத்தில் நிறுத்த முடியும் (turned off locally)."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="தங்கள் சேவையகத்தில், தேவையான php செயற்பாடுகள் <code>parse_ini_file</code> மற்றும் <code>parse_ini_string</code> ஆகியவை முடக்கப்பட்டுள்ளன."
 INSTL_NOTICE_XML_SUPPORT="XML Support இல்லை. இதனை இயல்புநிலையாக php-இல் இயலுமைப்படுத்தப்பட வேண்டும். ஆனால், Ubuntu பயனாளர்கள் இதனை <code>sudo apt-get install php-xml</code> என்ற குறியீட்டைச் செயற்படுத்தி, அதன் பின் சேவையகத்தை மறுதொடக்கம் செய்து நிறுவ வேண்டியிருக்கலாம்."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression அமைக்கப்படவில்லை. இதனைத் தங்கள் தளத்தில் <strong>zlib.output_compression = On</strong> என்ற சொற்றொடரைத் தங்கள் <code>php.ini</code> கோப்பில் எழுதுவதின் மூலம் அமைக்க (locally set) முடியும்."
diff --git a/installation/language/ta-IN/langmetadata.xml b/installation/language/ta-IN/langmetadata.xml
index daaf5e6a3d4c0..00b644c75072e 100644
--- a/installation/language/ta-IN/langmetadata.xml
+++ b/installation/language/ta-IN/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Tamil (India)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Ilagnayeru 'MIG' Manickam, Elango Samy Manim</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/th-TH/joomla.ini b/installation/language/th-TH/joomla.ini
index 52c55d633a5ca..ce963f7eee8d1 100644
--- a/installation/language/th-TH/joomla.ini
+++ b/installation/language/th-TH/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="โฮสต์ของคุณต้องใช้
 BUILD_MIN_PHP_ERROR_URL_TEXT="ช่วยฉันแก้ปัญหานี้"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="เปลี่ยนตำแหน่ง"
 INSTL_SELECT_INSTALL_LANG="เลือกภาษาที่ใช้ในการติดตั้ง"
 INSTL_SELECT_LANGUAGE_TITLE="เลือกภาษา"
 INSTL_SETUP_LOGIN_DATA="ตั้งค่าข้อมูลเข้าสู่ระบบ"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="คุณต้องเปิดการใช้งาน JSO
 INSTL_DATABASE_SUPPORT="รองรับฐานข้อมูล:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="ไม่พบฐานข้อมูลที่รองรับ"
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="คุณต้องเปิดการใช้งาน JSON สำหรับการติดตั้งจูมล่า"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring ไม่ได้ถูกตั้งให้เป็นกลาง คุณสามารถตั้งในประเทศโดยการใส่ค่า <strong>php_value mbstring.language ให้เป็นกลาง</strong> ในไฟล์ <code>.htaccess</code>"
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring ฟังก์ชัน นี้สามารถปิดได้โดยการใส่ค่า <strong>php_value mbstring.func_overload 0</strong> ในไฟล์  <code>.htaccess</code>"
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="จำเป็นที่จะต้องใช้ php ฟังก์ชัน <code>parse_ini_file</code> และ <code>parse_ini_string</code> แต่ถูกปิดการใช้งานบนเซิร์ฟเวอร์ของคุณ"
 INSTL_NOTICE_XML_SUPPORT="ไม่มีการสนับสนุน XML ควรเปิดใช้งานโดยค่าเริ่มต้นใน php แต่ผู้ใช้ Ubuntu อาจจำเป็นต้องติดตั้งสิ่งนี้โดยทำด้วยคำสั่ง <code>sudo apt-get install php-xml</code> แล้วรีสตาร์ทเว็บเซิร์ฟเวอร์"
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression ไม่ได้ตั้งค่า สามารถเปิดในเครื่องได้โดยกำหนดให้ <strong>zlib.output_compression = On</strong> ในไฟล์ <code>php.ini</code> ของคุณ"
@@ -235,7 +232,7 @@ JGLOBAL_SELECT_NO_RESULTS_MATCH="ไม่มีผลลัพธ์"
 JGLOBAL_SELECT_SOME_OPTIONS="เลือกตัวเลือกบางตัว"
 JHIDEPASSWORD="ซ่อนรหัสผ่าน"
 JINVALID_TOKEN="คำขอล่าสุดถูกปฏิเสธเนื่องจากมีความปลอดภัยของโทเค็นที่ไม่ถูกต้อง โปรดรีเฟรชหน้าเว็บและลองอีกครั้ง"
-JINVALID_TOKEN_NOTICE="โทเค็นความปลอดภัยไม่ตรงกัน คำขอถูกยกเลิกเพื่อป้องกันการละเมิดความปลอดภัย กรุณาลองอีกครั้ง"
+JINVALID_TOKEN_NOTICE="โทเค็นการรักษาความปลอดภัยไม่ตรงกัน การร้องขอถูกยกเลิกเพื่อป้องกันการละเมิดความปลอดภัย โปรดลองอีกครั้ง"
 JNEXT="ต่อไป"
 JNO="ไม่"
 JNOTICE="แจ้งให้ทราบ"
@@ -263,7 +260,7 @@ JLIB_INSTALLER_ABORT_CREATE_DIRECTORY="ส่วนเสริม %1$s: ไม
 JLIB_INSTALLER_ABORT_NOINSTALLPATH="ไม่มีพาทของการติดตั้ง"
 JLIB_INSTALLER_ABORT_PACK_INSTALL_ERROR_EXTENSION="แพ็กเกจ %1$s: เกิดข้อผิดพลาดในการติดตั้งส่วนเสริม: %2$s"
 JLIB_INSTALLER_ABORT_PACK_INSTALL_NO_FILES="แพ็กเกจ %s: ไม่มีไฟล์ให้ติดตั้ง!"
-JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="เกิดข้อผิดพลาดในการเชื่อมต่อกับเซิร์ฟเวอร์: %s"
+JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT="Error connecting to the server: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: การคัดลอกไฟล์ล้มเหลวจาก %1$s ไปยัง %2$s"
 JLIB_INSTALLER_INSTALL="ติดตั้ง"
 JLIB_INSTALLER_NOT_ERROR="หากมีข้อผิดที่เกี่ยวข้องกับการติดตั้งไฟล์ภาษาของ TinyMCE ซึ่งจะไม่มีผลกระทบต่อการติดตั้งของไฟล์ภาษา เพราะบางแพ็คเกจภาษาถูกสร้างขึ้นก่อนที่จะมี Joomla 3.2.0 อาจเป็นเพราะพยายามที่จะติดตั้งไฟล์ภาษาของ TinyMCE แยกต่างหาก ซึ่งตอนนี้ได้ถูกรวมอยู่ในคอร์หลักนี้แล้ว โดยที่ไม่จำเป็นต้องมีการติดตั้งตามลงไป"
@@ -300,10 +297,10 @@ WARNING="คำเตือน"
 
 ; Javascript ajax error messages
 JLIB_JS_AJAX_ERROR_CONNECTION_ABORT="เกิดข้อผิดพลาดในการเชื่อมต่อขณะดึงข้อมูล JSON"
-JLIB_JS_AJAX_ERROR_NO_CONTENT="ไม่มีการส่งคืนเนื้อหา"
+JLIB_JS_AJAX_ERROR_NO_CONTENT="No content was returned."
 JLIB_JS_AJAX_ERROR_OTHER="เกิดข้อผิดพลาดขณะดึงข้อมูล JSON: รหัสสถานะ HTTP %d"
 JLIB_JS_AJAX_ERROR_PARSE="เกิดข้อผิดพลาดในการแยกวิเคราะห์ขณะประมวลผลข้อมูล JSON ต่อไปนี้:<br><code style=\"color:inherit;white-space:pre-wrap;padding:0;margin:0;border:0;background:inherit;\">%s</code>"
-JLIB_JS_AJAX_ERROR_TIMEOUT="เกิดหมดเวลาขึ้นขณะดึงข้อมูล JSON"
+JLIB_JS_AJAX_ERROR_TIMEOUT="A timeout has occurred while fetching the JSON data."
 
 ; Field password messages
 JFIELD_PASSWORD_INDICATE_COMPLETE="รหัสผ่านได้รับการยอมรับ"
diff --git a/installation/language/th-TH/langmetadata.xml b/installation/language/th-TH/langmetadata.xml
index e4540002a93cc..4d71a0e8bb1d8 100644
--- a/installation/language/th-TH/langmetadata.xml
+++ b/installation/language/th-TH/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Thai (ภาษาไทย)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Thai Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/tr-TR/joomla.cli.ini b/installation/language/tr-TR/joomla.cli.ini
index f8653b506a504..1472db9f4828d 100644
--- a/installation/language/tr-TR/joomla.cli.ini
+++ b/installation/language/tr-TR/joomla.cli.ini
@@ -3,7 +3,7 @@ INSTL_ADMIN_EMAIL_DESC_SHORT="Web sitesinin Süper Kullanıcı hesabının e-pos
 INSTL_ADMIN_PASSWORD_DESC="Süper Kullanıcı hesabınız için şifre belirleyin"
 INSTL_ADMIN_PASSWORD_DESC_SHORT="Süper Kullanıcı hesabınızın şifresi"
 INSTL_ADMIN_USERNAME_DESC="Süper Kullanıcı hesabınız için kullanıcı adını belirleyin"
-INSTL_ADMIN_USERNAME_DESC_SHORT="Süper Kullanıcı hesabınızın şifresi"
+INSTL_ADMIN_USERNAME_DESC_SHORT="Süper Kullanıcı hesabınızın kullanıcı adı"
 INSTL_ADMIN_USER_DESC="Süper Kullanıcınızın gerçek adını girin"
 INSTL_ADMIN_USER_DESC_SHORT="Süper Kullanıcı hesabının gerçek adı"
 INSTL_DATABASE_COULD_NOT_CONNECT="%s"
@@ -12,7 +12,7 @@ INSTL_DATABASE_ENCRYPTION_CA_LABEL_SHORT="Şifrelemeyi doğrulamak için kullan
 INSTL_DATABASE_ENCRYPTION_CERT_LABEL="Veritabanı bağlantısı için SSL sertifikası dosyasının yolu. Şifreleme değerinin 2 olması gerekir"
 INSTL_DATABASE_ENCRYPTION_CERT_LABEL_SHORT="Veritabanı bağlantısı için SSL sertifikasının yolu. Şifrelemenin 2 olarak ayarlanması gerekir"
 INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL="Desteklenen Şifreleme Yöntemleri (isteğe baglı)"
-INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Desteklenen Şifreleme Yöntemi (isteğe bağlı)"
+INSTL_DATABASE_ENCRYPTION_CIPHER_LABEL_SHORT="Desteklenen Şifreleme Yöntemleri (isteğe baglı)"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL="Veritabanı bağlantısı için SSL anahtarı. Şifrelemenin 2 olarak ayarlanması gerekir"
 INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="Veritabanı bağlantısı için SSL anahtarı. Şifrelemenin 2 olarak ayarlanması gerekir"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL="Veritabanı bağlantısında kullanılacak şifreleme türü. Değerler: 0=Şifreleme yok, 1=Tek yönlü şifreleme, 2=Çift yönlü şifreleme"
diff --git a/installation/language/tr-TR/joomla.ini b/installation/language/tr-TR/joomla.ini
index 6f275648253df..d95a9134748ec 100644
--- a/installation/language/tr-TR/joomla.ini
+++ b/installation/language/tr-TR/joomla.ini
@@ -32,6 +32,9 @@ BUILD_MIN_PHP_ERROR_TEXT="Joomla'nın bu sürümünü çalıştırmak için sunu
 BUILD_MIN_PHP_ERROR_URL_TEXT="Bunu çözmeme yardım et"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG="Kurulum Dilini Değiştir"
+INSTL_CHANGE_INSTALL_LANG_SHORT="Değişiklikler"
+INSTL_SELECTED_INSTALL_LANGUAGE="Mevcut dil: %s"
 INSTL_SELECT_INSTALL_LANG="Kurulum Dilini Seçin"
 INSTL_SELECT_LANGUAGE_TITLE="Dil Seçin"
 INSTL_SETUP_LOGIN_DATA="Oturum Açma Verilerini Ayarla"
@@ -42,13 +45,9 @@ INSTL_WARNJSON="Joomla kurulabilmesi için PHP kurulumunuzda JSON'un etkinleşti
 INSTL_DATABASE_SUPPORT="Veritabanı Desteği:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Desteği"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Dili Varsayılandır"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MBString Aşırı Yük Kapalı"
 INSTL_NOTICE_DATABASE_SUPPORT="Desteklenen veritabanları bulunamadı."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Joomla kurulabilmesi için PHP kurulumunuzda JSON'un etkinleştirilmesi gerekir!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring dili nötr olarak ayarlanmadı. Bu, <code>.htaccess</code> dosyanıza <strong>php_value mbstring.language nötr</strong> girilerek yerel olarak ayarlanabilir."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring işlevi aşırı yüklemesi ayarlandı. Bu, <code>.htaccess</code> dosyanıza <strong>php_value mbstring.func_overload 0</strong> girilerek yerel olarak kapatılabilir."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Gerekli php işlevleri <code>parse_ini_file</code> ve <code>parse_ini_string</code> sunucunuzda devre dışı bırakıldı."
 INSTL_NOTICE_XML_SUPPORT="XML Desteği mevcut değil. Bu, php'de varsayılan olarak etkinleştirilmelidir, ancak Ubuntu kullanıcılarının bunu <code>sudo apt-get install php-xml</code> yaparak ve ardından web sunucusunu yeniden başlatarak yüklemeleri gerekebilir."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib sıkıştırması ayarlanmadı. Bu, <code>php.ini</code> dosyanıza <strong>zlib.output_compression = On</strong> yazılarak yerel olarak açılabilir."
@@ -229,7 +228,7 @@ INSTL_ZIP_SUPPORT_AVAILABLE="Yerel ZIP desteği"
 
 ; Global strings
 JADMINISTRATOR="Yönetici"
-JCLOSE="Kapalı"
+JCLOSE="Kapat"
 JEMAIL="E-posta"
 JERROR="Hata"
 JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="İsteğiniz işlenirken bir hata oluştu."
diff --git a/installation/language/tr-TR/langmetadata.xml b/installation/language/tr-TR/langmetadata.xml
index 3de022c75e1dc..f35028c57f82a 100644
--- a/installation/language/tr-TR/langmetadata.xml
+++ b/installation/language/tr-TR/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Turkish (Turkey)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Türkiye</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/uk-UA/joomla.ini b/installation/language/uk-UA/joomla.ini
index 926fef283080b..b3d86622c2280 100644
--- a/installation/language/uk-UA/joomla.ini
+++ b/installation/language/uk-UA/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Ваш хост повинен використову
 BUILD_MIN_PHP_ERROR_URL_TEXT="Допоможіть мені це вирішити"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Змінити"
 INSTL_SELECT_INSTALL_LANG="Оберіть мову встановлення"
 INSTL_SELECT_LANGUAGE_TITLE="Обрати мову"
 INSTL_SETUP_LOGIN_DATA="Налаштування даних для входу"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Налаштування PHP повинні підтримува
 INSTL_DATABASE_SUPPORT="Підтримка база даних:"
 INSTL_JSON_SUPPORT_AVAILABLE="Підтримка JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language за налаштуванням"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload вимкнено"
 INSTL_NOTICE_DATABASE_SUPPORT="Не знайдено підтримуваних баз даних."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Налаштування PHP повинні підтримувати бібліотеку JSON для подальшого встановлення Joomla!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="Функція мови PHP mbstring (mbstring.language) не встановлено у нейтральне положення. Ви можете задати цей параметр локально, прописавши <strong>php_value mbstring.language neutral</strong> у вашому файлі <code>.htaccess</code>."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Функція перезавантаження PHP mbstring (mbstring.func_overload) встановлена. Ви можете вимкнути цей параметр локально, прописавши <strong>php_value mbstring.func_overload 0</strong> у вашому файлі <code>.htaccess</code>."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Необхідні PHP-функції <code>parse_ini_file</code> та <code>parse_ini_string</code> вимкнені на вашому сервері."
 INSTL_NOTICE_XML_SUPPORT="Підтримка XML недоступна. Вона повинна бути ввімкненою за налаштуванням, але користувачам Ubuntu необхідно встановити її через термінал на сервері за допомогою команди <code>sudo apt-get install php-xml</code>. Це призведе до повторного старту сервера."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Компресія Zlib не встановлена. Для ввімкнення цього параметри необхідно у файлі <code>php.ini</code> розкоментувати або додати значення <strong>zlib.output_compression = On</strong>."
diff --git a/installation/language/uk-UA/langmetadata.xml b/installation/language/uk-UA/langmetadata.xml
index a9caa02a6195c..b194b75cce4c3 100644
--- a/installation/language/uk-UA/langmetadata.xml
+++ b/installation/language/uk-UA/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Ukrainian (uk-UA)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Denys Nosov</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/ur-PK/joomla.ini b/installation/language/ur-PK/joomla.ini
index 42dd036406102..b2458d4356788 100644
--- a/installation/language/ur-PK/joomla.ini
+++ b/installation/language/ur-PK/joomla.ini
@@ -5,10 +5,10 @@
 
 ; Fatal error page
 ; These will be processed by the JavaScript Build
-BUILD_FATAL_HEADER="معاف کیجیے گا، ایک مسئلہ تھا جس سے ہم بازیاب نہ ہو سکے."
+BUILD_FATAL_HEADER="معاف کیجیے گا، ایک مسئلہ تھا جس سے ہم بازیاب نہ ہو سکے۔"
 BUILD_FATAL_LANGUAGE="انگریزی جی-بی" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example French will be Français FR
 BUILD_FATAL_TEXT="سرور نے \"{{statusCode_statusText}}\" لوٹایا"
-BUILD_FATAL_URL_TEXT="اس کو حل کرنے میں میری مدد کریں."
+BUILD_FATAL_URL_TEXT="اس کو حل کرنے میں میری مدد کریں۔"
 
 ; Build incomplete error page
 ; These will be processed by the JavaScript Build
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="جملہ کے اس ورژن کو چلانے کے لی
 BUILD_MIN_PHP_ERROR_URL_TEXT="اس کو حل کرنے میں میری مدد کریں۔"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="تبدیلیاں"
 INSTL_SELECT_INSTALL_LANG="انسٹالیشن کی زبان منتخب کریں۔"
 INSTL_SELECT_LANGUAGE_TITLE="زبان منتخب کریں۔"
 INSTL_SETUP_LOGIN_DATA="لاگ ان ڈیٹا سیٹ کریں۔"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="جملہ کو انسٹال کرنے کے لیے آپ کی پی 
 INSTL_DATABASE_SUPPORT="ڈیٹا بیس سپورٹ:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON سپورٹ"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB زبان پہلے سے طے شدہ ہے۔"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="ایم بی سٹرنگ اوورلوڈ آف"
 INSTL_NOTICE_DATABASE_SUPPORT="کوئی معاون ڈیٹا بیس نہیں ملا۔"
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="جملہ کو انسٹال کرنے کے لیے آپ کی پی ایچ پی کی انسٹالیشن میں JSON کا فعال ہونا ضروری ہے!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring زبان غیر جانبدار پر سیٹ نہیں ہے۔ اسے اپنی <code>.htaccess</code> فائل میں <strong>php_value mbstring.language neutral</strong> درج کرکے مقامی طور پر سیٹ کیا جاسکتا ہے۔."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring فنکشن اوورلوڈ سیٹ ہے۔ اسے اپنی <code>.htaccess</code> فائل میں <strong>php_value mbstring.func_overload 0</strong> درج کرکے مقامی طور پر بند کیا جاسکتا ہے۔."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="مطلوبہ php فنکشنز <code>parse_ini_file</code> اور <code>parse_ini_string</code> آپ کے سرور پر غیر فعال ہیں۔"
 INSTL_NOTICE_XML_SUPPORT="XML سپورٹ دستیاب نہیں ہے۔ اسے php میں بطور ڈیفالٹ فعال ہونا چاہیے لیکن Ubuntu کے صارفین کو اسے <code>sudo apt-get install php-xml</code> کرکے انسٹال کرنے کی ضرورت پڑسکتی ہے جس کے بعد ویب سرور دوبارہ شروع ہوتا ہے۔"
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib کمپریشن سیٹ نہیں ہے۔ اسے اپنی <code>php.ini</code> فائل میں <strong>zlib.output_compression = On</strong> درج کرکے مقامی طور پر آن کیا جاسکتا ہے۔"
diff --git a/installation/language/ur-PK/langmetadata.xml b/installation/language/ur-PK/langmetadata.xml
index 4d23f9a3ee89b..efd049d158560 100644
--- a/installation/language/ur-PK/langmetadata.xml
+++ b/installation/language/ur-PK/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Urdu (ur-PK)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Urdu Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
@@ -10,7 +10,7 @@
 		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
-		<name>Urdu (ur-PK)</name>
+		<name/>
 		<nativeName>انگریزی (برطانیہ)</nativeName>
 		<tag>ur-PK</tag>
 		<rtl>1</rtl>
diff --git a/installation/language/vi-VN/joomla.ini b/installation/language/vi-VN/joomla.ini
index 6cb4ea95eaa1f..de15e58c49295 100644
--- a/installation/language/vi-VN/joomla.ini
+++ b/installation/language/vi-VN/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="Máy chủ của bạn cần sử dụng PHP phiên b
 BUILD_MIN_PHP_ERROR_URL_TEXT="Giúp tôi giải quyết vấn đề này"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="Thay đổi vị trí"
 INSTL_SELECT_INSTALL_LANG="Chọn ngôn ngữ cài đặt"
 INSTL_SELECT_LANGUAGE_TITLE="Chọn ngôn ngữ"
 INSTL_SETUP_LOGIN_DATA="Thiết lập dữ liệu đăng nhập"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="Hệ thống PHP của bạn cần có JSON được kích hoạ
 INSTL_DATABASE_SUPPORT="Hỗ trợ cơ sở dữ liệu:"
 INSTL_JSON_SUPPORT_AVAILABLE="Hỗ trợ JSON"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB language là mặc định"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String overload tắt"
 INSTL_NOTICE_DATABASE_SUPPORT="Không có cơ sở dữ liệu được hỗ trợ nào được tìm thấy."
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="Hệ thống PHP của bạn cần có JSON được kích hoạt để cài đặt Joomla!"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="Ngôn ngữ PHP mbstring không được để thành neutral. Có thể thiết lập cục bộ bằng cách điền<strong>php_value mbstring.language neutral</strong> vào tập tin <code>.htaccess</code> của bạn."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="Chức năng PHP mbstring overload đang được thiết lập. Có thể tắt cục bộ bằng cách điền <strong>php_value mbstring.func_overload 0</strong> vào tập tin <code>.htaccess</code> của bạn."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="Các hàm php bắt buộc <code> parse_ini_file </code> và <code> parse_ini_string </code> đã bị tắt trên máy chủ của bạn."
 INSTL_NOTICE_XML_SUPPORT="Hỗ trợ XML không khả dụng. Điều này sẽ được bật theo mặc định trong php nhưng người dùng Ubuntu có thể cần phải cài đặt điều này bằng cách thực hiện <code> sudo apt-get install php-xml </code> sau đó khởi động lại máy chủ web."
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib compression không được thiết lập. Điều này có thể được bật cục bộ bằng cách nhập <strong> zlib.output_compression = On </strong> trong tệp <code> php.ini </code> của bạn."
diff --git a/installation/language/vi-VN/langmetadata.xml b/installation/language/vi-VN/langmetadata.xml
index c6a5be31cd175..c58c4272bbac1 100644
--- a/installation/language/vi-VN/langmetadata.xml
+++ b/installation/language/vi-VN/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Vietnamese (Vietnam)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>Joomla! Project</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/language/zh-CN/joomla.ini b/installation/language/zh-CN/joomla.ini
index a5df6dd0a2e34..8728115ec6b7c 100644
--- a/installation/language/zh-CN/joomla.ini
+++ b/installation/language/zh-CN/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="需要 PHP {{phpversion}} 或更新的版本运行"
 BUILD_MIN_PHP_ERROR_URL_TEXT="帮助我解决这个问题"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="更换"
 INSTL_SELECT_INSTALL_LANG="选择安装语言"
 INSTL_SELECT_LANGUAGE_TITLE="选择安装语言"
 INSTL_SETUP_LOGIN_DATA="设置登录信息"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="PHP 需要启用 JSON 才能安装！"
 INSTL_DATABASE_SUPPORT="数据库支持："
 INSTL_JSON_SUPPORT_AVAILABLE="JSON 支持并启用"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language 设置为默认"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload 关闭"
 INSTL_NOTICE_DATABASE_SUPPORT="没有找到支持的数据库"
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="PHP 需要启用 JSON 才能安装！"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring 的当前设置不是 neutral 可以通过在网站根目录下的 <code>.htaccess</code> 文件中加入 <strong>php_value mbstring.language neutral</strong> 修改此设置"
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring Overload 设置为启用。可以童哥在网站根目录下的 <code>.htaccess</code> 文件中加入 <strong>php_value mbstring.func_overload 0</strong> 修改此设置"
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="所需的 PHP 函数<code>parse_ini_file</code>和 <code>parse_ini_string</code> 在服务器上已关闭。"
 INSTL_NOTICE_XML_SUPPORT="XML 支持不可用。这个功能在 PHP 中应该是默认启用，但 Ubuntu 用户可能需要通过<code>sudo apt-get install php-xml</code>安装这个功能，然后重新启动 WEB 服务器。"
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="没有设置 Zlib 压缩。可以在你的 <code>php.ini</code> 文件中输入 <strong>zlib.output_compression = On</strong> 打开。"
@@ -92,7 +89,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="数据库名无效。它必须以字母开头
 INSTL_DATABASE_NO_SCHEMA="该数据库类型不存在数据库模式"
 INSTL_DATABASE_PASSWORD_DESC="请输入数据库密码"
 INSTL_DATABASE_PREFIX_DESC="输入表前缀或使用随机生成的表前缀"
-INSTL_DATABASE_PREFIX_DUPLICATE_DESC="如果您正在使用一个带有相同前缀的表格的现有数据库，Joomla将通过添加前缀\"bak_\"重命名这些现有表格。"
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="如果您正在使用的数据库中已经存在带有相同前缀的数据表，Joomla将通过添加前缀\"bak_\"重命名这些重名的数据表。"
 INSTL_DATABASE_RESPONSE_ERROR="安装过程失败"
 INSTL_DATABASE_TYPE_DESC="选择数据库类型"
 INSTL_DATABASE_USER_DESC="请输入数据库用户名"
@@ -118,7 +115,7 @@ INSTL_PUBLIC_FOLDER_DESC="公共文件夹的相对路径或绝对路径"
 INSTL_PUBLIC_FOLDER_DESC_SHORT="公共文件夹的相对路径或绝对路径"
 
 ; Complete view
-INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="安装本地化语言包（zh-CN为简体中文）"
+INSTL_COMPLETE_ADD_EXTRA_LANGUAGE="安装其它语言"
 INSTL_COMPLETE_ADMIN_BTN="完成并打开后台"
 INSTL_COMPLETE_CONGRAT="恭喜！"
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="无法删除 \"%s\" 目录。请手动删除该文件夹。"
@@ -130,7 +127,7 @@ INSTL_COMPLETE_TITLE="网站安装成功。"
 INSTL_REMOVE_INST_FOLDER="你确定要删除吗？ 确认 将永久删除 \"%s\"文件夹。"
 
 ; Languages view
-INSTL_LANGUAGES="安装本地化语言包"
+INSTL_LANGUAGES="安装其它语言"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="语言"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="选择安装语言"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="语言标签"
@@ -216,13 +213,13 @@ INSTL_NOTICE_NEEDSTOBEWRITABLE="如果你修复了权限或者提供了 FTP 连
 INSTL_OUTPUT_BUFFERING="输出缓冲(Output Buffering)"
 INSTL_PHP_VERSION="PHP 版本"
 INSTL_PHP_VERSION_NEWER="PHP 版本 >= %s"
-INSTL_PROCESS_BUSY="安装正在进行，请稍候……"
+INSTL_PROCESS_BUSY="进程中。请等待 ..."
 INSTL_SESSION_AUTO_START="会话自启动(Session Auto Start)"
 INSTL_WRITABLE="没有足够的权限创建 %s"
 INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP 支持并启用"
 
 ; Global strings
-JADMINISTRATOR="管理员"
+JADMINISTRATOR="管理员激活"
 JCLOSE="关闭"
 JEMAIL="邮件"
 JERROR="错误"
diff --git a/installation/language/zh-CN/langmetadata.xml b/installation/language/zh-CN/langmetadata.xml
index 810c048df9c02..29d7ca0b1994f 100644
--- a/installation/language/zh-CN/langmetadata.xml
+++ b/installation/language/zh-CN/langmetadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Chinese Simplified (China)</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
-	<author>Joomla中文网</author>
+	<author>Joomla中文网 </author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<files>
 		<filename>joomla.ini</filename>
 	</files>
 	<metadata>
-		<name>简体中文(zh-CN)</name>
-		<nativeName>简体中文 (中国)</nativeName>
+		<name>Chinese Simplified (zh-CN)</name>
+		<nativeName>Chinese Simplified (China)</nativeName>
 		<tag>zh-CN</tag>
 		<rtl>0</rtl>
 	</metadata>
diff --git a/installation/language/zh-TW/joomla.cli.ini b/installation/language/zh-TW/joomla.cli.ini
index 912fc56724137..a7d7ee12bc1e8 100644
--- a/installation/language/zh-TW/joomla.cli.ini
+++ b/installation/language/zh-TW/joomla.cli.ini
@@ -2,7 +2,7 @@ INSTL_ADMIN_EMAIL_DESC="輸入網站超級管理者的電子信箱"
 INSTL_ADMIN_EMAIL_DESC_SHORT="網站超級管理者帳號的電子信箱"
 INSTL_ADMIN_PASSWORD_DESC="設定超級管理員的密碼"
 INSTL_ADMIN_PASSWORD_DESC_SHORT="超級使用者帳號的密碼"
-INSTL_ADMIN_USERNAME_DESC="設定超級管理員的帳號名稱"
+INSTL_ADMIN_USERNAME_DESC="設定超級管理員的帳號"
 INSTL_ADMIN_USERNAME_DESC_SHORT="超級使用者的帳號名稱"
 INSTL_ADMIN_USER_DESC="請填寫超級管理者的真實姓名"
 INSTL_ADMIN_USER_DESC_SHORT="超級使用者的真實姓名"
@@ -18,7 +18,7 @@ INSTL_DATABASE_ENCRYPTION_KEY_LABEL_SHORT="資料庫連線的SSL金鑰，加密
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL="資料庫連線的加密設定。 數值：0 = 無加密，1 = 單向加密，2 = 雙向加密"
 INSTL_DATABASE_ENCRYPTION_MODE_LABEL_SHORT="資料庫連線的加密設定。 數值：0 = 無加密，1 = 單向加密，2 = 雙向加密"
 INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="驗證資料庫連線的 SSL 憑證。數值：0 = 否，1 = 是。此設定需要將 加密（Encryption） 設為 1 或 2 才會生效"
-INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="驗證資料庫連線的 SSL 憑證。數值：0 = 否，1 = 是。此設定需要將 加密（Encryption） 設為 1 或 2 才會生效"
+INSTL_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL_SHORT="驗證資料庫連線的 SSL 憑證。數值：0 = 否，1 = 是。此設定需要將 加密（Encryption） 設為 1 或 2 才會生效。"
 INSTL_DATABASE_HOST_DESC="資料庫主機"
 INSTL_DATABASE_HOST_DESC_SHORT="資料庫主機"
 INSTL_DATABASE_NAME_DESC="資料庫名稱"
diff --git a/installation/language/zh-TW/joomla.ini b/installation/language/zh-TW/joomla.ini
index 3641d850aa16c..8726314c123b0 100644
--- a/installation/language/zh-TW/joomla.ini
+++ b/installation/language/zh-TW/joomla.ini
@@ -32,6 +32,7 @@ BUILD_MIN_PHP_ERROR_TEXT="您的主機需要PHP版本{{phpversion}}或以上來
 BUILD_MIN_PHP_ERROR_URL_TEXT="協助我解決這個問題"
 
 ; Main Config
+INSTL_CHANGE_INSTALL_LANG_SHORT="變更"
 INSTL_SELECT_INSTALL_LANG="選擇安裝語言"
 INSTL_SELECT_LANGUAGE_TITLE="選擇語言"
 INSTL_SETUP_LOGIN_DATA="設定登入資訊"
@@ -42,13 +43,9 @@ INSTL_WARNJSON="你的PHP環境需要啟用JSON支援才能進行Joomla!安裝"
 INSTL_DATABASE_SUPPORT="支援的資料庫:"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON 支援"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
-; Deprecated, will be removed with 6.0
-INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
 INSTL_NOTICE_DATABASE_SUPPORT="找不到被支援的資料庫"
 INSTL_NOTICE_JSON_SUPPORT_AVAILABLE="你的PHP環境需要啟用JSON支援才能進行Joomla!安裝"
 INSTL_NOTICE_MBLANG_NOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering <strong>php_value mbstring.language neutral</strong> in your <code>.htaccess</code> file."
-; Deprecated, will be removed with 6.0
-INSTL_NOTICE_MBSTRING_OVERLOAD_OFF="PHP mbstring function overload is set. This can be turned off locally by entering <strong>php_value mbstring.func_overload 0</strong> in your <code>.htaccess</code> file."
 INSTL_NOTICE_PARSE_INI_FILE_AVAILABLE="所需的 php 函式 <code>parse_ini_file</code> 及 <code>parse_ini_string</code> 在你的伺服器是停用的。"
 INSTL_NOTICE_XML_SUPPORT="XML 支援不可用，PHP 的預設應為啟動但 Ubuntu 系統使用者也許需透過 <code>sudo apt-get install php-xml</code> 並重新啟動 Web 伺服器。"
 INSTL_NOTICE_ZLIB_COMPRESSION_SUPPORT="Zlib 壓縮功能未設置，在你的 <code>php.ini</code> 檔案中透過輸入 <strong>zlib.output_compression = On</strong> 啟動。"
@@ -74,7 +71,7 @@ INSTL_DATABASE_ENCRYPTION_MODE_VALUE_NONE="預設(伺服器控制)"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_ONE_WAY="One-way authentication"
 INSTL_DATABASE_ENCRYPTION_MODE_VALUE_TWO_WAY="Two-way authentication"
 INSTL_DATABASE_ENCRYPTION_MSG_CONN_NOT_ENCRYPT="你已選擇使用資料庫連線加密，連線已確立但未加密。這可能是因為資料庫因錯誤加密參數而倒回未加密連線配置，逐個檢查並修正資料庫加密參數，或變更欄位 \"連線加密\" 退回 \"預設 (伺服器控制)\"."
-INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="欄位 \"%s\" 中輸入的檔案不存在或無法存取"
+INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_BAD="The file entered in field \"%s\" does not exist or is not accessible."
 INSTL_DATABASE_ENCRYPTION_MSG_FILE_FIELD_EMPTY="欄位 \"%s\" is empty or doesn't contain a valid path."
 INSTL_DATABASE_ENCRYPTION_MSG_LOCALHOST="You have entered \"localhost\" as host name. Connecting to the database with connection encryption might fail with this. Either change \"localhost\" to \"127.0.0.1\" or \"::1\" or a different host name, or change field \"Connection Encryption\" back to \"預設(server controlled)\"."
 INSTL_DATABASE_ENCRYPTION_MSG_SRV_NOT_SUPPORTS="The database server doesn't support connection encryption. Either enable TLS (often called SSL in docs) support on your database server, or change field \"Connection Encryption\" back to \"預設(server controlled)\"."
diff --git a/installation/language/zh-TW/langmetadata.xml b/installation/language/zh-TW/langmetadata.xml
index 1e7b4d5293f91..a7a97fb788f57 100644
--- a/installation/language/zh-TW/langmetadata.xml
+++ b/installation/language/zh-TW/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>正體中文</name>
-	<version>5.4.8</version>
+	<version>6.1.3</version>
 	<creationDate>2026-07</creationDate>
 	<author>正體中文 Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql
index 5a3b514606ed1..61180d9da653b 100644
--- a/installation/sql/mysql/base.sql
+++ b/installation/sql/mysql/base.sql
@@ -175,7 +175,7 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 (0, 'com_newsfeeds', 'component', 'com_newsfeeds', '', 1, 1, 1, 0, 1, '', '{"newsfeed_layout":"_:default","save_history":"1","history_limit":5,"show_feed_image":"1","show_feed_description":"1","show_item_description":"1","feed_character_count":"0","feed_display_order":"des","float_first":"right","float_second":"right","show_tags":"1","category_layout":"_:default","show_category_title":"1","show_description":"1","show_description_image":"1","maxLevel":"-1","show_empty_categories":"0","show_subcat_desc":"1","show_cat_items":"1","show_cat_tags":"1","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_items_cat":"1","filter_field":"1","show_pagination_limit":"1","show_headings":"1","show_articles":"0","show_link":"1","show_pagination":"1","show_pagination_results":"1","sef_ids":1}', ''),
 (0, 'com_plugins', 'component', 'com_plugins', '', 1, 1, 1, 1, 1, '', '', ''),
 (0, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, 1, '', '{"template_positions_display":"0","upload_limit":"10","image_formats":"gif,bmp,jpg,jpeg,png,webp","source_formats":"txt,less,ini,xml,js,php,css,scss,sass,json","font_formats":"woff,woff2,ttf,otf","compressed_formats":"zip","difference":"SideBySide"}', ''),
-(0, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","info_block_position":"0","info_block_show_title":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_associations":"0","flags":"1","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_readmore":"1","show_readmore_title":"1","readmore_limit":100,"show_tags":"1","record_hits":"1","show_hits":"1","show_noauth":"0","urls_position":0,"captcha":"","show_publishing_options":"1","show_article_options":"1","show_configure_edit_options":"1","show_permissions":"1","show_associations_edit":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_category_heading_title_text":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_cat_tags":"1","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":1,"blog_class_leading":"","num_intro_articles":4,"blog_class":"","num_columns":1,"multi_column_order":"0","num_links":4,"show_subcategory_content":"0","link_intro_image":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","display_num":"10","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_featured":"show","show_feed_link":"1","feed_summary":"0","feed_show_readmore":"0","sef_ids":1,"custom_fields_enable":"1","workflow_enabled":"0"}', ''),
+(0, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","info_block_position":"0","info_block_show_title":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_associations":"0","flags":"1","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_readmore":"1","show_readmore_title":"1","readmore_limit":100,"show_tags":"1","record_hits":"1","show_hits":"1","show_noauth":"0","urls_position":0,"captcha":"","show_publishing_options":"1","show_article_options":"1","show_configure_edit_options":"1","show_permissions":"1","show_associations_edit":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_category_heading_title_text":"1","show_subcat_desc":"1","show_subcat_image":"0","show_cat_num_articles":"0","show_cat_tags":"1","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":1,"blog_class_leading":"","num_intro_articles":4,"blog_class":"","num_columns":1,"multi_column_order":"0","num_links":4,"show_subcategory_content":"0","link_intro_image":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","display_num":"10","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_featured":"show","show_feed_link":"1","feed_summary":"0","feed_show_readmore":"0","sef_ids":1,"custom_fields_enable":"1","workflow_enabled":"0"}', ''),
 (0, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"9":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', ''),
 (0, 'com_redirect', 'component', 'com_redirect', '', 1, 1, 0, 0, 1, '', '', ''),
 (0, 'com_users', 'component', 'com_users', '', 1, 1, 0, 1, 1, '', '{"allowUserRegistration":"0","new_usertype":"2","guest_usergroup":"9","sendpassword":"0","useractivation":"2","mail_to_admin":"1","captcha":"","frontend_userparams":"1","site_language":"0","change_login_name":"0","reset_count":"10","reset_time":"1","minimum_length":"12","minimum_integers":"0","minimum_symbols":"0","minimum_uppercase":"0","save_history":"1","history_limit":5,"mailSubjectPrefix":"","mailBodySuffix":""}', ''),
@@ -262,10 +262,10 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 (0, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0, 1, 1, 1, 1, '', '', '', 2, 0),
 (0, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, 1, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', '', 3, 0),
-(0, 'plg_behaviour_compat', 'plugin', 'compat', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","es5_assets":"1"}', '', 1, 0),
-(0, 'plg_behaviour_compat6', 'plugin', 'compat6', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","legacy_classes":"1"}', '', 2, 0),
-(0, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
-(0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
+(0, 'plg_behaviour_compat6', 'plugin', 'compat6', 'behaviour', 0, 0, 1, 0, 1, '', '{"classes_aliases":"0","legacy_classes":"1"}', '', 1, 0),
+(0, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
+(0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
+(0, 'plg_captcha_powcaptcha', 'plugin', 'powcaptcha', 'captcha', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
 (0, 'plg_content_confirmconsent', 'plugin', 'confirmconsent', 'content', 0, 0, 1, 0, 1, '', '{}', '', 1, 0),
 (0, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, 1, '', '', '', 2, 0),
 (0, 'plg_content_emailcloak', 'plugin', 'emailcloak', 'content', 0, 1, 1, 0, 1, '', '{"mode":"1"}', '', 3, 0),
@@ -286,7 +286,7 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 (0, 'plg_editors-xtd_readmore', 'plugin', 'readmore', 'editors-xtd', 0, 1, 1, 0, 1, '', '', '', 8, 0),
 (0, 'plg_editors_codemirror', 'plugin', 'codemirror', 'editors', 0, 1, 1, 0, 1, '', '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}', '', 1, 0),
 (0, 'plg_editors_none', 'plugin', 'none', 'editors', 0, 1, 1, 1, 1, '', '', '', 2, 0),
-(0, 'plg_editors_tinymce', 'plugin', 'tinymce', 'editors', 0, 1, 1, 0, 1, '', '{"configuration":{"toolbars":{"2":{"toolbar1":["bold","underline","strikethrough","|","undo","redo","|","bullist","numlist","|","pastetext"]},"1":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","blocks","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","code","|","hr","table","|","subscript","superscript","|","charmap","pastetext","preview"]},"0":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","styles","|","blocks","fontfamily","fontsize","|","searchreplace","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","image","|","code","|","forecolor","backcolor","|","fullscreen","|","table","|","subscript","superscript","|","charmap","emoticons","media","hr","ltr","rtl","|","cut","copy","paste","pastetext","|","visualchars","visualblocks","nonbreaking","blockquote","jtemplate","|","print","preview","codesample","insertdatetime","removeformat"]}},"setoptions":{"2":{"access":["1"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"1":{"access":["6","2"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"0":{"access":["7","4","8"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"1","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""}}},"sets_amount":3,"html_height":"550","html_width":"750"}', '', 3, 0),
+(0, 'plg_editors_tinymce', 'plugin', 'tinymce', 'editors', 0, 1, 1, 0, 1, '', '{"configuration":{"toolbars":{"2":{"toolbar1":["bold","underline","strikethrough","|","readmore","|","undo","redo","|","bullist","numlist","|","pastetext"]},"1":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","readmore","|","blocks","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","code","|","hr","table","|","subscript","superscript","|","charmap","pastetext","preview"]},"0":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","readmore","|","lineheight","|","styles","|","blocks","fontfamily","fontsize","|","searchreplace","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","image","|","code","|","forecolor","backcolor","|","fullscreen","|","table","|","subscript","superscript","|","charmap","emoticons","media","hr","ltr","rtl","|","cut","copy","paste","pastetext","|","visualchars","visualblocks","nonbreaking","blockquote","jtemplate","|","print","preview","codesample","insertdatetime","removeformat","language","abbr","abbr_remove"]}},"setoptions":{"2":{"access":["1"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"1":{"access":["6","2"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"0":{"access":["7","4","8"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"1","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""}}},"sets_amount":3,"html_height":"550px","html_width":"100%"}', '', 3, 0),
 (0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_extension_joomla', 'plugin', 'joomla', 'extension', 0, 1, 1, 0, 1, '', '', '', 2, 0),
 (0, 'plg_extension_joomlaupdate', 'plugin', 'joomlaupdate', 'extension', 0, 1, 1, 0, 1, '', '', '', 3, 0),
@@ -299,14 +299,16 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 (0, 'plg_fields_integer', 'plugin', 'integer', 'fields', 0, 1, 1, 0, 1, '', '{"multiple":"0","first":"1","last":"100","step":"1"}', '', 6, 0),
 (0, 'plg_fields_list', 'plugin', 'list', 'fields', 0, 1, 1, 0, 1, '', '', '', 7, 0),
 (0, 'plg_fields_media', 'plugin', 'media', 'fields', 0, 1, 1, 0, 1, '', '', '', 8, 0),
-(0, 'plg_fields_radio', 'plugin', 'radio', 'fields', 0, 1, 1, 0, 1, '', '', '', 9, 0),
-(0, 'plg_fields_sql', 'plugin', 'sql', 'fields', 0, 1, 1, 0, 1, '', '', '', 10, 0),
-(0, 'plg_fields_subform', 'plugin', 'subform', 'fields', 0, 1, 1, 0, 1, '', '', '', 11, 0),
-(0, 'plg_fields_text', 'plugin', 'text', 'fields', 0, 1, 1, 0, 1, '', '', '', 12, 0),
-(0, 'plg_fields_textarea', 'plugin', 'textarea', 'fields', 0, 1, 1, 0, 1, '', '{"rows":10,"cols":10,"maxlength":"","filter":"\\\\Joomla\\\\CMS\\\\Component\\\\ComponentHelper::filterText"}', '', 13, 0),
-(0, 'plg_fields_url', 'plugin', 'url', 'fields', 0, 1, 1, 0, 1, '', '', '', 14, 0),
-(0, 'plg_fields_user', 'plugin', 'user', 'fields', 0, 1, 1, 0, 1, '', '', '', 15, 0),
-(0, 'plg_fields_usergrouplist', 'plugin', 'usergrouplist', 'fields', 0, 1, 1, 0, 1, '', '', '', 16, 0),
+(0, 'plg_fields_note', 'plugin', 'note', 'fields', 0, 1, 1, 0, 1, '', '{"class":"alert alert-info","heading":"h4"}', '', 9, 0),
+(0, 'plg_fields_number', 'plugin', 'number', 'fields', 0, 1, 1, 0, 1, '', '{"min":"1.0","max":"100.0","step":"0.1","currency":"0","symbol":"","position":"0","decimals":"2"}', '', 10, 0),
+(0, 'plg_fields_radio', 'plugin', 'radio', 'fields', 0, 1, 1, 0, 1, '', '', '', 11, 0),
+(0, 'plg_fields_sql', 'plugin', 'sql', 'fields', 0, 1, 1, 0, 1, '', '', '', 12, 0),
+(0, 'plg_fields_subform', 'plugin', 'subform', 'fields', 0, 1, 1, 0, 1, '', '', '', 13, 0),
+(0, 'plg_fields_text', 'plugin', 'text', 'fields', 0, 1, 1, 0, 1, '', '', '', 14, 0),
+(0, 'plg_fields_textarea', 'plugin', 'textarea', 'fields', 0, 1, 1, 0, 1, '', '{"rows":10,"cols":10,"maxlength":"","filter":"\\\\Joomla\\\\CMS\\\\Component\\\\ComponentHelper::filterText"}', '', 15, 0),
+(0, 'plg_fields_url', 'plugin', 'url', 'fields', 0, 1, 1, 0, 1, '', '', '', 16, 0),
+(0, 'plg_fields_user', 'plugin', 'user', 'fields', 0, 1, 1, 0, 1, '', '', '', 17, 0),
+(0, 'plg_fields_usergrouplist', 'plugin', 'usergrouplist', 'fields', 0, 1, 1, 0, 1, '', '', '', 18, 0),
 (0, 'plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
 (0, 'plg_finder_categories', 'plugin', 'categories', 'finder', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_finder_contacts', 'plugin', 'contacts', 'finder', 0, 1, 1, 0, 1, '', '', '', 2, 0),
@@ -414,7 +416,8 @@ INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`,
 -- Templates
 INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
 (0, 'atum', 'template', 'atum', '', 1, 1, 1, 0, 1, '', '', '', 0, 0),
-(0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}', '', 0, 0);
+(0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}', '', 0, 0),
+(0, 'cassiopeia_extended', 'template', 'cassiopeia_extended', '', 0, 1, 1, 0, 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","systemFontBody":"","systemFontHeading":"","colorName":"colors_standard","fluidContainer":"0","stickyHeader":"0","backTop":"0","colorSettings":"0","headerbg":"rgb(193, 205, 207)","headercolor":"rgb(23, 23, 23)","bodybg":"rgb(254, 254, 254)","bodycolor":"rgb(23, 23, 23)","linkcolor":"rgb(29, 121, 137)","linkcolorh":"rgb(14, 59, 67)","btnbg":"rgb(206, 60, 55)","btnbgh":"rgb(131, 35, 32)","btncolor":"rgb(254, 254, 254)","btncolorh":"rgb(254, 254, 254)","footerbg":"rgb(29, 121, 137)","footercolor":"rgb(254, 254, 254)","fontSettings":"0","bodysize":"1","h1size":"2","h2size":"1.7","h3size":"1.5"}', '', 0, 0);
 
 -- Files Extensions
 INSERT INTO `#__extensions` (`package_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `locked`, `manifest_cache`, `params`, `custom_data`, `ordering`, `state`) VALUES
@@ -847,7 +850,8 @@ CREATE TABLE IF NOT EXISTS `#__template_styles` (
 
 INSERT INTO `#__template_styles` (`id`, `template`, `client_id`, `home`, `title`, `inheritable`, `parent`, `params`) VALUES
 (10, 'atum', 1, '1', 'Atum - Default', 1, '', '{"hue":"hsl(214, 63%, 20%)","bg-light":"#f0f4fb","text-dark":"#495057","text-light":"#ffffff","link-color":"#2a69b8","special-color":"#001b4c","colorScheme":"os","monochrome":"0","loginLogo":"","loginLogoAlt":"","logoBrandLarge":"","logoBrandLargeAlt":"","logoBrandSmall":"","logoBrandSmallAlt":""}'),
-(11, 'cassiopeia', 0, '1', 'Cassiopeia - Default', 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}');
+(11, 'cassiopeia', 0, '1', 'Cassiopeia - Default', 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}'),
+(12, 'cassiopeia_extended', 0, '0', 'Cassiopeia Extended - Default', 0, 'cassiopeia', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","systemFontBody":"","systemFontHeading":"","colorName":"colors_standard","fluidContainer":"0","stickyHeader":"0","backTop":"0","colorSettings":"0","headerbg":"rgb(193, 205, 207)","headercolor":"rgb(23, 23, 23)","bodybg":"rgb(254, 254, 254)","bodycolor":"rgb(23, 23, 23)","linkcolor":"rgb(29, 121, 137)","linkcolorh":"rgb(14, 59, 67)","btnbg":"rgb(206, 60, 55)","btnbgh":"rgb(131, 35, 32)","btncolor":"rgb(254, 254, 254)","btncolorh":"rgb(254, 254, 254)","footerbg":"rgb(29, 121, 137)","footercolor":"rgb(254, 254, 254)","fontSettings":"0","bodysize":"1","h1size":"2","h2size":"1.7","h3size":"1.5"}');
 
 -- --------------------------------------------------------
 
@@ -871,6 +875,7 @@ CREATE TABLE IF NOT EXISTS `#__updates` (
   `infourl` text NOT NULL,
   `changelogurl` text,
   `extra_query` varchar(1000) DEFAULT '',
+  `security` tinyint DEFAULT NULL,
   PRIMARY KEY (`update_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci COMMENT='Available Updates';
 
@@ -922,7 +927,7 @@ CREATE TABLE IF NOT EXISTS `#__update_sites` (
 
 INSERT INTO `#__update_sites` (`update_site_id`, `name`, `type`, `location`, `enabled`, `last_check_timestamp`) VALUES
 (1, 'Joomla! Core', 'tuf', 'https://update.joomla.org/cms/', 1, 0),
-(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_5.xml', 1, 0),
+(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_6.xml', 1, 0),
 (3, 'Joomla! Update Component', 'extension', 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0);
 
 -- --------------------------------------------------------
@@ -1203,6 +1208,7 @@ CREATE TABLE IF NOT EXISTS `#__workflow_stages` (
   `title` varchar(255) NOT NULL,
   `description` text NOT NULL,
   `default` tinyint NOT NULL DEFAULT 0,
+  `position` text,
   `checked_out_time` datetime,
   `checked_out` int unsigned,
   PRIMARY KEY (`id`),
diff --git a/installation/sql/mysql/supports.sql b/installation/sql/mysql/supports.sql
index f54ff9edea74f..f5f28b276cb1f 100644
--- a/installation/sql/mysql/supports.sql
+++ b/installation/sql/mysql/supports.sql
@@ -95,19 +95,20 @@ CREATE TABLE IF NOT EXISTS `#__content_types` (
 --
 
 INSERT INTO `#__content_types` (`type_id`, `type_title`, `type_alias`, `table`, `rules`, `field_mappings`, `router`, `content_history_options`) VALUES
-(1, 'Article', 'com_content.article', '{"special":{"dbtable":"#__content","key":"id","type":"ArticleTable","prefix":"Joomla\\\\Component\\\\Content\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_user_id":"created_by","core_created_by_alias":"created_by_alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"asset_id", "note":"note"}, "special":{"fulltext":"fulltext"}}', 'ContentHelperRoute::getArticleRoute', '{"formFile":"administrator\\/components\\/com_content\\/forms\\/article.xml", "hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits", "ordering"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
-(2, 'Contact', 'com_contact.contact', '{"special":{"dbtable":"#__contact_details","key":"id","type":"ContactTable","prefix":"Joomla\\\\Component\\\\Contact\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"address", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"image", "core_urls":"webpage", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"null"}, "special":{"con_position":"con_position","suburb":"suburb","state":"state","country":"country","postcode":"postcode","telephone":"telephone","fax":"fax","misc":"misc","email_to":"email_to","default_con":"default_con","user_id":"user_id","mobile":"mobile","sortname1":"sortname1","sortname2":"sortname2","sortname3":"sortname3"}}', 'ContactHelperRoute::getContactRoute', '{"formFile":"administrator\\/components\\/com_contact\\/forms\\/contact.xml","hideFields":["default_con","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"], "displayLookup":[ {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ] }'),
-(3, 'Newsfeed', 'com_newsfeeds.newsfeed', '{"special":{"dbtable":"#__newsfeeds","key":"id","type":"NewsfeedTable","prefix":"Joomla\\\\Component\\\\Newsfeeds\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"null"}, "special":{"numarticles":"numarticles","cache_time":"cache_time","rtl":"rtl"}}', 'NewsfeedsHelperRoute::getNewsfeedRoute', '{"formFile":"administrator\\/components\\/com_newsfeeds\\/forms\\/newsfeed.xml","hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
+(1, 'Article', 'com_content.article', '{"special":{"dbtable":"#__content","key":"id","type":"ArticleTable","prefix":"Joomla\\\\Component\\\\Content\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_user_id":"created_by","core_created_by_alias":"created_by_alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"asset_id", "note":"note"}, "special":{"fulltext":"fulltext"}}', 'ContentHelperRoute::getArticleRoute', '{"formFile":"administrator\\/components\\/com_content\\/forms\\/article.xml", "hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits", "ordering"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"} ]}'),
+(2, 'Contact', 'com_contact.contact', '{"special":{"dbtable":"#__contact_details","key":"id","type":"ContactTable","prefix":"Joomla\\\\Component\\\\Contact\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"address", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"image", "core_urls":"webpage", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"null"}, "special":{"con_position":"con_position","suburb":"suburb","state":"state","country":"country","postcode":"postcode","telephone":"telephone","fax":"fax","misc":"misc","email_to":"email_to","default_con":"default_con","user_id":"user_id","mobile":"mobile","sortname1":"sortname1","sortname2":"sortname2","sortname3":"sortname3"}}', 'ContactHelperRoute::getContactRoute', '{"formFile":"administrator\\/components\\/com_contact\\/forms\\/contact.xml","hideFields":["default_con","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"], "displayLookup":[ {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"} ] }'),
+(3, 'Newsfeed', 'com_newsfeeds.newsfeed', '{"special":{"dbtable":"#__newsfeeds","key":"id","type":"NewsfeedTable","prefix":"Joomla\\\\Component\\\\Newsfeeds\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"null"}, "special":{"numarticles":"numarticles","cache_time":"cache_time","rtl":"rtl"}}', 'NewsfeedsHelperRoute::getNewsfeedRoute', '{"formFile":"administrator\\/components\\/com_newsfeeds\\/forms\\/newsfeed.xml","hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"} ]}'),
 (4, 'User', 'com_users.user', '{"special":{"dbtable":"#__users","key":"id","type":"User","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"null","core_alias":"username","core_created_time":"registerDate","core_modified_time":"lastvisitDate","core_body":"null", "core_hits":"null","core_publish_up":"null","core_publish_down":"null","access":"null", "core_params":"params", "core_featured":"null", "core_metadata":"null", "core_language":"null", "core_images":"null", "core_urls":"null", "core_version":"null", "core_ordering":"null", "core_metakey":"null", "core_metadesc":"null", "core_catid":"null", "asset_id":"null"}, "special":{}}', '', ''),
-(5, 'Article Category', 'com_content.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'ContentHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
-(6, 'Contact Category', 'com_contact.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'ContactHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
-(7, 'Newsfeeds Category', 'com_newsfeeds.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'NewsfeedsHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
+(5, 'Article Category', 'com_content.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'ContentHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"}]}'),
+(6, 'Contact Category', 'com_contact.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'ContactHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"}]}'),
+(7, 'Newsfeeds Category', 'com_newsfeeds.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'NewsfeedsHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"}]}'),
 (8, 'Tag', 'com_tags.tag', '{"special":{"dbtable":"#__tags","key":"tag_id","type":"TagTable","prefix":"Joomla\\\\Component\\\\Tags\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"null", "asset_id":"null"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path"}}', 'TagsHelperRoute::getTagRoute', '{"formFile":"administrator\\/components\\/com_tags\\/forms\\/tag.xml", "hideFields":["checked_out","checked_out_time","version", "lft", "rgt", "level", "path", "urls", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'),
 (9, 'Banner', 'com_banners.banner', '{"special":{"dbtable":"#__banners","key":"id","type":"BannerTable","prefix":"Joomla\\\\Component\\\\Banners\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"null","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"null"}, "special":{"imptotal":"imptotal", "impmade":"impmade", "clicks":"clicks", "clickurl":"clickurl", "custombannercode":"custombannercode", "cid":"cid", "purchase_type":"purchase_type", "track_impressions":"track_impressions", "track_clicks":"track_clicks"}}', '','{"formFile":"administrator\\/components\\/com_banners\\/forms\\/banner.xml", "hideFields":["checked_out","checked_out_time","version", "reset"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "imptotal", "impmade", "reset"], "convertToInt":["publish_up", "publish_down", "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"cid","targetTable":"#__banner_clients","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
-(10, 'Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}','','{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
+(10, 'Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}','','{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"}]}'),
 (11, 'Banner Client', 'com_banners.client', '{"special":{"dbtable":"#__banner_clients","key":"id","type":"ClientTable","prefix":"Joomla\\\\Component\\\\Banners\\\\Administrator\\\\Table\\\\"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_banners\\/forms\\/client.xml", "hideFields":["checked_out","checked_out_time"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":[], "displayLookup":[]}'),
 (12, 'User Notes', 'com_users.note', '{"special":{"dbtable":"#__user_notes","key":"id","type":"NoteTable","prefix":"Joomla\\\\Component\\\\Users\\\\Administrator\\\\Table\\\\"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_users\\/forms\\/note.xml", "hideFields":["checked_out","checked_out_time", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'),
-(13, 'User Notes Category', 'com_users.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}');
+(13, 'User Notes Category', 'com_users.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"}]}'),
+(14, 'Module', 'com_modules.module', '{"special":{"dbtable":"#__modules","key":"id","type":"Module","prefix":"Joomla\\\\CMS\\\\Table\\\\"}}', '', '{}', '', '{"formFile":"administrator\\/components\\/com_modules\\/forms\\/module.xml", "hideFields":["checked_out", "checked_out_time", "publish_up", "publish_down"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"checked_out", "targetTable":"#__users", "targetColumn":"id", "displayColumn":"name"}]}');
 
 -- --------------------------------------------------------
 
@@ -367,6 +368,8 @@ CREATE TABLE IF NOT EXISTS `#__history` (
   `sha1_hash` varchar(50) NOT NULL DEFAULT '' COMMENT 'SHA1 hash of the version_data column.',
   `version_data` mediumtext NOT NULL COMMENT 'json-encoded string of version data',
   `keep_forever` tinyint NOT NULL DEFAULT 0 COMMENT '0=auto delete; 1=keep',
+  `is_current` tinyint NOT NULL DEFAULT 0,
+  `is_legacy` tinyint NOT NULL DEFAULT 0,
   PRIMARY KEY (`version_id`),
   KEY `idx_ucm_item_id` (`item_id`),
   KEY `idx_save_date` (`save_date`)
@@ -420,7 +423,7 @@ INSERT INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subjec
 ('com_joomlaupdate.update.failed', 'com_joomlaupdate', '', 'COM_JOOMLAUPDATE_UPDATE_FAILED_MAIL_SUBJECT', 'COM_JOOMLAUPDATE_UPDATE_FAILED_MAIL_BODY', '', '', '{"tags":["newversion","oldversion","sitename","url"]}'),
 ('plg_task_updatenotification.mail', 'plg_task_updatenotification', '', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_SUBJECT', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_BODY', '', '', '{"tags":["newversion","curversion","sitename","url","link","releasenews"]}'),
 ('plg_user_joomla.mail', 'plg_user_joomla', '', 'PLG_USER_JOOMLA_NEW_USER_EMAIL_SUBJECT', 'PLG_USER_JOOMLA_NEW_USER_EMAIL_BODY', '', '', '{"tags":["name","sitename","url","username","password","email"]}'),
-('com_actionlogs.notification', 'com_actionlogs', '', 'COM_ACTIONLOGS_EMAIL_SUBJECT', 'COM_ACTIONLOGS_EMAIL_BODY', 'COM_ACTIONLOGS_EMAIL_HTMLBODY', '', '{"tags":["messages","message","date","extension","username"]}'),
+('com_actionlogs.notification', 'com_actionlogs', '', 'COM_ACTIONLOGS_EMAIL_SUBJECT', 'COM_ACTIONLOGS_EMAIL_BODY', 'COM_ACTIONLOGS_EMAIL_HTMLBODY', '', '{"tags":["messages","message","date","extension","username","ip_address"]}'),
 ('com_privacy.userdataexport', 'com_privacy', '', 'COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_SUBJECT', 'COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_BODY', '', '', '{"tags":["sitename","url"]}'),
 ('com_privacy.notification.export', 'com_privacy', '', 'COM_PRIVACY_EMAIL_REQUEST_SUBJECT_EXPORT_REQUEST', 'COM_PRIVACY_EMAIL_REQUEST_BODY_EXPORT_REQUEST', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
 ('com_privacy.notification.remove', 'com_privacy', '', 'COM_PRIVACY_EMAIL_REQUEST_SUBJECT_REMOVE_REQUEST', 'COM_PRIVACY_EMAIL_REQUEST_BODY_REMOVE_REQUEST', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
@@ -441,4 +444,5 @@ INSERT INTO `#__mail_templates` (`template_id`, `extension`, `language`, `subjec
 ('plg_system_tasknotification.fatal_recovery_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_FATAL_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_FATAL_MAIL_BODY', '', '', '{"tags": ["task_id", "task_title"]}'),
 ('plg_system_tasknotification.orphan_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_ORPHAN_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_ORPHAN_MAIL_BODY', '', '', '{"tags": ["task_id", "task_title"]}'),
 ('plg_system_tasknotification.success_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_SUCCESS_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_SUCCESS_MAIL_BODY', '', '', '{"tags":["task_id", "task_title", "exec_data_time", "task_output"]}'),
-('plg_multifactorauth_email.mail', 'plg_multifactorauth_email', '', 'PLG_MULTIFACTORAUTH_EMAIL_EMAIL_SUBJECT', 'PLG_MULTIFACTORAUTH_EMAIL_EMAIL_BODY', '', '', '{"tags":["code","sitename","siteurl","username","email","fullname"]}');
+('plg_multifactorauth_email.mail', 'plg_multifactorauth_email', '', 'PLG_MULTIFACTORAUTH_EMAIL_EMAIL_SUBJECT', 'PLG_MULTIFACTORAUTH_EMAIL_EMAIL_BODY', '', '', '{"tags":["code","sitename","siteurl","username","email","fullname"]}'),
+('plg_content_joomla.newarticle', 'plg_content_joomla', '', 'PLG_CONTENT_JOOMLA_NEW_ARTICLE_SUBJECT', 'PLG_CONTENT_JOOMLA_NEW_ARTICLE_BODY', '', '', '{"tags":["sitename","name","email","title","url"]}');
diff --git a/installation/sql/postgresql/base.sql b/installation/sql/postgresql/base.sql
index bbff277f4c5b3..2916c3f99c7a1 100644
--- a/installation/sql/postgresql/base.sql
+++ b/installation/sql/postgresql/base.sql
@@ -181,7 +181,7 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 (0, 'com_newsfeeds', 'component', 'com_newsfeeds', '', 1, 1, 1, 0, 1, '', '{"newsfeed_layout":"_:default","save_history":"1","history_limit":5,"show_feed_image":"1","show_feed_description":"1","show_item_description":"1","feed_character_count":"0","feed_display_order":"des","float_first":"right","float_second":"right","show_tags":"1","category_layout":"_:default","show_category_title":"1","show_description":"1","show_description_image":"1","maxLevel":"-1","show_empty_categories":"0","show_subcat_desc":"1","show_cat_items":"1","show_cat_tags":"1","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_items_cat":"1","filter_field":"1","show_pagination_limit":"1","show_headings":"1","show_articles":"0","show_link":"1","show_pagination":"1","show_pagination_results":"1","sef_ids":1}', '', 0, 0),
 (0, 'com_plugins', 'component', 'com_plugins', '', 1, 1, 1, 1, 1, '', '', '', 0, 0),
 (0, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, 1, '', '{"template_positions_display":"0","upload_limit":"10","image_formats":"gif,bmp,jpg,jpeg,png,webp","source_formats":"txt,less,ini,xml,js,php,css,scss,sass,json","font_formats":"woff,woff2,ttf,otf","compressed_formats":"zip","difference":"SideBySide"}', '', 0, 0),
-(0, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","info_block_position":"0","info_block_show_title":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_associations":"0","flags":"1","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_readmore":"1","show_readmore_title":"1","readmore_limit":100,"show_tags":"1","record_hits":"1","show_hits":"1","show_noauth":"0","urls_position":0,"captcha":"","show_publishing_options":"1","show_article_options":"1","show_configure_edit_options":"1","show_permissions":"1","show_associations_edit":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_category_heading_title_text":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_cat_tags":"1","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":1,"blog_class_leading":"","num_intro_articles":4,"blog_class":"","num_columns":1,"multi_column_order":"0","num_links":4,"show_subcategory_content":"0","link_intro_image":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","display_num":"10","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_featured":"show","show_feed_link":"1","feed_summary":"0","feed_show_readmore":"0","sef_ids":1,"custom_fields_enable":"1","workflow_enabled":"0"}', '', 0, 0),
+(0, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","info_block_position":"0","info_block_show_title":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_associations":"0","flags":"1","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_readmore":"1","show_readmore_title":"1","readmore_limit":100,"show_tags":"1","record_hits":"1","show_hits":"1","show_noauth":"0","urls_position":0,"captcha":"","show_publishing_options":"1","show_article_options":"1","show_configure_edit_options":"1","show_permissions":"1","show_associations_edit":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_category_heading_title_text":"1","show_subcat_desc":"1","show_subcat_image":"0","show_cat_num_articles":"0","show_cat_tags":"1","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":1,"blog_class_leading":"","num_intro_articles":4,"blog_class":"","num_columns":1,"multi_column_order":"0","num_links":4,"show_subcategory_content":"0","link_intro_image":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","display_num":"10","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_featured":"show","show_feed_link":"1","feed_summary":"0","feed_show_readmore":"0","sef_ids":1,"custom_fields_enable":"1","workflow_enabled":"0"}', '', 0, 0),
 (0, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"9":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', '', 0, 0),
 (0, 'com_redirect', 'component', 'com_redirect', '', 1, 1, 0, 0, 1, '', '', '', 0, 0),
 (0, 'com_users', 'component', 'com_users', '', 1, 1, 0, 1, 1, '', '{"allowUserRegistration":"0","new_usertype":"2","guest_usergroup":"9","sendpassword":"0","useractivation":"2","mail_to_admin":"1","captcha":"","frontend_userparams":"1","site_language":"0","change_login_name":"0","reset_count":"10","reset_time":"1","minimum_length":"12","minimum_integers":"0","minimum_symbols":"0","minimum_uppercase":"0","save_history":"1","history_limit":5,"mailSubjectPrefix":"","mailBodySuffix":""}', '', 0, 0),
@@ -268,10 +268,10 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 (0, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0, 1, 1, 1, 1, '', '', '', 2, 0),
 (0, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, 1, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', '', 3, 0),
-(0, 'plg_behaviour_compat', 'plugin', 'compat', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","es5_assets":"1"}', '', 1, 0),
-(0, 'plg_behaviour_compat6', 'plugin', 'compat6', 'behaviour', 0, 1, 1, 0, 1, '', '{"classes_aliases":"1","legacy_classes":"1"}', '', 2, 0),
-(0, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
-(0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 4, 0),
+(0, 'plg_behaviour_compat6', 'plugin', 'compat6', 'behaviour', 0, 0, 1, 0, 1, '', '{"classes_aliases":"0","legacy_classes":"1"}', '', 1, 0),
+(0, 'plg_behaviour_taggable', 'plugin', 'taggable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 2, 0),
+(0, 'plg_behaviour_versionable', 'plugin', 'versionable', 'behaviour', 0, 1, 1, 0, 1, '', '{}', '', 3, 0),
+(0, 'plg_captcha_powcaptcha', 'plugin', 'powcaptcha', 'captcha', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
 (0, 'plg_content_confirmconsent', 'plugin', 'confirmconsent', 'content', 0, 0, 1, 0, 1, '', '{}', '', 1, 0),
 (0, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, 1, '', '', '', 2, 0),
 (0, 'plg_content_emailcloak', 'plugin', 'emailcloak', 'content', 0, 1, 1, 0, 1, '', '{"mode":"1"}', '', 3, 0),
@@ -292,7 +292,7 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 (0, 'plg_editors-xtd_readmore', 'plugin', 'readmore', 'editors-xtd', 0, 1, 1, 0, 1, '', '', '', 8, 0),
 (0, 'plg_editors_codemirror', 'plugin', 'codemirror', 'editors', 0, 1, 1, 0, 1, '', '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}', '', 1, 0),
 (0, 'plg_editors_none', 'plugin', 'none', 'editors', 0, 1, 1, 1, 1, '', '', '', 2, 0),
-(0, 'plg_editors_tinymce', 'plugin', 'tinymce', 'editors', 0, 1, 1, 0, 1, '', '{"configuration":{"toolbars":{"2":{"toolbar1":["bold","underline","strikethrough","|","undo","redo","|","bullist","numlist","|","pastetext"]},"1":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","blocks","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","code","|","hr","table","|","subscript","superscript","|","charmap","pastetext","preview"]},"0":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","styles","|","blocks","fontfamily","fontsize","|","searchreplace","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","image","|","code","|","forecolor","backcolor","|","fullscreen","|","table","|","subscript","superscript","|","charmap","emoticons","media","hr","ltr","rtl","|","cut","copy","paste","pastetext","|","visualchars","visualblocks","nonbreaking","blockquote","jtemplate","|","print","preview","codesample","insertdatetime","removeformat"]}},"setoptions":{"2":{"access":["1"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"1":{"access":["6","2"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"0":{"access":["7","4","8"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"0","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"1","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""}}},"sets_amount":3,"html_height":"550","html_width":"750"}', '', 3, 0),
+(0, 'plg_editors_tinymce', 'plugin', 'tinymce', 'editors', 0, 1, 1, 0, 1, '', '{"configuration":{"toolbars":{"2":{"toolbar1":["bold","underline","strikethrough","|","readmore","|","undo","redo","|","bullist","numlist","|","pastetext"]},"1":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","readmore","|","blocks","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","code","|","hr","table","|","subscript","superscript","|","charmap","pastetext","preview"]},"0":{"menu":["edit","insert","view","format","table","tools"],"toolbar1":["bold","italic","underline","strikethrough","|","alignleft","aligncenter","alignright","alignjustify","|","readmore","|","lineheight","|","styles","|","blocks","fontfamily","fontsize","|","searchreplace","|","bullist","numlist","|","outdent","indent","|","undo","redo","|","link","unlink","anchor","image","|","code","|","forecolor","backcolor","|","fullscreen","|","table","|","subscript","superscript","|","charmap","emoticons","media","hr","ltr","rtl","|","cut","copy","paste","pastetext","|","visualchars","visualblocks","nonbreaking","blockquote","jtemplate","|","print","preview","codesample","insertdatetime","removeformat","language","abbr","abbr_remove"]}},"setoptions":{"2":{"access":["1"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"1":{"access":["6","2"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"0","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""},"0":{"access":["7","4","8"],"skin":"0","skin_admin":"0","mobile":"0","drag_drop":"1","path":"","entity_encoding":"raw","lang_mode":"1","text_direction":"ltr","content_css":"1","content_css_custom":"","relative_urls":"1","newlines":"0","use_config_textfilters":"1","invalid_elements":"script,applet,iframe","valid_elements":"","extended_elements":"","resizing":"1","resize_horizontal":"1","element_path":"1","wordcount":"1","image_advtab":"1","advlist":"1","autosave":"1","contextmenu":"1","custom_plugin":"","custom_button":""}}},"sets_amount":3,"html_height":"550px","html_width":"100%"}', '', 3, 0),
 (0, 'plg_extension_finder', 'plugin', 'finder', 'extension', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_extension_joomla', 'plugin', 'joomla', 'extension', 0, 1, 1, 0, 1, '', '', '', 2, 0),
 (0, 'plg_extension_joomlaupdate', 'plugin', 'joomlaupdate', 'extension', 0, 1, 1, 0, 1, '', '', '', 3, 0),
@@ -305,14 +305,16 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 (0, 'plg_fields_integer', 'plugin', 'integer', 'fields', 0, 1, 1, 0, 1, '', '{"multiple":"0","first":"1","last":"100","step":"1"}', '', 6, 0),
 (0, 'plg_fields_list', 'plugin', 'list', 'fields', 0, 1, 1, 0, 1, '', '', '', 7, 0),
 (0, 'plg_fields_media', 'plugin', 'media', 'fields', 0, 1, 1, 0, 1, '', '', '', 8, 0),
-(0, 'plg_fields_radio', 'plugin', 'radio', 'fields', 0, 1, 1, 0, 1, '', '', '', 9, 0),
-(0, 'plg_fields_sql', 'plugin', 'sql', 'fields', 0, 1, 1, 0, 1, '', '', '', 10, 0),
-(0, 'plg_fields_subform', 'plugin', 'subform', 'fields', 0, 1, 1, 0, 1, '', '', '', 11, 0),
-(0, 'plg_fields_text', 'plugin', 'text', 'fields', 0, 1, 1, 0, 1, '', '', '', 12, 0),
-(0, 'plg_fields_textarea', 'plugin', 'textarea', 'fields', 0, 1, 1, 0, 1, '', '{"rows":10,"cols":10,"maxlength":"","filter":"\\\\Joomla\\\\CMS\\\\Component\\\\ComponentHelper::filterText"}', '', 13, 0),
-(0, 'plg_fields_url', 'plugin', 'url', 'fields', 0, 1, 1, 0, 1, '', '', '', 14, 0),
-(0, 'plg_fields_user', 'plugin', 'user', 'fields', 0, 1, 1, 0, 1, '', '', '', 15, 0),
-(0, 'plg_fields_usergrouplist', 'plugin', 'usergrouplist', 'fields', 0, 1, 1, 0, 1, '', '', '', 16, 0),
+(0, 'plg_fields_note', 'plugin', 'note', 'fields', 0, 1, 1, 0, 1, '', '{"class":"alert alert-info","heading":"h4"}', '', 9, 0),
+(0, 'plg_fields_number', 'plugin', 'number', 'fields', 0, 1, 1, 0, 1, '', '{"min":"1.0","max":"100.0","step":"0.1","currency":"0","symbol":"","position":"0","decimals":"2"}', '', 10, 0),
+(0, 'plg_fields_radio', 'plugin', 'radio', 'fields', 0, 1, 1, 0, 1, '', '', '', 11, 0),
+(0, 'plg_fields_sql', 'plugin', 'sql', 'fields', 0, 1, 1, 0, 1, '', '', '', 12, 0),
+(0, 'plg_fields_subform', 'plugin', 'subform', 'fields', 0, 1, 1, 0, 1, '', '', '', 13, 0),
+(0, 'plg_fields_text', 'plugin', 'text', 'fields', 0, 1, 1, 0, 1, '', '', '', 14, 0),
+(0, 'plg_fields_textarea', 'plugin', 'textarea', 'fields', 0, 1, 1, 0, 1, '', '{"rows":10,"cols":10,"maxlength":"","filter":"\\\\Joomla\\\\CMS\\\\Component\\\\ComponentHelper::filterText"}', '', 15, 0),
+(0, 'plg_fields_url', 'plugin', 'url', 'fields', 0, 1, 1, 0, 1, '', '', '', 16, 0),
+(0, 'plg_fields_user', 'plugin', 'user', 'fields', 0, 1, 1, 0, 1, '', '', '', 17, 0),
+(0, 'plg_fields_usergrouplist', 'plugin', 'usergrouplist', 'fields', 0, 1, 1, 0, 1, '', '', '', 18, 0),
 (0, 'plg_filesystem_local', 'plugin', 'local', 'filesystem', 0, 1, 1, 0, 1, '', '{}', '', 1, 0),
 (0, 'plg_finder_categories', 'plugin', 'categories', 'finder', 0, 1, 1, 0, 1, '', '', '', 1, 0),
 (0, 'plg_finder_contacts', 'plugin', 'contacts', 'finder', 0, 1, 1, 0, 1, '', '', '', 2, 0),
@@ -420,7 +422,8 @@ INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder",
 -- Templates
 INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
 (0, 'atum', 'template', 'atum', '', 1, 1, 1, 0, 1, '', '', '', 0, 0),
-(0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}', '', 0, 0);
+(0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0,"colorSettings":0,"fontSettings":0}', '', 0, 0),
+(0, 'cassiopeia_extended', 'template', 'cassiopeia_extended', '', 0, 1, 1, 0, 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","systemFontBody":"","systemFontHeading":"","colorName":"colors_standard","fluidContainer":"0","stickyHeader":"0","backTop":"0","colorSettings":"0","headerbg":"rgb(193, 205, 207)","headercolor":"rgb(23, 23, 23)","bodybg":"rgb(254, 254, 254)","bodycolor":"rgb(23, 23, 23)","linkcolor":"rgb(29, 121, 137)","linkcolorh":"rgb(14, 59, 67)","btnbg":"rgb(206, 60, 55)","btnbgh":"rgb(131, 35, 32)","btncolor":"rgb(254, 254, 254)","btncolorh":"rgb(254, 254, 254)","footerbg":"rgb(29, 121, 137)","footercolor":"rgb(254, 254, 254)","fontSettings":"0","bodysize":"1","h1size":"2","h2size":"1.7","h3size":"1.5"}', '', 0, 0);
 
 -- Files Extensions
 INSERT INTO "#__extensions" ("package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "locked", "manifest_cache", "params", "custom_data", "ordering", "state") VALUES
@@ -862,9 +865,10 @@ CREATE INDEX "#__template_styles_idx_client_id_home" ON "#__template_styles" ("c
 --
 INSERT INTO "#__template_styles" ("id", "template", "client_id", "home", "title", "inheritable", "parent", "params") VALUES
 (10, 'atum', 1, '1', 'Atum - Default', 1, '', '{"hue":"hsl(214, 63%, 20%)","bg-light":"#f0f4fb","text-dark":"#495057","text-light":"#ffffff","link-color":"#2a69b8","special-color":"#001b4c","colorScheme":"os","monochrome":"0","loginLogo":"","loginLogoAlt":"","logoBrandLarge":"","logoBrandLargeAlt":"","logoBrandSmall":"","logoBrandSmallAlt":""}'),
-(11, 'cassiopeia', 0, '1', 'Cassiopeia - Default', 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}');
+(11, 'cassiopeia', 0, '1', 'Cassiopeia - Default', 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}'),
+(12, 'cassiopeia_extended', 0, '0', 'Cassiopeia Extended - Default', 0, 'cassiopeia', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","systemFontBody":"","systemFontHeading":"","colorName":"colors_standard","fluidContainer":"0","stickyHeader":"0","backTop":"0","colorSettings":"0","headerbg":"rgb(193, 205, 207)","headercolor":"rgb(23, 23, 23)","bodybg":"rgb(254, 254, 254)","bodycolor":"rgb(23, 23, 23)","linkcolor":"rgb(29, 121, 137)","linkcolorh":"rgb(14, 59, 67)","btnbg":"rgb(206, 60, 55)","btnbgh":"rgb(131, 35, 32)","btncolor":"rgb(254, 254, 254)","btncolorh":"rgb(254, 254, 254)","footerbg":"rgb(29, 121, 137)","footercolor":"rgb(254, 254, 254)","fontSettings":"0","bodysize":"1","h1size":"2","h2size":"1.7","h3size":"1.5"}');
 
-SELECT setval('#__template_styles_id_seq', 12, false);
+SELECT setval('#__template_styles_id_seq', 13, false);
 
 --
 -- Table structure for table `#__updates`
@@ -886,6 +890,7 @@ CREATE TABLE IF NOT EXISTS "#__updates" (
   "infourl" text NOT NULL,
   "changelogurl" text,
   "extra_query" varchar(1000) DEFAULT '',
+  "security" smallint DEFAULT NULL,
   PRIMARY KEY ("update_id")
 );
 
@@ -940,7 +945,7 @@ COMMENT ON TABLE "#__update_sites" IS 'Update Sites';
 
 INSERT INTO "#__update_sites" ("update_site_id", "name", "type", "location", "enabled", "last_check_timestamp") VALUES
 (1, 'Joomla! Core', 'tuf', 'https://update.joomla.org/cms/', 1, 0),
-(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_5.xml', 1, 0),
+(2, 'Accredited Joomla! Translations', 'collection', 'https://update.joomla.org/language/translationlist_6.xml', 1, 0),
 (3, 'Joomla! Update Component', 'extension', 'https://update.joomla.org/core/extensions/com_joomlaupdate.xml', 1, 0);
 
 SELECT setval('#__update_sites_update_site_id_seq', 4, false);
@@ -1228,6 +1233,7 @@ CREATE TABLE IF NOT EXISTS "#__workflow_stages" (
   "title" varchar(255) NOT NULL,
   "description" text NOT NULL,
   "default" smallint NOT NULL  DEFAULT 0,
+  "position" text,
   "checked_out_time" timestamp without time zone,
   "checked_out" integer,
   PRIMARY KEY ("id")
diff --git a/installation/sql/postgresql/supports.sql b/installation/sql/postgresql/supports.sql
index 0a35f22d80db7..c0688fa70a7be 100644
--- a/installation/sql/postgresql/supports.sql
+++ b/installation/sql/postgresql/supports.sql
@@ -99,19 +99,20 @@ COMMENT ON COLUMN "#__content_types"."content_history_options" IS 'JSON string f
 --
 
 INSERT INTO "#__content_types" ("type_id", "type_title", "type_alias", "table", "rules", "field_mappings", "router", "content_history_options") VALUES
-(1, 'Article', 'com_content.article', '{"special":{"dbtable":"#__content","key":"id","type":"ArticleTable","prefix":"Joomla\\\\Component\\\\Content\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_user_id":"created_by","core_created_by_alias":"created_by_alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"asset_id", "note":"note"}, "special":{"fulltext":"fulltext"}}', 'ContentHelperRoute::getArticleRoute', '{"formFile":"administrator\\/components\\/com_content\\/forms\\/article.xml", "hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits", "ordering"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
-(2, 'Contact', 'com_contact.contact', '{"special":{"dbtable":"#__contact_details","key":"id","type":"ContactTable","prefix":"Joomla\\\\Component\\\\Contact\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"address", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"image", "core_urls":"webpage", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"null"}, "special":{"con_position":"con_position","suburb":"suburb","state":"state","country":"country","postcode":"postcode","telephone":"telephone","fax":"fax","misc":"misc","email_to":"email_to","default_con":"default_con","user_id":"user_id","mobile":"mobile","sortname1":"sortname1","sortname2":"sortname2","sortname3":"sortname3"}}', 'ContactHelperRoute::getContactRoute', '{"formFile":"administrator\\/components\\/com_contact\\/forms\\/contact.xml","hideFields":["default_con","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"], "displayLookup":[ {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ] }'),
-(3, 'Newsfeed', 'com_newsfeeds.newsfeed', '{"special":{"dbtable":"#__newsfeeds","key":"id","type":"NewsfeedTable","prefix":"Joomla\\\\Component\\\\Newsfeeds\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"null"}, "special":{"numarticles":"numarticles","cache_time":"cache_time","rtl":"rtl"}}', 'NewsfeedsHelperRoute::getNewsfeedRoute', '{"formFile":"administrator\\/components\\/com_newsfeeds\\/forms\\/newsfeed.xml","hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
+(1, 'Article', 'com_content.article', '{"special":{"dbtable":"#__content","key":"id","type":"ArticleTable","prefix":"Joomla\\\\Component\\\\Content\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"state","core_alias":"alias","core_created_user_id":"created_by","core_created_by_alias":"created_by_alias","core_created_time":"created","core_modified_time":"modified","core_body":"introtext", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"attribs", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"asset_id", "note":"note"}, "special":{"fulltext":"fulltext"}}', 'ContentHelperRoute::getArticleRoute', '{"formFile":"administrator\\/components\\/com_content\\/forms\\/article.xml", "hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits", "ordering"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"} ]}'),
+(2, 'Contact', 'com_contact.contact', '{"special":{"dbtable":"#__contact_details","key":"id","type":"ContactTable","prefix":"Joomla\\\\Component\\\\Contact\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"address", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"image", "core_urls":"webpage", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"null"}, "special":{"con_position":"con_position","suburb":"suburb","state":"state","country":"country","postcode":"postcode","telephone":"telephone","fax":"fax","misc":"misc","email_to":"email_to","default_con":"default_con","user_id":"user_id","mobile":"mobile","sortname1":"sortname1","sortname2":"sortname2","sortname3":"sortname3"}}', 'ContactHelperRoute::getContactRoute', '{"formFile":"administrator\\/components\\/com_contact\\/forms\\/contact.xml","hideFields":["default_con","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"], "displayLookup":[ {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"} ] }'),
+(3, 'Newsfeed', 'com_newsfeeds.newsfeed', '{"special":{"dbtable":"#__newsfeeds","key":"id","type":"NewsfeedTable","prefix":"Joomla\\\\Component\\\\Newsfeeds\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"hits","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"null"}, "special":{"numarticles":"numarticles","cache_time":"cache_time","rtl":"rtl"}}', 'NewsfeedsHelperRoute::getNewsfeedRoute', '{"formFile":"administrator\\/components\\/com_newsfeeds\\/forms\\/newsfeed.xml","hideFields":["asset_id","checked_out","checked_out_time","version"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "hits"],"convertToInt":["publish_up", "publish_down", "featured", "ordering"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"} ]}'),
 (4, 'User', 'com_users.user', '{"special":{"dbtable":"#__users","key":"id","type":"User","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"null","core_alias":"username","core_created_time":"registerDate","core_modified_time":"lastvisitDate","core_body":"null", "core_hits":"null","core_publish_up":"null","core_publish_down":"null","access":"null", "core_params":"params", "core_featured":"null", "core_metadata":"null", "core_language":"null", "core_images":"null", "core_urls":"null", "core_version":"null", "core_ordering":"null", "core_metakey":"null", "core_metadesc":"null", "core_catid":"null", "asset_id":"null"}, "special":{}}', '', ''),
-(5, 'Article Category', 'com_content.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'ContentHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
-(6, 'Contact Category', 'com_contact.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'ContactHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
-(7, 'Newsfeeds Category', 'com_newsfeeds.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'NewsfeedsHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
+(5, 'Article Category', 'com_content.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'ContentHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"}]}'),
+(6, 'Contact Category', 'com_contact.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'ContactHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"}]}'),
+(7, 'Newsfeeds Category', 'com_newsfeeds.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', 'NewsfeedsHelperRoute::getCategoryRoute', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"}]}'),
 (8, 'Tag', 'com_tags.tag', '{"special":{"dbtable":"#__tags","key":"tag_id","type":"TagTable","prefix":"Joomla\\\\Component\\\\Tags\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"featured", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"urls", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"null", "asset_id":"null"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path"}}', 'TagsHelperRoute::getTagRoute', '{"formFile":"administrator\\/components\\/com_tags\\/forms\\/tag.xml", "hideFields":["checked_out","checked_out_time","version", "lft", "rgt", "level", "path", "urls", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"],"convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'),
 (9, 'Banner', 'com_banners.banner', '{"special":{"dbtable":"#__banners","key":"id","type":"BannerTable","prefix":"Joomla\\\\Component\\\\Banners\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"name","core_state":"published","core_alias":"alias","core_created_time":"created","core_modified_time":"modified","core_body":"description", "core_hits":"null","core_publish_up":"publish_up","core_publish_down":"publish_down","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"images", "core_urls":"link", "core_version":"version", "core_ordering":"ordering", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"catid", "asset_id":"null"}, "special":{"imptotal":"imptotal", "impmade":"impmade", "clicks":"clicks", "clickurl":"clickurl", "custombannercode":"custombannercode", "cid":"cid", "purchase_type":"purchase_type", "track_impressions":"track_impressions", "track_clicks":"track_clicks"}}', '','{"formFile":"administrator\\/components\\/com_banners\\/forms\\/banner.xml", "hideFields":["checked_out","checked_out_time","version", "reset"],"ignoreChanges":["modified_by", "modified", "checked_out", "checked_out_time", "version", "imptotal", "impmade", "reset"], "convertToInt":["publish_up", "publish_down", "ordering"], "displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"cid","targetTable":"#__banner_clients","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"created_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"modified_by","targetTable":"#__users","targetColumn":"id","displayColumn":"name"} ]}'),
-(10, 'Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}','','{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}'),
+(10, 'Banners Category', 'com_banners.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special": {"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}','','{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["asset_id","checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"}]}'),
 (11, 'Banner Client', 'com_banners.client', '{"special":{"dbtable":"#__banner_clients","key":"id","type":"ClientTable","prefix":"Joomla\\\\Component\\\\Banners\\\\Administrator\\\\Table\\\\"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_banners\\/forms\\/client.xml", "hideFields":["checked_out","checked_out_time"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":[], "displayLookup":[]}'),
 (12, 'User Notes', 'com_users.note', '{"special":{"dbtable":"#__user_notes","key":"id","type":"NoteTable","prefix":"Joomla\\\\Component\\\\Users\\\\Administrator\\\\Table\\\\"}}', '', '', '', '{"formFile":"administrator\\/components\\/com_users\\/forms\\/note.xml", "hideFields":["checked_out","checked_out_time", "publish_up", "publish_down"],"ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"],"displayLookup":[{"sourceColumn":"catid","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}, {"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}]}'),
-(13, 'User Notes Category', 'com_users.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"}]}');
+(13, 'User Notes Category', 'com_users.category', '{"special":{"dbtable":"#__categories","key":"id","type":"CategoryTable","prefix":"Joomla\\\\Component\\\\Categories\\\\Administrator\\\\Table\\\\","config":"array()"},"common":{"dbtable":"#__ucm_content","key":"ucm_id","type":"Corecontent","prefix":"Joomla\\\\CMS\\\\Table\\\\","config":"array()"}}', '', '{"common":{"core_content_item_id":"id","core_title":"title","core_state":"published","core_alias":"alias","core_created_time":"created_time","core_modified_time":"modified_time","core_body":"description", "core_hits":"hits","core_publish_up":"null","core_publish_down":"null","core_access":"access", "core_params":"params", "core_featured":"null", "core_metadata":"metadata", "core_language":"language", "core_images":"null", "core_urls":"null", "core_version":"version", "core_ordering":"null", "core_metakey":"metakey", "core_metadesc":"metadesc", "core_catid":"parent_id", "asset_id":"asset_id"}, "special":{"parent_id":"parent_id","lft":"lft","rgt":"rgt","level":"level","path":"path","extension":"extension","note":"note"}}', '', '{"formFile":"administrator\\/components\\/com_categories\\/forms\\/category.xml", "hideFields":["checked_out","checked_out_time","version","lft","rgt","level","path","extension"], "ignoreChanges":["modified_user_id", "modified_time", "checked_out", "checked_out_time", "version", "hits", "path"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"created_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"}, {"sourceColumn":"access","targetTable":"#__viewlevels","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"modified_user_id","targetTable":"#__users","targetColumn":"id","displayColumn":"name"},{"sourceColumn":"parent_id","targetTable":"#__categories","targetColumn":"id","displayColumn":"title"},{"sourceColumn":"tags","targetTable":"#__tags","targetColumn":"id","displayColumn":"title"}]}'),
+(14, 'Module', 'com_modules.module', '{"special":{"dbtable":"#__modules","key":"id","type":"Module","prefix":"Joomla\\\\CMS\\\\Table\\\\"}}', '', '{}', '', '{"formFile":"administrator\\/components\\/com_modules\\/forms\\/module.xml", "hideFields":["checked_out", "checked_out_time", "publish_up", "publish_down"], "ignoreChanges":["checked_out", "checked_out_time"], "convertToInt":["publish_up", "publish_down"], "displayLookup":[{"sourceColumn":"checked_out", "targetTable":"#__users", "targetColumn":"id", "displayColumn":"name"}]}');
 
 SELECT setval('#__content_types_type_id_seq', 10000, false);
 
@@ -372,6 +373,8 @@ CREATE TABLE IF NOT EXISTS "#__history" (
   "sha1_hash" varchar(50) NOT NULL DEFAULT '',
   "version_data" text NOT NULL,
   "keep_forever" smallint NOT NULL DEFAULT 0,
+  "is_current" smallint NOT NULL DEFAULT 0,
+  "is_legacy" smallint NOT NULL DEFAULT 0,
   PRIMARY KEY ("version_id")
 );
 CREATE INDEX "#__history_idx_ucm_item_id" ON "#__history" ("item_id");
@@ -430,7 +433,7 @@ INSERT INTO "#__mail_templates" ("template_id", "extension", "language", "subjec
 ('com_joomlaupdate.update.failed', 'com_joomlaupdate', '', 'COM_JOOMLAUPDATE_UPDATE_FAILED_MAIL_SUBJECT', 'COM_JOOMLAUPDATE_UPDATE_FAILED_MAIL_BODY', '', '', '{"tags":["newversion","oldversion","sitename","url"]}'),
 ('plg_task_updatenotification.mail', 'plg_task_updatenotification', '', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_SUBJECT', 'PLG_TASK_UPDATENOTIFICATION_EMAIL_BODY', '', '', '{"tags":["newversion","curversion","sitename","url","link","releasenews"]}'),
 ('plg_user_joomla.mail', 'plg_user_joomla', '', 'PLG_USER_JOOMLA_NEW_USER_EMAIL_SUBJECT', 'PLG_USER_JOOMLA_NEW_USER_EMAIL_BODY', '', '', '{"tags":["name","sitename","url","username","password","email"]}'),
-('com_actionlogs.notification', 'com_actionlogs', '', 'COM_ACTIONLOGS_EMAIL_SUBJECT', 'COM_ACTIONLOGS_EMAIL_BODY', 'COM_ACTIONLOGS_EMAIL_HTMLBODY', '', '{"tags":["messages","message","date","extension","username"]}'),
+('com_actionlogs.notification', 'com_actionlogs', '', 'COM_ACTIONLOGS_EMAIL_SUBJECT', 'COM_ACTIONLOGS_EMAIL_BODY', 'COM_ACTIONLOGS_EMAIL_HTMLBODY', '', '{"tags":["messages","message","date","extension","username","ip_address"]}'),
 ('com_privacy.userdataexport', 'com_privacy', '', 'COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_SUBJECT', 'COM_PRIVACY_EMAIL_DATA_EXPORT_COMPLETED_BODY', '', '', '{"tags":["sitename","url"]}'),
 ('com_privacy.notification.export', 'com_privacy', '', 'COM_PRIVACY_EMAIL_REQUEST_SUBJECT_EXPORT_REQUEST', 'COM_PRIVACY_EMAIL_REQUEST_BODY_EXPORT_REQUEST', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
 ('com_privacy.notification.remove', 'com_privacy', '', 'COM_PRIVACY_EMAIL_REQUEST_SUBJECT_REMOVE_REQUEST', 'COM_PRIVACY_EMAIL_REQUEST_BODY_REMOVE_REQUEST', '', '', '{"tags":["sitename","url","tokenurl","formurl","token"]}'),
@@ -451,4 +454,5 @@ INSERT INTO "#__mail_templates" ("template_id", "extension", "language", "subjec
 ('plg_system_tasknotification.fatal_recovery_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_FATAL_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_FATAL_MAIL_BODY', '', '', '{"tags": ["task_id", "task_title"]}'),
 ('plg_system_tasknotification.orphan_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_ORPHAN_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_ORPHAN_MAIL_BODY', '', '', '{"tags": ["task_id", "task_title"]}'),
 ('plg_system_tasknotification.success_mail', 'plg_system_tasknotification', '', 'PLG_SYSTEM_TASK_NOTIFICATION_SUCCESS_MAIL_SUBJECT', 'PLG_SYSTEM_TASK_NOTIFICATION_SUCCESS_MAIL_BODY', '', '', '{"tags":["task_id", "task_title", "exec_data_time", "task_output"]}'),
-('plg_multifactorauth_email.mail', 'plg_multifactorauth_email', '', 'PLG_MULTIFACTORAUTH_EMAIL_EMAIL_SUBJECT', 'PLG_MULTIFACTORAUTH_EMAIL_EMAIL_BODY', '', '', '{"tags":["code","sitename","siteurl","username","email","fullname"]}');
+('plg_multifactorauth_email.mail', 'plg_multifactorauth_email', '', 'PLG_MULTIFACTORAUTH_EMAIL_EMAIL_SUBJECT', 'PLG_MULTIFACTORAUTH_EMAIL_EMAIL_BODY', '', '', '{"tags":["code","sitename","siteurl","username","email","fullname"]}'),
+('plg_content_joomla.newarticle', 'plg_content_joomla', '', 'PLG_CONTENT_JOOMLA_NEW_ARTICLE_SUBJECT', 'PLG_CONTENT_JOOMLA_NEW_ARTICLE_BODY', '', '', '{"tags":["sitename","name","email","title","url"]}');
diff --git a/installation/src/Application/CliInstallationApplication.php b/installation/src/Application/CliInstallationApplication.php
index 56f704874f473..627c688f2339d 100644
--- a/installation/src/Application/CliInstallationApplication.php
+++ b/installation/src/Application/CliInstallationApplication.php
@@ -121,10 +121,6 @@ public function __construct(
         // Store the debug value to config based on the JDEBUG flag.
         $this->config->set('debug', JDEBUG);
 
-        \define('JPATH_COMPONENT', JPATH_BASE);
-        \define('JPATH_COMPONENT_SITE', JPATH_SITE);
-        \define('JPATH_COMPONENT_ADMINISTRATOR', JPATH_ADMINISTRATOR);
-
         // Register the config to Factory.
         Factory::$config   = $this->config;
         Factory::$language = $language;
@@ -311,21 +307,4 @@ public function isClient($identifier)
     {
         return 'cli_installation' === $identifier;
     }
-
-    /**
-     * Flag if the application instance is a CLI or web based application.
-     *
-     * Helper function, you should use the native PHP functions to detect if it is a CLI application.
-     *
-     * @return  boolean
-     *
-     * @since       4.3.0
-     *
-     * @deprecated   4.3 will be removed in 5.0
-     *               Use $app->isClient('cli_installation') instead
-     */
-    public function isCli()
-    {
-        return $this->isClient('cli_installation');
-    }
 }
diff --git a/installation/src/Application/InstallationApplication.php b/installation/src/Application/InstallationApplication.php
index 8f65c113e9bec..6121ccdcc5730 100644
--- a/installation/src/Application/InstallationApplication.php
+++ b/installation/src/Application/InstallationApplication.php
@@ -18,7 +18,6 @@
 use Joomla\CMS\Document\HtmlDocument;
 use Joomla\CMS\Exception\ExceptionHandler;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Input\Input;
 use Joomla\CMS\Language\LanguageFactoryInterface;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
@@ -27,6 +26,7 @@
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\Filesystem\Folder;
+use Joomla\Input\Input;
 use Joomla\Registry\Registry;
 use Joomla\Session\SessionEvent;
 
@@ -47,7 +47,7 @@ final class InstallationApplication extends CMSApplication
      * Class constructor.
      *
      * @param   ?Input      $input      An optional argument to provide dependency injection for the application's input
-     *                                  object.  If the argument is a JInput object that object will become the
+     *                                  object.  If the argument is a Input object that object will become the
      *                                  application's input object, otherwise a default input object is created.
      * @param   ?Registry   $config     An optional argument to provide dependency injection for the application's
      *                                  config object.  If the argument is a Registry object that object will become
@@ -187,11 +187,6 @@ public function dispatch()
         // Register the document object with Factory.
         Factory::$document = $document;
 
-        // Define component path.
-        \define('JPATH_COMPONENT', JPATH_BASE);
-        \define('JPATH_COMPONENT_SITE', JPATH_SITE);
-        \define('JPATH_COMPONENT_ADMINISTRATOR', JPATH_ADMINISTRATOR);
-
         // Execute the task.
         ob_start();
         $this->executeController();
@@ -294,14 +289,14 @@ private function executeController()
 
         // Parse task in format controller.task
         if ($task !== '') {
-            list($controllerName, $task) = explode('.', $task, 2);
+            [$controllerName, $task] = explode('.', $task, 2);
         }
 
         $factory = new MVCFactory('Joomla\\CMS', $this->getLogger());
         $factory->setDatabase($this->getContainer()->get(DatabaseInterface::class));
 
         // Create the instance
-        $controller = $factory->createController($controllerName, 'Installation', [], $this, $this->input);
+        $controller = $factory->createController($controllerName, 'Installation', ['base_path' => JPATH_INSTALLATION], $this, $this->input);
 
         // Execute the task
         $controller->execute($task);
@@ -368,30 +363,6 @@ public function getLocaliseAdmin(?DatabaseInterface $db = null)
         return $langfiles;
     }
 
-    /**
-     * Gets the name of the current template.
-     *
-     * @param   boolean  $params  True to return the template parameters
-     *
-     * @return  string|\stdClass  The name of the template.
-     *
-     * @since   3.1
-     */
-    public function getTemplate($params = false)
-    {
-        if ($params) {
-            $template              = new \stdClass();
-            $template->template    = 'template';
-            $template->params      = new Registry();
-            $template->inheritable = 0;
-            $template->parent      = '';
-
-            return $template;
-        }
-
-        return 'template';
-    }
-
     /**
      * Initialise the application.
      *
@@ -568,4 +539,21 @@ public function getMenu($name = null, $options = [])
     {
         return null;
     }
+
+    /**
+     * Initialise the template.
+     *
+     * @return  void
+     *
+     * @since   6.1.0
+     */
+    protected function initialiseTemplate(): void
+    {
+        $this->template = (object) [
+            'template'    => 'template',
+            'params'      => new Registry(),
+            'inheritable' => 0,
+            'parent'      => '',
+        ];
+    }
 }
diff --git a/installation/src/Controller/InstallationController.php b/installation/src/Controller/InstallationController.php
index 5b93cdf619bd3..c3ff5ee31bed7 100644
--- a/installation/src/Controller/InstallationController.php
+++ b/installation/src/Controller/InstallationController.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Session\Session;
+use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -27,12 +28,12 @@
 class InstallationController extends JSONController
 {
     /**
-     * @param   array                     $config   An optional associative array of configuration settings.
-     *                                              Recognized key values include 'name', 'default_task', 'model_path', and
-     *                                              'view_path' (this list is not meant to be comprehensive).
-     * @param   ?MVCFactoryInterface      $factory  The factory.
-     * @param   ?CMSApplication           $app      The Application for the dispatcher
-     * @param   ?\Joomla\CMS\Input\Input  $input    The Input object.
+     * @param   array                 $config   An optional associative array of configuration settings.
+     *                                          Recognized key values include 'name', 'default_task', 'model_path', and
+     *                                          'view_path' (this list is not meant to be comprehensive).
+     * @param   ?MVCFactoryInterface  $factory  The factory.
+     * @param   ?CMSApplication       $app      The Application for the dispatcher
+     * @param   ?Input                $input    The Input object.
      *
      * @since   3.0
      */
@@ -70,6 +71,7 @@ public function dbcheck()
         if ($model->validate($data, 'setup') === false) {
             $this->app->enqueueMessage(Text::_('INSTL_DATABASE_VALIDATION_ERROR'), 'error');
             $r->validated = false;
+            $r->error     = true;
             $this->sendJsonResponse($r);
 
             return;
diff --git a/installation/src/Form/Field/Installation/PrefixField.php b/installation/src/Form/Field/Installation/PrefixField.php
index f29acdab035fb..9f839324fca42 100644
--- a/installation/src/Form/Field/Installation/PrefixField.php
+++ b/installation/src/Form/Field/Installation/PrefixField.php
@@ -53,7 +53,7 @@ protected function getInput()
         }
 
         // If a prefix is already set, use it instead.
-        $session = Factory::getSession()->get('setup.options', []);
+        $session = Factory::getApplication()->getSession()->get('setup.options', []);
 
         if (empty($session['db_prefix'])) {
             // Create the random prefix.
diff --git a/installation/src/Helper/DatabaseHelper.php b/installation/src/Helper/DatabaseHelper.php
index aa4f1351a7fb1..364c182555edd 100644
--- a/installation/src/Helper/DatabaseHelper.php
+++ b/installation/src/Helper/DatabaseHelper.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\User\UserHelper;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseFactory;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Path;
@@ -113,7 +113,7 @@ public static function getDbo($driver, $host, $user, $password, $database, $pref
             }
 
             // Get a database object.
-            $db = DatabaseDriver::getInstance($options);
+            $db = (new DatabaseFactory())->getDriver($options['driver'], $options);
         }
 
         return $db;
@@ -143,8 +143,8 @@ public static function getEncryptionSettings($options)
     /**
      * Get the minimum required database server version.
      *
-     * @param   DatabaseDriver  $db       Database object
-     * @param   \stdClass       $options  The session options
+     * @param   DatabaseInterface  $db       Database object
+     * @param   \stdClass          $options  The session options
      *
      * @return  string  The minimum required database server version.
      *
@@ -318,7 +318,7 @@ public static function validateConnectionParameters($options)
         // Save options to session data if changed
         if ($optionsChanged) {
             $optsArr = ArrayHelper::fromObject($options);
-            Factory::getSession()->set('setup.options', $optsArr);
+            Factory::getApplication()->getSession()->set('setup.options', $optsArr);
         }
 
         return false;
@@ -344,7 +344,7 @@ public static function checkRemoteDbHost($options)
 
         // Check the security file if the db_host is not localhost / 127.0.0.1 / ::1
         if ($shouldCheckLocalhost && preg_match($localhost, $options->db_host) !== 1) {
-            $remoteDbFileTestsPassed = Factory::getSession()->get('remoteDbFileTestsPassed', false);
+            $remoteDbFileTestsPassed = Factory::getApplication()->getSession()->get('remoteDbFileTestsPassed', false);
 
             // When all checks have been passed we don't need to do this here again.
             if ($remoteDbFileTestsPassed === false) {
@@ -353,7 +353,7 @@ public static function checkRemoteDbHost($options)
                     'https://docs.joomla.org/Special:MyLanguage/J3.x:Secured_procedure_for_installing_Joomla_with_a_remote_database'
                 );
 
-                $remoteDbFile = Factory::getSession()->get('remoteDbFile', false);
+                $remoteDbFile = Factory::getApplication()->getSession()->get('remoteDbFile', false);
 
                 if ($remoteDbFile === false) {
                     // Add the general message
@@ -361,7 +361,7 @@ public static function checkRemoteDbHost($options)
 
                     // This is the file you need to remove if you want to use a remote database
                     $remoteDbFile = '_Joomla' . UserHelper::genRandomPassword(21) . '.txt';
-                    Factory::getSession()->set('remoteDbFile', $remoteDbFile);
+                    Factory::getApplication()->getSession()->set('remoteDbFile', $remoteDbFile);
 
                     // Get the path
                     $remoteDbPath = JPATH_INSTALLATION . '/' . $remoteDbFile;
@@ -380,13 +380,13 @@ public static function checkRemoteDbHost($options)
                             'notice'
                         );
 
-                        Factory::getSession()->set('remoteDbFileUnwritable', true);
+                        Factory::getApplication()->getSession()->set('remoteDbFileUnwritable', true);
 
                         return false;
                     }
 
                     // Save the file name to the session
-                    Factory::getSession()->set('remoteDbFileWrittenByJoomla', true);
+                    Factory::getApplication()->getSession()->set('remoteDbFileWrittenByJoomla', true);
 
                     // Request to delete that file
                     Factory::getApplication()->enqueueMessage(
@@ -403,7 +403,7 @@ public static function checkRemoteDbHost($options)
                 }
 
                 if (
-                    Factory::getSession()->get('remoteDbFileWrittenByJoomla', false) === true
+                    Factory::getApplication()->getSession()->get('remoteDbFileWrittenByJoomla', false) === true
                     && is_file(JPATH_INSTALLATION . '/' . $remoteDbFile)
                 ) {
                     // Add the general message
@@ -423,7 +423,7 @@ public static function checkRemoteDbHost($options)
                     return false;
                 }
 
-                if (Factory::getSession()->get('remoteDbFileUnwritable', false) === true && !is_file(JPATH_INSTALLATION . '/' . $remoteDbFile)) {
+                if (Factory::getApplication()->getSession()->get('remoteDbFileUnwritable', false) === true && !is_file(JPATH_INSTALLATION . '/' . $remoteDbFile)) {
                     // Add the general message
                     Factory::getApplication()->enqueueMessage($generalRemoteDatabaseMessage, 'warning');
 
@@ -442,7 +442,7 @@ public static function checkRemoteDbHost($options)
                 }
 
                 // All tests for this session passed set it to the session
-                Factory::getSession()->set('remoteDbFileTestsPassed', true);
+                Factory::getApplication()->getSession()->set('remoteDbFileTestsPassed', true);
             }
         }
 
@@ -452,8 +452,8 @@ public static function checkRemoteDbHost($options)
     /**
      * Check database server parameters after connection
      *
-     * @param   DatabaseDriver  $db       Database object
-     * @param   \stdClass       $options  The session options
+     * @param   DatabaseInterface  $db       Database object
+     * @param   \stdClass          $options  The session options
      *
      * @return  string|boolean  A string with the translated error message if
      *                          some server parameter is not ok, otherwise false.
diff --git a/installation/src/Model/AutomatedUpdatesModel.php b/installation/src/Model/AutomatedUpdatesModel.php
index bfbe4d9ba716b..29548d4ce2c53 100644
--- a/installation/src/Model/AutomatedUpdatesModel.php
+++ b/installation/src/Model/AutomatedUpdatesModel.php
@@ -51,7 +51,7 @@ public function disable()
     {
         // Get the params of com_joomlaupdate
         $db        = $this->getDatabase();
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
 
         $query->select('params')
             ->from($db->quoteName('#__extensions'))
diff --git a/installation/src/Model/BaseInstallationModel.php b/installation/src/Model/BaseInstallationModel.php
index e22c8b607f072..78a6d23d904d5 100644
--- a/installation/src/Model/BaseInstallationModel.php
+++ b/installation/src/Model/BaseInstallationModel.php
@@ -51,6 +51,6 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
      */
     public function getOptions()
     {
-        return Factory::getSession()->get('setup.options', []);
+        return Factory::getApplication()->getSession()->get('setup.options', []);
     }
 }
diff --git a/installation/src/Model/ConfigurationModel.php b/installation/src/Model/ConfigurationModel.php
index 915d7b469b42f..4a8f0aa845bf3 100644
--- a/installation/src/Model/ConfigurationModel.php
+++ b/installation/src/Model/ConfigurationModel.php
@@ -99,7 +99,7 @@ public function setup($options)
             }
         }
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('extension_id')
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('name') . ' = ' . $db->quote('files_joomla'));
@@ -140,7 +140,7 @@ public function setup($options)
             $return = false;
         }
 
-        // This is needed because the installer loads the extension table in constructor, needs to be refactored in 5.0
+        // This is needed because the installer loads the extension table in constructor, needs to be refactored in 7.0
         // It doesn't honor the DatabaseAware interface
         Factory::getContainer()->set('\Joomla\CMS\Table\Extension', new \Joomla\CMS\Table\Extension($db));
 
@@ -235,7 +235,7 @@ public static function getUserId()
      */
     protected static function generateRandUserId()
     {
-        $session    = Factory::getSession();
+        $session    = Factory::getApplication()->getSession();
         $randUserId = $session->get('randUserId');
 
         if (empty($randUserId)) {
@@ -258,7 +258,7 @@ public static function resetRandUserId()
     {
         self::$userId = 0;
 
-        Factory::getSession()->set('randUserId', self::$userId);
+        Factory::getApplication()->getSession()->set('randUserId', self::$userId);
     }
 
     /**
@@ -287,7 +287,7 @@ protected function updateUserIds($db)
 
         foreach ($updatesArray as $table => $fields) {
             foreach ($fields as $field) {
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->update($db->quoteName($table))
                     ->set($db->quoteName($field) . ' = ' . $db->quote($userId))
                     ->where($db->quoteName($field) . ' != 0')
@@ -407,7 +407,7 @@ public function createConfiguration($options)
         $registry->set('cors', false);
         $registry->set('cors_allow_origin', '*');
         $registry->set('cors_allow_methods', '');
-        $registry->set('cors_allow_headers', 'Content-Type,X-Joomla-Token');
+        $registry->set('cors_allow_headers', 'Content-Type,X-Joomla-Token,Authorization');
 
         // Mail settings.
         $registry->set('mailonline', true);
@@ -475,7 +475,7 @@ public function createConfiguration($options)
         }
 
         // Get the session
-        $session = Factory::getSession();
+        $session = Factory::getApplication()->getSession();
 
         if ($canWrite) {
             file_put_contents($path, $buffer);
@@ -509,7 +509,7 @@ private function createRootUser($options, $db)
         date_default_timezone_set('UTC');
         $installdate = date('Y-m-d H:i:s');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('id') . ' = ' . $db->quote($userId));
@@ -570,7 +570,7 @@ private function createRootUser($options, $db)
 
             // Synch the sequence if pgsql
             if (($db->getServerType() === 'postgresql') && (!$result)) {
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('MAX(' . $db->quoteName('id') . ') + 1 AS ' . $db->quoteName('id'))
                     ->from($db->quoteName('#__users'));
                 $db->setQuery($query);
diff --git a/installation/src/Model/DatabaseModel.php b/installation/src/Model/DatabaseModel.php
index 7ab5bf80d808a..813d39f11531d 100644
--- a/installation/src/Model/DatabaseModel.php
+++ b/installation/src/Model/DatabaseModel.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Installation\Helper\DatabaseHelper;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseFactory;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Utilities\ArrayHelper;
 
@@ -159,7 +159,7 @@ public function createDatabase(array $options)
                     ];
                 }
 
-                $altDB = DatabaseDriver::getInstance($altDBoptions);
+                $altDB = (new DatabaseFactory())->getDriver($altDBoptions['driver'], $altDBoptions);
 
                 // Check database server parameters
                 $dbServerCheck = DatabaseHelper::checkDbServerParameters($altDB, $options);
@@ -243,7 +243,7 @@ public function createDatabase(array $options)
 
         $options = array_merge(['db_created' => 1], $options);
 
-        Factory::getSession()->set('setup.options', $options);
+        Factory::getApplication()->getSession()->set('setup.options', $options);
 
         return true;
     }
@@ -321,8 +321,8 @@ public function createTables(string $schema, array $options)
     /**
      * Method to backup all tables in a database with a given prefix.
      *
-     * @param   DatabaseDriver  $db      DatabaseDriver object.
-     * @param   string          $prefix  Database table prefix.
+     * @param   DatabaseInterface  $db      Database object.
+     * @param   string             $prefix  Database table prefix.
      *
      * @return  boolean  True on success.
      *
diff --git a/installation/src/Model/LanguagesModel.php b/installation/src/Model/LanguagesModel.php
index 62a4b25e0fe76..e52069ca40954 100644
--- a/installation/src/Model/LanguagesModel.php
+++ b/installation/src/Model/LanguagesModel.php
@@ -18,7 +18,8 @@
 use Joomla\CMS\Installer\InstallerHelper;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Extension;
+use Joomla\CMS\Table\Update as UpdateTable;
 use Joomla\CMS\Updater\Update;
 use Joomla\CMS\Updater\Updater;
 use Joomla\Database\DatabaseAwareInterface;
@@ -94,7 +95,7 @@ public function getItems()
     {
         // Get the extension_id of the en-GB package.
         $db        = $this->getDatabase();
-        $extQuery  = $db->getQuery(true);
+        $extQuery  = $db->createQuery();
 
         $extQuery->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
@@ -116,7 +117,7 @@ public function getItems()
              */
             $updater->findUpdates([$extId], 0);
 
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Select the required fields from the updates table.
             $query->select($db->quoteName(['update_id', 'name', 'element', 'version']))
@@ -154,7 +155,7 @@ public function install($lids)
             $installer = clone $installerBase;
 
             // Loads the update database object that represents the language.
-            $language = Table::getInstance('update');
+            $language = new UpdateTable($this->getDatabase());
             $language->load($id);
 
             // Get the URL to the XML manifest file of the selected language.
@@ -228,7 +229,7 @@ public function install($lids)
      */
     protected function getLanguageManifest($uid)
     {
-        $instance = Table::getInstance('update');
+        $instance = new UpdateTable($this->getDatabase());
         $instance->load($uid);
 
         return trim($instance->detailsurl);
@@ -379,7 +380,7 @@ protected function getLanguageList($clientId = 1)
     {
         // Create a new db object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select field element from the extensions table.
         $query->select($db->quoteName(['element', 'name']))
@@ -461,7 +462,7 @@ public function setDefault($language, $clientName = 'administrator')
         $params = ComponentHelper::getParams('com_languages');
         $params->set($client->name, $language);
 
-        $table = Table::getInstance('extension');
+        $table = new Extension($this->getDatabase());
         $id    = $table->find(['element' => 'com_languages']);
 
         // Load
diff --git a/installation/src/Model/SetupModel.php b/installation/src/Model/SetupModel.php
index 4809decf925c4..102e63c991252 100644
--- a/installation/src/Model/SetupModel.php
+++ b/installation/src/Model/SetupModel.php
@@ -59,7 +59,7 @@ public function storeOptions($options)
         }
 
         // Get the session
-        $session            = Factory::getSession();
+        $session            = Factory::getApplication()->getSession();
         $options['helpurl'] = $session->get('setup.helpurl', null);
 
         // Merge the new setup options into the current ones and store in the session.
diff --git a/installation/src/Service/Provider/Application.php b/installation/src/Service/Provider/Application.php
index b8da47fb3b480..dab5283f079c8 100644
--- a/installation/src/Service/Provider/Application.php
+++ b/installation/src/Service/Provider/Application.php
@@ -11,13 +11,13 @@
 namespace Joomla\CMS\Installation\Service\Provider;
 
 use Joomla\CMS\Error\Renderer\JsonRenderer;
-use Joomla\CMS\Input\Input as CMSInput;
 use Joomla\CMS\Installation\Application\CliInstallationApplication;
 use Joomla\CMS\Installation\Application\InstallationApplication;
 use Joomla\CMS\Language\LanguageFactoryInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\Priority;
+use Joomla\Input\Input as CMSInput;
 use Joomla\Session\SessionEvents;
 use Joomla\Session\SessionInterface;
 use Psr\Log\LoggerInterface;
diff --git a/installation/template/error.php b/installation/template/error.php
index a06218f96fe4f..b3310731aadda 100644
--- a/installation/template/error.php
+++ b/installation/template/error.php
@@ -46,7 +46,7 @@
                     <img src="<?php echo $this->baseurl; ?>/template/images/logo.svg" alt="" class="logo"/>
                 </div>
                 <div class="j-header-help">
-                    <a href="https://docs.joomla.org/Special:MyLanguage/J4.x:Installing_Joomla">
+                    <a href="https://guide.joomla.org/user-manual/getting-started/getting-started-installing-joomla">
                         <span class="icon-lightbulb" aria-hidden="true"></span>
                         <span class="visually-hidden"><?php echo Text::_('INSTL_HELP_LINK'); ?></span>
                     </a>
diff --git a/installation/template/index.php b/installation/template/index.php
index b11dec7fee0fe..303a2152f1641 100644
--- a/installation/template/index.php
+++ b/installation/template/index.php
@@ -93,7 +93,7 @@
                         </span>
                     </div>
                     <div class="m-2 d-flex align-items-center col justify-content-end">
-                        <a href="https://docs.joomla.org/Special:MyLanguage/J4.x:Installing_Joomla" target="_blank">
+                        <a href="https://guide.joomla.org/user-manual/getting-started/getting-started-installing-joomla" target="_blank">
                             <span class="icon-question" aria-hidden="true"></span>
                             <span class="visually-hidden"><?php echo Text::_('INSTL_HELP_LINK'); ?></span>
                         </a>
diff --git a/installation/template/js/remove.js b/installation/template/js/remove.js
deleted file mode 100644
index 3e72ecec592e1..0000000000000
--- a/installation/template/js/remove.js
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * @package     Joomla.Installation
- * @copyright   (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-// Init on dom content loaded event
-var url = Joomla.getOptions('system.installation').url ? Joomla.getOptions('system.installation').url.replace(/&amp;/g, '&') : 'index.php';
-
-if (document.getElementById('installAddFeatures')) {
-  document.getElementById('installAddFeatures').addEventListener('click', function(e) {
-    e.preventDefault();
-    document.getElementById('installLanguages').classList.add('active');
-    document.getElementById('automatedUpdates')?.classList?.remove('active');
-    document.getElementById('installCongrat').classList.remove('active');
-    document.getElementById('installFinal').classList.remove('active');
-    document.getElementById('installRecommended').classList.remove('active');
-  })
-}
-
-if (document.getElementById('skipLanguages')) {
-	document.getElementById('skipLanguages').addEventListener('click', function(e) {
-		e.preventDefault();
-		document.getElementById('automatedUpdates')?.classList?.add('active');
-		document.getElementById('installCongrat').classList.add('active');
-		document.getElementById('installFinal').classList.add('active');
-		document.getElementById('installRecommended').classList.add('active');
-		document.getElementById('installLanguages').classList.remove('active');
-
-		if (document.getElementById('installFinal')) {
-			document.getElementById('installFinal').focus();
-		}
-	})
-}
-
-if (document.getElementById('removeInstallationFolder')) {
-	document.getElementById('removeInstallationFolder')
-		.addEventListener('click', function (e) {
-			e.preventDefault();
-			let confirm = window.confirm(Joomla.Text._('INSTL_REMOVE_INST_FOLDER').replace('%s', 'installation'));
-			if (confirm) {
-			    Joomla.deleteJoomlaInstallationDirectory();
-			}
-		});
-}
-
-if (document.getElementById('automatedUpdatesDisableButton')) {
-  document.getElementById('automatedUpdatesDisableButton')
-    .addEventListener('click', function (e) {
-      e.preventDefault();
-      let confirm = window.confirm(Joomla.Text._('INSTL_DISABLE_AUTOUPDATE'));
-      if (confirm) {
-        Joomla.disableAutomatedUpdates();
-      }
-    });
-}
-
-const completeInstallationOptions = document.querySelectorAll('.complete-installation');
-
-completeInstallationOptions.forEach(function(item) {
-    item.addEventListener('click', function (e) {
-        // In development mode we show the user a pretty button to allow them to choose whether to delete the installation
-        // directory or not. In this case or when the installation folder has been deleted or might be partly deleted,
-        // the buttons just redirect to the admin or site.
-        // In stable release we always try to delete the folder at the first click. Maximum extermination!
-        if ('development' in item.dataset || 'installremoved' in item.dataset) {
-            window.location.href = item.dataset.href;
-        } else {
-            Joomla.deleteJoomlaInstallationDirectory(item.dataset.href);
-        }
-
-        return false;
-    });
-});
-
-
-Joomla.disableAutomatedUpdates = function () {
-  Joomla.request({
-    method: "POST",
-    url: Joomla.installationBaseUrl + '?task=installation.disableAutomatedUpdates&format=json',
-    perform: true,
-    token: true,
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    onSuccess: function (response) {
-      const successresponse = JSON.parse(response);
-      if (successresponse.error === true) {
-        if (successresponse.messages) {
-          Joomla.renderMessages(successresponse.messages);
-          Joomla.loadOptions({'csrf.token': successresponse.token});
-        } else {
-          // Stuff went wrong. No error messages. Just panic bail!
-          Joomla.renderMessages({error:['Unknown error disabling the automated updates.']});
-        }
-      } else {
-        const automatedUpdates = document.getElementById('automatedUpdates');
-        automatedUpdates.parentNode.removeChild(automatedUpdates);
-      }
-    },
-    onError: function (xhr) {
-      Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr));
-    }
-  });
-}
-
-Joomla.deleteJoomlaInstallationDirectory = function (redirectUrl) {
-    Joomla.request({
-        method: "POST",
-        url: Joomla.installationBaseUrl + '?task=installation.removeFolder&format=json',
-        perform: true,
-        token: true,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        onSuccess: function (response) {
-            // If the installation folder has been deleted at least partly, i.e. also
-            // in case of a failure, we cannot use it anymore.
-            // Therefore set a marker in the admin and site buttons so they still work
-            // and disable buttons which will not work anymore.
-            completeInstallationOptions.forEach(function(item) {
-                item.dataset.installremoved = 'true';
-            });
-            if (document.getElementById('installAddFeatures')) {
-                document.getElementById('installAddFeatures').disabled = true;
-            }
-            if (document.getElementById('automatedUpdatesDisableButton')) {
-                document.getElementById('automatedUpdatesDisableButton').disabled = true;
-            }
-            if (document.getElementById('removeInstallationFolder')) {
-                document.getElementById('removeInstallationFolder').disabled = true;
-            }
-            const successresponse = JSON.parse(response);
-            if (successresponse.error === true) {
-                if (successresponse.messages) {
-                    Joomla.renderMessages(successresponse.messages);
-                    Joomla.loadOptions({'csrf.token': successresponse.token});
-                } else {
-                    // Stuff went wrong. No error messages. Just panic bail!
-                    Joomla.renderMessages({error:['Unknown error deleting the installation folder.']});
-                }
-            } else {
-                const customInstallation = document.getElementById('customInstallation');
-                customInstallation.parentNode.removeChild(customInstallation);
-
-                const automatedUpdates = document.getElementById('automatedUpdates');
-
-                // This will only exist if it has not been removed with a previous step
-                if (automatedUpdates) {
-                    automatedUpdates.parentNode.removeChild(automatedUpdates);
-                }
-
-                const removeInstallationTab = document.getElementById('removeInstallationTab');
-
-                // This will only exist in debug mode
-                if (removeInstallationTab) {
-                    removeInstallationTab.parentNode.removeChild(removeInstallationTab);
-                }
-
-                if (redirectUrl) {
-                    window.location.href = redirectUrl;
-                }
-            }
-        },
-        onError: function (xhr) {
-          Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr));
-        }
-    });
-}
-
-if (document.getElementById('installLanguagesButton')) {
-	document.getElementById('installLanguagesButton').addEventListener('click', function(e) {
-		e.preventDefault();
-		var form = document.getElementById('languagesForm');
-    if (form) {
-      Joomla.removeMessages();
-      document.body.appendChild(document.createElement('joomla-core-loader'));
-
-			// Install the extra languages
-      try {
-        Joomla.install(['languages'], form, true);
-      } catch (err) {
-        const loader = document.querySelector('joomla-core-loader');
-        if (loader) {
-          loader.remove();
-        }
-      }
-		}
-	})
-}
-
-if (document.getElementById('defaultLanguagesButton')) {
-  document.getElementById('defaultLanguagesButton')
-    .addEventListener('click', (e) => {
-      let frontendlang = 'en-GB';
-      if (document.querySelector('input[name="frontendlang"]:checked')) {
-        frontendlang = document.querySelector('input[name="frontendlang"]:checked').value;
-      }
-
-      let administratorlang = 'en-GB';
-      if (document.querySelector('input[name="administratorlang"]:checked')) {
-        administratorlang = document.querySelector('input[name="administratorlang"]:checked').value;
-      }
-
-      e.preventDefault();
-
-      Joomla.request({
-        method: 'POST',
-        url: `${Joomla.installationBaseUrl}?view=setup&frontendlang=${frontendlang}&administratorlang=${administratorlang}&task=language.setdefault&format=json`,
-        perform: true,
-        token: true,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-        onSuccess(response) {
-          const successresponse = JSON.parse(response);
-          if (successresponse.messages) {
-            Joomla.renderMessages(successresponse.messages, '#system-message-container');
-          }
-          Joomla.loadOptions({'csrf.token': successresponse.token});
-        },
-        onError(xhr) {
-          Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr));
-        },
-      });
-
-      if (document.getElementById('header')) {
-        document.getElementById('header').scrollIntoView();
-      }
-    });
-}
diff --git a/installation/tmpl/preinstall/default.php b/installation/tmpl/preinstall/default.php
index 6a19e70924fd6..d38a98f4f71b3 100644
--- a/installation/tmpl/preinstall/default.php
+++ b/installation/tmpl/preinstall/default.php
@@ -9,11 +9,8 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
-HTMLHelper::_('behavior.formvalidator');
-
 /** @var \Joomla\CMS\Installation\View\Preinstall\HtmlView $this */
 ?>
 <div id="installer-view" class="container" data-page-name="preinstall">
diff --git a/installation/tmpl/remove/default.php b/installation/tmpl/remove/default.php
index 99ff60cc1d3a3..7cf8182539ee5 100644
--- a/installation/tmpl/remove/default.php
+++ b/installation/tmpl/remove/default.php
@@ -14,8 +14,6 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Uri\Uri;
 
-HTMLHelper::_('behavior.formvalidator');
-
 $direction = Factory::getLanguage()->isRtl() ? 'left' : 'right';
 
 /** @var \Joomla\CMS\Installation\View\Remove\HtmlView $this */
diff --git a/installation/tmpl/setup/default.php b/installation/tmpl/setup/default.php
index 85d1e94eef988..df441fc3ace2f 100644
--- a/installation/tmpl/setup/default.php
+++ b/installation/tmpl/setup/default.php
@@ -14,29 +14,16 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
-HTMLHelper::_('behavior.formvalidator');
-
 $direction = Factory::getLanguage()->isRtl() ? 'left' : 'right';
 
 /** @var \Joomla\CMS\Installation\View\Setup\HtmlView $this */
+
+$wa = $this->getDocument()->getWebAssetManager();
+
+$wa->useScript('joomla.dialog-autocreate');
 ?>
 
 <div id="installer-view" data-page-name="setup">
-    <form action="index.php" method="post" id="languageForm" class="lang-select">
-        <fieldset class="j-install-step active">
-            <legend class="j-install-step-header">
-                <span class="icon-language" aria-hidden="true"></span> <?php echo Text::_('INSTL_SELECT_INSTALL_LANG'); ?>
-            </legend>
-            <div class="j-install-step-form">
-                <div class="mb-3">
-                    <?php echo $this->form->renderField('language'); ?>
-                </div>
-                <input type="hidden" name="task" value="language.set">
-                <input type="hidden" name="format" value="json">
-                <?php echo HTMLHelper::_('form.token'); ?>
-            </div>
-        </fieldset>
-    </form>
     <form action="index.php" method="post" id="adminForm" class="form-validate">
         <fieldset id="installStep1" class="j-install-step active">
             <legend class="j-install-step-header">
@@ -137,5 +124,31 @@
         <input type="hidden" name="admin_password2" id="jform_admin_password2">
         <?php echo HTMLHelper::_('form.token'); ?>
     </form>
+    <form action="index.php" method="post" id="languageForm" class="lang-select">
+        <div class="d-flex align-items-center">
+            <span class="fas fa-globe me-1" aria-hidden="true"></span>
+            <?php
+                $dataAttribs = [
+                    'textHeader'      => Text::_('INSTL_SELECT_INSTALL_LANG'),
+                    'iconHeader'      => 'icon-language',
+                    'src'             => '#languageSelect',
+                ];
+
+                $text = '<span class="ms-1 fw-bold" id="languageForm-current"></span>';
+
+                $text .= '<button type="button" data-joomla-dialog="' . htmlspecialchars(json_encode($dataAttribs)) . '" aria-label="' . Text::_('INSTL_CHANGE_INSTALL_LANG') . '" class="btn btn-primary btn-sm ms-2"><span class="fas fa-repeat fa-fw me-2" aria-hidden="true"></span>' . Text::_('INSTL_CHANGE_INSTALL_LANG_SHORT') . '</button>';
+
+                echo Text::sprintf('INSTL_SELECTED_INSTALL_LANGUAGE', $text);
+                ?>
+        </div>
+        <template id="languageSelect">
+            <div class="mb-3">
+                <?php echo $this->form->renderField('language'); ?>
+            </div>
+        </template>
+        <input type="hidden" name="task" value="language.set">
+        <input type="hidden" name="format" value="json">
+        <?php echo HTMLHelper::_('form.token'); ?>
+    </form>
 
 </div>
diff --git a/language/en-GB/com_content.ini b/language/en-GB/com_content.ini
index 7ffe305b55ffc..1f6f55726ff90 100644
--- a/language/en-GB/com_content.ini
+++ b/language/en-GB/com_content.ini
@@ -32,6 +32,7 @@ COM_CONTENT_FEED_READMORE="Read More &hellip;"
 COM_CONTENT_FIELD_ARTICLETEXT_LABEL="Article Text"
 COM_CONTENT_FIELD_FEATURED_DOWN_LABEL="Finish Featured"
 COM_CONTENT_FIELD_FEATURED_UP_LABEL="Start Featured"
+COM_CONTENT_FIELD_FIGURE_CLASS_LABEL="Figure Class"
 COM_CONTENT_FIELD_FULL_LABEL="Full Article Image"
 COM_CONTENT_FIELD_IMAGE_ALT_EMPTY_DESC="Decorative Image - no description required"
 COM_CONTENT_FIELD_IMAGE_ALT_EMPTY_LABEL="No Description"
@@ -68,6 +69,7 @@ COM_CONTENT_MORE_ARTICLES="More Articles &hellip;"
 COM_CONTENT_NEW_ARTICLE="New Article"
 COM_CONTENT_NO_ARTICLES="There are no articles in this category. If subcategories display on this page, they may have articles."
 COM_CONTENT_NUM_ITEMS="Article Count:"
+;Deprecated, will be removed in 7.0
 COM_CONTENT_ON_NEW_CONTENT="A new Article has been submitted by '%1$s' entitled '%2$s'."
 COM_CONTENT_ORDERING="Ordering:<br>New articles default to the first position in the Category. The ordering can be changed in Backend."
 COM_CONTENT_PAGEBREAK_DOC_TITLE="Page Break"
diff --git a/language/en-GB/com_users.ini b/language/en-GB/com_users.ini
index c49d8509f26e8..42479b546fb19 100644
--- a/language/en-GB/com_users.ini
+++ b/language/en-GB/com_users.ini
@@ -5,6 +5,7 @@
 
 COM_USERS_ACTIVATION_TOKEN_NOT_FOUND="Verification code not found. Check if your account is already activated and try to log in."
 COM_USERS_CAPTCHA_LABEL="Captcha"
+COM_USERS_COMPLETE="Complete Password Reset"
 COM_USERS_DATABASE_ERROR="Error getting the user from the database: %s"
 COM_USERS_EDIT_PROFILE="Edit Profile"
 COM_USERS_EMAIL_ACCOUNT_DETAILS="Account Details for {NAME} at {SITENAME}"
@@ -108,6 +109,7 @@ COM_USERS_REGISTRATION_ACL_ADMIN_ACTIVATION="Please log in to confirm that you a
 COM_USERS_REGISTRATION_ACL_ADMIN_ACTIVATION_PERMISSIONS="You are not authorised to activate new accounts, please log in with a privileged account."
 COM_USERS_REGISTRATION_ACTIVATE_SUCCESS="Your Account has been activated. You can now log in using the username and password you chose during the registration."
 COM_USERS_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_FAILED="An error was encountered while sending activation notification email"
+COM_USERS_REGISTRATION_ACTIVATION_NOTIFY_SEND_MAIL_SUCCESS="The user has been notified that their account has been activated."
 COM_USERS_REGISTRATION_ACTIVATION_SAVE_FAILED="Failed to save activation data: %s"
 COM_USERS_REGISTRATION_ADMINACTIVATE_SUCCESS="The user's account has been activated and the user has been notified about it."
 COM_USERS_REGISTRATION_COMPLETE_ACTIVATE="Your account has been created and an activation link has been sent to the email address you entered. Note that you must activate the account by selecting the activation link when you get the email before you can login."
diff --git a/language/en-GB/files_joomla.sys.ini b/language/en-GB/files_joomla.sys.ini
index 62031e108ca39..a569b4686c3ab 100644
--- a/language/en-GB/files_joomla.sys.ini
+++ b/language/en-GB/files_joomla.sys.ini
@@ -4,8 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 FILES_JOOMLA="Joomla CMS"
-FILES_JOOMLA_XML_DESCRIPTION="Joomla! 5 Content Management System."
-
-; All the following strings are deprecated and will be removed with 6.0
-FILES_JOOMLA_ERROR_FILE_FOLDER="Error on deleting file or folder %s"
-FILES_JOOMLA_ERROR_MANIFEST="Error on updating manifest cache: (type, element, folder, client) = (%s, %s, %s, %s)"
+FILES_JOOMLA_XML_DESCRIPTION="Joomla! 6 Content Management System."
diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
index 4c9f4379a15f9..36c28c489290e 100644
--- a/language/en-GB/install.xml
+++ b/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension client="site" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>5.4.8</version>
+	<version>6.2.0</version>
 	<creationDate>2026-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/language/en-GB/joomla.ini b/language/en-GB/joomla.ini
index 5c1f063cbf05a..4a1e16ff22001 100644
--- a/language/en-GB/joomla.ini
+++ b/language/en-GB/joomla.ini
@@ -156,8 +156,6 @@ JERROR_LAYOUT_AN_OUT_OF_DATE_BOOKMARK_FAVOURITE="an <strong>out-of-date bookmark
 JERROR_LAYOUT_ERROR_HAS_OCCURRED_WHILE_PROCESSING_YOUR_REQUEST="An error has occurred while processing your request."
 JERROR_LAYOUT_GO_TO_THE_HOME_PAGE="Go to the Home Page"
 JERROR_LAYOUT_HOME_PAGE="Home Page"
-; deprecated will be removed in 6.0
-JERROR_LAYOUT_MIS_TYPED_ADDRESS="a <strong>mistyped address</strong>"
 JERROR_LAYOUT_MISTYPED_ADDRESS="a <strong>mistyped address</strong>"
 JERROR_LAYOUT_NOT_ABLE_TO_VISIT="You may not be able to visit this page because of:"
 JERROR_LAYOUT_PAGE_NOT_FOUND="The requested page can't be found."
@@ -185,8 +183,11 @@ JFIELD_ALIAS_LABEL="Alias"
 JFIELD_ALIAS_PLACEHOLDER="Auto-generate from title"
 JFIELD_ALT_PAGE_TITLE_LABEL="Alternative Page Title"
 JFIELD_CATEGORY_DESC="Category"
+; The following string is deprecated and will be removed with 7.0
 JFIELD_COLOR_SELECT="Select a colour"
+; The following string is deprecated and will be removed with 7.0
 JFIELD_COLOR_TRANSPARENT="No colour, transparent"
+; The following string is deprecated and will be removed with 7.0
 JFIELD_COLOR_VALUE="Colour with hexadecimal value of"
 JFIELD_FIELDS_CATEGORY_DESC="Select the category that this field is assigned to."
 JFIELD_LANGUAGE_DESC="Assign a language to this article."
@@ -495,6 +496,7 @@ PHPMAILER_RECIPIENTS_FAILED="SMTP Error! The following recipients failed: "
 PHPMAILER_SIGNING_ERROR="Signing error: "
 PHPMAILER_SMTP_CONNECT_FAILED="SMTP connect failed"
 PHPMAILER_SMTP_ERROR="SMTP server error: "
+; Deprecated, will be removed with 7.0
 PHPMAILER_TLS="Could not start TLS"
 PHPMAILER_VARIABLE_SET="Can't set or reset variable: "
 
diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml
index 40936753234fd..b9a021f27e871 100644
--- a/language/en-GB/langmetadata.xml
+++ b/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="site">
 	<name>English (en-GB)</name>
-	<version>5.4.8</version>
+	<version>6.2.0</version>
 	<creationDate>2026-08</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/language/en-GB/lib_joomla.ini b/language/en-GB/lib_joomla.ini
index 9d68f025455cf..105557192ced8 100644
--- a/language/en-GB/lib_joomla.ini
+++ b/language/en-GB/lib_joomla.ini
@@ -255,6 +255,7 @@ JLIB_FILTER_PARAMS_TEXT="Text"
 
 JLIB_FORM_BUTTON_CLEAR="Clear"
 JLIB_FORM_BUTTON_SELECT="Select"
+JLIB_FORM_CHANGE_FILE="Change File"
 JLIB_FORM_CHANGE_IMAGE="Change Image"
 JLIB_FORM_CHANGE_IMAGE_BUTTON="Change Image Button"
 JLIB_FORM_CHANGE_USER="Select User"
@@ -271,11 +272,20 @@ JLIB_FORM_FIELD_INVALID_MIN_TIME="The time you entered is before the minimum tim
 JLIB_FORM_FIELD_INVALID_TIME_INPUT="Invalid time format. Please use hh:mm."
 JLIB_FORM_FIELD_INVALID_TIME_INPUT_SECONDS="Invalid time format. Please use hh:mm:ss."
 JLIB_FORM_FIELD_INVALID_VALUE="This value is not valid"
-JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_LABEL="Media"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_LABEL="Media (%s)"
 JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_ALT_EMPTY_DESC="Decorative Image - no description required"
 JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_ALT_EMPTY_LABEL="No Description"
 JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_ALT_TEXT_LABEL="Image Description (Alt Text)"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_AUDIO_LABEL="Audio"
 JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_IMAGEFILE_LABEL="Image"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_LINKTEXT_DEFAULT_VALUE="Download {filename}"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_LINKTEXT_DESC="Specify the link text for non-image file."
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_LINKTEXT_LABEL="Link Text"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_MEDIA_TYPE_AUDIOS="Audio"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_MEDIA_TYPE_DOCUMENTS="Document"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_MEDIA_TYPE_IMAGES="Image"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_MEDIA_TYPE_VIDEOS="Video"
+JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_VIDEO_POSTER_LABEL="Video Poster"
 JLIB_FORM_FIELD_PARAM_CALENDAR_FORMAT_DESC="The date format to be used. This is in the format used by PHP to specify date string formats (see below). If no format argument is given, '%Y-%m-%d' is assumed (giving dates like '2008-04-16')."
 JLIB_FORM_FIELD_PARAM_CALENDAR_FORMAT_LABEL="Format"
 JLIB_FORM_FIELD_PARAM_CHECKBOX_MULTIPLE_DESC="Allow multiple values to be selected."
@@ -375,8 +385,11 @@ JLIB_HTML_BATCH_MOVE="Move"
 JLIB_HTML_BATCH_MOVE_QUESTION="Action to Perform"
 JLIB_HTML_BATCH_NO_CATEGORY="- Don't copy or move -"
 JLIB_HTML_BATCH_NOCHANGE="- Keep original Access Levels -"
-JLIB_HTML_BATCH_TAG_LABEL="Add Tag"
+JLIB_HTML_BATCH_TAG_ADD="Add"
+JLIB_HTML_BATCH_TAG_ADDREMOVE_QUESTION="Action to Perform"
+JLIB_HTML_BATCH_TAG_LABEL="Add or Remove Tag"
 JLIB_HTML_BATCH_TAG_NOCHANGE="- Keep original Tags -"
+JLIB_HTML_BATCH_TAG_REMOVE="Remove"
 JLIB_HTML_BATCH_USER_LABEL="Set User."
 JLIB_HTML_BATCH_USER_NOCHANGE="- Keep original User -"
 JLIB_HTML_BATCH_USER_NOUSER="No User."
@@ -619,8 +632,6 @@ JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MANIFEST_NOT_REMOVED="Package Uninstall: Err
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSING_EXTENSION="Package Uninstall: This extension is missing or has already been uninstalled: %s"
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSINGMANIFEST="Package Uninstall: Missing manifest file."
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_NOT_PROPER="Package Uninstall: This extension may have already been uninstalled or might not have been uninstalled properly: %s"
-; The following string is deprecated and will be removed with 6.0
-JLIB_INSTALLER_ERROR_PACK_UNINSTALL_UNKNOWN_EXTENSION="Trying to uninstall unknown extension from package. This extension may have already been removed earlier."
 JLIB_INSTALLER_ERROR_PACK_UNINSTALL_WARNCOREPACK="Package Uninstall: Trying to uninstall core package."
 JLIB_INSTALLER_ERROR_PLG_DISCOVER_STORE_DETAILS="Plugin Discover install: Failed to store plugin details."
 JLIB_INSTALLER_ERROR_PLG_REFRESH_MANIFEST_CACHE="Plugin Refresh manifest cache: Failed to store plugin details."
@@ -674,6 +685,7 @@ JLIB_JS_AJAX_ERROR_TIMEOUT="A timeout has occurred while fetching the JSON data.
 
 JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METADATA="Could not load %s metadata from %s."
 JLIB_LANGUAGE_ERROR_CANNOT_LOAD_METAFILE="Could not load %s language XML file from %s."
+JLIB_LANGUAGE_ERROR_CANNOT_WRITE_CACHE="Unable to write cache file for %s."
 
 JLIB_LOGIN_AUTHORISATION="Your access has been authorised."
 JLIB_LOGIN_DENIED="Your access has been denied."
@@ -683,6 +695,8 @@ JLIB_MAIL_FUNCTION_DISABLED="The mail() function has been disabled and the mail
 JLIB_MAIL_FUNCTION_OFFLINE="The mail function has been disabled by an administrator."
 JLIB_MAIL_INVALID_EMAIL_SENDER="Invalid email sender: %s"
 
+JLIB_MEDIA_ERROR_SVG_ISSUE="SVG Issue: %s"
+JLIB_MEDIA_ERROR_SVG_UNKNOWN="Unknown SVG error"
 JLIB_MEDIA_ERROR_UPLOAD_INPUT="Unable to upload file."
 JLIB_MEDIA_ERROR_WARNFILENAME="File name must only have alphanumeric characters and no spaces."
 JLIB_MEDIA_ERROR_WARNFILETOOLARGE="This file is too large to upload."
diff --git a/language/en-GB/mod_articles.ini b/language/en-GB/mod_articles.ini
index 1ae372de8848a..64a22c778421d 100644
--- a/language/en-GB/mod_articles.ini
+++ b/language/en-GB/mod_articles.ini
@@ -70,6 +70,7 @@ MOD_ARTICLES_FIELD_TITLE_HEADING_NONE="None"
 MOD_ARTICLES_FIELD_TITLE_LABEL="Article Title"
 MOD_ARTICLES_FIELD_TRIGGER_EVENTS_DESC="Enable this option to trigger four plugin events (onContentPrepare, afterDisplayTitle, beforeDisplayContent, afterDisplayContent) for each article in the results list."
 MOD_ARTICLES_FIELD_TRIGGER_EVENTS_LABEL="Trigger Plugin Events"
+MOD_ARTICLES_FIELD_UNPUBLISHED_LABEL="Show Unpublished Articles"
 MOD_ARTICLES_INFO="Details"
 MOD_ARTICLES_OPTION_ASCENDING_VALUE="Ascending"
 MOD_ARTICLES_OPTION_CREATED_VALUE="Created Date"
diff --git a/language/en-GB/mod_login.ini b/language/en-GB/mod_login.ini
index f63a865d26f21..931e6d229561d 100644
--- a/language/en-GB/mod_login.ini
+++ b/language/en-GB/mod_login.ini
@@ -14,6 +14,10 @@ MOD_LOGIN_FIELD_POST_TEXT_LABEL="Post-text"
 MOD_LOGIN_FIELD_PRE_TEXT_LABEL="Pre-text"
 MOD_LOGIN_FIELD_PROFILE_LABEL="Profile Link"
 MOD_LOGIN_FIELD_REGISTRATION_MENU_LABEL="Registration Page"
+MOD_LOGIN_FIELD_SHOW_PASSWORD_RESET_DESC="Show the link that lets users request a password reset."
+MOD_LOGIN_FIELD_SHOW_PASSWORD_RESET_LABEL="Reset Password Link"
+MOD_LOGIN_FIELD_SHOW_USERNAME_REMINDER_DESC="Show the link that lets users request a reminder of their username."
+MOD_LOGIN_FIELD_SHOW_USERNAME_REMINDER_LABEL="Forgot Username Link"
 MOD_LOGIN_FIELD_USETEXT_LABEL="Display Labels"
 MOD_LOGIN_FORGOT_YOUR_PASSWORD="Forgot your password?"
 MOD_LOGIN_FORGOT_YOUR_USERNAME="Forgot your username?"
diff --git a/language/en-GB/mod_menu.ini b/language/en-GB/mod_menu.ini
index 01c0ddb9d2ef3..a3e5902b6f126 100644
--- a/language/en-GB/mod_menu.ini
+++ b/language/en-GB/mod_menu.ini
@@ -14,4 +14,6 @@ MOD_MENU_FIELD_TAG_ID_LABEL="Menu Tag ID"
 MOD_MENU_FIELD_TARGET_DESC="JavaScript values to position a popup window, eg top=50, left=50, width=200, height=300."
 MOD_MENU_FIELD_TARGET_LABEL="Target Position"
 MOD_MENU_TOGGLE="Toggle Navigation"
+MOD_MENU_TOGGLE_SUBMENU_LABEL="More about: %s"
 MOD_MENU_XML_DESCRIPTION="This module displays a menu on the Frontend."
+
diff --git a/language/en-GB/tpl_cassiopeia.ini b/language/en-GB/tpl_cassiopeia.ini
index ea9946904cb93..f8b0cd3cd8106 100644
--- a/language/en-GB/tpl_cassiopeia.ini
+++ b/language/en-GB/tpl_cassiopeia.ini
@@ -6,12 +6,23 @@
 CASSIOPEIA="Cassiopeia Site template"
 TPL_CASSIOPEIA_BACKTOTOP="Back to Top"
 TPL_CASSIOPEIA_BACKTOTOP_LABEL="Back-to-top Link"
+TPL_CASSIOPEIA_BODY_BACKGROUND_COLOR_LABEL="Body Background Colour"
+TPL_CASSIOPEIA_BODY_SIZE="Body Font Size (rem)"
+TPL_CASSIOPEIA_BODY_TEXT_COLOR_LABEL="Body Text Colour"
 TPL_CASSIOPEIA_BRAND_LABEL="Brand"
+TPL_CASSIOPEIA_BUTTON_BACKGROUND_COLOR_LABEL="Button Primary Background Colour"
+TPL_CASSIOPEIA_BUTTON_BACKGROUND_HOVER_COLOR_LABEL="Button Primary Hover Background Colour"
+TPL_CASSIOPEIA_BUTTON_COLOR_LABEL="Button Primary Text Colour"
+TPL_CASSIOPEIA_BUTTON_HOVER_COLOR_LABEL="Button Primary Hover Text Colour"
+TPL_CASSIOPEIA_COLORS_FIELDSET_LABEL="Colour Settings"
 TPL_CASSIOPEIA_COLOR_NAME_ALTERNATIVE="Alternative"
+TPL_CASSIOPEIA_COLOR_NAME_CUSTOM="Custom"
 TPL_CASSIOPEIA_COLOR_NAME_LABEL="Colour Theme"
 TPL_CASSIOPEIA_COLOR_NAME_STANDARD="Standard"
+TPL_CASSIOPEIA_EXTENDED_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0, Milkyway from 1.5 and Protostar from 3.0), Cassiopeia is the Joomla site template based on Bootstrap 5. This is an extended child version with a new colour set for the base Cassiopeia template."
 TPL_CASSIOPEIA_FLUID="Fluid"
 TPL_CASSIOPEIA_FLUID_LABEL="Layout"
+TPL_CASSIOPEIA_FONTS_FIELDSET_LABEL="Font Settings"
 TPL_CASSIOPEIA_FONT_GROUP_LOCAL="Fonts from Folder"
 TPL_CASSIOPEIA_FONT_GROUP_WEB="Fonts from Web"
 TPL_CASSIOPEIA_FONT_LABEL="Fonts Scheme"
@@ -34,10 +45,19 @@ TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_OLDSTYLE="Old Style"
 TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_ROUNDED="Rounded Sans"
 TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_SLAB="Slab Serif"
 TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_TRANSITIONAL="Transitional"
+TPL_CASSIOPEIA_FOOTER_BACKGROUND_COLOR_LABEL="Footer Background Colour"
+TPL_CASSIOPEIA_FOOTER_TEXT_COLOR_LABEL="Footer Text Colour"
+TPL_CASSIOPEIA_H1_SIZE="H1 Font Size (rem)"
+TPL_CASSIOPEIA_H2_SIZE="H2 Font Size (rem)"
+TPL_CASSIOPEIA_H3_SIZE="H3 Font Size (rem)"
+TPL_CASSIOPEIA_HEADER_BACKGROUND_COLOR_LABEL="Header Background Colour"
+TPL_CASSIOPEIA_HEADER_TEXT_COLOR_LABEL="Header Text Colour"
+TPL_CASSIOPEIA_LINK_COLOR_LABEL="Links Colour"
+TPL_CASSIOPEIA_LINK_HOVER_COLOR_LABEL="Links Hover Colour"
 TPL_CASSIOPEIA_LOGO_LABEL="Logo"
 TPL_CASSIOPEIA_STATIC="Static"
 TPL_CASSIOPEIA_STICKY_LABEL="Sticky Header"
 TPL_CASSIOPEIA_TAGLINE_DESC="Optional text to show as a subheading"
 TPL_CASSIOPEIA_TAGLINE_LABEL="Tagline"
 TPL_CASSIOPEIA_TITLE="Title (alternative to logo)"
-TPL_CASSIOPEIA_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0, Milkyway from 1.5 and Protostar from 3.0), Cassiopeia is the Joomla 4 and Joomla 5 site template based on Bootstrap 5."
+TPL_CASSIOPEIA_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0, Milkyway from 1.5 and Protostar from 3.0), Cassiopeia is the Joomla site template based on Bootstrap 5."
diff --git a/language/en-GB/tpl_cassiopeia.sys.ini b/language/en-GB/tpl_cassiopeia.sys.ini
index 42e58e4a3bd90..88d27dac3095b 100644
--- a/language/en-GB/tpl_cassiopeia.sys.ini
+++ b/language/en-GB/tpl_cassiopeia.sys.ini
@@ -1,28 +1,31 @@
-; Joomla! Project
-; (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-CASSIOPEIA="Cassiopeia Site template"
-TPL_CASSIOPEIA_MOD_CUSTOM_LAYOUT_BANNER="Banner"
-TPL_CASSIOPEIA_MOD_MENU_LAYOUT_COLLAPSE-METISMENU="Collapsible Dropdown"
-TPL_CASSIOPEIA_MOD_MENU_LAYOUT_DROPDOWN-METISMENU="Dropdown"
-TPL_CASSIOPEIA_POSITION_BANNER="Banner"
-TPL_CASSIOPEIA_POSITION_BELOW-TOP="Below Top"
-TPL_CASSIOPEIA_POSITION_BOTTOM-A="Bottom-a"
-TPL_CASSIOPEIA_POSITION_BOTTOM-B="Bottom-b"
-TPL_CASSIOPEIA_POSITION_BREADCRUMBS="Breadcrumbs"
-TPL_CASSIOPEIA_POSITION_DEBUG="Debug"
-TPL_CASSIOPEIA_POSITION_ERROR-403="Error 403"
-TPL_CASSIOPEIA_POSITION_ERROR-404="Error 404"
-TPL_CASSIOPEIA_POSITION_FOOTER="Footer"
-TPL_CASSIOPEIA_POSITION_MAIN-BOTTOM="Main-bottom"
-TPL_CASSIOPEIA_POSITION_MAIN-TOP="Main-top"
-TPL_CASSIOPEIA_POSITION_MENU="Menu"
-TPL_CASSIOPEIA_POSITION_SEARCH="Search"
-TPL_CASSIOPEIA_POSITION_SIDEBAR-LEFT="Sidebar-left"
-TPL_CASSIOPEIA_POSITION_SIDEBAR-RIGHT="Sidebar-right"
-TPL_CASSIOPEIA_POSITION_TOP-A="Top-a"
-TPL_CASSIOPEIA_POSITION_TOP-B="Top-b"
-TPL_CASSIOPEIA_POSITION_TOPBAR="Top Bar"
-TPL_CASSIOPEIA_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0, Milkyway from 1.5 and Protostar from 3.0), Cassiopeia is the Joomla 4 and Joomla 5 site template based on Bootstrap 5."
+; Joomla! Project
+; (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+CASSIOPEIA="Cassiopeia Site template"
+TPL_CASSIOPEIA_COLORS_FIELDSET_LABEL="Colour Settings"
+TPL_CASSIOPEIA_EXTENDED_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0, Milkyway from 1.5 and Protostar from 3.0), Cassiopeia is the Joomla site template based on Bootstrap 5. This is an extended child version with a new colour set for the base Cassiopeia template."
+TPL_CASSIOPEIA_FONTS_FIELDSET_LABEL="Font Settings"
+TPL_CASSIOPEIA_MOD_CUSTOM_LAYOUT_BANNER="Banner"
+TPL_CASSIOPEIA_MOD_MENU_LAYOUT_COLLAPSE-METISMENU="Collapsible Dropdown"
+TPL_CASSIOPEIA_MOD_MENU_LAYOUT_DROPDOWN-METISMENU="Dropdown"
+TPL_CASSIOPEIA_POSITION_BANNER="Banner"
+TPL_CASSIOPEIA_POSITION_BELOW-TOP="Below Top"
+TPL_CASSIOPEIA_POSITION_BOTTOM-A="Bottom-a"
+TPL_CASSIOPEIA_POSITION_BOTTOM-B="Bottom-b"
+TPL_CASSIOPEIA_POSITION_BREADCRUMBS="Breadcrumbs"
+TPL_CASSIOPEIA_POSITION_DEBUG="Debug"
+TPL_CASSIOPEIA_POSITION_ERROR-403="Error 403"
+TPL_CASSIOPEIA_POSITION_ERROR-404="Error 404"
+TPL_CASSIOPEIA_POSITION_FOOTER="Footer"
+TPL_CASSIOPEIA_POSITION_MAIN-BOTTOM="Main-bottom"
+TPL_CASSIOPEIA_POSITION_MAIN-TOP="Main-top"
+TPL_CASSIOPEIA_POSITION_MENU="Menu"
+TPL_CASSIOPEIA_POSITION_SEARCH="Search"
+TPL_CASSIOPEIA_POSITION_SIDEBAR-LEFT="Sidebar-left"
+TPL_CASSIOPEIA_POSITION_SIDEBAR-RIGHT="Sidebar-right"
+TPL_CASSIOPEIA_POSITION_TOP-A="Top-a"
+TPL_CASSIOPEIA_POSITION_TOP-B="Top-b"
+TPL_CASSIOPEIA_POSITION_TOPBAR="Top Bar"
+TPL_CASSIOPEIA_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0, Milkyway from 1.5 and Protostar from 3.0), Cassiopeia is the Joomla site template based on Bootstrap 5."
diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php
index 8b7fc1f7dfb57..51dcb8a8644ba 100644
--- a/layouts/joomla/content/category_default.php
+++ b/layouts/joomla/content/category_default.php
@@ -10,10 +10,15 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Event\Content\AfterDisplayEvent;
+use Joomla\CMS\Event\Content\AfterTitleEvent;
+use Joomla\CMS\Event\Content\BeforeDisplayEvent;
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\Event\DispatcherInterface;
 
 /**
  * Note that this layout opens a div with the page class suffix. If you do not use the category children
@@ -26,19 +31,40 @@
 $className = substr($extension, 4);
 $htag      = $params->get('show_page_heading') ? 'h2' : 'h1';
 
-$app = Factory::getApplication();
+$dispatcher = Factory::getContainer()->get(DispatcherInterface::class);
 
 $category->text = $category->description;
-$app->triggerEvent('onContentPrepare', [$extension . '.categories', &$category, &$params, 0]);
+
+$contentEventArguments = [
+    'context' => $extension . '.categories',
+    'subject' => $category,
+    'params'  => $params,
+    'page'    => 0,
+];
+
+$dispatcher->dispatch('onContentPrepare', new ContentPrepareEvent('onContentPrepare', $contentEventArguments));
+
 $category->description = $category->text;
 
-$results = $app->triggerEvent('onContentAfterTitle', [$extension . '.categories', &$category, &$params, 0]);
+$results = $dispatcher->dispatch(
+    'onContentAfterTitle',
+    new AfterTitleEvent('onContentAfterTitle', $contentEventArguments)
+)->getArgument('result', []);
+
 $afterDisplayTitle = trim(implode("\n", $results));
 
-$results = $app->triggerEvent('onContentBeforeDisplay', [$extension . '.categories', &$category, &$params, 0]);
+$results = $dispatcher->dispatch(
+    'onContentBeforeDisplay',
+    new BeforeDisplayEvent('onContentBeforeDisplay', $contentEventArguments)
+)->getArgument('result', []);
+
 $beforeDisplayContent = trim(implode("\n", $results));
 
-$results = $app->triggerEvent('onContentAfterDisplay', [$extension . '.categories', &$category, &$params, 0]);
+$results = $dispatcher->dispatch(
+    'onContentAfterDisplay',
+    new AfterDisplayEvent('onContentAfterDisplay', $contentEventArguments)
+)->getArgument('result', []);
+
 $afterDisplayContent = trim(implode("\n", $results));
 
 /**
diff --git a/layouts/joomla/content/emptystate.php b/layouts/joomla/content/emptystate.php
index 2abe33d2ab641..dfe7a9f8bba62 100644
--- a/layouts/joomla/content/emptystate.php
+++ b/layouts/joomla/content/emptystate.php
@@ -29,6 +29,8 @@
 $icon       = $displayData['icon'] ?? 'icon-copy article';
 $append     = $displayData['formAppend'] ?? '';
 $btnadd     = $displayData['btnadd'] ?? Text::_($textPrefix . '_EMPTYSTATE_BUTTON_ADD');
+
+$controlFields = $displayData['controlFields'] ?? '';
 ?>
 
 <form action="<?php echo Route::_($formURL); ?>" method="post" name="adminForm" id="adminForm">
@@ -58,7 +60,11 @@ class="btn btn-outline-secondary btn-lg px-4"><?php echo Text::_('JGLOBAL_LEARN_
         echo $append;
     ?>
 
-    <input type="hidden" name="task" value="">
-    <input type="hidden" name="boxchecked" value="0">
-    <?php echo HTMLHelper::_('form.token'); ?>
+    <?php if ($controlFields) : ?>
+        <?php echo $controlFields; ?>
+    <?php else : ?>
+        <input type="hidden" name="task" value="">
+        <input type="hidden" name="boxchecked" value="0">
+        <?php echo HTMLHelper::_('form.token'); ?>
+    <?php endif; ?>
 </form>
diff --git a/layouts/joomla/content/full_image.php b/layouts/joomla/content/full_image.php
index 94e4ffd94e41f..1075ffabcb479 100644
--- a/layouts/joomla/content/full_image.php
+++ b/layouts/joomla/content/full_image.php
@@ -19,13 +19,15 @@
     return;
 }
 
-$imgclass   = empty($images->float_fulltext) ? $params->get('float_fulltext') : $images->float_fulltext;
+$figureClass   = empty($images->float_fulltext) ? $params->get('float_fulltext') : $images->float_fulltext;
+$imageClass   = empty($images->imgclass_fulltext) ? $params->get('imgclass_fulltext') : $images->imgclass_fulltext;
 $layoutAttr = [
     'src'      => $images->image_fulltext,
     'alt'      => empty($images->image_fulltext_alt) && empty($images->image_fulltext_alt_empty) ? false : $images->image_fulltext_alt,
+    'class'    => $imageClass,
 ];
 ?>
-<figure class="<?php echo $this->escape($imgclass); ?> item-image">
+<figure class="<?php echo $this->escape($figureClass); ?> item-image">
     <?php echo LayoutHelper::render('joomla.html.image', $layoutAttr); ?>
     <?php if (isset($images->image_fulltext_caption) && $images->image_fulltext_caption !== '') : ?>
         <figcaption class="caption"><?php echo $this->escape($images->image_fulltext_caption); ?></figcaption>
diff --git a/layouts/joomla/content/icons/create.php b/layouts/joomla/content/icons/create.php
index c4d77e67f54e1..da412d91b0a6c 100644
--- a/layouts/joomla/content/icons/create.php
+++ b/layouts/joomla/content/icons/create.php
@@ -6,7 +6,7 @@
  *
  * @copyright   (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  */
 
 defined('_JEXEC') or die;
diff --git a/layouts/joomla/content/intro_image.php b/layouts/joomla/content/intro_image.php
index 8bd618bbc0e9d..505ebe9cac8e5 100644
--- a/layouts/joomla/content/intro_image.php
+++ b/layouts/joomla/content/intro_image.php
@@ -21,13 +21,18 @@
     return;
 }
 
-$imgclass   = empty($images->float_intro) ? $params->get('float_intro') : $images->float_intro;
-$layoutAttr = [
-    'src' => $images->image_intro,
-    'alt' => empty($images->image_intro_alt) && empty($images->image_intro_alt_empty) ? false : $images->image_intro_alt,
+$figureClass = empty($images->float_intro) ? $params->get('float_intro') : $images->float_intro;
+$imageClass  = empty($images->imgclass_intro) ? $params->get('imgclass_intro') : $images->imgclass_intro;
+$layoutAttr  = [
+    'src'   => $images->image_intro,
+    'alt'   => empty($images->image_intro_alt) && empty($images->image_intro_alt_empty) ? false : $images->image_intro_alt,
+    'class' => $imageClass,
 ];
 ?>
-<figure class="<?php echo $this->escape($imgclass); ?> item-image">
+<?php if (isset($images->image_intro_caption) && $images->image_intro_caption !== '') : ?>
+    <figure class="<?php echo $this->escape($figureClass); ?> item-image">
+<?php endif; ?>
+
     <?php if ($params->get('link_intro_image') && ($params->get('access-view') || $params->get('show_noauth', '0') == '1')) : ?>
         <a href="<?php echo Route::_(RouteHelper::getArticleRoute($displayData->slug, $displayData->catid, $displayData->language)); ?>" title="<?php echo $this->escape($displayData->title); ?>">
             <?php echo LayoutHelper::render('joomla.html.image', $layoutAttr); ?>
@@ -35,7 +40,9 @@
     <?php else : ?>
         <?php echo LayoutHelper::render('joomla.html.image', $layoutAttr); ?>
     <?php endif; ?>
-    <?php if (isset($images->image_intro_caption) && $images->image_intro_caption !== '') : ?>
+
+<?php if (isset($images->image_intro_caption) && $images->image_intro_caption !== '') : ?>
         <figcaption class="caption"><?php echo $this->escape($images->image_intro_caption); ?></figcaption>
-    <?php endif; ?>
-</figure>
+
+    </figure>
+<?php endif; ?>
diff --git a/layouts/joomla/edit/admin_modules.php b/layouts/joomla/edit/admin_modules.php
index f06d5752f4f38..02fb858033e10 100644
--- a/layouts/joomla/edit/admin_modules.php
+++ b/layouts/joomla/edit/admin_modules.php
@@ -10,12 +10,16 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ModuleHelper;
 
-$app    = Factory::getApplication();
-$form   = $displayData->getForm();
-$input  = $app->getInput();
+$app       = Factory::getApplication();
+$form      = $displayData->getForm();
+$input     = $app->getInput();
+$component = $input->getCmd('option', 'com_content');
+
+$saveHistory = ComponentHelper::getParams($component)->get('save_history', 0);
 
 $fields = $displayData->get('fields') ?: [
     ['parent', 'parent_id'],
@@ -32,6 +36,10 @@
 
 $hiddenFields = $displayData->get('hidden_fields') ?: [];
 
+if (!$saveHistory) {
+    $hiddenFields[] = 'version_note';
+}
+
 if (!ModuleHelper::isAdminMultilang()) {
     $hiddenFields[] = 'language';
     $form->setFieldAttribute('language', 'default', '*');
diff --git a/layouts/joomla/form/field/color/simple.php b/layouts/joomla/form/field/color/simple.php
index 2ed3e632ead10..73e443135eb3e 100644
--- a/layouts/joomla/form/field/color/simple.php
+++ b/layouts/joomla/form/field/color/simple.php
@@ -12,6 +12,7 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
+use Joomla\Utilities\ArrayHelper;
 
 extract($displayData);
 
@@ -51,22 +52,34 @@
  * @var   string   $dataAttribute   Miscellaneous data attributes preprocessed for HTML output
  * @var   array    $dataAttributes  Miscellaneous data attribute for eg, data-*.
  */
-
-$class    = ' class="form-select ' . trim($class) . '"';
-$disabled = $disabled ? ' disabled' : '';
-$readonly = $readonly ? ' readonly' : '';
-
 Factory::getDocument()->getWebAssetManager()
     ->useStyle('webcomponent.field-simple-color')
     ->useScript('webcomponent.field-simple-color');
 
+Text::script('JCLOSE');
+Text::script('JNONE');
+
+$slots = [];
+$attr  = [
+    'name'  => $name,
+    'id'    => $id,
+    'class' => trim($class),
+    'value' => trim($color),
+];
+
+if ($disabled) {
+    $attr['disabled'] = '';
+}
+
+if ($readonly) {
+    $attr['readonly'] = '';
+}
+
+foreach ($colors as $val) {
+    $slots[] = '<button slot="colors" value="' . trim($val) . '" aria-pressed="' . (trim($val) === $color ? 'true' : 'false') . '" type="button"></button>';
+}
 ?>
-<joomla-field-simple-color text-select="<?php echo Text::_('JFIELD_COLOR_SELECT'); ?>" text-color="<?php echo Text::_('JFIELD_COLOR_VALUE'); ?>" text-close="<?php echo Text::_('JLIB_HTML_BEHAVIOR_CLOSE'); ?>" text-transparent="<?php echo Text::_('JFIELD_COLOR_TRANSPARENT'); ?>">
-    <select name="<?php echo $name; ?>" id="<?php echo $id; ?>"<?php
-    echo $disabled; ?><?php echo $readonly; ?><?php echo $dataAttribute; ?><?php echo $required; ?><?php echo $class; ?><?php echo $position; ?><?php
-    echo $onchange; ?><?php echo $autofocus; ?> style="visibility:hidden;width:22px;height:1px">
-        <?php foreach ($colors as $i => $c) : ?>
-            <option<?php echo ($c === $color ? ' selected="selected"' : ''); ?> value="<?php echo $c; ?>"></option>
-        <?php endforeach; ?>
-    </select>
+<joomla-field-simple-color <?php echo ArrayHelper::toString($attr); ?>>
+    <?php echo implode('', $slots); ?>
+    <input type="hidden" name="<?php echo $name; ?>" value="<?php echo $color; ?>" />
 </joomla-field-simple-color>
diff --git a/layouts/joomla/form/field/combo.php b/layouts/joomla/form/field/combo.php
index 86f52cee67e07..b710201c388fb 100644
--- a/layouts/joomla/form/field/combo.php
+++ b/layouts/joomla/form/field/combo.php
@@ -12,7 +12,7 @@
 
 extract($displayData);
 
-use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Factory;
 
 /**
  * Layout variables
@@ -45,7 +45,7 @@
  * @var   array    $dataAttributes  Miscellaneous data attribute for eg, data-*.
  */
 
-HTMLHelper::_('behavior.combobox');
+Factory::getApplication()->getDocument()->getWebAssetManager()->usePreset('awesomplete');
 
 $attr = '';
 
diff --git a/layouts/joomla/form/field/date.php b/layouts/joomla/form/field/date.php
new file mode 100644
index 0000000000000..5771653dc9e58
--- /dev/null
+++ b/layouts/joomla/form/field/date.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   string   $value           Value attribute of the field.
+ * @var   string   $min
+ * @var   string   $max
+ */
+extract($displayData);
+
+$class        = !empty($class) ? 'class="form-control ' . $class . '"' : 'class="form-control"';
+$readonly     = $readonly ? ' readonly' : '';
+$disabled     = $disabled ? ' disabled' : '';
+$required     = $required ? ' required' : '';
+$hint         = strlen($hint)   ? ' placeholder="' . $hint . '"' : '';
+$autocomplete = !$autocomplete ? ' autocomplete="off"' : ' autocomplete="' . $autocomplete . '"';
+$autocomplete = $autocomplete == ' autocomplete="on"' ? '' : $autocomplete;
+$autofocus    = $autofocus ? ' autofocus' : '';
+$pattern      = !empty($pattern) ? ' pattern="' . $pattern . '"' : '';
+$onchange     = !empty($onchange) ? ' onchange="' . $onchange . '"' : '';
+$minAttr      = !empty($min) ? ' min="' . $this->escape($min) . '"' : '';
+$maxAttr      = !empty($max) ? ' max="' . $this->escape($max) . '"' : '';
+
+echo '<input type="date" name="' . $name . '" id="' . $id . '" value="' . $this->escape($value) . '"'
+            . $class . $disabled . $readonly
+            . $hint . $onchange . $required . $autocomplete . $autofocus . $pattern . $minAttr . $maxAttr . ' />';
diff --git a/layouts/joomla/form/field/datetime.php b/layouts/joomla/form/field/datetime.php
new file mode 100644
index 0000000000000..cfe5e6ae9cab3
--- /dev/null
+++ b/layouts/joomla/form/field/datetime.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   string   $autocomplete    Autocomplete attribute for the field.
+ * @var   boolean  $autofocus       Is autofocus enabled?
+ * @var   string   $class           Classes for the input.
+ * @var   string   $description     Description of the field.
+ * @var   boolean  $disabled        Is this field disabled?
+ * @var   string   $group           Group the field belongs to. <fields> section in form XML.
+ * @var   boolean  $hidden          Is this field hidden in the form?
+ * @var   string   $hint            Placeholder for the field.
+ * @var   string   $id              DOM id of the field.
+ * @var   string   $label           Label of the field.
+ * @var   string   $labelclass      Classes to apply to the label.
+ * @var   boolean  $multiple        Does this field support multiple values?
+ * @var   string   $name            Name of the input field.
+ * @var   string   $onchange        Onchange attribute for the field.
+ * @var   string   $onclick         Onclick attribute for the field.
+ * @var   string   $pattern         Pattern (Reg Ex) of value of the form field.
+ * @var   boolean  $readonly        Is this field read only?
+ * @var   boolean  $required        Is this field required?
+ * @var   integer  $size            Size attribute of the input.
+ * @var   string   $value           Value attribute of the field.
+ * @var   string   $min
+ * @var   string   $max
+ */
+extract($displayData);
+
+$class        = !empty($class) ? 'class="form-control ' . $class . '"' : 'class="form-control"';
+$readonly     = $readonly ? ' readonly' : '';
+$disabled     = $disabled ? ' disabled' : '';
+$required     = $required ? ' required' : '';
+$hint         = strlen($hint)   ? ' placeholder="' . $hint . '"' : '';
+$autocomplete = !$autocomplete ? ' autocomplete="off"' : ' autocomplete="' . $autocomplete . '"';
+$autocomplete = $autocomplete == ' autocomplete="on"' ? '' : $autocomplete;
+$autofocus    = $autofocus ? ' autofocus' : '';
+$pattern      = !empty($pattern) ? ' pattern="' . $pattern . '"' : '';
+$onchange     = !empty($onchange) ? ' onchange="' . $onchange . '"' : '';
+$minAttr      = !empty($min) ? ' min="' . $this->escape($min) . '"' : '';
+$maxAttr      = !empty($max) ? ' max="' . $this->escape($max) . '"' : '';
+
+echo '<input type="datetime-local" name="' . $name . '" id="' . $id . '" value="' . $this->escape($value) . '"'
+    . $class . $disabled . $readonly
+            . $hint . $onchange . $required . $autocomplete . $autofocus . $pattern . $minAttr . $maxAttr . ' />';
diff --git a/layouts/joomla/form/field/groupedlist-transition.php b/layouts/joomla/form/field/groupedlist-transition.php
new file mode 100644
index 0000000000000..8fe9f2c1e35cd
--- /dev/null
+++ b/layouts/joomla/form/field/groupedlist-transition.php
@@ -0,0 +1,207 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Layout\LayoutHelper;
+
+extract($displayData);
+$wa   = Factory::getApplication()->getDocument()->getWebAssetManager();
+$wa->getRegistry()->addExtensionRegistryFile('com_workflow');
+
+$wa->useScript('joomla.dialog-autocreate');
+$wa->useScript('com_workflow.workflowgraphclient')
+    ->useStyle('com_workflow.workflowgraphclient');
+
+
+// Populate the language
+$translationStrings = [
+    'COM_WORKFLOW_GRAPH',
+    'COM_WORKFLOW_GRAPH_ADD_STAGE',
+    'COM_WORKFLOW_GRAPH_ADD_STAGE_DIALOG_OPENED',
+    'COM_WORKFLOW_GRAPH_ADD_TRANSITION_DIALOG_OPENED',
+    'COM_WORKFLOW_GRAPH_ADD_TRANSITION',
+    'COM_WORKFLOW_GRAPH_API_NOT_SET',
+    'COM_WORKFLOW_GRAPH_BACKGROUND',
+    'COM_WORKFLOW_GRAPH_CANVAS_DESCRIPTION',
+    'COM_WORKFLOW_GRAPH_CANVAS_LABEL',
+    'COM_WORKFLOW_GRAPH_CANVAS_VIEW_CONTROLS',
+    'COM_WORKFLOW_GRAPH_CLEAR_SELECTION',
+    'COM_WORKFLOW_GRAPH_CLOSE_ACTIONS_MENU',
+    'COM_WORKFLOW_GRAPH_CONTROLS',
+    'COM_WORKFLOW_GRAPH_CREATING_TRANSITION',
+    'COM_WORKFLOW_GRAPH_DEFAULT',
+    'COM_WORKFLOW_GRAPH_DISABLED',
+    'COM_WORKFLOW_GRAPH_EDIT_ITEM',
+    'COM_WORKFLOW_GRAPH_EDIT_STAGE',
+    'COM_WORKFLOW_GRAPH_EDIT_TRANSITION',
+    'COM_WORKFLOW_GRAPH_ENABLED',
+    'COM_WORKFLOW_GRAPH_ERROR_API_RETURNED_ERROR',
+    'COM_WORKFLOW_GRAPH_ERROR_CSRF_TOKEN_NOT_SET',
+    'COM_WORKFLOW_GRAPH_ERROR_EXTENSION_NOT_SET',
+    'COM_WORKFLOW_GRAPH_ERROR_FAILED_TO_UPDATE_STAGE_POSITIONS',
+    'COM_WORKFLOW_GRAPH_ERROR_FETCHING_MODEL',
+    'COM_WORKFLOW_GRAPH_ERROR_INVALID_ID',
+    'COM_WORKFLOW_GRAPH_ERROR_INVALID_POSITION_DATA',
+    'COM_WORKFLOW_GRAPH_ERROR_INVALID_STAGE_POSITIONS',
+    'COM_WORKFLOW_GRAPH_ERROR_NOT_AUTHENTICATED',
+    'COM_WORKFLOW_GRAPH_ERROR_NO_PERMISSION',
+    'COM_WORKFLOW_GRAPH_ERROR_REQUEST_FAILED',
+    'COM_WORKFLOW_GRAPH_ERROR_STAGES_NOT_FOUND',
+    'COM_WORKFLOW_GRAPH_ERROR_STAGE_DEFAULT_CANT_DELETED',
+    'COM_WORKFLOW_GRAPH_ERROR_STAGE_HAS_TRANSITIONS',
+    'COM_WORKFLOW_GRAPH_ERROR_UNKNOWN',
+    'COM_WORKFLOW_GRAPH_ERROR_WORKFLOW_ID_NOT_SET',
+    'COM_WORKFLOW_GRAPH_ERROR_WORKFLOW_NOT_FOUND',
+    'COM_WORKFLOW_GRAPH_FIT_VIEW',
+    'COM_WORKFLOW_GRAPH_FOCUS_TYPE_CHANGE',
+    'COM_WORKFLOW_GRAPH_FROM_ANY',
+    'COM_WORKFLOW_GRAPH_LOADING',
+    'COM_WORKFLOW_GRAPH_MINIMAP_HIDE',
+    'COM_WORKFLOW_GRAPH_MINIMAP_LABEL',
+    'COM_WORKFLOW_GRAPH_MINIMAP_SHOW',
+    'COM_WORKFLOW_GRAPH_MOVE_STAGE',
+    'COM_WORKFLOW_GRAPH_MOVE_VIEW',
+    'COM_WORKFLOW_GRAPH_NAVIGATE_NODES',
+    'COM_WORKFLOW_GRAPH_OPEN_ACTIONS_MENU',
+    'COM_WORKFLOW_GRAPH_SELECTION_CLEARED',
+    'COM_WORKFLOW_GRAPH_SELECT_ITEM',
+    'COM_WORKFLOW_GRAPH_SHORTCUTS',
+    'COM_WORKFLOW_GRAPH_SHORTCUTS_TITLE',
+    'COM_WORKFLOW_GRAPH_STAGE',
+    'COM_WORKFLOW_GRAPH_STAGES',
+    'COM_WORKFLOW_GRAPH_STAGE_ACTIONS',
+    'COM_WORKFLOW_GRAPH_STAGE_COUNT',
+    'COM_WORKFLOW_GRAPH_STAGE_DESCRIPTION',
+    'COM_WORKFLOW_GRAPH_STAGE_POSITIONS_UPDATED',
+    'COM_WORKFLOW_GRAPH_STAGE_REF',
+    'COM_WORKFLOW_GRAPH_STAGE_SELECTED',
+    'COM_WORKFLOW_GRAPH_STAGE_STATUS_ENABLED',
+    'COM_WORKFLOW_GRAPH_STAGE_STATUS_DISABLED',
+    'COM_WORKFLOW_GRAPH_STATUS',
+    'COM_WORKFLOW_GRAPH_TRANSITION',
+    'COM_WORKFLOW_GRAPH_TRANSITIONS',
+    'COM_WORKFLOW_GRAPH_TRANSITION_ACTIONS',
+    'COM_WORKFLOW_GRAPH_TRANSITION_COUNT',
+    'COM_WORKFLOW_GRAPH_TRANSITION_DESCRIPTION',
+    'COM_WORKFLOW_GRAPH_TRANSITION_PATH',
+    'COM_WORKFLOW_GRAPH_TRANSITION_REF',
+    'COM_WORKFLOW_GRAPH_TRANSITION_SELECTED',
+    'COM_WORKFLOW_GRAPH_TRANSITION_STATUS_ENABLED',
+    'COM_WORKFLOW_GRAPH_TRANSITION_STATUS_DISABLED',
+    'COM_WORKFLOW_GRAPH_TRASH_ITEM',
+    'COM_WORKFLOW_GRAPH_TRASH_STAGE',
+    'COM_WORKFLOW_GRAPH_TRASH_STAGE_CONFIRM',
+    'COM_WORKFLOW_GRAPH_TRASH_STAGE_FAILED',
+    'COM_WORKFLOW_GRAPH_TRASH_TRANSITION',
+    'COM_WORKFLOW_GRAPH_TRASH_TRANSITION_CONFIRM',
+    'COM_WORKFLOW_GRAPH_TRASH_TRANSITION_FAILED',
+    'COM_WORKFLOW_GRAPH_UNSAVED_CHANGES',
+    'COM_WORKFLOW_GRAPH_UPDATE_STAGE_POSITION_FAILED',
+    'COM_WORKFLOW_GRAPH_UP_TO_DATE',
+    'COM_WORKFLOW_GRAPH_WORKFLOWS_EDIT',
+    'COM_WORKFLOW_GRAPH_ZOOM_IN',
+    'COM_WORKFLOW_GRAPH_ZOOM_OUT',
+];
+
+foreach ($translationStrings as $string) {
+    Text::script($string);
+}
+
+$workflowId = $field ? $field->getAttribute('workflow_id') : null;
+if (!$workflowId) {
+    return;
+}
+$popupId = 'workflow-graph-modal-content';
+$popupOptions = json_encode([
+    'src'             => '#' . $popupId,
+    'height'          => 'fit-content',
+    'textHeader'      => Text::_('COM_WORKFLOW_GRAPH_FULL'),
+    'preferredParent' => 'body',
+    'modal'           => true,
+]);
+
+?>
+<div class="d-flex align-items-center gap-3">
+    <div class="flex-grow-1">
+        <?php echo LayoutHelper::render('joomla.form.field.groupedlist-fancy-select', $displayData); ?>
+    </div>
+    <div class="flex-shrink-0">
+        <div class="align-center text-center btns">
+            <button type="button" class="btn btn-primary px-3 py-2" data-joomla-dialog="<?php echo htmlspecialchars($popupOptions, ENT_QUOTES, 'UTF-8'); ?>">
+                <span class="fa fa-diagram-project" aria-hidden="true"></span> <?php echo Text::_('COM_WORKFLOW_GRAPH_VIEW'); ?>
+            </button>
+        </div>
+    </div>
+</div>
+
+<template id="workflow-graph-modal-content">
+<div class="p-3">
+    <section
+        class="d-flex flex-wrap align-items-center justify-content-between"
+    >
+        <div class="col-md-6 d-flex flex-column">
+            <dl class="d-flex align-items-center flex-wrap mb-0">
+                <dt class="visually-hidden"><?php echo Text::_('COM_WORKFLOW_GRAPH_STATUS'); ?>:</dt>
+                <dd class="me-3 mb-1 d-flex mb-0">
+                    <span class="badge" role="status" id="workflow-status-badge"></span>
+                </dd>
+                <dt class="visually-hidden"><?php echo Text::_('COM_WORKFLOW_GRAPH_STAGE_COUNT'); ?>:</dt>
+                <dd class="me-3 mb-1 d-flex mb-0" id="workflow-stage-count">
+                    <span></span>
+                </dd>
+                <dt class="visually-hidden"><?php echo Text::_('COM_WORKFLOW_GRAPH_TRANSITION_COUNT'); ?>:</dt>
+                <dd class="me-3 mb-1 d-flex mb-0" id="workflow-transition-count">
+                    <span></span>
+                </dd>
+            </dl>
+        </div>
+    </section>
+    <div id="workflow-graph">
+        <div id="workflow-container" data-workflow-id="<?php echo (int) $workflowId; ?>">
+            <div id="graph">
+                <div id="stages"></div>
+                <svg id="connections"></svg>
+            </div>
+            <div class="zoom-controls">
+              <div
+                ref="controlsContainer"
+                class="custom-controls z-10"
+                aria-labelledby="canvas-controls-title"
+              >
+                <h2 id="canvas-controls-title" class="visually-hidden"><?php echo Text::_('COM_WORKFLOW_GRAPH_CANVAS_VIEW_CONTROLS'); ?></h2>
+                <ul class="d-flex flex-column gap-1 list-unstyled mb-0 px-0">
+                  <li>
+                    <button class="toolbar-button custom-controls-button zoom-btn zoom-in" title="<?php echo Text::_('COM_WORKFLOW_GRAPH_ZOOM_IN'); ?>">
+                      <span class="icon icon-plus" aria-hidden="true"></span>
+                      <span class="visually-hidden"><?php echo Text::_('COM_WORKFLOW_GRAPH_ZOOM_IN'); ?></span>
+                    </button>
+                  </li>
+                  <li>
+                    <button class="toolbar-button custom-controls-button zoom-btn zoom-out" title="<?php echo Text::_('COM_WORKFLOW_GRAPH_ZOOM_OUT'); ?>">
+                      <span class="icon icon-minus" aria-hidden="true"></span>
+                      <span class="visually-hidden"><?php echo Text::_('COM_WORKFLOW_GRAPH_ZOOM_OUT'); ?></span>
+                    </button>
+                  </li>
+                  <li>
+                    <button class="toolbar-button custom-controls-button zoom-btn fit-screen" title="<?php echo Text::_('COM_WORKFLOW_GRAPH_FIT_VIEW'); ?>">
+                      <span class="icon icon-expand" aria-hidden="true"></span>
+                      <span class="visually-hidden"><?php echo Text::_('COM_WORKFLOW_GRAPH_FIT_VIEW'); ?></span>
+                    </button>
+                  </li>
+                </ul>
+              </div>
+            </div>
+        </div>
+    </div>
+</div>
+</template>
diff --git a/layouts/joomla/form/field/media.php b/layouts/joomla/form/field/media.php
index 340e1e248fa9b..99a4dd965415d 100644
--- a/layouts/joomla/form/field/media.php
+++ b/layouts/joomla/form/field/media.php
@@ -154,6 +154,8 @@
     ]);
 }
 
+$imagesOnly = count($mediaTypeNames) === 1 && in_array('images', $mediaTypeNames);
+
 ?>
 <joomla-field-media class="field-media-wrapper"
     types="<?php echo $this->escape(implode(',', $mediaTypeNames)); ?>"
@@ -163,7 +165,7 @@
     input=".field-media-input"
     button-select=".button-select"
     button-clear=".button-clear"
-    modal-title="<?php echo $this->escape(Text::_('JLIB_FORM_CHANGE_IMAGE')); ?>"
+    modal-title="<?php echo $this->escape(Text::_($imagesOnly ? 'JLIB_FORM_CHANGE_IMAGE' : 'JLIB_FORM_CHANGE_FILE')); ?>"
     preview="static"
     preview-container=".field-media-preview"
     preview-width="<?php echo $previewWidth; ?>"
diff --git a/layouts/joomla/form/field/radiobasic.php b/layouts/joomla/form/field/radiobasic.php
index c47d39d0e18ea..5384557d973a5 100644
--- a/layouts/joomla/form/field/radiobasic.php
+++ b/layouts/joomla/form/field/radiobasic.php
@@ -7,7 +7,7 @@
  * @copyright   (C) 2016 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
- * @deprecated  5.2 will be moved to the b/c plugin in 6.0 and removed in 7.0
+ * @deprecated  5.2 will be moved to the b/c plugin in 7.0 and removed in 8.0
  *
  */
 
diff --git a/layouts/joomla/form/field/subform/repeatable-grid.php b/layouts/joomla/form/field/subform/repeatable-grid.php
new file mode 100644
index 0000000000000..73056dfad5d4c
--- /dev/null
+++ b/layouts/joomla/form/field/subform/repeatable-grid.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\Text;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   Form    $tmpl             The Empty form for template
+ * @var   array   $forms            Array of JForm instances for render the rows
+ * @var   bool    $multiple         The multiple state for the form field
+ * @var   int     $min              Count of minimum repeating in multiple mode
+ * @var   int     $max              Count of maximum repeating in multiple mode
+ * @var   string  $name             Name of the input field.
+ * @var   string  $fieldname        The field name
+ * @var   string  $fieldId          The field ID
+ * @var   string  $control          The forms control
+ * @var   string  $label            The field label
+ * @var   string  $description      The field description
+ * @var   string  $class            Classes for the container
+ * @var   array   $buttons          Array of the buttons that will be rendered
+ * @var   bool    $groupByFieldset  Whether group the subform fields by it`s fieldset
+ */
+if ($multiple) {
+    // Add script
+    Factory::getApplication()
+        ->getDocument()
+        ->getWebAssetManager()
+        ->useScript('webcomponent.field-subform');
+}
+
+$class = $class ? ' ' . $class : '';
+
+$sublayout = empty($groupByFieldset) ? 'section' : 'section-byfieldsets';
+?>
+
+<div class="subform-repeatable-wrapper subform-layout-grid">
+    <joomla-field-subform class="subform-repeatable<?php echo $class; ?> subform-repeatable-grid" name="<?php echo $name; ?>"
+        button-add=".group-add" button-remove=".group-remove" button-move="<?php echo empty($buttons['move']) ? '' : '.group-move' ?>"
+        repeatable-element=".subform-repeatable-group" minimum="<?php echo $min; ?>" maximum="<?php echo $max; ?>">
+        <?php if (!empty($buttons['add'])) : ?>
+        <div class="btn-toolbar">
+            <div class="btn-group">
+                <button type="button" class="group-add btn btn-sm button btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>">
+                    <span class="icon-plus icon-white" aria-hidden="true"></span>
+                </button>
+            </div>
+        </div>
+        <?php endif; ?>
+    <?php
+    foreach ($forms as $k => $form) :
+        echo $this->sublayout($sublayout, ['form' => $form, 'basegroup' => $fieldname, 'group' => $fieldname . $k, 'buttons' => $buttons]);
+    endforeach;
+    ?>
+    <?php if ($multiple) : ?>
+    <template class="subform-repeatable-template-section hidden"><?php
+        echo trim($this->sublayout($sublayout, ['form' => $tmpl, 'basegroup' => $fieldname, 'group' => $fieldname . 'X', 'buttons' => $buttons]));
+    ?></template>
+    <?php endif; ?>
+    </joomla-field-subform>
+</div>
diff --git a/layouts/joomla/form/field/subform/repeatable-grid/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable-grid/section-byfieldsets.php
new file mode 100644
index 0000000000000..210b8c6a7bb30
--- /dev/null
+++ b/layouts/joomla/form/field/subform/repeatable-grid/section-byfieldsets.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\Text;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   Form    $form       The form instance for render the section
+ * @var   string  $basegroup  The base group name
+ * @var   string  $group      Current group name
+ * @var   array   $buttons    Array of the buttons that will be rendered
+ */
+?>
+
+<div class="subform-repeatable-group" data-base-name="<?php echo $basegroup; ?>" data-group="<?php echo $group; ?>">
+    <?php if (!empty($buttons)) : ?>
+    <div class="btn-toolbar text-end">
+        <div class="btn-group">
+            <?php if (!empty($buttons['add'])) :
+                ?><button type="button" class="group-add btn btn-sm btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-plus icon-white" aria-hidden="true"></span> </button><?php
+            endif; ?>
+            <?php if (!empty($buttons['remove'])) :
+                ?><button type="button" class="group-remove btn btn-sm btn-danger" aria-label="<?php echo Text::_('JGLOBAL_FIELD_REMOVE'); ?>"><span class="icon-minus icon-white" aria-hidden="true"></span> </button><?php
+            endif; ?>
+            <?php if (!empty($buttons['move'])) :
+                ?><button type="button" class="group-move btn btn-sm btn-primary" aria-label="<?php echo Text::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="icon-arrows-alt icon-white" aria-hidden="true"></span> </button><?php
+            endif; ?>
+        </div>
+    </div>
+    <?php endif; ?>
+    <div class="subform-grid-row">
+    <?php foreach ($form->getFieldsets() as $fieldset) : ?>
+    <fieldset class="<?php echo !empty($fieldset->class) ? $this->escape($fieldset->class) : ''; ?>">
+        <?php if (!empty($fieldset->label)) : ?>
+            <legend><?php echo Text::_($fieldset->label); ?></legend>
+        <?php endif; ?>
+        <?php foreach ($form->getFieldset($fieldset->name) as $field) : ?>
+            <?php echo $field->renderField(); ?>
+        <?php endforeach; ?>
+    </fieldset>
+    <?php endforeach; ?>
+    </div>
+</div>
diff --git a/layouts/joomla/form/field/subform/repeatable-grid/section.php b/layouts/joomla/form/field/subform/repeatable-grid/section.php
new file mode 100644
index 0000000000000..fbd2c10b40192
--- /dev/null
+++ b/layouts/joomla/form/field/subform/repeatable-grid/section.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\Text;
+
+extract($displayData);
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   Form    $form       The form instance for render the section
+ * @var   string  $basegroup  The base group name
+ * @var   string  $group      Current group name
+ * @var   array   $buttons    Array of the buttons that will be rendered
+ */
+?>
+
+<div class="subform-repeatable-group" data-base-name="<?php echo $basegroup; ?>" data-group="<?php echo $group; ?>">
+    <?php if (!empty($buttons)) : ?>
+    <div class="btn-toolbar text-end">
+        <div class="btn-group">
+            <?php if (!empty($buttons['add'])) :
+                ?><button type="button" class="group-add btn btn-sm btn-success" aria-label="<?php echo Text::_('JGLOBAL_FIELD_ADD'); ?>"><span class="icon-plus icon-white" aria-hidden="true"></span> </button><?php
+            endif; ?>
+            <?php if (!empty($buttons['remove'])) :
+                ?><button type="button" class="group-remove btn btn-sm btn-danger" aria-label="<?php echo Text::_('JGLOBAL_FIELD_REMOVE'); ?>"><span class="icon-minus icon-white" aria-hidden="true"></span> </button><?php
+            endif; ?>
+            <?php if (!empty($buttons['move'])) :
+                ?><button type="button" class="group-move btn btn-sm btn-primary" aria-label="<?php echo Text::_('JGLOBAL_FIELD_MOVE'); ?>"><span class="icon-arrows-alt icon-white" aria-hidden="true"></span> </button><?php
+            endif; ?>
+        </div>
+    </div>
+    <?php endif; ?>
+    <div class="subform-grid-row">
+    <?php foreach ($form->getGroup('') as $field) : ?>
+        <?php echo $field->renderField(); ?>
+    <?php endforeach; ?>
+    </div>
+</div>
diff --git a/layouts/joomla/form/field/subform/repeatable-table.php b/layouts/joomla/form/field/subform/repeatable-table.php
index e37d3ffb48975..1648032e8caea 100644
--- a/layouts/joomla/form/field/subform/repeatable-table.php
+++ b/layouts/joomla/form/field/subform/repeatable-table.php
@@ -82,12 +82,12 @@
 ?>
 
 <div class="subform-repeatable-wrapper subform-table-layout subform-table-sublayout-<?php echo $sublayout; ?>">
-    <joomla-field-subform class="subform-repeatable<?php echo $class; ?>" name="<?php echo $name; ?>"
+    <joomla-field-subform class="subform-repeatable<?php echo $class; ?> subform-repeatable-table" name="<?php echo $name; ?>"
         button-add=".group-add" button-remove=".group-remove" button-move="<?php echo empty($buttons['move']) ? '' : '.group-move' ?>"
         repeatable-element=".subform-repeatable-group"
         rows-container="tbody.subform-repeatable-container" minimum="<?php echo $min; ?>" maximum="<?php echo $max; ?>">
         <div class="table-responsive">
-            <table class="table" id="subfieldList_<?php echo $fieldId; ?>">
+            <table class="table table-bordered" id="subfieldList_<?php echo $fieldId; ?>">
                 <caption class="visually-hidden">
                     <?php echo Text::_('JGLOBAL_REPEATABLE_FIELDS_TABLE_CAPTION'); ?>
                 </caption>
diff --git a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
index 4713233ba9b60..70680361ee33b 100644
--- a/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
+++ b/layouts/joomla/form/field/subform/repeatable/section-byfieldsets.php
@@ -8,11 +8,11 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
-
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 
+\defined('_JEXEC') or die;
+
 extract($displayData);
 
 /**
@@ -45,16 +45,15 @@
     <?php endif; ?>
     <div class="row">
         <?php foreach ($form->getFieldsets() as $fieldset) : ?>
-        <fieldset class="<?php if (!empty($fieldset->class)) {
-            echo $fieldset->class;
-                         } ?>">
-            <?php if (!empty($fieldset->label)) : ?>
-                <legend><?php echo Text::_($fieldset->label); ?></legend>
-            <?php endif; ?>
-            <?php foreach ($form->getFieldset($fieldset->name) as $field) : ?>
-                <?php echo $field->renderField(); ?>
-            <?php endforeach; ?>
-        </fieldset>
+            <?php $class = !empty($fieldset->class) ? ' class="' . $this->escape($fieldset->class) . '"' : ''; ?>
+            <fieldset<?php echo $class; ?>>
+                <?php if (!empty($fieldset->label)) : ?>
+                    <legend><?php echo Text::_($fieldset->label); ?></legend>
+                <?php endif; ?>
+                <?php foreach ($form->getFieldset($fieldset->name) as $field) : ?>
+                    <?php echo $field->renderField(); ?>
+                <?php endforeach; ?>
+            </fieldset>
         <?php endforeach; ?>
     </div>
 </div>
diff --git a/layouts/joomla/form/field/url.php b/layouts/joomla/form/field/url.php
index 377fa2fad77db..c9af1729c322b 100644
--- a/layouts/joomla/form/field/url.php
+++ b/layouts/joomla/form/field/url.php
@@ -65,7 +65,7 @@
 ];
 
 /**
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              The unicode conversion of the URL will be moved to \Joomla\CMS\Form\Field\UrlField::getLayoutData
  */
 if ($value !== null) {
diff --git a/layouts/joomla/html/audio.php b/layouts/joomla/html/audio.php
new file mode 100644
index 0000000000000..225b20f4cb60c
--- /dev/null
+++ b/layouts/joomla/html/audio.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * @package         Joomla.Site
+ * @subpackage      Layout
+ *
+ * @copyright       (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   array $displayData   Array with all the given attributes for the audio element.
+ *                             Eg: src, class, controls, controlslist, autoplay, loop, style, data-*
+ *                             See: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/audio
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+if (array_key_exists('src', $displayData) && !empty($displayData['src'])) {
+    $displayData['src'] = $this->escape($displayData['src']);
+}
+
+echo '<audio ' . ArrayHelper::toString($displayData) . '></audio>';
diff --git a/layouts/joomla/html/batch/item.php b/layouts/joomla/html/batch/item.php
index e83f6cad722cc..7ddbaeeff753c 100644
--- a/layouts/joomla/html/batch/item.php
+++ b/layouts/joomla/html/batch/item.php
@@ -32,6 +32,13 @@
 $wa = Factory::getApplication()->getDocument()->getWebAssetManager();
 $wa->useScript('joomla.batch-copymove');
 
+// Get category options
+if (isset($addRoot) && $addRoot) {
+    $categoryOptions = HTMLHelper::_('category.categories', $extension, ['filter.published' => [0, 1, 2]]);
+} else {
+    $categoryOptions = HTMLHelper::_('category.options', $extension, ['filter.published' => [0, 1, 2]]);
+}
+
 ?>
 <label id="batch-choose-action-lbl" for="batch-category-id">
     <?php echo Text::_('JLIB_HTML_BATCH_MENU_LABEL'); ?>
@@ -39,11 +46,7 @@
 <div id="batch-choose-action" class="control-group">
     <select name="batch[category_id]" class="form-select" id="batch-category-id">
         <option value=""><?php echo Text::_('JLIB_HTML_BATCH_NO_CATEGORY'); ?></option>
-        <?php if (isset($addRoot) && $addRoot) : ?>
-            <?php echo HTMLHelper::_('select.options', HTMLHelper::_('category.categories', $extension)); ?>
-        <?php else : ?>
-            <?php echo HTMLHelper::_('select.options', HTMLHelper::_('category.options', $extension)); ?>
-        <?php endif; ?>
+        <?php echo HTMLHelper::_('select.options', $categoryOptions); ?>
     </select>
 </div>
 <div id="batch-copy-move" class="control-group radio">
diff --git a/layouts/joomla/html/batch/tag.php b/layouts/joomla/html/batch/tag.php
index 4112bb222b7fd..ea122fdf50e00 100644
--- a/layouts/joomla/html/batch/tag.php
+++ b/layouts/joomla/html/batch/tag.php
@@ -10,14 +10,35 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
+// Create the add/remove tag options.
+$options = [
+    HTMLHelper::_('select.option', 'a', Text::_('JLIB_HTML_BATCH_TAG_ADD')),
+    HTMLHelper::_('select.option', 'r', Text::_('JLIB_HTML_BATCH_TAG_REMOVE'))
+];
+
+/** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
+$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
+$wa->useScript('joomla.batch-tag-addremove');
+
 ?>
-<label id="batch-tag-lbl" for="batch-tag-id">
+<label id="batch-tag-choose-action-lbl" for="batch-tag-id">
     <?php echo Text::_('JLIB_HTML_BATCH_TAG_LABEL'); ?>
 </label>
-<select name="batch[tag]" class="form-select" id="batch-tag-id">
-    <option value=""><?php echo Text::_('JLIB_HTML_BATCH_TAG_NOCHANGE'); ?></option>
-    <?php echo HTMLHelper::_('select.options', HTMLHelper::_('tag.tags', ['filter.published' => [1]]), 'value', 'text'); ?>
-</select>
+<div id="batch-tag-choose-action" class="control-group">
+    <select name="batch[tag]" class="form-select" id="batch-tag-id">
+        <option value=""><?php echo Text::_('JLIB_HTML_BATCH_TAG_NOCHANGE'); ?></option>
+        <?php echo HTMLHelper::_('select.options', HTMLHelper::_('tag.tags', ['filter.published' => [1]]), 'value', 'text'); ?>
+    </select>
+</div>
+<div id="batch-tag-addremove" class="control-group radio">
+    <fieldset id="batch-tag-addremove-id">
+        <legend>
+            <?php echo Text::_('JLIB_HTML_BATCH_TAG_ADDREMOVE_QUESTION'); ?>
+        </legend>
+        <?php echo HTMLHelper::_('select.radiolist', $options, 'batch[tag_addremove]', '', 'value', 'text', 'a'); ?>
+    </fieldset>
+</div>
diff --git a/layouts/joomla/html/video.php b/layouts/joomla/html/video.php
new file mode 100644
index 0000000000000..e6f2afa5a1000
--- /dev/null
+++ b/layouts/joomla/html/video.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @package         Joomla.Site
+ * @subpackage      Layout
+ *
+ * @copyright       (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license         GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Layout variables
+ * -----------------
+ * @var   array $displayData   Array with all the given attributes for the video element.
+ *                             Eg: src, class, controls, width, height, autoplay, decoding, style, data-*
+ *                             Note: <source> tags for <video> - is array of arrays with `src` and `type` keys.
+ *                             $displayData['source'] = [ ['src' => 'path/to/video.mp4', 'type' => 'video/mp4'] ];
+ *                             See: https://developer.mozilla.org/en-US/docs/Web/HTML/Element/video
+ */
+defined('_JEXEC') or die;
+
+use Joomla\Utilities\ArrayHelper;
+
+if (array_key_exists('src', $displayData) && !empty($displayData['src'])) {
+    $displayData['src'] = $this->escape($displayData['src']);
+}
+
+$source = [];
+if (isset($displayData['source']) && is_array($displayData['source'])) {
+    $source = $displayData['source'];
+    unset($displayData['source']);
+}
+
+echo '<video ' . ArrayHelper::toString($displayData) . '>';
+if (!empty($source)) {
+    foreach ($source as $sourceData) {
+        echo '<source src="' . $this->escape($sourceData['src']) . '" type="' . $sourceData['type'] . '" />';
+    }
+}
+echo '</video>';
diff --git a/layouts/plugins/system/webauthn/manage.php b/layouts/plugins/system/webauthn/manage.php
index e69d59fc6ecbd..dcfea7cbf6fe8 100644
--- a/layouts/plugins/system/webauthn/manage.php
+++ b/layouts/plugins/system/webauthn/manage.php
@@ -96,8 +96,8 @@
             <tr data-credential_id="<?php echo $method['id'] ?>">
                 <?php
                 if ($attestationSupport) :
-                    $aaguid = ($method['credential'] instanceof PublicKeyCredentialSource) ? $method['credential']->getAaguid() : '';
-                    $authMetadata = $knownAuthenticators[$aaguid->toString()] ?? $knownAuthenticators[''];
+                    $aaguid = ($method['credential'] instanceof PublicKeyCredentialSource) ? (string) $method['credential']->getAaguid() : '';
+                    $authMetadata = $knownAuthenticators[$aaguid] ?? $knownAuthenticators[''];
                     ?>
                 <td class="text-center">
                     <img class="plg_system_webauth-has-tooltip bg-secondary"
diff --git a/libraries/bootstrap.php b/libraries/bootstrap.php
index 041f53782a0ca..c94a58b899543 100644
--- a/libraries/bootstrap.php
+++ b/libraries/bootstrap.php
@@ -8,21 +8,13 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
-
-/**
- * Set the platform root path as a constant if necessary.
- *
- * @deprecated 4.4.0 will be removed in 6.0
- *             Use defined('_JEXEC') or die; to detect if the CMS is loaded correctly
- **/
-defined('JPATH_PLATFORM') or define('JPATH_PLATFORM', __DIR__);
+\defined('_JEXEC') or die;
 
 // Detect the native operating system type.
 $os = strtoupper(substr(PHP_OS, 0, 3));
 
-defined('IS_WIN') or define('IS_WIN', ($os === 'WIN'));
-defined('IS_UNIX') or define('IS_UNIX', (($os !== 'MAC') && ($os !== 'WIN')));
+\defined('IS_WIN') or \define('IS_WIN', ($os === 'WIN'));
+\defined('IS_UNIX') or \define('IS_UNIX', (($os !== 'MAC') && ($os !== 'WIN')));
 
 // Import the library loader if necessary.
 if (!class_exists('JLoader')) {
@@ -63,10 +55,10 @@ class_exists('\\Joomla\\CMS\\Autoload\\ClassLoader');
 }
 
 // Define the Joomla version if not already defined.
-defined('JVERSION') or define('JVERSION', (new \Joomla\CMS\Version())->getShortVersion());
+\defined('JVERSION') or \define('JVERSION', (new \Joomla\CMS\Version())->getShortVersion());
 
 // Set up the message queue logger for web requests
-if (array_key_exists('REQUEST_METHOD', $_SERVER)) {
+if (\array_key_exists('REQUEST_METHOD', $_SERVER)) {
     \Joomla\CMS\Log\Log::addLogger(['logger' => 'messagequeue'], \Joomla\CMS\Log\Log::ALL, ['jerror']);
 }
 
diff --git a/libraries/cms.php b/libraries/cms.php
index e8303fd34ca34..2f5ab9f2f154c 100644
--- a/libraries/cms.php
+++ b/libraries/cms.php
@@ -7,10 +7,10 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 trigger_error(
-    sprintf(
+    \sprintf(
         'Bootstrapping Joomla using the %1$s file is deprecated.  Use %2$s instead.',
         __FILE__,
         __DIR__ . '/bootstrap.php'
@@ -18,16 +18,6 @@
     E_USER_DEPRECATED
 );
 
-/**
- * Set the platform root path as a constant if necessary.
- *
- * @deprecated 4.4.0 will be removed in 6.0
- *             Use defined('_JEXEC') or die; to detect if the CMS is loaded correctly
- **/
-if (!defined('JPATH_PLATFORM')) {
-    define('JPATH_PLATFORM', __DIR__);
-}
-
 // Import the library loader if necessary
 if (!class_exists('JLoader')) {
     require_once JPATH_LIBRARIES . '/loader.php';
@@ -50,15 +40,15 @@ class_exists('\\Joomla\\CMS\\Autoload\\ClassLoader');
 spl_autoload_register([new \Joomla\CMS\Autoload\ClassLoader($loader), 'loadClass'], true, true);
 
 // Define the Joomla version if not already defined
-if (!defined('JVERSION')) {
-    define('JVERSION', (new \Joomla\CMS\Version())->getShortVersion());
+if (!\defined('JVERSION')) {
+    \define('JVERSION', (new \Joomla\CMS\Version())->getShortVersion());
 }
 
 // Register a handler for uncaught exceptions that shows a pretty error page when possible
 set_exception_handler(['Joomla\CMS\Exception\ExceptionHandler', 'handleException']);
 
 // Set up the message queue logger for web requests
-if (array_key_exists('REQUEST_METHOD', $_SERVER)) {
+if (\array_key_exists('REQUEST_METHOD', $_SERVER)) {
     \Joomla\CMS\Log\Log::addLogger(['logger' => 'messagequeue'], \Joomla\CMS\Log\Log::ALL, ['jerror']);
 }
 
diff --git a/libraries/import.legacy.php b/libraries/import.legacy.php
index 60ea147aaa017..0263d3099c28b 100644
--- a/libraries/import.legacy.php
+++ b/libraries/import.legacy.php
@@ -9,7 +9,7 @@
  */
 
 trigger_error(
-    sprintf(
+    \sprintf(
         'Bootstrapping Joomla using the %1$s file is deprecated.  Use %2$s instead.',
         __FILE__,
         __DIR__ . '/bootstrap.php'
@@ -17,25 +17,15 @@
     E_USER_DEPRECATED
 );
 
-/**
- * Set the platform root path as a constant if necessary.
- *
- * @deprecated 4.4.0 will be removed in 6.0
- *             Use defined('_JEXEC') or die; to detect if the CMS is loaded correctly
- **/
-if (!defined('JPATH_PLATFORM')) {
-    define('JPATH_PLATFORM', __DIR__);
-}
-
 // Detect the native operating system type.
 $os = strtoupper(substr(PHP_OS, 0, 3));
 
-if (!defined('IS_WIN')) {
-    define('IS_WIN', $os === 'WIN');
+if (!\defined('IS_WIN')) {
+    \define('IS_WIN', $os === 'WIN');
 }
 
-if (!defined('IS_UNIX')) {
-    define('IS_UNIX', $os !== 'MAC' && $os !== 'WIN');
+if (!\defined('IS_UNIX')) {
+    \define('IS_UNIX', $os !== 'MAC' && $os !== 'WIN');
 }
 
 // Import the library loader if necessary.
diff --git a/libraries/import.php b/libraries/import.php
index cc87ee797a32f..6a6a63d34093a 100644
--- a/libraries/import.php
+++ b/libraries/import.php
@@ -9,7 +9,7 @@
  */
 
 trigger_error(
-    sprintf(
+    \sprintf(
         'Bootstrapping Joomla using the %1$s file is deprecated.  Use %2$s instead.',
         __FILE__,
         __DIR__ . '/bootstrap.php'
@@ -17,25 +17,15 @@
     E_USER_DEPRECATED
 );
 
-/**
- * Set the platform root path as a constant if necessary.
- *
- * @deprecated 4.4.0 will be removed in 6.0
- *             Use defined('_JEXEC') or die; to detect if the CMS is loaded correctly
- **/
-if (!defined('JPATH_PLATFORM')) {
-    define('JPATH_PLATFORM', __DIR__);
-}
-
 // Detect the native operating system type.
 $os = strtoupper(substr(PHP_OS, 0, 3));
 
-if (!defined('IS_WIN')) {
-    define('IS_WIN', $os === 'WIN');
+if (!\defined('IS_WIN')) {
+    \define('IS_WIN', $os === 'WIN');
 }
 
-if (!defined('IS_UNIX')) {
-    define('IS_UNIX', IS_WIN === false);
+if (!\defined('IS_UNIX')) {
+    \define('IS_UNIX', IS_WIN === false);
 }
 
 // Import the library loader if necessary.
diff --git a/libraries/loader.php b/libraries/loader.php
index 5883847634300..70089172a830a 100644
--- a/libraries/loader.php
+++ b/libraries/loader.php
@@ -9,7 +9,7 @@
  * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
  */
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
 /**
  * Static class to handle loading of libraries.
@@ -94,7 +94,7 @@ abstract class JLoader
      *
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Classes should be autoloaded. Use JLoader::registerPrefix() or JLoader::registerNamespace() to
      *              register an autoloader for your files.
      */
@@ -176,7 +176,7 @@ public static function getNamespaces()
      *
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Classes should be autoloaded. Use JLoader::registerPrefix() or JLoader::registerNamespace() to
      *              register an autoloader for your files.
      */
@@ -207,7 +207,7 @@ public static function import($key, $base = null)
                 // Only register the class for autoloading if the file exists.
                 if (is_file($base . '/' . $path . '.php')) {
                     self::$classes[strtolower($class)] = $base . '/' . $path . '.php';
-                    $success = true;
+                    $success                           = true;
                 }
             } else {
                 /**
@@ -289,7 +289,7 @@ class_alias($original, $class);
     public static function register($class, $path, $force = true)
     {
         // When an alias exists, register it as well
-        if (array_key_exists(strtolower($class), self::$classAliases)) {
+        if (\array_key_exists(strtolower($class), self::$classAliases)) {
             self::register(self::stripFirstBackslash(self::$classAliases[strtolower($class)]), $path, $force);
         }
 
@@ -466,7 +466,7 @@ public static function setup($enablePsr = true, $enablePrefixes = true, $enableC
      *
      * @since       3.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use JLoader::loadByPsr instead
      */
     public static function loadByPsr4($class)
@@ -509,7 +509,7 @@ public static function loadByPsr($class)
 
                 // Loop through paths registered to this namespace until we find a match.
                 foreach ($paths as $path) {
-                    $classFilePath = realpath($path . DIRECTORY_SEPARATOR . substr_replace($classPath, '', 0, strlen($nsPath) + 1));
+                    $classFilePath = realpath($path . DIRECTORY_SEPARATOR . substr_replace($classPath, '', 0, \strlen($nsPath) + 1));
 
                     // We do not allow files outside the namespace root to be loaded
                     if (strpos($classFilePath, realpath($path)) !== 0) {
@@ -590,10 +590,10 @@ class_alias($class, $alias);
     public static function _autoload($class)
     {
         foreach (self::$prefixes as $prefix => $lookup) {
-            $chr = strlen($prefix) < strlen($class) ? $class[strlen($prefix)] : 0;
+            $chr = \strlen($prefix) < \strlen($class) ? $class[\strlen($prefix)] : 0;
 
             if (strpos($class, $prefix) === 0 && ($chr === strtoupper($chr))) {
-                return self::_load(substr($class, strlen($prefix)), $lookup);
+                return self::_load(substr($class, \strlen($prefix)), $lookup);
             }
         }
 
@@ -613,8 +613,8 @@ public static function _autoload($class)
     private static function _load($class, $lookup)
     {
         // Split the class name into parts separated by camelCase.
-        $parts = preg_split('/(?<=[a-z0-9])(?=[A-Z])/x', $class);
-        $partsCount = count($parts);
+        $parts      = preg_split('/(?<=[a-z0-9])(?=[A-Z])/x', $class);
+        $partsCount = \count($parts);
 
         foreach ($lookup as $base) {
             // Generate the path based on the class name parts.
@@ -665,7 +665,7 @@ private static function _load($class, $lookup)
      */
     private static function loadAliasFor($class)
     {
-        if (!array_key_exists($class, self::$classAliasesInverse)) {
+        if (!\array_key_exists($class, self::$classAliasesInverse)) {
             return;
         }
 
@@ -691,7 +691,7 @@ private static function stripFirstBackslash($class)
 }
 
 // Check if jexit is defined first (our unit tests mock this)
-if (!function_exists('jexit')) {
+if (!\function_exists('jexit')) {
     /**
      * Global application exit.
      *
@@ -720,7 +720,7 @@ function jexit($message = 0): never
  *
  * @since       1.7.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Classes should be autoloaded. Use JLoader::registerPrefix() or JLoader::registerNamespace() to
  *              register an autoloader for your files.
  */
diff --git a/libraries/namespacemap.php b/libraries/namespacemap.php
index 709988e87817d..00beb17d3584e 100644
--- a/libraries/namespacemap.php
+++ b/libraries/namespacemap.php
@@ -154,15 +154,15 @@ protected function writeNamespaceFile($elements)
         } catch (Exception $e) {
             Log::add('Could not save ' . $this->file, Log::WARNING);
 
-            $map = [];
+            $map       = [];
             $constants = ['JPATH_ADMINISTRATOR', 'JPATH_API', 'JPATH_SITE', 'JPATH_PLUGINS', 'JPATH_LIBRARIES'];
 
             foreach ($elements as $namespace => $path) {
                 foreach ($constants as $constant) {
-                    $path = preg_replace(['/^(' . $constant . ")\s\.\s\'/", '/\'$/'], [constant($constant), ''], $path);
+                    $path = preg_replace(['/^(' . $constant . ")\s\.\s\'/", '/\'$/'], [\constant($constant), ''], $path);
                 }
 
-                $namespace = str_replace('\\\\', '\\', $namespace);
+                $namespace       = str_replace('\\\\', '\\', $namespace);
                 $map[$namespace] = [ $path ];
             }
 
@@ -212,7 +212,7 @@ private function getNamespaces(string $type): array
 
             if ($type === 'plugin' || $type === 'library') {
                 $baseDir = $type === 'plugin' ? 'JPATH_PLUGINS . \'' : 'JPATH_LIBRARIES . \'';
-                $path    = substr($namespacePath, strlen($type === 'plugin' ? JPATH_PLUGINS : JPATH_LIBRARIES));
+                $path    = substr($namespacePath, \strlen($type === 'plugin' ? JPATH_PLUGINS : JPATH_LIBRARIES));
 
                 // Set the namespace
                 $extensions[$namespace] = $baseDir . $path . '\'';
@@ -222,7 +222,7 @@ private function getNamespaces(string $type): array
 
             // Check if we need to use administrator path
             $isAdministrator = strpos($namespacePath, JPATH_ADMINISTRATOR) === 0;
-            $path            = substr($namespacePath, strlen($isAdministrator ? JPATH_ADMINISTRATOR : JPATH_SITE));
+            $path            = substr($namespacePath, \strlen($isAdministrator ? JPATH_ADMINISTRATOR : JPATH_SITE));
 
             // Add the site path when a component
             if ($type === 'component') {
@@ -271,7 +271,7 @@ private function getExtensions(string $type): array
                 // Scan library manifest directories for XML files
                 foreach (Folder::files(JPATH_MANIFESTS . '/libraries', '\.xml$', true, true) as $file) {
                     // Match manifest to extension directory
-                    $manifests[JPATH_LIBRARIES . '/' . File::stripExt(substr($file, strlen(JPATH_MANIFESTS . '/libraries') + 1))] = $file;
+                    $manifests[JPATH_LIBRARIES . '/' . File::stripExt(substr($file, \strlen(JPATH_MANIFESTS . '/libraries') + 1))] = $file;
                 }
             } catch (UnexpectedValueException $e) {
                 return [];
diff --git a/libraries/src/Access/Access.php b/libraries/src/Access/Access.php
index f8a8ae036624f..c090c91ba5fb3 100644
--- a/libraries/src/Access/Access.php
+++ b/libraries/src/Access/Access.php
@@ -178,7 +178,7 @@ public static function check($userId, $action, $assetKey = null, $preload = true
      * @return  boolean  True on success.
      *
      * @since   1.6
-     * @note    This method will return void in 4.0.
+     * @note    This method will return void in 7.0.
      */
     public static function preload($assetTypes = 'components', $reload = false)
     {
@@ -283,7 +283,7 @@ protected static function preloadPermissions($assetType, $reload = false)
         $assetKey = $extensionName . '.%';
 
         // Get a fresh query object.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'name', 'rules', 'parent_id']))
             ->from($db->quoteName('#__assets'))
             ->where(
@@ -348,7 +348,7 @@ protected static function preloadComponents()
         $db = Factory::getDbo();
 
         // Get the asset info for all assets in asset names list.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'name', 'rules', 'parent_id']))
             ->from($db->quoteName('#__assets'))
             ->whereIn($db->quoteName('name'), $components, ParameterType::STRING);
@@ -444,7 +444,7 @@ protected static function getGroupPath($groupId)
      * @return  Rules  Rules object for the asset.
      *
      * @since   1.7.0
-     * @note    The non preloading code will be removed in 4.0. All asset rules should use asset preloading.
+     * @note    The non preloading code will be removed in 7.0. All asset rules should use asset preloading.
      */
     public static function getAssetRules($assetKey, $recursive = false, $recursiveParentAsset = true, $preload = true)
     {
@@ -569,7 +569,7 @@ public static function getAssetRules($assetKey, $recursive = false, $recursivePa
         $db = Factory::getDbo();
 
         // Build the database query to get the rules for the asset.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName($recursive ? 'b.rules' : 'a.rules', 'rules'))
             ->from($db->quoteName('#__assets', 'a'));
 
@@ -798,7 +798,7 @@ public static function getGroupTitle($groupId)
 
         // Fetch the group title from the database
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select($db->quoteName('title'))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('id') . ' = :groupId')
@@ -840,7 +840,7 @@ public static function getGroupsByUser($userId, $recursive = true)
                 $db = Factory::getDbo();
 
                 // Build the database query to get the rules for the asset.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName($recursive ? 'b.id' : 'a.id'));
 
                 if (empty($userId)) {
@@ -905,7 +905,7 @@ public static function getUsersByGroup($groupId, $recursive = false)
         $test = $recursive ? ' >= ' : ' = ';
 
         // First find the users contained in the group
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT(' . $db->quoteName('user_id') . ')')
             ->from($db->quoteName('#__usergroups', 'ug1'))
             ->join(
@@ -944,7 +944,7 @@ public static function getAuthorisedViewLevels($userId)
             $db = Factory::getDbo();
 
             // Build the base query.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['id', 'rules']))
                 ->from($db->quoteName('#__viewlevels'));
 
diff --git a/libraries/src/Access/Rules.php b/libraries/src/Access/Rules.php
index 5ee37eb47cc83..277f3cee31c97 100644
--- a/libraries/src/Access/Rules.php
+++ b/libraries/src/Access/Rules.php
@@ -9,8 +9,6 @@
 
 namespace Joomla\CMS\Access;
 
-use Joomla\CMS\Object\CMSObject;
-
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -163,14 +161,14 @@ public function allow($action, $identity)
      *
      * @param   mixed  $identity  An integer representing the identity or an array of identities
      *
-     * @return  CMSObject  Allowed actions for the identity or identities
+     * @return  \stdClass  Allowed actions for the identity or identities
      *
      * @since   1.7.0
      */
     public function getAllowed($identity)
     {
         // Sweep for the allowed actions.
-        $allowed = new CMSObject();
+        $allowed = new \stdClass();
 
         foreach ($this->data as $name => &$action) {
             if ($action->allow($identity)) {
diff --git a/libraries/src/Adapter/Adapter.php b/libraries/src/Adapter/Adapter.php
deleted file mode 100644
index e415206781180..0000000000000
--- a/libraries/src/Adapter/Adapter.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-/**
- * Joomla! Content Management System
- *
- * @copyright  (C) 2008 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\CMS\Adapter;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Object\LegacyErrorHandlingTrait;
-use Joomla\CMS\Object\LegacyPropertyManagementTrait;
-use Joomla\Database\DatabaseAwareInterface;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-/**
- * Adapter Class
- * Retains common adapter pattern functions
- * Class harvested from joomla.installer.installer
- *
- * @since       1.6
- * @deprecated  4.3 will be removed in 6.0
- *              Will be removed without replacement
- */
-class Adapter
-{
-    use LegacyErrorHandlingTrait;
-    use LegacyPropertyManagementTrait;
-
-    /**
-     * Associative array of adapters
-     *
-     * @var    static[]
-     * @since  1.6
-     */
-    protected $_adapters = [];
-
-    /**
-     * Adapter Folder
-     *
-     * @var    string
-     * @since  1.6
-     */
-    protected $_adapterfolder = 'adapters';
-
-    /**
-     * Adapter Class Prefix
-     *
-     * @var    string
-     * @since  1.6
-     */
-    protected $_classprefix = 'J';
-
-    /**
-     * Base Path for the adapter instance
-     *
-     * @var    string
-     * @since  1.6
-     */
-    protected $_basepath = null;
-
-    /**
-     * Database Connector Object
-     *
-     * @var    \Joomla\Database\DatabaseDriver
-     * @since  1.6
-     */
-    protected $_db;
-
-    /**
-     * Constructor
-     *
-     * @param   string  $basepath       Base Path of the adapters
-     * @param   string  $classprefix    Class prefix of adapters
-     * @param   string  $adapterfolder  Name of folder to append to base path
-     *
-     * @since   1.6
-     */
-    public function __construct($basepath, $classprefix = null, $adapterfolder = null)
-    {
-        $this->_basepath      = $basepath;
-        $this->_classprefix   = $classprefix ?: 'J';
-        $this->_adapterfolder = $adapterfolder ?: 'adapters';
-
-        $this->_db = Factory::getDbo();
-
-        // Ensure BC, when removed in 5, then the db must be set with setDatabase explicitly
-        if ($this instanceof DatabaseAwareInterface) {
-            $this->setDatabase($this->_db);
-        }
-    }
-
-    /**
-     * Get the database connector object
-     *
-     * @return  \Joomla\Database\DatabaseDriver  Database connector object
-     *
-     * @since   1.6
-     */
-    public function getDbo()
-    {
-        return $this->_db;
-    }
-
-    /**
-     * Return an adapter.
-     *
-     * @param   string  $name     Name of adapter to return
-     * @param   array   $options  Adapter options
-     *
-     * @return  static|boolean  Adapter of type 'name' or false
-     *
-     * @since   1.6
-     */
-    public function getAdapter($name, $options = [])
-    {
-        if (\array_key_exists($name, $this->_adapters)) {
-            return $this->_adapters[$name];
-        }
-
-        if ($this->setAdapter($name, $options)) {
-            return $this->_adapters[$name];
-        }
-
-        return false;
-    }
-
-    /**
-     * Set an adapter by name
-     *
-     * @param   string  $name     Adapter name
-     * @param   object  $adapter  Adapter object
-     * @param   array   $options  Adapter options
-     *
-     * @return  boolean  True if successful
-     *
-     * @since   1.6
-     */
-    public function setAdapter($name, &$adapter = null, $options = [])
-    {
-        if (\is_object($adapter)) {
-            $this->_adapters[$name] = &$adapter;
-
-            return true;
-        }
-
-        $class = rtrim($this->_classprefix, '\\') . '\\' . ucfirst($name);
-
-        if (class_exists($class)) {
-            $this->_adapters[$name] = new $class($this, $this->_db, $options);
-
-            return true;
-        }
-
-        $class = rtrim($this->_classprefix, '\\') . '\\' . ucfirst($name) . 'Adapter';
-
-        if (class_exists($class)) {
-            $this->_adapters[$name] = new $class($this, $this->_db, $options);
-
-            return true;
-        }
-
-        $fullpath = $this->_basepath . '/' . $this->_adapterfolder . '/' . strtolower($name) . '.php';
-
-        if (!is_file($fullpath)) {
-            return false;
-        }
-
-        // Try to load the adapter object
-        $class = $this->_classprefix . ucfirst($name);
-
-        \JLoader::register($class, $fullpath);
-
-        if (!class_exists($class)) {
-            return false;
-        }
-
-        $this->_adapters[$name] = new $class($this, $this->_db, $options);
-
-        return true;
-    }
-
-    /**
-     * Loads all adapters.
-     *
-     * @param   array  $options  Adapter options
-     *
-     * @return  void
-     *
-     * @since   1.6
-     */
-    public function loadAllAdapters($options = [])
-    {
-        $files = new \DirectoryIterator($this->_basepath . '/' . $this->_adapterfolder);
-
-        /** @type  $file  \DirectoryIterator */
-        foreach ($files as $file) {
-            $fileName = $file->getFilename();
-
-            // Only load for php files.
-            if (!$file->isFile() || $file->getExtension() != 'php') {
-                continue;
-            }
-
-            // Try to load the adapter object
-            require_once $this->_basepath . '/' . $this->_adapterfolder . '/' . $fileName;
-
-            // Derive the class name from the filename.
-            $name  = str_ireplace('.php', '', ucfirst(trim($fileName)));
-            $class = $this->_classprefix . ucfirst($name);
-
-            if (!class_exists($class)) {
-                // Skip to next one
-                continue;
-            }
-
-            $adapter                = new $class($this, $this->_db, $options);
-            $this->_adapters[$name] = clone $adapter;
-        }
-    }
-}
diff --git a/libraries/src/Adapter/AdapterInstance.php b/libraries/src/Adapter/AdapterInstance.php
deleted file mode 100644
index 49023952b8ed0..0000000000000
--- a/libraries/src/Adapter/AdapterInstance.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Joomla! Content Management System
- *
- * @copyright  (C) 2008 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\CMS\Adapter;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Object\LegacyErrorHandlingTrait;
-use Joomla\CMS\Object\LegacyPropertyManagementTrait;
-use Joomla\Database\DatabaseDriver;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-/**
- * Adapter Instance Class
- *
- * @since       1.6
- * @deprecated  4.3 will be removed in 6.0
- *              Will be removed without replacement
- */
-class AdapterInstance
-{
-    use LegacyErrorHandlingTrait;
-    use LegacyPropertyManagementTrait;
-
-    /**
-     * Parent
-     *
-     * @var    Adapter
-     * @since  1.6
-     */
-    protected $parent = null;
-
-    /**
-     * Database
-     *
-     * @var    DatabaseDriver
-     * @since  1.6
-     */
-    protected $db = null;
-
-    /**
-     * Constructor
-     *
-     * @param   Adapter         $parent   Parent object
-     * @param   DatabaseDriver  $db       Database object
-     * @param   array           $options  Configuration Options
-     *
-     * @since   1.6
-     */
-    public function __construct(Adapter $parent, DatabaseDriver $db, array $options = [])
-    {
-        // Set the properties from the options array that is passed in
-        $this->setProperties($options);
-
-        // Set the parent and db in case $options for some reason overrides it.
-        $this->parent = $parent;
-
-        // Pull in the global dbo in case something happened to it.
-        $this->db = $db ?: Factory::getDbo();
-    }
-
-    /**
-     * Retrieves the parent object
-     *
-     * @return  Adapter
-     *
-     * @since   1.6
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-}
diff --git a/libraries/src/Application/AdministratorApplication.php b/libraries/src/Application/AdministratorApplication.php
index 76e5625a120ad..1ffbf4b4275fc 100644
--- a/libraries/src/Application/AdministratorApplication.php
+++ b/libraries/src/Application/AdministratorApplication.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\Event\Application\AfterRouteEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
-use Joomla\CMS\Input\Input;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -24,6 +23,7 @@
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use Joomla\DI\Container;
+use Joomla\Input\Input;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -59,7 +59,7 @@ class AdministratorApplication extends CMSApplication
      * Class constructor.
      *
      * @param   ?Input      $input      An optional argument to provide dependency injection for the application's input
-     *                                  object.  If the argument is a JInput object that object will become the
+     *                                  object.  If the argument is a Input object that object will become the
      *                                  application's input object, otherwise a default input object is created.
      * @param   ?Registry   $config     An optional argument to provide dependency injection for the application's config
      *                                  object.  If the argument is a Registry object that object will become the
@@ -219,7 +219,7 @@ protected function doExecute()
      *
      * @since      3.2
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Inject the router or load it from the dependency injection container
      *              Example:
      *              Factory::getContainer()->get(AdministratorRouter::class);
@@ -229,61 +229,6 @@ public static function getRouter($name = 'administrator', array $options = [])
         return parent::getRouter($name, $options);
     }
 
-    /**
-     * Gets the name of the current template.
-     *
-     * @param   boolean  $params  True to return the template parameters
-     *
-     * @return  string|\stdClass  The name of the template if the params argument is false. The template object if the params argument is true.
-     *
-     * @since   3.2
-     * @throws  \InvalidArgumentException
-     */
-    public function getTemplate($params = false)
-    {
-        if (\is_object($this->template)) {
-            if ($params) {
-                return $this->template;
-            }
-
-            return $this->template->template;
-        }
-
-        $adminStyle = $this->getIdentity() ? (int) $this->getIdentity()->getParam('admin_style') : 0;
-        $template   = $this->bootComponent('templates')->getMVCFactory()
-            ->createModel('Style', 'Administrator')->getAdminTemplate($adminStyle);
-
-        $template->template = InputFilter::getInstance()->clean($template->template, 'cmd');
-        $template->params   = new Registry($template->params);
-
-        // Fallback template
-        if (
-            !is_file(JPATH_THEMES . '/' . $template->template . '/index.php')
-            && !is_file(JPATH_THEMES . '/' . $template->parent . '/index.php')
-        ) {
-            $this->getLogger()->error(Text::_('JERROR_ALERTNOTEMPLATE'), ['category' => 'system']);
-            $template->params   = new Registry();
-            $template->template = 'atum';
-
-            // Check, the data were found and if template really exists
-            if (!is_file(JPATH_THEMES . '/' . $template->template . '/index.php')) {
-                throw new \InvalidArgumentException(Text::sprintf('JERROR_COULD_NOT_FIND_TEMPLATE', $template->template));
-            }
-        }
-
-        // Cache the result
-        $this->template = $template;
-
-        // Pass the parent template to the state
-        $this->set('themeInherits', $template->parent);
-
-        if ($params) {
-            return $template;
-        }
-
-        return $template->template;
-    }
-
     /**
      * Initialise the application.
      *
@@ -295,7 +240,7 @@ public function getTemplate($params = false)
      */
     protected function initialiseApp($options = [])
     {
-        $user = Factory::getUser();
+        $user = $this->getIdentity();
 
         // If the user is a guest we populate it with the guest user group.
         if ($user->guest) {
@@ -397,7 +342,7 @@ public function login($credentials, $options = [])
      *
      * @since   3.2
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Purge the messages through the messages model
      *              Example:
      *              Factory::getApplication()->bootComponent('messages')->getMVCFactory()
@@ -406,7 +351,7 @@ public function login($credentials, $options = [])
     public static function purgeMessages()
     {
         Factory::getApplication()->bootComponent('messages')->getMVCFactory()
-            ->createModel('Messages', 'Administrator')->purge(Factory::getUser()->id);
+            ->createModel('Messages', 'Administrator')->purge(Factory::getApplication()->getIdentity()->id);
     }
 
     /**
@@ -420,7 +365,7 @@ public static function purgeMessages()
      */
     protected function render()
     {
-        // Get the \JInput object
+        // Get the Input object
         $input = $this->input;
 
         $component = $input->getCmd('option', 'com_login');
@@ -534,4 +479,42 @@ public function findOption(): string
 
         return $option;
     }
+
+    /**
+     * Initialise the template.
+     *
+     * @return  void
+     *
+     * @throws  \InvalidArgumentException
+     * @since   6.1.0
+     */
+    protected function initialiseTemplate(): void
+    {
+        $adminStyle = $this->getIdentity() ? (int) $this->getIdentity()->getParam('admin_style') : 0;
+        $template   = $this->bootComponent('templates')->getMVCFactory()
+            ->createModel('Style', 'Administrator')->getAdminTemplate($adminStyle);
+
+        $template->template = InputFilter::getInstance()->clean($template->template, 'cmd');
+        $template->params   = new Registry($template->params);
+
+        // Fallback template
+        if (!$this->isValidTemplate($template)) {
+            $this->getLogger()->error(Text::_('JERROR_ALERTNOTEMPLATE'), ['category' => 'system']);
+            $template->params   = new Registry();
+            $template->template = 'atum';
+
+            // Check, the data were found and if template really exists
+            if ($this->isValidTemplate($template)) {
+                throw new \InvalidArgumentException(
+                    Text::sprintf('JERROR_COULD_NOT_FIND_TEMPLATE', $template->template)
+                );
+            }
+        }
+
+        // Cache the result
+        $this->template = $template;
+
+        // Pass the parent template to the state
+        $this->set('themeInherits', $template->parent);
+    }
 }
diff --git a/libraries/src/Application/ApiApplication.php b/libraries/src/Application/ApiApplication.php
index 188f8509dfb26..c42e22de95420 100644
--- a/libraries/src/Application/ApiApplication.php
+++ b/libraries/src/Application/ApiApplication.php
@@ -172,15 +172,33 @@ protected function respond($options = [])
         if ($forceCORS) {
             /**
              * Enable CORS (Cross-origin resource sharing)
-             * Obtain allowed CORS origin from Global Settings.
-             * Set to * (=all) if not set.
+             * Obtain allowed CORS origin(s) from Global Settings.
+             * Set to * (=all) if not set. A comma-separated list of exact
+             * origins is supported, e.g. "https://a.example.com,https://b.example.com".
              */
             $allowedOrigin = $this->get('cors_allow_origin', '*');
-            $this->setHeader('Access-Control-Allow-Origin', $allowedOrigin, true);
-            $this->setHeader('Access-Control-Allow-Headers', 'Authorization');
+            $requestOrigin = $this->input->server->get('HTTP_ORIGIN', null, 'raw');
 
-            if ($this->input->server->getString('HTTP_ORIGIN', null) !== null) {
-                $this->setHeader('Access-Control-Allow-Origin', $this->input->server->getString('HTTP_ORIGIN'), true);
+            if ($allowedOrigin !== '*') {
+                $this->setHeader('Vary', 'Origin', false);
+            }
+
+            if ($allowedOrigin === '*') {
+                /**
+                 * Wildcard configuration: echo back "*". Credentials must never
+                 * be allowed alongside a wildcard origin (browsers reject
+                 * credentialed responses with Access-Control-Allow-Origin: *
+                 * anyway, per the Fetch/CORS specification).
+                 */
+                $this->setHeader('Access-Control-Allow-Origin', '*', true);
+            } elseif ($requestOrigin !== null && $this->isOriginAllowed($requestOrigin, $allowedOrigin)) {
+                /**
+                 * Only reflect the request's Origin header back if it is
+                 * present in the configured whitelist. This is what makes it
+                 * safe to also allow credentials (cookies / HTTP auth) for
+                 * this specific, validated origin.
+                 */
+                $this->setHeader('Access-Control-Allow-Origin', $requestOrigin, true);
                 $this->setHeader('Access-Control-Allow-Credentials', 'true', true);
             }
         }
@@ -190,28 +208,22 @@ protected function respond($options = [])
     }
 
     /**
-     * Gets the name of the current template.
+     * Checks whether a request's Origin header matches an entry in the
+     * configured CORS origin whitelist.
      *
-     * @param   boolean  $params  True to return the template parameters
+     * @param   string  $requestOrigin   The Origin header sent by the browser.
+     * @param   string  $allowedOrigins  The configured cors_allow_origin value; a single
+     *                                   origin, or a comma-separated list of origins.
      *
-     * @return  string|\stdClass
+     * @return  boolean  True if the request origin is present in the whitelist.
      *
-     * @since   4.0.0
+     * @since   6.1.3
      */
-    public function getTemplate($params = false)
+    private function isOriginAllowed(string $requestOrigin, string $allowedOrigins): bool
     {
-        // The API application should not need to use a template
-        if ($params) {
-            $template              = new \stdClass();
-            $template->template    = 'system';
-            $template->params      = new Registry();
-            $template->inheritable = 0;
-            $template->parent      = '';
-
-            return $template;
-        }
+        $whitelist = array_map('trim', explode(',', $allowedOrigins));
 
-        return 'system';
+        return \in_array($requestOrigin, $whitelist, true);
     }
 
     /**
@@ -355,7 +367,7 @@ function ($carry, $route) {
         );
 
         /**
-         * Obtain allowed CORS origin from Global Settings.
+         * Obtain allowed CORS origin(s) from Global Settings.
          * Set to * (=all) if not set.
          */
         $allowedOrigin = $this->get('cors_allow_origin', '*');
@@ -364,7 +376,7 @@ function ($carry, $route) {
          * Obtain allowed CORS headers from Global Settings.
          * Set to sensible default if not set.
          */
-        $allowedHeaders = $this->get('cors_allow_headers', 'Content-Type,X-Joomla-Token');
+        $allowedHeaders = $this->get('cors_allow_headers', 'Content-Type,X-Joomla-Token,Authorization');
 
         /**
          * Obtain allowed CORS methods from Global Settings.
@@ -372,10 +384,30 @@ function ($carry, $route) {
          */
         $allowedMethods = $this->get('cors_allow_methods', implode(',', $matchingRoutesMethods));
 
+        // Obtain the current request ORIGIN from the respective HTTP header
+        $requestOrigin = $this->input->server->get('HTTP_ORIGIN', null, 'raw');
+
         // No use to go through the regular route handling hassle,
         // so let's simply output the headers and exit.
         $this->setHeader('status', '204');
-        $this->setHeader('Access-Control-Allow-Origin', $allowedOrigin);
+
+        if ($allowedOrigin !== '*') {
+            // Set regardless of the outcome so shared caches partition on Origin.
+            $this->setHeader('Vary', 'Origin', false);
+        }
+
+        if ($allowedOrigin === '*') {
+            $this->setHeader('Access-Control-Allow-Origin', '*');
+        } elseif ($requestOrigin !== null && $this->isOriginAllowed($requestOrigin, $allowedOrigin)) {
+            $this->setHeader('Access-Control-Allow-Origin', $requestOrigin);
+            $this->setHeader('Access-Control-Allow-Credentials', 'true');
+        } else {
+            // Invalid cors origin requested, respond early without CORS header
+            $this->setHeader('status', 403, true);
+            $this->sendHeaders();
+            $this->close();
+        }
+
         $this->setHeader('Access-Control-Allow-Headers', $allowedHeaders);
         $this->setHeader('Access-Control-Allow-Methods', $allowedMethods);
         $this->sendHeaders();
@@ -390,7 +422,7 @@ function ($carry, $route) {
      *
      * @since      4.0.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Inject the router or load it from the dependency injection container
      *              Example:
      *              Factory::getContainer()->get(ApiRouter::class);
@@ -439,4 +471,29 @@ public function dispatch($component = null)
             new AfterDispatchEvent('onAfterDispatch', ['subject' => $this])
         );
     }
+
+    /**
+     * Gets current template data
+     *
+     * This overrides the parent to skip the template validity check to prevent InvalidArgumentException being thrown
+     * when getTemplate() is called in the API application
+     *
+     * @param   boolean  $params  An optional associative array of configuration settings
+     *
+     * @return  string|\stdClass  The name of the template if the params argument is false. The template object if the params argument is true.
+     *
+     * @since   6.1.1
+     */
+    public function getTemplate($params = false)
+    {
+        if (!\is_object($this->template)) {
+            $this->initialiseTemplate();
+        }
+
+        if ($params) {
+            return $this->template;
+        }
+
+        return $this->template->template;
+    }
 }
diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php
index 3dcec60b661be..39010e1b577da 100644
--- a/libraries/src/Application/CMSApplication.php
+++ b/libraries/src/Application/CMSApplication.php
@@ -17,6 +17,7 @@
 use Joomla\CMS\Event\Application\AfterRenderEvent;
 use Joomla\CMS\Event\Application\AfterRespondEvent;
 use Joomla\CMS\Event\Application\AfterRouteEvent;
+use Joomla\CMS\Event\Application\BeforeExecuteEvent;
 use Joomla\CMS\Event\Application\BeforeRenderEvent;
 use Joomla\CMS\Event\Application\BeforeRespondEvent;
 use Joomla\CMS\Event\ErrorEvent;
@@ -31,7 +32,6 @@
 use Joomla\CMS\Extension\ExtensionManagerTrait;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
-use Joomla\CMS\Input\Input;
 use Joomla\CMS\Language\LanguageFactoryInterface;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
@@ -48,6 +48,7 @@
 use Joomla\DI\Container;
 use Joomla\DI\ContainerAwareInterface;
 use Joomla\DI\ContainerAwareTrait;
+use Joomla\Input\Input;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 
@@ -168,7 +169,7 @@ abstract class CMSApplication extends WebApplication implements ContainerAwareIn
      * Class constructor.
      *
      * @param   ?Input      $input      An optional argument to provide dependency injection for the application's input
-     *                                  object.  If the argument is a JInput object that object will become the
+     *                                  object.  If the argument is a Input object that object will become the
      *                                  application's input object, otherwise a default input object is created.
      * @param   ?Registry   $config     An optional argument to provide dependency injection for the application's config
      *                                  object.  If the argument is a Registry object that object will become the
@@ -300,6 +301,21 @@ public function execute()
             $this->setupLogging();
             $this->createExtensionNamespaceMap();
 
+            // Load the behaviour plugins
+            PluginHelper::importPlugin('behaviour', null, true, $this->getDispatcher());
+
+            // Load the system plugins
+            PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
+
+            // Trigger the onBeforeExecute event
+            $this->dispatchEvent(
+                'onBeforeExecute',
+                new BeforeExecuteEvent('onBeforeExecute', ['subject' => $this, 'container' => $this->getContainer()])
+            );
+
+            // Mark beforeExecute in the profiler.
+            JDEBUG ? $this->profiler->mark('beforeExecute event dispatched') : null;
+
             // Perform application routines.
             $this->doExecute();
 
@@ -484,7 +500,7 @@ protected function checkUserRequiresReset($option, $view, $layout, $urls = [])
      *
      * @since   3.2
      *
-     * @deprecated  3.2 will be removed in 6.0
+     * @deprecated  3.2 will be removed in 7.0
      *              Use get() instead
      *              Example: Factory::getApplication()->get($varname, $default);
      */
@@ -492,7 +508,7 @@ public function getCfg($varname, $default = null)
     {
         try {
             Log::add(
-                \sprintf('%s() is deprecated and will be removed in 6.0. Use Factory->getApplication()->get() instead.', __METHOD__),
+                \sprintf('%s() is deprecated and will be removed in 7.0. Use Factory->getApplication()->get() instead.', __METHOD__),
                 Log::WARNING,
                 'deprecated'
             );
@@ -528,7 +544,7 @@ public function getClientId()
      *
      * @since       3.2
      * @throws      \RuntimeException
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the application service from the DI container instead
      *              Example: Factory::getContainer()->get($name);
      */
@@ -583,7 +599,7 @@ public function getMenu($name = null, $options = [])
         }
 
         if ($this->menuFactory === null) {
-            @trigger_error('Menu factory must be set in 5.0', E_USER_DEPRECATED);
+            @trigger_error('Menu factory must be set in 7.0', E_USER_DEPRECATED);
             $this->menuFactory = $this->getContainer()->get(MenuFactoryInterface::class);
         }
 
@@ -672,7 +688,7 @@ public function getPathway()
      *
      * @since      3.2
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Inject the router or load it from the dependency injection container
      *              Example: Factory::getContainer()->get($name);
      */
@@ -690,28 +706,32 @@ public static function getRouter($name = null, array $options = [])
     }
 
     /**
-     * Gets the name of the current template.
+     * Gets current template data
      *
      * @param   boolean  $params  An optional associative array of configuration settings
      *
      * @return  string|\stdClass  The name of the template if the params argument is false. The template object if the params argument is true.
      *
+     * @throws  \InvalidArgumentException
      * @since   3.2
      */
     public function getTemplate($params = false)
     {
-        if ($params) {
-            $template = new \stdClass();
+        if (!\is_object($this->template)) {
+            $this->initialiseTemplate();
+        }
 
-            $template->template    = 'system';
-            $template->params      = new Registry();
-            $template->inheritable = 0;
-            $template->parent      = '';
+        if (!$this->isValidTemplate($this->template)) {
+            throw new \InvalidArgumentException(
+                Text::sprintf('JERROR_COULD_NOT_FIND_TEMPLATE', $this->template->template)
+            );
+        }
 
-            return $template;
+        if ($params) {
+            return $this->template;
         }
 
-        return 'system';
+        return $this->template->template;
     }
 
     /**
@@ -805,11 +825,7 @@ protected function initialiseApp($options = [])
 
         $this->set('editor', $editor);
 
-        // Load the behaviour plugins
-        PluginHelper::importPlugin('behaviour', null, true, $this->getDispatcher());
-
         // Trigger the onAfterInitialise event.
-        PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
         $this->dispatchEvent(
             'onAfterInitialise',
             new AfterInitialiseEvent('onAfterInitialise', ['subject' => $this])
@@ -1144,7 +1160,7 @@ protected function render()
      *
      * @since      3.2
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Implement the route functionality in the extending class, this here will be removed without replacement
      */
     protected function route()
@@ -1286,23 +1302,6 @@ public function checkToken($method = 'post')
         return $session::checkToken($method);
     }
 
-    /**
-     * Flag if the application instance is a CLI or web based application.
-     *
-     * Helper function, you should use the native PHP functions to detect if it is a CLI application.
-     *
-     * @return  boolean
-     *
-     * @since       4.0.0
-     *
-     * @deprecated  4.0 will be removed in 6.0
-     *              Will be removed without replacements
-     */
-    public function isCli()
-    {
-        return false;
-    }
-
     /**
      * No longer used
      *
@@ -1312,7 +1311,7 @@ public function isCli()
      *
      * @throws \Exception
      *
-     * @deprecated  4.2 will be removed in 6.0
+     * @deprecated  4.2 will be removed in 7.0
      *              Will be removed without replacements
      */
     protected function isTwoFactorAuthenticationRequired(): bool
@@ -1329,7 +1328,7 @@ protected function isTwoFactorAuthenticationRequired(): bool
      *
      * @throws \Exception
      *
-     * @deprecated  4.2 will be removed in 6.0
+     * @deprecated  4.2 will be removed in 7.0
      *              Will be removed without replacements
      */
     private function hasUserConfiguredTwoFactorAuthentication(): bool
@@ -1406,4 +1405,44 @@ public function setMenuFactory(MenuFactoryInterface $menuFactory): void
     {
         $this->menuFactory = $menuFactory;
     }
+
+    /**
+     * Initialise the template
+     *
+     * @return  void
+     *
+     * @since   6.1.0
+     */
+    protected function initialiseTemplate(): void
+    {
+        $this->template = (object) [
+            'template'    => 'system',
+            'params'      => new Registry(),
+            'inheritable' => 0,
+            'parent'      => '',
+        ];
+    }
+
+    /**
+     * Check if a template is valid
+     *
+     * @param   \stdClass  $template  The template object
+     *
+     * @return  bool  True if the template is valid, false otherwise. A template is valid if its index.php file exists
+     *                either in the template itself or in its parent template.
+     *
+     * @since   6.1.0
+     */
+    protected function isValidTemplate($template): bool
+    {
+        if (!empty($template->template) && is_file(JPATH_THEMES . '/' . $template->template . '/index.php')) {
+            return true;
+        }
+
+        if (!empty($template->parent) && is_file(JPATH_THEMES . '/' . $template->parent . '/index.php')) {
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/libraries/src/Application/CMSApplicationInterface.php b/libraries/src/Application/CMSApplicationInterface.php
index 9082b2aeb576f..73f87a8c5e9df 100644
--- a/libraries/src/Application/CMSApplicationInterface.php
+++ b/libraries/src/Application/CMSApplicationInterface.php
@@ -24,7 +24,7 @@
  *
  * @since  4.0.0
  * @note   In Joomla 6 this interface will no longer extend EventAwareInterface
- * @property-read   Input  $input  {@deprecated 4.0 will be removed in 6.0} The Joomla Input property. Deprecated in favour of getInput()
+ * @property-read   Input  $input  {@deprecated 4.0 will be removed in 7.0} The Joomla Input property. Deprecated in favour of getInput()
  */
 interface CMSApplicationInterface extends ExtensionManagerInterface, ConfigurationAwareApplicationInterface, EventAwareInterface
 {
@@ -96,7 +96,7 @@ interface CMSApplicationInterface extends ExtensionManagerInterface, Configurati
      * Constant defining an enqueued message message
      *
      * @var    string
-     * @since  5.4.2
+     * @since  6.0.2
      */
     public const MSG_MESSAGE = 'message';
 
@@ -104,7 +104,7 @@ interface CMSApplicationInterface extends ExtensionManagerInterface, Configurati
      * Constant defining an enqueued success message
      *
      * @var    string
-     * @since  5.4.2
+     * @since  6.0.2
      */
     public const MSG_SUCCESS = 'success';
 
@@ -140,20 +140,6 @@ public function getMessageQueue();
      */
     public function isClient($identifier);
 
-    /**
-     * Flag if the application instance is a CLI or web based application.
-     *
-     * Helper function, you should use the native PHP functions to detect if it is a CLI application.
-     *
-     * @return  boolean
-     *
-     * @since       4.0.0
-     *
-     * @deprecated  4.0 will be removed in 6.0
-     *              Will be removed without replacement. CLI will be handled by the joomla/console package instead
-     */
-    public function isCli();
-
     /**
      * Get the application identity.
      *
diff --git a/libraries/src/Application/CMSWebApplicationInterface.php b/libraries/src/Application/CMSWebApplicationInterface.php
index 73a728fdb3312..cc702434eaeb2 100644
--- a/libraries/src/Application/CMSWebApplicationInterface.php
+++ b/libraries/src/Application/CMSWebApplicationInterface.php
@@ -56,7 +56,7 @@ public function getMenu($name = null, $options = []);
      *
      * @since      4.0.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Inject the router or load it from the dependency injection container
      *              Example: Factory::getContainer()->get($name);
      */
diff --git a/libraries/src/Application/ConsoleApplication.php b/libraries/src/Application/ConsoleApplication.php
index 684551145dcbf..1d28b9ba9d0aa 100644
--- a/libraries/src/Application/ConsoleApplication.php
+++ b/libraries/src/Application/ConsoleApplication.php
@@ -158,7 +158,7 @@ public function __construct(
      *
      * @since       4.0.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              This is a B/C proxy for deprecated read accesses, use getInput() method instead
      *              Example:
      *              $app->getInput();
@@ -390,23 +390,6 @@ public function isClient($identifier)
         return $this->getName() === $identifier;
     }
 
-    /**
-     * Flag if the application instance is a CLI or web based application.
-     *
-     * Helper function, you should use the native PHP functions to detect if it is a CLI application.
-     *
-     * @return  boolean
-     *
-     * @since       4.0.0
-     *
-     * @deprecated  4.0 will be removed in 6.0
-     *              Will be removed without replacement. CLI will be handled by the joomla/console package instead
-     */
-    public function isCli()
-    {
-        return true;
-    }
-
     /**
      * Sets the session for the application to use, if required.
      *
@@ -477,7 +460,7 @@ public function setName(string $name): void
      *
      * @throws     \InvalidArgumentException
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Inject the router or load it from the dependency injection container
      *              Example: Factory::getContainer()->get(ApiRouter::class);
      */
diff --git a/libraries/src/Application/EventAware.php b/libraries/src/Application/EventAware.php
index 76ca8c95ae1b5..62016788be90c 100644
--- a/libraries/src/Application/EventAware.php
+++ b/libraries/src/Application/EventAware.php
@@ -72,7 +72,7 @@ public function registerEvent($event, callable $handler)
      *
      * This is a legacy method, implementing old-style (Joomla! 3.x) plugin calls. It's best to go directly through the
      * Dispatcher and handle the returned EventInterface object instead of going through this method. This method is
-     * deprecated and will be removed in Joomla! 5.x.
+     * deprecated and will be removed in Joomla! 7.0.
      *
      * This method will only return the 'result' argument of the event
      *
diff --git a/libraries/src/Application/EventAwareInterface.php b/libraries/src/Application/EventAwareInterface.php
index c5ae193027629..962a997315056 100644
--- a/libraries/src/Application/EventAwareInterface.php
+++ b/libraries/src/Application/EventAwareInterface.php
@@ -42,7 +42,7 @@ public function getDispatcher();
      *
      * This is a legacy method, implementing old-style (Joomla! 3.x) plugin calls. It's best to go directly through the
      * Dispatcher and handle the returned EventInterface object instead of going through this method. This method is
-     * deprecated and will be removed in Joomla! 5.x.
+     * deprecated and will be removed in Joomla! 7.0.
      *
      * This method will only return the 'result' argument of the event
      *
diff --git a/libraries/src/Application/MultiFactorAuthenticationHandler.php b/libraries/src/Application/MultiFactorAuthenticationHandler.php
index 087d56dbb28b5..8afcef52bbcde 100644
--- a/libraries/src/Application/MultiFactorAuthenticationHandler.php
+++ b/libraries/src/Application/MultiFactorAuthenticationHandler.php
@@ -317,24 +317,27 @@ public function isMultiFactorAuthenticationPage(bool $onlyCaptive = false): bool
             return false;
         }
 
-        $allowedViews = ['captive'];
-        $allowedTasks = [
-            'captive.display', 'captive.captive', 'captive.validate',
-            'methods.display',
-        ];
+        $allowedTasks = ['captive.captive', 'captive.validate', 'callback.callback', 'captive.select', 'methods.display'];
+        $allowedViews = ['captive', 'methods'];
 
         if (!$onlyCaptive) {
-            $allowedViews = array_merge($allowedViews, ['method', 'methods', 'callback']);
             $allowedTasks = array_merge(
                 $allowedTasks,
                 [
-                    'method.display', 'method.add', 'method.edit', 'method.regenerateBackupCodes',
-                    'method.delete', 'method.save', 'methods.disable', 'methods.doNotShowThisAgain',
+                    'method.add', 'method.edit', 'method.regenerateBackupCodes',
+                    'method.delete', 'method.save', 'methods.doNotShowThisAgain',
+                ]
+            );
+
+            $allowedViews = array_merge(
+                $allowedViews,
+                [
+                    'method', 'methods',
                 ]
             );
         }
 
-        return \in_array($view, $allowedViews) || \in_array($task, $allowedTasks);
+        return \in_array($task, $allowedTasks) || (\in_array($view, $allowedViews) && !$task);
     }
 
     /**
@@ -349,7 +352,7 @@ private function hasRejectedMultiFactorAuthenticationSetup(): bool
         $profileKey = 'mfa.dontshow';
         /** @var DatabaseInterface $db */
         $db         = Factory::getContainer()->get(DatabaseInterface::class);
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->select($db->quoteName('profile_value'))
             ->from($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = :userId')
@@ -445,7 +448,7 @@ private function migrateFromLegacyMFA(): void
             // Delete any other record with the same user_id and Method.
             $method = 'emergencycodes';
             $userId = $user->id;
-            $query  = $db->getQuery(true)
+            $query  = $db->createQuery()
                 ->delete($db->quoteName('#__user_mfa'))
                 ->where($db->quoteName('user_id') . ' = :user_id')
                 ->where($db->quoteName('method') . ' = :method')
diff --git a/libraries/src/Application/SiteApplication.php b/libraries/src/Application/SiteApplication.php
index 6610da4290b9f..be6c4e8f0a524 100644
--- a/libraries/src/Application/SiteApplication.php
+++ b/libraries/src/Application/SiteApplication.php
@@ -18,14 +18,15 @@
 use Joomla\CMS\Event\Application\AfterRouteEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
-use Joomla\CMS\Input\Input;
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Router\SiteRouter;
 use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\User\User;
 use Joomla\DI\Container;
+use Joomla\Input\Input;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 
@@ -71,7 +72,7 @@ final class SiteApplication extends CMSApplication
      * Class constructor.
      *
      * @param   ?Input      $input      An optional argument to provide dependency injection for the application's input
-     *                                  object.  If the argument is a JInput object that object will become the
+     *                                  object.  If the argument is a Input object that object will become the
      *                                  application's input object, otherwise a default input object is created.
      * @param   ?Registry   $config     An optional argument to provide dependency injection for the application's config
      *                                  object.  If the argument is a Registry object that object will become the
@@ -109,7 +110,7 @@ public function __construct(?Input $input = null, ?Registry $config = null, ?Web
     protected function authorise($itemid)
     {
         $menus = $this->getMenu();
-        $user  = Factory::getUser();
+        $user  = $this->getIdentity();
 
         if (!$menus->authorise($itemid)) {
             if ($user->id == 0) {
@@ -382,7 +383,7 @@ public function getParams($option = null)
      *
      * @since      3.2
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Inject the router or load it from the dependency injection container
      *              Example: Factory::getContainer()->get(SiteRouter::class);
      */
@@ -392,250 +393,89 @@ public static function getRouter($name = 'site', array $options = [])
     }
 
     /**
-     * Gets the name of the current template.
+     * Initialise the application.
      *
-     * @param   boolean  $params  True to return the template parameters
+     * @param   array  $options  An optional associative array of configuration settings.
      *
-     * @return  string|\stdClass  The name of the template if the params argument is false. The template object if the params argument is true.
+     * @return  void
      *
      * @since   3.2
-     * @throws  \InvalidArgumentException
      */
-    public function getTemplate($params = false)
+    protected function initialiseApp($options = [])
     {
-        if (\is_object($this->template)) {
-            if ($this->template->parent) {
-                if (!is_file(JPATH_THEMES . '/' . $this->template->template . '/index.php')) {
-                    if (!is_file(JPATH_THEMES . '/' . $this->template->parent . '/index.php')) {
-                        throw new \InvalidArgumentException(Text::sprintf('JERROR_COULD_NOT_FIND_TEMPLATE', $this->template->template));
-                    }
-                }
-            } elseif (!is_file(JPATH_THEMES . '/' . $this->template->template . '/index.php')) {
-                throw new \InvalidArgumentException(Text::sprintf('JERROR_COULD_NOT_FIND_TEMPLATE', $this->template->template));
-            }
-
-            if ($params) {
-                return $this->template;
-            }
-
-            return $this->template->template;
-        }
-
-        // Get the id of the active menu item
-        $menu = $this->getMenu();
-        $item = $menu->getActive();
-
-        if (!$item) {
-            $item = $menu->getItem($this->input->getInt('Itemid', null));
-        }
+        $user = $this->getIdentity();
 
-        $id = 0;
-
-        if (\is_object($item)) {
-            // Valid item retrieved
-            $id = $item->template_style_id;
-        }
-
-        $tid = $this->input->getUint('templateStyle', 0);
-
-        if (is_numeric($tid) && (int) $tid > 0) {
-            $id = (int) $tid;
-        }
-
-        /** @var OutputController $cache */
-        $cache = $this->getCacheControllerFactory()->createCacheController('output', ['defaultgroup' => 'com_templates']);
-
-        if ($this->getLanguageFilter()) {
-            $tag = $this->getLanguage()->getTag();
-        } else {
-            $tag = '';
-        }
-
-        $cacheId = 'templates0' . $tag;
-
-        if ($cache->contains($cacheId)) {
-            $templates = $cache->get($cacheId);
-        } else {
-            $templates = $this->bootComponent('templates')->getMVCFactory()
-                ->createModel('Style', 'Administrator')->getSiteTemplates();
-
-            foreach ($templates as &$template) {
-                // Create home element
-                if ($template->home == 1 && !isset($template_home) || $this->getLanguageFilter() && $template->home == $tag) {
-                    $template_home = clone $template;
-                }
-
-                $template->params = new Registry($template->params);
-            }
-
-            // Unset the $template reference to the last $templates[n] item cycled in the foreach above to avoid editing it later
-            unset($template);
-
-            // Add home element, after loop to avoid double execution
-            if (isset($template_home)) {
-                $template_home->params = new Registry($template_home->params);
-                $templates[0]          = $template_home;
-            }
-
-            $cache->store($templates, $cacheId);
+        // If the user is a guest we populate it with the guest user group.
+        if ($user->guest) {
+            $guestUsergroup = ComponentHelper::getParams('com_users')->get('guest_usergroup', 1);
+            $user->groups   = [$guestUsergroup];
         }
 
-        $template = $templates[$id] ?? $templates[0];
-
-        // Allows for overriding the active template from the request
-        $template_override = $this->input->getCmd('template', '');
-
-        // Only set template override if it is a valid template (= it exists and is enabled)
-        if (!empty($template_override)) {
-            if (is_file(JPATH_THEMES . '/' . $template_override . '/index.php')) {
-                foreach ($templates as $tmpl) {
-                    if ($tmpl->template === $template_override) {
-                        $template = $tmpl;
-                        break;
-                    }
-                }
-            }
+        if (empty($options['language'])) {
+            $options['language'] = $this->detectLanguage($user);
         }
 
-        // Need to filter the default value as well
-        $template->template = InputFilter::getInstance()->clean($template->template, 'cmd');
-
-        // Fallback template
-        if (!empty($template->parent)) {
-            if (!is_file(JPATH_THEMES . '/' . $template->template . '/index.php')) {
-                if (!is_file(JPATH_THEMES . '/' . $template->parent . '/index.php')) {
-                    $this->enqueueMessage(Text::_('JERROR_ALERTNOTEMPLATE'), 'error');
-
-                    // Try to find data for 'cassiopeia' template
-                    $original_tmpl = $template->template;
-
-                    foreach ($templates as $tmpl) {
-                        if ($tmpl->template === 'cassiopeia') {
-                            $template = $tmpl;
-                            break;
-                        }
-                    }
-
-                    // Check, the data were found and if template really exists
-                    if (!is_file(JPATH_THEMES . '/' . $template->template . '/index.php')) {
-                        throw new \InvalidArgumentException(Text::sprintf('JERROR_COULD_NOT_FIND_TEMPLATE', $original_tmpl));
-                    }
-                }
-            }
-        } elseif (!is_file(JPATH_THEMES . '/' . $template->template . '/index.php')) {
-            $this->enqueueMessage(Text::_('JERROR_ALERTNOTEMPLATE'), 'error');
-
-            // Try to find data for 'cassiopeia' template
-            $original_tmpl = $template->template;
-
-            foreach ($templates as $tmpl) {
-                if ($tmpl->template === 'cassiopeia') {
-                    $template = $tmpl;
-                    break;
-                }
-            }
+        // One last check to make sure we have something
+        if (!LanguageHelper::exists($options['language'])) {
+            $lang = $this->config->get('language', 'en-GB');
 
-            // Check, the data were found and if template really exists
-            if (!is_file(JPATH_THEMES . '/' . $template->template . '/index.php')) {
-                throw new \InvalidArgumentException(Text::sprintf('JERROR_COULD_NOT_FIND_TEMPLATE', $original_tmpl));
+            if (LanguageHelper::exists($lang)) {
+                $options['language'] = $lang;
+            } else {
+                // As a last ditch fail to english
+                $options['language'] = 'en-GB';
             }
         }
 
-        // Cache the result
-        $this->template = $template;
-
-        if ($params) {
-            return $template;
-        }
-
-        return $template->template;
+        // Finish initialisation
+        parent::initialiseApp($options);
     }
 
     /**
-     * Initialise the application.
+     * Detect the language to use for the application
      *
-     * @param   array  $options  An optional associative array of configuration settings.
+     * @param   User  $user  The user object
      *
-     * @return  void
+     * @return  string  The detected language
      *
-     * @since   3.2
+     * @since   6.1.0
      */
-    protected function initialiseApp($options = [])
+    private function detectLanguage(User $user): string
     {
-        $user = Factory::getUser();
-
-        // If the user is a guest we populate it with the guest user group.
-        if ($user->guest) {
-            $guestUsergroup = ComponentHelper::getParams('com_users')->get('guest_usergroup', 1);
-            $user->groups   = [$guestUsergroup];
-        }
+        // Detect language from input
+        $lang = $this->input->getString('language');
 
-        if ($plugin = PluginHelper::getPlugin('system', 'languagefilter')) {
-            $pluginParams = new Registry($plugin->params);
-            $this->setLanguageFilter(true);
-            $this->setDetectBrowser($pluginParams->get('detect_browser', 1) == 1);
+        if ($lang && LanguageHelper::exists($lang)) {
+            return $lang;
         }
 
-        if (empty($options['language'])) {
-            // Detect the specified language
-            $lang = $this->input->getString('language', null);
-
-            // Make sure that the user's language exists
-            if ($lang && LanguageHelper::exists($lang)) {
-                $options['language'] = $lang;
-            }
-        }
-
-        if (empty($options['language']) && $this->getLanguageFilter()) {
+        if ($this->getLanguageFilter()) {
             // Detect cookie language
             $lang = $this->input->cookie->get(md5($this->get('secret') . 'language'), null, 'string');
 
-            // Make sure that the user's language exists
             if ($lang && LanguageHelper::exists($lang)) {
-                $options['language'] = $lang;
+                return $lang;
             }
         }
 
-        if (empty($options['language'])) {
-            // Detect user language
-            $lang = $user->getParam('language');
+        // Detect user language
+        $lang = $user->getParam('language');
 
-            // Make sure that the user's language exists
-            if ($lang && LanguageHelper::exists($lang)) {
-                $options['language'] = $lang;
-            }
+        if ($lang && LanguageHelper::exists($lang)) {
+            return $lang;
         }
 
-        if (empty($options['language']) && $this->getDetectBrowser()) {
+        if ($this->getDetectBrowser()) {
             // Detect browser language
             $lang = LanguageHelper::detectLanguage();
 
-            // Make sure that the user's language exists
             if ($lang && LanguageHelper::exists($lang)) {
-                $options['language'] = $lang;
+                return $lang;
             }
         }
 
-        if (empty($options['language'])) {
-            // Detect default language
-            $params              = ComponentHelper::getParams('com_languages');
-            $options['language'] = $params->get('site', $this->get('language', 'en-GB'));
-        }
-
-        // One last check to make sure we have something
-        if (!LanguageHelper::exists($options['language'])) {
-            $lang = $this->config->get('language', 'en-GB');
-
-            if (LanguageHelper::exists($lang)) {
-                $options['language'] = $lang;
-            } else {
-                // As a last ditch fail to english
-                $options['language'] = 'en-GB';
-            }
-        }
-
-        // Finish initialisation
-        parent::initialiseApp($options);
+        // Use default language
+        return ComponentHelper::getParams('com_languages')->get('site', $this->get('language', 'en-GB'));
     }
 
     /**
@@ -721,7 +561,7 @@ protected function render()
                     $this->set('themeFile', 'index.php');
                 }
 
-                if ($this->get('offline') && !Factory::getUser()->authorise('core.login.offline')) {
+                if ($this->get('offline') && !$this->getIdentity()->authorise('core.login.offline')) {
                     $this->setUserState('users.login.form.data', ['return' => Uri::getInstance()->toString()]);
                     $this->set('themeFile', 'offline.php');
                     $this->setHeader('Status', '503 Service Temporarily Unavailable', 'true');
@@ -901,4 +741,155 @@ public function setTemplate($template, $styleParams = null)
             $this->set('themeParams', $this->template->params);
         }
     }
+
+    /**
+     * Initialise the template
+     *
+     * @return  void
+     *
+     * @since   6.1.0
+     *
+     * @throws  \InvalidArgumentException
+     */
+    protected function initialiseTemplate(): void
+    {
+        $id = $this->getTemplateStyleId();
+
+        $templates = $this->getTemplates();
+
+        $template = $templates[$id] ?? $templates[0];
+
+        // Allows for overriding the active template from the request
+        $template_override = $this->input->getCmd('template', '');
+
+        // Only set template override if it is a valid template (= it exists and is enabled)
+        if (!empty($template_override)) {
+            $tmpl = $this->findTemplate($templates, $template_override);
+
+            if ($tmpl) {
+                $template = $tmpl;
+            }
+        }
+
+        // Need to filter the default value as well
+        $template->template = InputFilter::getInstance()->clean($template->template, 'cmd');
+
+        // Fallback template
+        if (!$this->isValidTemplate($template)) {
+            $this->enqueueMessage(Text::_('JERROR_ALERTNOTEMPLATE'), 'error');
+
+            // Try to find data for 'cassiopeia' template
+            $original_tmpl = $template->template;
+
+            $template = $this->findTemplate($templates, 'cassiopeia');
+
+            if ($template === null) {
+                throw new \InvalidArgumentException(Text::sprintf('JERROR_COULD_NOT_FIND_TEMPLATE', $original_tmpl));
+            }
+        }
+
+        // Cache the result
+        $this->template = $template;
+    }
+
+    /**
+     * Get the template style ID
+     *
+     * @return  int  The template style ID
+     *
+     * @since   6.1.0
+     */
+    private function getTemplateStyleId(): int
+    {
+        $menu = $this->getMenu();
+        $item = $menu->getActive();
+
+        if (!$item) {
+            $item = $menu->getItem($this->input->getInt('Itemid', 0));
+        }
+
+        $id = 0;
+
+        if ($item) {
+            // Valid item retrieved
+            $id = $item->template_style_id;
+        }
+
+        $tid = $this->input->getUint('templateStyle', 0);
+
+        if ($tid > 0) {
+            $id = $tid;
+        }
+
+        return $id;
+    }
+
+    /**
+     * Get all site templates
+     *
+     * @return  array  An array of template objects
+     *
+     * @since   6.1.0
+     */
+    private function getTemplates(): array
+    {
+        /** @var OutputController $cache */
+        $cache = $this->getCacheControllerFactory()
+            ->createCacheController('output', ['defaultgroup' => 'com_templates']);
+
+        if ($this->getLanguageFilter()) {
+            $tag = $this->getLanguage()->getTag();
+        } else {
+            $tag = '';
+        }
+
+        $cacheId = 'templates0' . $tag;
+
+        if ($cache->contains($cacheId)) {
+            $templates = $cache->get($cacheId);
+        } else {
+            $templates = $this->bootComponent('templates')->getMVCFactory()
+                ->createModel('Style', 'Administrator')->getSiteTemplates();
+
+            foreach ($templates as $template) {
+                // Create home element
+                if ($template->home == 1 && !isset($template_home) || $this->getLanguageFilter() && $template->home == $tag) {
+                    $template_home = clone $template;
+                }
+
+                $template->params = new Registry($template->params);
+            }
+
+            // Add home element, after loop to avoid double execution
+            if (isset($template_home)) {
+                $template_home->params = new Registry($template_home->params);
+                $templates[0]          = $template_home;
+            }
+
+            $cache->store($templates, $cacheId);
+        }
+
+        return $templates;
+    }
+
+    /**
+     * Find a valid template by name
+     *
+     * @param   array   $templates     An array of template objects
+     * @param   string  $templateName  The template name
+     *
+     * @return  ?\stdClass  The template object if found, null otherwise
+     *
+     * @since   6.1.0
+     */
+    private function findTemplate(array $templates, string $templateName): ?\stdClass
+    {
+        foreach ($templates as $template) {
+            if ($template->template === $templateName && $this->isValidTemplate($template)) {
+                return $template;
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/libraries/src/Application/WebApplication.php b/libraries/src/Application/WebApplication.php
index d276f17ec31bf..a143efefcff55 100644
--- a/libraries/src/Application/WebApplication.php
+++ b/libraries/src/Application/WebApplication.php
@@ -19,13 +19,13 @@
 use Joomla\CMS\Event\Application\BeforeRenderEvent;
 use Joomla\CMS\Event\Application\BeforeRespondEvent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Input\Input;
 use Joomla\CMS\Language\Language;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
 use Joomla\CMS\Version;
 use Joomla\Filter\OutputFilter;
+use Joomla\Input\Input;
 use Joomla\Registry\Registry;
 use Joomla\Session\SessionEvent;
 use Psr\Http\Message\ResponseInterface;
@@ -56,16 +56,6 @@ abstract class WebApplication extends AbstractWebApplication
      */
     public $JComponentTitle;
 
-    /**
-     * The item associations
-     *
-     * @var    integer
-     * @since  4.3.0
-     *
-     * @deprecated 4.4.0 will be removed in 6.0 as this property is not used anymore
-     */
-    public $item_associations;
-
     /**
      * The application document object.
      *
@@ -94,7 +84,7 @@ abstract class WebApplication extends AbstractWebApplication
      * Class constructor.
      *
      * @param   ?Input              $input     An optional argument to provide dependency injection for the application's
-     *                                         input object.  If the argument is a JInput object that object will become
+     *                                         input object.  If the argument is a Input object that object will become
      *                                         the application's input object, otherwise a default input object is created.
      * @param   ?Registry           $config    An optional argument to provide dependency injection for the application's
      *                                         config object.  If the argument is a Registry object that object will become
@@ -111,7 +101,7 @@ abstract class WebApplication extends AbstractWebApplication
      */
     public function __construct(?Input $input = null, ?Registry $config = null, ?WebClient $client = null, ?ResponseInterface $response = null)
     {
-        // Ensure we have a CMS Input object otherwise the DI for \Joomla\CMS\Session\Storage\JoomlaStorage fails
+        // Ensure we have a Input object otherwise the DI for \Joomla\CMS\Session\Storage\JoomlaStorage fails
         $input = $input ?: new Input();
 
         parent::__construct($input, $config, $client, $response);
@@ -136,7 +126,7 @@ public function __construct(?Input $input = null, ?Registry $config = null, ?Web
      * @since       1.7.3
      * @throws      \RuntimeException
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the application service in the DI container instead
      *              Example: \Joomla\CMS\Factory::getContainer()->get($name)
      */
@@ -144,7 +134,7 @@ public static function getInstance($name = null)
     {
         // Only create the object if it doesn't exist.
         if (empty(static::$instance)) {
-            if (!is_subclass_of($name, '\\Joomla\\CMS\\Application\\WebApplication')) {
+            if (!is_subclass_of($name, __CLASS__)) {
                 throw new \RuntimeException(\sprintf('Unable to load application: %s', $name), 500);
             }
 
@@ -343,7 +333,7 @@ public function loadLanguage(?Language $language = null)
      *
      * @since   1.7.3
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              The session should be injected as a service.
      */
     public function loadSession(?Session $session = null)
@@ -469,4 +459,42 @@ public function getConfig()
     {
         return $this->config;
     }
+
+    /**
+     * Proxy to the input property.
+     *
+     * @return  Input | null
+     *
+     * @since       6.0.0
+     * @deprecated  4.0 will be removed in 8.0 use $this->getInput() instead
+     */
+    public function __get($name)
+    {
+        switch ($name) {
+            case 'input':
+                trigger_deprecation(
+                    'cms/application',
+                    '6.0',
+                    'Accessing the input property of %s is deprecated, use the %s::getInput() method instead.',
+                    self::class,
+                    self::class
+                );
+
+                return $this->getInput();
+
+            default:
+                $trace = debug_backtrace();
+                trigger_error(
+                    \sprintf(
+                        'Undefined property via __get(): %1$s in %2$s on line %3$s',
+                        $name,
+                        $trace[0]['file'],
+                        $trace[0]['line']
+                    ),
+                    E_USER_NOTICE
+                );
+
+                return null;
+        }
+    }
 }
diff --git a/libraries/src/Association/AssociationExtensionHelper.php b/libraries/src/Association/AssociationExtensionHelper.php
index 3a6191187fc57..9e1aca7eca32e 100644
--- a/libraries/src/Association/AssociationExtensionHelper.php
+++ b/libraries/src/Association/AssociationExtensionHelper.php
@@ -114,11 +114,12 @@ public function getType($typeName = '')
         $title   = '';
 
         return [
-            'fields'  => $fields,
-            'support' => $support,
-            'tables'  => $tables,
-            'joins'   => $joins,
-            'title'   => $title,
+            'fields'     => $fields,
+            'support'    => $support,
+            'tables'     => $tables,
+            'joins'      => $joins,
+            'title'      => $title,
+            'urlOptions' => $this->getUrlOptions($typeName),
         ];
     }
 
@@ -247,6 +248,20 @@ public function getTypeFieldName($typeName, $fieldName)
         return substr($tmp, $pos + 1);
     }
 
+    /**
+     * Get a table field name for a type
+     *
+     * @param   string  $typeName   The item type
+     *
+     * @return  array
+     *
+     * @since   6.1.0
+     */
+    public function getUrlOptions($type = '')
+    {
+        return [];
+    }
+
     /**
      * Get default values for support array
      *
diff --git a/libraries/src/Authentication/Password/MD5Handler.php b/libraries/src/Authentication/Password/MD5Handler.php
index 8719b5a719675..750971807c44b 100644
--- a/libraries/src/Authentication/Password/MD5Handler.php
+++ b/libraries/src/Authentication/Password/MD5Handler.php
@@ -10,7 +10,6 @@
 namespace Joomla\CMS\Authentication\Password;
 
 use Joomla\Authentication\Password\HandlerInterface;
-use Joomla\CMS\Crypt\Crypt;
 use Joomla\CMS\User\UserHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -22,7 +21,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.0 will be removed in 6.0
+ * @deprecated  4.0 will be removed in 7.0
  *              Support for MD5 hashed passwords will be removed without replacement
  */
 class MD5Handler implements HandlerInterface, CheckIfRehashNeededHandlerInterface
@@ -91,6 +90,6 @@ public function validatePassword($plaintext, $hashed)
         // If the salt is empty AND there is a ':' in the original hash, we must append ':' at the end
         $testcrypt = md5($plaintext . $salt) . ($salt ? ':' . $salt : (str_contains($hashed, ':') ? ':' : ''));
 
-        return Crypt::timingSafeCompare($hashed, $testcrypt);
+        return hash_equals($hashed, $testcrypt);
     }
 }
diff --git a/libraries/src/Authentication/Password/PHPassHandler.php b/libraries/src/Authentication/Password/PHPassHandler.php
index 823123e5bb178..0e42e97f00c59 100644
--- a/libraries/src/Authentication/Password/PHPassHandler.php
+++ b/libraries/src/Authentication/Password/PHPassHandler.php
@@ -20,7 +20,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.0 will be removed in 6.0
+ * @deprecated  4.0 will be removed in 7.0
  *              Support for PHPass hashed passwords will be removed without replacement
  */
 class PHPassHandler implements HandlerInterface, CheckIfRehashNeededHandlerInterface
diff --git a/libraries/src/Cache/Cache.php b/libraries/src/Cache/Cache.php
index cef3fa92bfe8b..0850b9d84bd04 100644
--- a/libraries/src/Cache/Cache.php
+++ b/libraries/src/Cache/Cache.php
@@ -87,7 +87,7 @@ public function __construct($options)
      *
      * @since       1.7.0
      *
-     * @deprecated  4.2 will be removed in 6.0
+     * @deprecated  4.2 will be removed in 7.0
      *              Use the cache controller factory instead
      *              Example: Factory::getContainer()->get(CacheControllerFactoryInterface::class)->createCacheController($type, $options);
      */
diff --git a/libraries/src/Cache/CacheController.php b/libraries/src/Cache/CacheController.php
index 038d1e321d602..d5e5465dd1503 100644
--- a/libraries/src/Cache/CacheController.php
+++ b/libraries/src/Cache/CacheController.php
@@ -87,7 +87,7 @@ public function __call($name, $arguments)
      * @since       1.7.0
      * @throws      \RuntimeException
      *
-     * @deprecated  4.2 will be removed in 6.0
+     * @deprecated  4.2 will be removed in 7.0
      *              Use the cache controller factory instead
      *              Example: Factory::getContainer()->get(CacheControllerFactoryInterface::class)->createCacheController($type, $options);
      */
@@ -122,7 +122,7 @@ public static function getInstance($type = 'output', $options = [])
 
                 // Only trigger a deprecation notice if the file and class are found
                 @trigger_error(
-                    'Support for including cache controllers using path lookup is deprecated and will be removed in 5.0.'
+                    'Support for including cache controllers using path lookup is deprecated and will be removed in 7.0.'
                         . ' Use a custom cache controller factory instead.',
                     E_USER_DEPRECATED
                 );
@@ -141,7 +141,7 @@ public static function getInstance($type = 'output', $options = [])
      *
      * @since       1.7.0
      *
-     * @deprecated  4.2 will be removed in 6.0
+     * @deprecated  4.2 will be removed in 7.0
      *              Use the cache controller factory instead
      *              Example: Factory::getContainer()->get(CacheControllerFactoryInterface::class)->createCacheController($type, $options);
      */
@@ -156,7 +156,7 @@ public static function addIncludePath($path = '')
         if (!empty($path) && !\in_array($path, $paths)) {
             // Only trigger a deprecation notice when adding a lookup path
             @trigger_error(
-                'Support for including cache controllers using path lookup is deprecated and will be removed in 5.0.'
+                'Support for including cache controllers using path lookup is deprecated and will be removed in 7.0.'
                     . ' Use a custom cache controller factory instead.',
                 E_USER_DEPRECATED
             );
diff --git a/libraries/src/Cache/CacheControllerFactoryAwareTrait.php b/libraries/src/Cache/CacheControllerFactoryAwareTrait.php
index b7a5446bcd246..8684255e926ac 100644
--- a/libraries/src/Cache/CacheControllerFactoryAwareTrait.php
+++ b/libraries/src/Cache/CacheControllerFactoryAwareTrait.php
@@ -45,7 +45,7 @@ protected function getCacheControllerFactory(): CacheControllerFactoryInterface
         }
 
         @trigger_error(
-            \sprintf('A cache controller is needed in %s. An UnexpectedValueException will be thrown in 5.0.', __CLASS__),
+            \sprintf('A cache controller is needed in %s. An UnexpectedValueException will be thrown in 7.0.', __CLASS__),
             E_USER_DEPRECATED
         );
 
diff --git a/libraries/src/Cache/Storage/RedisStorage.php b/libraries/src/Cache/Storage/RedisStorage.php
index 19a352c4ee62e..123d82d017772 100644
--- a/libraries/src/Cache/Storage/RedisStorage.php
+++ b/libraries/src/Cache/Storage/RedisStorage.php
@@ -307,7 +307,7 @@ public function clean($group, $mode = null)
      */
     public static function isSupported()
     {
-        return class_exists('\\Redis');
+        return class_exists(\Redis::class);
     }
 
     /**
diff --git a/libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php b/libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php
index acee2c848c368..edf171bd82b6f 100644
--- a/libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php
+++ b/libraries/src/Captcha/Google/HttpBridgePostRequestMethod.php
@@ -9,9 +9,11 @@
 
 namespace Joomla\CMS\Captcha\Google;
 
-use Joomla\CMS\Http\HttpFactory;
+use Joomla\CMS\Version;
 use Joomla\Http\Exception\InvalidResponseCodeException;
 use Joomla\Http\Http;
+use Joomla\Http\HttpFactory;
+use Joomla\Registry\Registry;
 use ReCaptcha\RequestMethod;
 use ReCaptcha\RequestParameters;
 
@@ -51,7 +53,10 @@ final class HttpBridgePostRequestMethod implements RequestMethod
      */
     public function __construct(?Http $http = null)
     {
-        $this->http = $http ?: HttpFactory::getHttp();
+        $options = new Registry();
+        $options->set('userAgent', (new Version())->getUserAgent('Joomla', true, false));
+
+        $this->http = $http ?: (new HttpFactory())->getHttp($options);
     }
 
     /**
diff --git a/libraries/src/Categories/Categories.php b/libraries/src/Categories/Categories.php
index 24b8ee3310c26..de4b6e9e307bb 100644
--- a/libraries/src/Categories/Categories.php
+++ b/libraries/src/Categories/Categories.php
@@ -86,6 +86,14 @@ class Categories implements CategoryInterface, DatabaseAwareInterface
      */
     protected $_key;
 
+    /**
+     * Name of the items access field
+     *
+     * @var    string
+     * @since  6.2.0
+     */
+    protected $_accessfield;
+
     /**
      * Name of the items state field
      *
@@ -111,15 +119,17 @@ class Categories implements CategoryInterface, DatabaseAwareInterface
      */
     public function __construct($options)
     {
-        $this->_extension  = $options['extension'];
-        $this->_table      = $options['table'];
-        $this->_field      = isset($options['field']) && $options['field'] ? $options['field'] : 'catid';
-        $this->_key        = isset($options['key']) && $options['key'] ? $options['key'] : 'id';
-        $this->_statefield = $options['statefield'] ?? 'state';
-
-        $options['access']      ??= 'true';
-        $options['published']   ??= 1;
-        $options['countItems']  ??= 0;
+        $this->_extension   = $options['extension'];
+        $this->_table       = $options['table'];
+        $this->_field       = isset($options['field']) && $options['field'] ? $options['field'] : 'catid';
+        $this->_key         = isset($options['key']) && $options['key'] ? $options['key'] : 'id';
+        $this->_accessfield = $options['accessfield'] ?? null;
+        $this->_statefield  = $options['statefield'] ?? 'state';
+
+        $options['access']        ??= 'true';
+        $options['published']     ??= 1;
+        $options['countItems']    ??= 0;
+        $options['accessOnItems'] ??= 1;
         $options['currentlang'] = Multilanguage::isEnabled() ? Factory::getLanguage()->getTag() : 0;
 
         $this->_options = $options;
@@ -135,7 +145,7 @@ public function __construct($options)
      *
      * @since       1.6
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the ComponentInterface to get the categories
      *              Example: Factory::getApplication()->bootComponent($component)->getCategory($options, $section);
      */
@@ -237,7 +247,7 @@ protected function _load($id)
         try {
             $db = $this->getDatabase();
         } catch (DatabaseNotFoundException) {
-            @trigger_error('Database must be set, this will not be caught anymore in 5.0.', E_USER_DEPRECATED);
+            @trigger_error('Database must be set, this will not be caught anymore in 7.0.', E_USER_DEPRECATED);
             $db = Factory::getContainer()->get(DatabaseInterface::class);
         }
 
@@ -256,7 +266,7 @@ protected function _load($id)
         // Record that has this $id has been checked
         $this->_checkedCategories[$id] = true;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('c.id'),
@@ -351,11 +361,18 @@ protected function _load($id)
 
         // Note: i for item
         if ($this->_options['countItems'] == 1) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName($db->escape('i.' . $this->_key)) . ')')
                 ->from($db->quoteName($db->escape($this->_table), 'i'))
                 ->where($db->quoteName($db->escape('i.' . $this->_field)) . ' = ' . $db->quoteName('c.id'));
 
+            if ($this->_accessfield && $this->_options['accessOnItems']) {
+                $subQuery->where(
+                    $db->quoteName($db->escape('i.' . $this->_accessfield))
+                    . ' IN (' . implode(',', $query->bindArray($user->getAuthorisedViewLevels())) . ')'
+                );
+            }
+
             if ($this->_options['published'] == 1) {
                 $subQuery->where($db->quoteName($db->escape('i.' . $this->_statefield)) . ' = 1');
             }
diff --git a/libraries/src/Categories/CategoryNode.php b/libraries/src/Categories/CategoryNode.php
index 07186ec2d71b1..120a8649cdb14 100644
--- a/libraries/src/Categories/CategoryNode.php
+++ b/libraries/src/Categories/CategoryNode.php
@@ -10,7 +10,6 @@
 namespace Joomla\CMS\Categories;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Object\LegacyErrorHandlingTrait;
 use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Tree\NodeInterface;
 use Joomla\CMS\Tree\NodeTrait;
@@ -28,7 +27,6 @@
 #[\AllowDynamicProperties]
 class CategoryNode implements NodeInterface
 {
-    use LegacyErrorHandlingTrait;
     use LegacyPropertyManagementTrait;
     use NodeTrait;
 
diff --git a/libraries/src/Changelog/Changelog.php b/libraries/src/Changelog/Changelog.php
index 51928fb4399b4..75ce0209b28f8 100644
--- a/libraries/src/Changelog/Changelog.php
+++ b/libraries/src/Changelog/Changelog.php
@@ -9,12 +9,11 @@
 
 namespace Joomla\CMS\Changelog;
 
-use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Object\LegacyErrorHandlingTrait;
 use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Version;
+use Joomla\Http\HttpFactory;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -28,7 +27,6 @@
  */
 class Changelog
 {
-    use LegacyErrorHandlingTrait;
     use LegacyPropertyManagementTrait;
 
     /**
@@ -351,7 +349,7 @@ public function loadFromXml($url)
         $httpOption->set('userAgent', $version->getUserAgent('Joomla', true, false));
 
         try {
-            $http     = HttpFactory::getHttp($httpOption);
+            $http     = (new HttpFactory())->getHttp($httpOption);
             $response = $http->get($url);
         } catch (\RuntimeException) {
             $response = null;
diff --git a/libraries/src/Client/ClientHelper.php b/libraries/src/Client/ClientHelper.php
index 76186c32338b4..987436116bffb 100644
--- a/libraries/src/Client/ClientHelper.php
+++ b/libraries/src/Client/ClientHelper.php
@@ -39,10 +39,9 @@ public static function getCredentials($client, $force = false)
         static $credentials = [];
 
         $client = strtolower($client);
+        $app    = Factory::getApplication();
 
         if (!isset($credentials[$client]) || $force) {
-            $app = Factory::getApplication();
-
             // Fetch the client layer configuration options for the specific client
             switch ($client) {
                 case 'ftp':
@@ -63,7 +62,7 @@ public static function getCredentials($client, $force = false)
 
             // If user and pass are not set in global config lets see if they are in the session
             if ($options['enabled'] && ($options['user'] == '' || $options['pass'] == '')) {
-                $session         = Factory::getSession();
+                $session         = $app->getSession();
                 $options['user'] = $session->get($client . '.user', null, 'JClientHelper');
                 $options['pass'] = $session->get($client . '.pass', null, 'JClientHelper');
             }
@@ -95,11 +94,11 @@ public static function setCredentials($client, $user, $pass)
     {
         $return = false;
         $client = strtolower($client);
+        $app    = Factory::getApplication();
 
         // Test if the given credentials are valid
         switch ($client) {
             case 'ftp':
-                $app     = Factory::getApplication();
                 $options = ['enabled' => $app->get('ftp_enable'), 'host' => $app->get('ftp_host'), 'port' => $app->get('ftp_port')];
 
                 if ($options['enabled']) {
@@ -122,7 +121,7 @@ public static function setCredentials($client, $user, $pass)
 
         if ($return) {
             // Save valid credentials to the session
-            $session = Factory::getSession();
+            $session = $app->getSession();
             $session->set($client . '.user', $user, 'JClientHelper');
             $session->set($client . '.pass', $pass, 'JClientHelper');
 
@@ -146,11 +145,11 @@ public static function hasCredentials($client)
     {
         $return = false;
         $client = strtolower($client);
+        $app    = Factory::getApplication();
 
         // Get (unmodified) credentials for this client
         switch ($client) {
             case 'ftp':
-                $app     = Factory::getApplication();
                 $options = ['enabled' => $app->get('ftp_enable'), 'user' => $app->get('ftp_user'), 'pass' => $app->get('ftp_pass')];
                 break;
 
@@ -167,7 +166,7 @@ public static function hasCredentials($client)
             $return = true;
         } else {
             // Check if login credentials are available in the session
-            $session = Factory::getSession();
+            $session = $app->getSession();
             $user    = $session->get($client . '.user', null, 'JClientHelper');
             $pass    = $session->get($client . '.pass', null, 'JClientHelper');
 
diff --git a/libraries/src/Component/ComponentHelper.php b/libraries/src/Component/ComponentHelper.php
index eb508008a035d..8ee5923a80675 100644
--- a/libraries/src/Component/ComponentHelper.php
+++ b/libraries/src/Component/ComponentHelper.php
@@ -320,7 +320,7 @@ public static function renderComponent($option, $params = [])
              * @var    string
              * @since  1.5
              *
-             * @deprecated  4.3 will be removed in 6.0
+             * @deprecated  4.3 will be removed in 7.0
              *              Will be removed without replacement
              */
             \define('JPATH_COMPONENT', JPATH_BASE . '/components/' . $option);
@@ -333,7 +333,7 @@ public static function renderComponent($option, $params = [])
              * @var    string
              * @since  1.5
              *
-             * @deprecated  4.3 will be removed in 6.0
+             * @deprecated  4.3 will be removed in 7.0
              *              Will be removed without replacement
              */
             \define('JPATH_COMPONENT_SITE', JPATH_SITE . '/components/' . $option);
@@ -346,7 +346,7 @@ public static function renderComponent($option, $params = [])
              * @var    string
              * @since  1.5
              *
-             * @deprecated  4.3 will be removed in 6.0
+             * @deprecated  4.3 will be removed in 7.0
              *              Will be removed without replacement
              */
             \define('JPATH_COMPONENT_ADMINISTRATOR', JPATH_ADMINISTRATOR . '/components/' . $option);
@@ -382,8 +382,8 @@ protected static function load()
     {
         $loader = function () {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
-                ->select($db->quoteName(['extension_id', 'element', 'params', 'enabled'], ['id', 'option', null, null]))
+            $query = $db->createQuery()
+                ->select($db->quoteName(['extension_id', 'element', 'params', 'enabled', 'custom_data'], ['id', 'option', null, null, null]))
                 ->from($db->quoteName('#__extensions'))
                 ->where(
                     [
diff --git a/libraries/src/Component/ComponentRecord.php b/libraries/src/Component/ComponentRecord.php
index abb32312191de..f46d056c8d026 100644
--- a/libraries/src/Component/ComponentRecord.php
+++ b/libraries/src/Component/ComponentRecord.php
@@ -65,6 +65,14 @@ class ComponentRecord
      */
     public $enabled;
 
+    /**
+     * The component custom data
+     *
+     * @var    string
+     * @since  6.1.0
+     */
+    public $custom_data;
+
     /**
      * Class constructor
      *
@@ -88,7 +96,7 @@ public function __construct($data = [])
      *
      * @since   3.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Access the item parameters through the `getParams()` method
      *              Example:
      *              $componentRecord->getParams();
@@ -112,7 +120,7 @@ public function __get($name)
      *
      * @since   3.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Set the item parameters through the `setParams()` method
      *              Example:
      *              $componentRecord->setParams($value);
diff --git a/libraries/src/Component/Router/Rules/MenuRules.php b/libraries/src/Component/Router/Rules/MenuRules.php
index 4deac6ec64a1a..0ab853bd0e0fd 100644
--- a/libraries/src/Component/Router/Rules/MenuRules.php
+++ b/libraries/src/Component/Router/Rules/MenuRules.php
@@ -47,7 +47,7 @@ class MenuRules implements RulesInterface
      *
      * @var   Registry
      * @since 5.2.0
-     * @deprecated  5.2.0 will be removed in 6.0
+     * @deprecated  5.2.0 will be removed in 7.0
      *              without replacement
      */
     private $sefparams;
@@ -171,7 +171,7 @@ public function preprocess(&$query)
             }
         }
 
-        // TODO: Remove this whole block in 6.0 as it is a bug
+        // TODO: Remove this whole block in 7.0 as it is a bug
         if (!$this->sefparams->get('strictrouting', 0)) {
             // Check if the active menuitem matches the requested language
             if (
diff --git a/libraries/src/Component/Router/Rules/PreprocessRules.php b/libraries/src/Component/Router/Rules/PreprocessRules.php
index b75a9e42ba576..831ef15f62c58 100644
--- a/libraries/src/Component/Router/Rules/PreprocessRules.php
+++ b/libraries/src/Component/Router/Rules/PreprocessRules.php
@@ -107,7 +107,7 @@ public function preprocess(&$query)
             return;
         }
 
-        $dbquery = $this->getDatabase()->getQuery(true);
+        $dbquery = $this->getDatabase()->createQuery();
         $id      = (int) $query[$key];
 
         $dbquery->select($dbquery->quoteName('alias'))
diff --git a/libraries/src/Console/AddUserCommand.php b/libraries/src/Console/AddUserCommand.php
index 93c944641852a..578b46fa79ddf 100644
--- a/libraries/src/Console/AddUserCommand.php
+++ b/libraries/src/Console/AddUserCommand.php
@@ -189,7 +189,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
     protected function getGroupId($groupName)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('title') . ' = :groupName')
@@ -257,7 +257,7 @@ protected function getUserGroups(): array
         }
 
         // Generate select list for user
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__usergroups'))
             ->order($db->quoteName('id') . 'ASC');
diff --git a/libraries/src/Console/AddUserToGroupCommand.php b/libraries/src/Console/AddUserToGroupCommand.php
index bd2bcf9fc274b..c7cf919a828c4 100644
--- a/libraries/src/Console/AddUserToGroupCommand.php
+++ b/libraries/src/Console/AddUserToGroupCommand.php
@@ -120,7 +120,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         $this->userGroups = $this->getGroups($user);
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('id') . ' = :userGroup');
@@ -182,7 +182,7 @@ protected function getGroups($user): array
         $userGroups = Access::getGroupsByUser($user->id, false);
 
         // Generate select list for user
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__usergroups'))
             ->whereNotIn($db->quoteName('id'), $userGroups)
@@ -218,7 +218,7 @@ protected function getGroups($user): array
     protected function getGroupId($groupName)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('title') . '= :groupName')
@@ -240,7 +240,7 @@ protected function getGroupId($groupName)
     protected function getUserId($username)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . '= :username')
diff --git a/libraries/src/Console/CheckJoomlaUpdatesCommand.php b/libraries/src/Console/CheckJoomlaUpdatesCommand.php
index 7f31704b74245..ec59345350693 100644
--- a/libraries/src/Console/CheckJoomlaUpdatesCommand.php
+++ b/libraries/src/Console/CheckJoomlaUpdatesCommand.php
@@ -51,7 +51,7 @@ class CheckJoomlaUpdatesCommand extends AbstractCommand
      * @param   string|null  $name  The name of the command; if the name is empty and no default is set, a name must be set in the configure() method
      *
      * @since   5.1.0
-     * @deprecated 5.1.0 will be removed in 6.0
+     * @deprecated 5.1.0 will be removed in 7.0
      *             Use core:update:check instead of core:check-updates
      *
      */
diff --git a/libraries/src/Console/CoreUpdateChannelCommand.php b/libraries/src/Console/CoreUpdateChannelCommand.php
index bfc9a0b7e826b..ac15dccbd7c23 100644
--- a/libraries/src/Console/CoreUpdateChannelCommand.php
+++ b/libraries/src/Console/CoreUpdateChannelCommand.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Console;
 
 use Joomla\CMS\Component\ComponentHelper;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Extension;
 use Joomla\Component\Joomlaupdate\Administrator\Model\UpdateModel;
 use Joomla\Console\Command\AbstractCommand;
 use Joomla\Database\DatabaseInterface;
@@ -134,7 +134,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         }
 
         // Storing the parameters in the DB
-        $table = Table::getInstance('extension');
+        $table = new Extension($this->db);
         $table->load(['type' => 'component', 'element' => 'com_joomlaupdate']);
         $table->params = $params->toString();
         $table->store();
diff --git a/libraries/src/Console/DeleteUserCommand.php b/libraries/src/Console/DeleteUserCommand.php
index 6dc7f5c8f9dd9..ac100d0bdefce 100644
--- a/libraries/src/Console/DeleteUserCommand.php
+++ b/libraries/src/Console/DeleteUserCommand.php
@@ -119,7 +119,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         if ($user->block == 0) {
             foreach ($groups as $groupId) {
                 if (Access::checkGroup($groupId, 'core.admin')) {
-                    $queryUser = $db->getQuery(true);
+                    $queryUser = $db->createQuery();
                     $queryUser->select('COUNT(*)')
                         ->from($db->quoteName('#__users', 'u'))
                         ->leftJoin(
diff --git a/libraries/src/Console/ExtensionDisableCommand.php b/libraries/src/Console/ExtensionDisableCommand.php
new file mode 100644
index 0000000000000..4a874720c613b
--- /dev/null
+++ b/libraries/src/Console/ExtensionDisableCommand.php
@@ -0,0 +1,216 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Console;
+
+use Joomla\CMS\Table\Extension;
+use Joomla\Component\Templates\Administrator\Table\StyleTable;
+use Joomla\Console\Command\AbstractCommand;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\DatabaseInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Console command to disable extensions
+ *
+ * @since  6.1.0
+ */
+class ExtensionDisableCommand extends AbstractCommand
+{
+    use DatabaseAwareTrait;
+
+    /**
+     * The default command name
+     *
+     * @var    string
+     * @since  6.1.0
+     */
+    protected static $defaultName = 'extension:disable';
+
+    /**
+     * @var InputInterface
+     * @since 6.1.0
+     */
+    private $cliInput;
+
+    /**
+     * @var SymfonyStyle
+     * @since 6.1.0
+     */
+    private $ioStyle;
+
+    /**
+     * Exit Code for extensions already enabled\disabled
+     * @since 6.1.0
+     */
+    public const DISABLE_NOCHANGE = 3;
+
+    /**
+     * Exit Code for extensions enable\disable failure
+     * @since 6.1.0
+     */
+    public const DISABLE_FAILED = 1;
+
+    /**
+     * Exit Code for disable parent template with child failure
+     * @since 6.1.0
+     */
+    public const DISABLE_WITHCHILD_NOT_PERMITTED = 5;
+
+    /**
+     * Exit Code for disable home template failure
+     * @since 6.1.0
+     */
+    public const DISABLE_HOME_NOT_PERMITTED = 6;
+
+    /**
+     * Exit Code for extensions protected enable\disable failure
+     * @since 6.1.0
+     */
+    public const DISABLE_PROTECTED = 4;
+
+    /**
+     * Exit Code for extensions not found
+     * @since 6.1.0
+     */
+    public const DISABLE_NOT_FOUND = 2;
+
+    /**
+     * Exit Code for extensions enable\disable success
+     * @since 6.1.0
+     */
+    public const DISABLE_SUCCESSFUL = 0;
+
+    /**
+     * Command constructor.
+     *
+     * @param   DatabaseInterface  $db  The database
+     *
+     * @since   6.1.0
+     */
+    public function __construct(DatabaseInterface $db)
+    {
+        parent::__construct();
+
+        $this->setDatabase($db);
+    }
+
+    /**
+     * Configures the IO
+     *
+     * @param   InputInterface   $input   Console Input
+     * @param   OutputInterface  $output  Console Output
+     *
+     * @return void
+     *
+     * @since 6.1.0
+     *
+     */
+    private function configureIO(InputInterface $input, OutputInterface $output): void
+    {
+        $this->cliInput = $input;
+        $this->ioStyle  = new SymfonyStyle($input, $output);
+    }
+
+    /**
+     * Initialise the command.
+     *
+     * @return  void
+     *
+     * @since   6.1.0
+     */
+    protected function configure(): void
+    {
+        $this->addArgument(
+            'extensionId',
+            InputArgument::REQUIRED,
+            'ID of extension to be disabled (run extension:list command to check)'
+        );
+
+        $help = "<info>%command.name%</info> is used to disable an extension.
+		\nThe command requires one argument, the ID of the extension to disable.
+		\nYou may find this ID by running the <info>extension:list</info> command.
+		\nUsage: <info>php %command.full_name% <extension_id></info>";
+
+        $this->setDescription('Disable an extension');
+        $this->setHelp($help);
+    }
+
+    /**
+     * Internal function to execute the command.
+     *
+     * @param   InputInterface   $input   The input to inject into the command.
+     * @param   OutputInterface  $output  The output to inject into the command.
+     *
+     * @return  integer  The command exit code
+     *
+     * @since   6.1.0
+     */
+    protected function doExecute(InputInterface $input, OutputInterface $output): int
+    {
+        $this->configureIO($input, $output);
+
+        $extensionId = $this->cliInput->getArgument('extensionId');
+        $this->ioStyle->title('Disable Extension');
+
+        // Get a table object for the extension type
+        $table = new Extension($this->getDatabase());
+
+        if ((int) $extensionId === 0 || !$table->load($extensionId)) {
+            $this->ioStyle->error("Extension with ID of $extensionId not found.");
+
+            return self::DISABLE_NOT_FOUND;
+        }
+
+        if ($table->type === 'template') {
+            $style = new StyleTable($this->getDatabase());
+
+            if ($style->load(['template' => $table->element, 'client_id' => $table->client_id, 'home' => 1])) {
+                $this->ioStyle->note("Template with ID of $extensionId $table->element is home.");
+                return self::DISABLE_HOME_NOT_PERMITTED;
+            }
+
+            // Parent template cannot be disabled if there are children
+            if ($style->load(['parent' => $table->element, 'client_id' => $table->client_id])) {
+                $this->ioStyle->note("Template with ID of $extensionId $table->element have child.");
+                return self::DISABLE_WITHCHILD_NOT_PERMITTED;
+            }
+        }
+
+        $type = ucfirst($table->type);
+
+        if ($table->protected === 1) {
+            $this->ioStyle->error("$type with ID of $extensionId $table->name is protectd.");
+            return self::DISABLE_PROTECTED;
+        }
+
+        if ($table->enabled === 0) {
+            $this->ioStyle->warning("$type with ID of $extensionId $table->name already is disabled.");
+            return self::DISABLE_NOCHANGE;
+        }
+
+        $table->enabled = 0;
+
+        if (!$table->store()) {
+            $this->ioStyle->error("$type with ID of $extensionId $table->name not disabled.");
+            return self::DISABLE_FAILED;
+        }
+
+        $this->ioStyle->success("$type with ID of $extensionId $table->name disabled.");
+
+        return self::DISABLE_SUCCESSFUL;
+    }
+}
diff --git a/libraries/src/Console/ExtensionDiscoverInstallCommand.php b/libraries/src/Console/ExtensionDiscoverInstallCommand.php
index 9306da19403d3..d6d38c6622ea8 100644
--- a/libraries/src/Console/ExtensionDiscoverInstallCommand.php
+++ b/libraries/src/Console/ExtensionDiscoverInstallCommand.php
@@ -128,7 +128,7 @@ public function processDiscover($eid): int
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['extension_id']))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('state') . ' = -1');
diff --git a/libraries/src/Console/ExtensionEnableCommand.php b/libraries/src/Console/ExtensionEnableCommand.php
new file mode 100644
index 0000000000000..69b2a1e3335a1
--- /dev/null
+++ b/libraries/src/Console/ExtensionEnableCommand.php
@@ -0,0 +1,179 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Console;
+
+use Joomla\CMS\Table\Extension;
+use Joomla\Console\Command\AbstractCommand;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\DatabaseInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Console command to enable extensions
+ *
+ * @since  6.1.0
+ */
+class ExtensionEnableCommand extends AbstractCommand
+{
+    use DatabaseAwareTrait;
+
+    /**
+     * The default command name
+     *
+     * @var    string
+     * @since  6.1.0
+     */
+    protected static $defaultName = 'extension:enable';
+
+    /**
+     * @var InputInterface
+     * @since 6.1.0
+     */
+    private $cliInput;
+
+    /**
+     * @var SymfonyStyle
+     * @since 6.1.0
+     */
+    private $ioStyle;
+
+    /**
+     * Exit Code for extensions already enabled\disabled
+     * @since 6.1.0
+     */
+    public const ENABLE_NOCHANGE = 3;
+
+    /**
+     * Exit Code for extensions enable\disable failure
+     * @since 6.1.0
+     */
+    public const ENABLE_FAILED = 1;
+
+    /**
+     * Exit Code for extensions not found
+     * @since 6.1.0
+     */
+    public const ENABLE_NOT_FOUND = 2;
+
+    /**
+     * Exit Code for extensions enable\disable success
+     * @since 6.1.0
+     */
+    public const ENABLE_SUCCESSFUL = 0;
+
+    /**
+     * Command constructor.
+     *
+     * @param   DatabaseInterface  $db  The database
+     *
+     * @since   6.1.0
+     */
+    public function __construct(DatabaseInterface $db)
+    {
+        parent::__construct();
+
+        $this->setDatabase($db);
+    }
+
+    /**
+     * Configures the IO
+     *
+     * @param   InputInterface   $input   Console Input
+     * @param   OutputInterface  $output  Console Output
+     *
+     * @return void
+     *
+     * @since 6.1.0
+     *
+     */
+    private function configureIO(InputInterface $input, OutputInterface $output): void
+    {
+        $this->cliInput = $input;
+        $this->ioStyle  = new SymfonyStyle($input, $output);
+    }
+
+    /**
+     * Initialise the command.
+     *
+     * @return  void
+     *
+     * @since   6.1.0
+     */
+    protected function configure(): void
+    {
+        $this->addArgument(
+            'extensionId',
+            InputArgument::REQUIRED,
+            'ID of extension to be enabled (run extension:list command to check)'
+        );
+
+        $help = "<info>%command.name%</info> is used to enable an extension.
+		\nThe command requires one argument, the ID of the extension to enable.
+		\nYou may find this ID by running the <info>extension:list</info> command.
+		\nUsage: <info>php %command.full_name% <extension_id></info>";
+
+        $this->setDescription('Enable an extension');
+        $this->setHelp($help);
+    }
+
+    /**
+     * Internal function to execute the command.
+     *
+     * @param   InputInterface   $input   The input to inject into the command.
+     * @param   OutputInterface  $output  The output to inject into the command.
+     *
+     * @return  integer  The command exit code
+     *
+     * @since   6.1.0
+     */
+    protected function doExecute(InputInterface $input, OutputInterface $output): int
+    {
+        $this->configureIO($input, $output);
+        $commandSelected = $input->getFirstArgument();
+
+        $extensionId = $this->cliInput->getArgument('extensionId');
+
+        $this->ioStyle->title('Enable Extension');
+
+        // Get a table object for the extension type
+        $table = new Extension($this->getDatabase());
+
+        if ((int) $extensionId === 0 || !$table->load($extensionId)) {
+            $this->ioStyle->error("Extension with ID of $extensionId not found.");
+
+            return self::ENABLE_NOT_FOUND;
+        }
+
+        $type = ucfirst($table->type);
+
+        if ($table->enabled === 1) {
+            $this->ioStyle->warning("$type with ID of $extensionId $table->name already is enabled.");
+            return self::ENABLE_NOCHANGE;
+        }
+
+        $table->enabled = 1;
+
+        if (!$table->store()) {
+            $this->ioStyle->error("$type with ID of $extensionId $table->name not enabled.");
+            return self::ENABLE_FAILED;
+        }
+
+        $this->ioStyle->success("$type with ID of $extensionId $table->name enabled.");
+
+        return self::ENABLE_SUCCESSFUL;
+    }
+}
diff --git a/libraries/src/Console/ExtensionInstallCommand.php b/libraries/src/Console/ExtensionInstallCommand.php
index 557646a68ede4..80efcc8323a28 100644
--- a/libraries/src/Console/ExtensionInstallCommand.php
+++ b/libraries/src/Console/ExtensionInstallCommand.php
@@ -12,6 +12,8 @@
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Installer\InstallerHelper;
 use Joomla\Console\Command\AbstractCommand;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\DatabaseInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -28,6 +30,8 @@
  */
 class ExtensionInstallCommand extends AbstractCommand
 {
+    use DatabaseAwareTrait;
+
     /**
      * The default command name
      *
@@ -62,6 +66,20 @@ class ExtensionInstallCommand extends AbstractCommand
      */
     public const INSTALLATION_SUCCESSFUL = 0;
 
+    /**
+     * Command constructor.
+     *
+     * @param   DatabaseInterface  $db  The database
+     *
+     * @since   6.0.0
+     */
+    public function __construct(DatabaseInterface $db)
+    {
+        parent::__construct();
+
+        $this->setDatabase($db);
+    }
+
     /**
      * Configures the IO
      *
@@ -130,7 +148,8 @@ public function processPathInstallation($path): bool
             return false;
         }
 
-        $jInstaller = Installer::getInstance();
+        $jInstaller = new Installer();
+        $jInstaller->setDatabase($this->getDatabase());
         $result     = $jInstaller->install($package['extractdir']);
         InstallerHelper::cleanupInstall($tmpPath, $package['extractdir']);
 
@@ -163,6 +182,7 @@ public function processUrlInstallation($url): bool
         }
 
         $jInstaller = new Installer();
+        $jInstaller->setDatabase($this->getDatabase());
         $result     = $jInstaller->install($package['extractdir']);
         InstallerHelper::cleanupInstall($path, $package['extractdir']);
 
diff --git a/libraries/src/Console/ExtensionsListCommand.php b/libraries/src/Console/ExtensionsListCommand.php
index 6015d3eb66806..faf607aeb3e2c 100644
--- a/libraries/src/Console/ExtensionsListCommand.php
+++ b/libraries/src/Console/ExtensionsListCommand.php
@@ -155,7 +155,7 @@ public function setExtensions($extensions = null): void
     private function getAllExtensionsFromDB(): array
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select('*')
             ->from('#__extensions');
         $db->setQuery($query);
diff --git a/libraries/src/Console/FinderIndexCommand.php b/libraries/src/Console/FinderIndexCommand.php
index 66d7ebed1b5dc..f93b45e90db26 100644
--- a/libraries/src/Console/FinderIndexCommand.php
+++ b/libraries/src/Console/FinderIndexCommand.php
@@ -9,6 +9,9 @@
 
 namespace Joomla\CMS\Console;
 
+use Joomla\CMS\Event\Finder\BeforeIndexEvent;
+use Joomla\CMS\Event\Finder\BuildIndexEvent;
+use Joomla\CMS\Event\Finder\StartIndexEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\LanguageAwareInterface;
 use Joomla\CMS\Language\LanguageAwareTrait;
@@ -17,6 +20,7 @@
 use Joomla\Component\Finder\Administrator\Indexer\Indexer;
 use Joomla\Console\Command\AbstractCommand;
 use Joomla\Database\DatabaseInterface;
+use Joomla\Event\DispatcherAwareTrait;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -36,6 +40,7 @@
 class FinderIndexCommand extends AbstractCommand implements LanguageAwareInterface
 {
     use LanguageAwareTrait;
+    use DispatcherAwareTrait;
 
     /**
      * The default command name
@@ -246,7 +251,7 @@ private function configureIO(InputInterface $input, OutputInterface $output): vo
         try {
             $language = $this->getLanguage();
         } catch (\UnexpectedValueException) {
-            @trigger_error(\sprintf('Language must be set in 6.0 in %s', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(\sprintf('Language must be set in 7.0 in %s', __METHOD__), E_USER_DEPRECATED);
             $language = Factory::getLanguage();
         }
 
@@ -274,7 +279,7 @@ private function getFilters(): void
 
         // Get the taxonomy ids used by the filters.
         $db    = $this->db;
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query
             ->select('filter_id, title, data')
             ->from($db->quoteName('#__finder_filters'));
@@ -288,7 +293,7 @@ private function getFilters(): void
             }
 
             // Get taxonomy records.
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query
                 ->select('t.title, p.title AS parent')
                 ->from($db->quoteName('#__finder_taxonomy') . ' AS t')
@@ -356,14 +361,16 @@ private function index()
         Indexer::resetState();
 
         // Import the plugins.
-        PluginHelper::importPlugin('system');
-        PluginHelper::importPlugin('finder');
+        $dispatcher = $this->getDispatcher();
+        PluginHelper::importPlugin('system', null, true, $dispatcher);
+        PluginHelper::importPlugin('finder', null, true, $dispatcher);
 
         // Starting Indexer.
         $this->ioStyle->text(Text::_('FINDER_CLI_STARTING_INDEXER'));
 
         // Trigger the onStartIndex event.
-        $app->triggerEvent('onStartIndex');
+
+        $dispatcher->dispatch('onStartIndex', new StartIndexEvent('onStartIndex'));
 
         // Remove the script time limit.
         if (\function_exists('set_time_limit')) {
@@ -377,7 +384,7 @@ private function index()
         $this->ioStyle->text(Text::_('FINDER_CLI_SETTING_UP_PLUGINS'));
 
         // Trigger the onBeforeIndex event.
-        $app->triggerEvent('onBeforeIndex');
+        $dispatcher->dispatch('onBeforeIndex', new BeforeIndexEvent('onBeforeIndex'));
 
         // Startup reporting.
         $this->ioStyle->text(Text::sprintf('FINDER_CLI_SETUP_ITEMS', $state->totalItems, round(microtime(true) - $this->time, 3)));
@@ -397,7 +404,7 @@ private function index()
                 $state->batchOffset = 0;
 
                 // Trigger the onBuildIndex event.
-                Factory::getApplication()->triggerEvent('onBuildIndex');
+                $dispatcher->dispatch('onBuildIndex', new BuildIndexEvent('onBuildIndex'));
 
                 // Batch reporting.
                 $text = Text::sprintf('FINDER_CLI_BATCH_COMPLETE', $i + 1, $processingTime = round(microtime(true) - $this->qtime, 3));
@@ -474,7 +481,7 @@ private function putFilters()
 
             foreach ($filter as $element) {
                 // Look for the old taxonomy in the new taxonomy table.
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
                 $query
                     ->select('t.id')
                     ->from($db->quoteName('#__finder_taxonomy') . ' AS t')
@@ -496,7 +503,7 @@ private function putFilters()
             $taxonomyIds = empty($tids) ? '' : implode(',', $tids);
 
             // Update the filter with the new taxonomy ids.
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query
                 ->update($db->quoteName('#__finder_filters'))
                 ->set($db->quoteName('data') . ' = ' . $db->quote($taxonomyIds))
diff --git a/libraries/src/Console/ListUserCommand.php b/libraries/src/Console/ListUserCommand.php
index a9a2d593d594f..23064f2bd142e 100644
--- a/libraries/src/Console/ListUserCommand.php
+++ b/libraries/src/Console/ListUserCommand.php
@@ -76,13 +76,13 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         $this->configureIO($input, $output);
         $this->ioStyle->title('List Users');
 
-        $groupsQuery = $db->getQuery(true)
+        $groupsQuery = $db->createQuery()
             ->select($db->quoteName(['title', 'id']))
             ->from($db->quoteName('#__usergroups'));
 
         $groups = $db->setQuery($groupsQuery)->loadAssocList('id', 'title');
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select($db->quoteName(['u.id', 'u.username', 'u.name', 'u.email', 'u.block']))
             ->select($query->groupConcat($query->castAs('CHAR', $db->quoteName('g.group_id'))) . ' AS ' . $db->quoteName('groups'))
             ->innerJoin($db->quoteName('#__user_usergroup_map', 'g'), $db->quoteName('g.user_id') . ' = ' . $db->quoteName('u.id'))
diff --git a/libraries/src/Console/RemoveUserFromGroupCommand.php b/libraries/src/Console/RemoveUserFromGroupCommand.php
index 39f04bbb43c66..5befc9ad60dfe 100644
--- a/libraries/src/Console/RemoveUserFromGroupCommand.php
+++ b/libraries/src/Console/RemoveUserFromGroupCommand.php
@@ -119,7 +119,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         $this->userGroups = $this->getGroups($user);
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('id') . ' = :userGroup');
@@ -131,7 +131,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
             $result = $db->loadResult();
 
             if (Access::checkGroup($userGroup, 'core.admin')) {
-                $queryUser = $db->getQuery(true);
+                $queryUser = $db->createQuery();
                 $queryUser->select('COUNT(*)')
                     ->from($db->quoteName('#__users', 'u'))
                     ->leftJoin(
@@ -188,7 +188,7 @@ protected function getGroups($user): array
         $userGroups = Access::getGroupsByUser($user->id, false);
 
         if (!$option) {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__usergroups'))
                 ->whereIn($db->quoteName('id'), $userGroups);
@@ -242,7 +242,7 @@ protected function getGroups($user): array
     protected function getGroupId($groupName)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('title') . '= :groupName')
diff --git a/libraries/src/Console/SetConfigurationCommand.php b/libraries/src/Console/SetConfigurationCommand.php
index 7db330f30e2b3..a13cbff03a2d9 100644
--- a/libraries/src/Console/SetConfigurationCommand.php
+++ b/libraries/src/Console/SetConfigurationCommand.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\Console\Command\AbstractCommand;
-use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseFactory;
 use Joomla\Registry\Registry;
 use Symfony\Component\Console\Input\Input;
 use Symfony\Component\Console\Input\InputArgument;
@@ -363,7 +363,7 @@ public function checkDb($options): bool
 
         // Get a database object.
         try {
-            $db = DatabaseDriver::getInstance($settings);
+            $db = (new DatabaseFactory())->getDriver($settings['driver'], $settings);
             $db->getVersion();
         } catch (\Exception $e) {
             $this->ioStyle->error(
diff --git a/libraries/src/Console/UpdateCoreCommand.php b/libraries/src/Console/UpdateCoreCommand.php
index d1224c5f5dc2a..ca9132d8edad4 100644
--- a/libraries/src/Console/UpdateCoreCommand.php
+++ b/libraries/src/Console/UpdateCoreCommand.php
@@ -525,24 +525,34 @@ public function checkSchema(): int
      *
      * @return  boolean  True if success
      *
-     * @since 5.4.0
+     * @since 6.0.0
      */
     public function checkMajorUpgrade(): bool
     {
         $return = true;
 
         $language = Factory::getLanguage();
-        $language->load('plg_behaviour_compat.sys', JPATH_ADMINISTRATOR);
-        $language->load('plg_behaviour_compat6.sys', JPATH_ADMINISTRATOR);
 
-        if (PluginHelper::isEnabled('behaviour', 'compat')) {
-            $this->ioStyle->error('The \'' . Text::_('PLG_BEHAVIOUR_COMPAT') . '\' plugin is enabled.');
-            $return = false;
+        $plugin = ExtensionHelper::getExtensionRecord('compat' . Version::MAJOR_VERSION, 'plugin', 0, 'behaviour');
+
+        if ($plugin) {
+            $language->load($plugin->name . '.sys', JPATH_ADMINISTRATOR);
+
+            if (PluginHelper::isEnabled($plugin->folder, $plugin->element)) {
+                $this->ioStyle->error('The \'' . Text::_($plugin->name) . '\' plugin is enabled.');
+                $return = false;
+            }
         }
 
-        if (!PluginHelper::isEnabled('behaviour', 'compat6')) {
-            $this->ioStyle->error('The \'' . Text::_('PLG_BEHAVIOUR_COMPAT6') . '\' plugin is disabled.');
-            $return = false;
+        $plugin = ExtensionHelper::getExtensionRecord('compat' . (Version::MAJOR_VERSION + 1), 'plugin', 0, 'behaviour');
+
+        if ($plugin) {
+            $language->load($plugin->name . '.sys', JPATH_ADMINISTRATOR);
+
+            if (!PluginHelper::isEnabled($plugin->folder, $plugin->element)) {
+                $this->ioStyle->error('The \'' . Text::_($plugin->name) . '\' plugin is disabled.');
+                $return = false;
+            }
         }
 
         return $return;
diff --git a/libraries/src/Crypt/Cipher/CryptoCipher.php b/libraries/src/Crypt/Cipher/CryptoCipher.php
index 8a353f9bf3493..769141c5942dc 100644
--- a/libraries/src/Crypt/Cipher/CryptoCipher.php
+++ b/libraries/src/Crypt/Cipher/CryptoCipher.php
@@ -9,8 +9,7 @@
 
 namespace Joomla\CMS\Crypt\Cipher;
 
-use Joomla\Crypt\CipherInterface;
-use Joomla\Crypt\Key;
+use Joomla\Crypt\Cipher\Crypto;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -21,111 +20,9 @@
  *
  * @since       3.5
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Will be removed without replacement use SodiumCipher instead
  */
-class CryptoCipher implements CipherInterface
+class CryptoCipher extends Crypto
 {
-    /**
-     * Method to decrypt a data string.
-     *
-     * @param   string  $data  The encrypted string to decrypt.
-     * @param   Key     $key   The key object to use for decryption.
-     *
-     * @return  string  The decrypted data string.
-     *
-     * @since   3.5
-     * @throws  \RuntimeException
-     */
-    public function decrypt($data, Key $key)
-    {
-        // Validate key.
-        if ($key->getType() !== 'crypto') {
-            throw new \InvalidArgumentException('Invalid key of type: ' . $key->getType() . '.  Expected crypto.');
-        }
-
-        // Decrypt the data.
-        try {
-            return \Crypto::Decrypt($data, $key->getPublic());
-        } catch (\InvalidCiphertextException $ex) {
-            throw new \RuntimeException('DANGER! DANGER! The ciphertext has been tampered with!', $ex->getCode(), $ex);
-        } catch (\CryptoTestFailedException $ex) {
-            throw new \RuntimeException('Cannot safely perform decryption', $ex->getCode(), $ex);
-        } catch (\CannotPerformOperationException $ex) {
-            throw new \RuntimeException('Cannot safely perform decryption', $ex->getCode(), $ex);
-        }
-    }
-
-    /**
-     * Method to encrypt a data string.
-     *
-     * @param   string  $data  The data string to encrypt.
-     * @param   Key     $key   The key object to use for encryption.
-     *
-     * @return  string  The encrypted data string.
-     *
-     * @since   3.5
-     * @throws  \RuntimeException
-     */
-    public function encrypt($data, Key $key)
-    {
-        // Validate key.
-        if ($key->getType() !== 'crypto') {
-            throw new \InvalidArgumentException('Invalid key of type: ' . $key->getType() . '.  Expected crypto.');
-        }
-
-        // Encrypt the data.
-        try {
-            return \Crypto::Encrypt($data, $key->getPublic());
-        } catch (\CryptoTestFailedException $ex) {
-            throw new \RuntimeException('Cannot safely perform encryption', $ex->getCode(), $ex);
-        } catch (\CannotPerformOperationException $ex) {
-            throw new \RuntimeException('Cannot safely perform encryption', $ex->getCode(), $ex);
-        }
-    }
-
-    /**
-     * Method to generate a new encryption key object.
-     *
-     * @param   array  $options  Key generation options.
-     *
-     * @return  Key
-     *
-     * @since   3.5
-     * @throws  \RuntimeException
-     */
-    public function generateKey(array $options = [])
-    {
-        // Generate the encryption key.
-        try {
-            $public = \Crypto::CreateNewRandomKey();
-        } catch (\CryptoTestFailedException $ex) {
-            throw new \RuntimeException('Cannot safely create a key', $ex->getCode(), $ex);
-        } catch (\CannotPerformOperationException $ex) {
-            throw new \RuntimeException('Cannot safely create a key', $ex->getCode(), $ex);
-        }
-
-        // Explicitly flag the private as unused in this cipher.
-        $private = 'unused';
-
-        return new Key('crypto', $private, $public);
-    }
-
-    /**
-     * Check if the cipher is supported in this environment.
-     *
-     * @return  boolean
-     *
-     * @since   4.0.0
-     */
-    public static function isSupported(): bool
-    {
-        try {
-            \Crypto::RuntimeTest();
-
-            return true;
-        } catch (\CryptoTestFailedException) {
-            return false;
-        }
-    }
 }
diff --git a/libraries/src/Crypt/Cipher/SodiumCipher.php b/libraries/src/Crypt/Cipher/SodiumCipher.php
index 8cf156aedb7ed..8f7aaeaa47540 100644
--- a/libraries/src/Crypt/Cipher/SodiumCipher.php
+++ b/libraries/src/Crypt/Cipher/SodiumCipher.php
@@ -9,9 +9,7 @@
 
 namespace Joomla\CMS\Crypt\Cipher;
 
-use Joomla\Crypt\CipherInterface;
-use Joomla\Crypt\Key;
-use ParagonIE\Sodium\Compat;
+use Joomla\Crypt\Cipher\Sodium;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -21,122 +19,9 @@
  * JCrypt cipher for sodium algorithm encryption, decryption and key generation.
  *
  * @since  3.8.0
+ * @deprecated  6.2.0 will be removed in 8.0
+ *               Please use \Joomla\Crypt\Cipher\Sodium instead
  */
-class SodiumCipher implements CipherInterface
+class SodiumCipher extends Sodium
 {
-    /**
-     * The message nonce to be used with encryption/decryption
-     *
-     * @var    string
-     * @since  3.8.0
-     */
-    private $nonce;
-
-    /**
-     * Method to decrypt a data string.
-     *
-     * @param   string  $data  The encrypted string to decrypt.
-     * @param   Key     $key   The key object to use for decryption.
-     *
-     * @return  string  The decrypted data string.
-     *
-     * @since   3.8.0
-     * @throws  \RuntimeException
-     */
-    public function decrypt($data, Key $key)
-    {
-        // Validate key.
-        if ($key->getType() !== 'sodium') {
-            throw new \InvalidArgumentException('Invalid key of type: ' . $key->getType() . '.  Expected sodium.');
-        }
-
-        if (!$this->nonce) {
-            throw new \RuntimeException('Missing nonce to decrypt data');
-        }
-
-        $decrypted = Compat::crypto_box_open(
-            $data,
-            $this->nonce,
-            Compat::crypto_box_keypair_from_secretkey_and_publickey($key->getPrivate(), $key->getPublic())
-        );
-
-        if ($decrypted === false) {
-            throw new \RuntimeException('Malformed message or invalid MAC');
-        }
-
-        return $decrypted;
-    }
-
-    /**
-     * Method to encrypt a data string.
-     *
-     * @param   string  $data  The data string to encrypt.
-     * @param   Key     $key   The key object to use for encryption.
-     *
-     * @return  string  The encrypted data string.
-     *
-     * @since   3.8.0
-     * @throws  \RuntimeException
-     */
-    public function encrypt($data, Key $key)
-    {
-        // Validate key.
-        if ($key->getType() !== 'sodium') {
-            throw new \InvalidArgumentException('Invalid key of type: ' . $key->getType() . '.  Expected sodium.');
-        }
-
-        if (!$this->nonce) {
-            throw new \RuntimeException('Missing nonce to decrypt data');
-        }
-
-        return Compat::crypto_box(
-            $data,
-            $this->nonce,
-            Compat::crypto_box_keypair_from_secretkey_and_publickey($key->getPrivate(), $key->getPublic())
-        );
-    }
-
-    /**
-     * Method to generate a new encryption key object.
-     *
-     * @param   array  $options  Key generation options.
-     *
-     * @return  Key
-     *
-     * @since   3.8.0
-     * @throws  \RuntimeException
-     */
-    public function generateKey(array $options = [])
-    {
-        // Generate the encryption key.
-        $pair = Compat::crypto_box_keypair();
-
-        return new Key('sodium', Compat::crypto_box_secretkey($pair), Compat::crypto_box_publickey($pair));
-    }
-
-    /**
-     * Check if the cipher is supported in this environment.
-     *
-     * @return  boolean
-     *
-     * @since   4.0.0
-     */
-    public static function isSupported(): bool
-    {
-        return class_exists(Compat::class);
-    }
-
-    /**
-     * Set the nonce to use for encrypting/decrypting messages
-     *
-     * @param   string  $nonce  The message nonce
-     *
-     * @return  void
-     *
-     * @since   3.8.0
-     */
-    public function setNonce($nonce)
-    {
-        $this->nonce = $nonce;
-    }
 }
diff --git a/libraries/src/Crypt/Crypt.php b/libraries/src/Crypt/Crypt.php
index 2b134dee8addc..2bc032fba4954 100644
--- a/libraries/src/Crypt/Crypt.php
+++ b/libraries/src/Crypt/Crypt.php
@@ -19,6 +19,8 @@
  * Crypt is a Joomla Platform class for handling basic encryption/decryption of data.
  *
  * @since  3.0.0
+ * @deprecated  6.2.0 will be removed in 8.0
+ *                Please use \Joomla\Crypt\Crypt instead
  */
 class Crypt extends JCrypt
 {
@@ -35,6 +37,8 @@ class Crypt extends JCrypt
      * @return  boolean  True if the two strings are exactly the same.
      *
      * @since   3.2
+     * @deprecated  6.2.0 will be removed in 8.0
+     *                Please use hash_equals() instead
      */
     public static function timingSafeCompare($known, $unknown)
     {
@@ -80,9 +84,11 @@ public static function timingSafeCompare($known, $unknown)
      *
      * @return  integer
      *
-     * @since   3.5
-     * @ref     mbstring.func_overload
      * @throws  \RuntimeException
+     * @deprecated    6.2.0 will be removed in 8.0
+     *                Please use mb_strlen() instead
+     * @ref     mbstring.func_overload
+     * @since   3.5
      */
     public static function safeStrlen($str)
     {
@@ -118,6 +124,8 @@ public static function safeStrlen($str)
      * @return  string
      *
      * @since   3.5
+     * @deprecated  6.2.0 will be removed in 8.0
+     *                Please use mb_substr() instead
      */
     public static function safeSubstr($str, $start, $length = null)
     {
diff --git a/libraries/src/Date/Date.php b/libraries/src/Date/Date.php
index 0315aa6cfdd4e..a70af5bc4fc99 100644
--- a/libraries/src/Date/Date.php
+++ b/libraries/src/Date/Date.php
@@ -12,6 +12,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -56,29 +57,6 @@ class Date extends \DateTime
      */
     public static $format = 'Y-m-d H:i:s';
 
-    /**
-     * Placeholder for a \DateTimeZone object with GMT as the time zone.
-     *
-     * @var    object
-     * @since  1.7.0
-     *
-     * @deprecated  4.0 will be removed in 6.0
-     *              Will be removed without replacement
-     */
-    protected static $gmt;
-
-    /**
-     * Placeholder for a \DateTimeZone object with the default server
-     * time zone as the time zone.
-     *
-     * @var    object
-     * @since  1.7.0
-     *
-     * @deprecated  4.0 will be removed in 6.0
-     *              Will be removed without replacement
-     */
-    protected static $stz;
-
     /**
      * The \DateTimeZone object for usage in rending dates as strings.
      *
@@ -97,13 +75,6 @@ class Date extends \DateTime
      */
     public function __construct($date = 'now', $tz = null)
     {
-        // Create the base GMT and server time zone objects.
-        if (empty(self::$gmt) || empty(self::$stz)) {
-            // @TODO: This code block stays here only for B/C, can be removed in 5.0
-            self::$gmt = new \DateTimeZone('GMT');
-            self::$stz = new \DateTimeZone(@date_default_timezone_get());
-        }
-
         // If the time zone object is not set, attempt to build it.
         if (!($tz instanceof \DateTimeZone)) {
             if (\is_string($tz)) {
@@ -439,7 +410,7 @@ public function toISO8601($local = false)
     public function toSql($local = false, ?DatabaseDriver $db = null)
     {
         if ($db === null) {
-            $db = Factory::getDbo();
+            $db = Factory::getContainer()->get(DatabaseInterface::class);
         }
 
         return $this->format($db->getDateFormat(), $local, false);
diff --git a/libraries/src/Document/Document.php b/libraries/src/Document/Document.php
index b2090cff6577d..099e0c0fcdef3 100644
--- a/libraries/src/Document/Document.php
+++ b/libraries/src/Document/Document.php
@@ -342,7 +342,7 @@ public function __construct($options = [])
      *
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the \Joomla\CMS\Document\FactoryInterface instead
      *              Example: Factory::getApplication()->getDocument();
      */
@@ -980,7 +980,7 @@ public function setModifiedDate($date)
                 \sprintf(
                     'The $date parameter of %1$s must be a string or a %2$s instance, a %3$s was given.',
                     __METHOD__ . '()',
-                    'Joomla\\CMS\\Date\\Date',
+                    Date::class,
                     \is_object($date) ? (\get_class($date) . ' instance') : \gettype($date)
                 )
             );
diff --git a/libraries/src/Document/HtmlDocument.php b/libraries/src/Document/HtmlDocument.php
index ed018d81a18bc..f489245e807d3 100644
--- a/libraries/src/Document/HtmlDocument.php
+++ b/libraries/src/Document/HtmlDocument.php
@@ -171,7 +171,7 @@ public function getHeadData()
         $data['custom']        = $this->_custom;
 
         /**
-         * @deprecated  4.0 will be removed in 6.0
+         * @deprecated  4.0 will be removed in 7.0
          *              This property is for backwards compatibility. Pass text through script options in the future
          */
         $data['scriptText']    = Text::getScriptStrings();
@@ -699,7 +699,7 @@ public function countModules(string $positionName, bool $withContentOnly = false
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Load the active menu item directly and count the children with the php count function
      *              `$children = count($app->getMenu()->getActive()->getChildren())` beware getActive could be `null`
      */
@@ -773,11 +773,14 @@ protected function _fetchTemplate($params = [])
         // Load the language file for the template
         $lang = CmsFactory::getLanguage();
 
+        if ($inherits) {
+            $lang->load('tpl_' . $inherits, $directory . '/' . $inherits)
+                || $lang->load('tpl_' . $inherits, JPATH_BASE);
+        }
+
         // 1.5 or core then 1.6
         $lang->load('tpl_' . $template, JPATH_BASE)
-            || ($inherits !== '' && $lang->load('tpl_' . $inherits, JPATH_BASE))
-            || $lang->load('tpl_' . $template, $directory . '/' . $template)
-            || ($inherits !== '' && $lang->load('tpl_' . $inherits, $directory . '/' . $inherits));
+            || $lang->load('tpl_' . $template, $directory . '/' . $template);
 
         // Assign the variables
         $this->baseurl  = Uri::base(true);
@@ -853,28 +856,28 @@ protected function _parseTemplate()
     {
         $matches = [];
 
-        if (preg_match_all('#<jdoc:include\ type="([^"]+)"(.*)\/>#iU', $this->_template, $matches)) {
+        if (preg_match_all('#<jdoc:include\ type="([^"]+)"(.*)\/>#iU', $this->_template, $matches, PREG_SET_ORDER)) {
             $messages            = [];
             $template_tags_first = [];
             $template_tags_last  = [];
 
-            // Step through the jdocs in reverse order.
-            for ($i = \count($matches[0]) - 1; $i >= 0; $i--) {
-                $type    = $matches[1][$i];
-                $attribs = empty($matches[2][$i]) ? [] : Utility::parseAttributes($matches[2][$i]);
+            foreach ($matches as $match) {
+                $type    = $match[1];
+                $attribs = empty($match[2]) ? [] : Utility::parseAttributes($match[2]);
                 $name    = $attribs['name'] ?? null;
 
                 // Separate buffers to be executed first and last
                 if ($type === 'module' || $type === 'modules') {
-                    $template_tags_first[$matches[0][$i]] = ['type' => $type, 'name' => $name, 'attribs' => $attribs];
+                    $template_tags_first[$match[0]] = ['type' => $type, 'name' => $name, 'attribs' => $attribs];
                 } elseif ($type === 'message') {
-                    $messages = [$matches[0][$i] => ['type' => $type, 'name' => $name, 'attribs' => $attribs]];
+                    $messages = [$match[0] => ['type' => $type, 'name' => $name, 'attribs' => $attribs]];
                 } else {
-                    $template_tags_last[$matches[0][$i]] = ['type' => $type, 'name' => $name, 'attribs' => $attribs];
+                    $template_tags_last[$match[0]] = ['type' => $type, 'name' => $name, 'attribs' => $attribs];
                 }
             }
 
-            $this->_template_tags = $template_tags_first + $messages + array_reverse($template_tags_last);
+
+            $this->_template_tags = $template_tags_first + $messages + $template_tags_last;
         }
 
         return $this;
diff --git a/libraries/src/Document/Renderer/Html/ScriptsRenderer.php b/libraries/src/Document/Renderer/Html/ScriptsRenderer.php
index b1819c578dec8..78f2f36f6f764 100644
--- a/libraries/src/Document/Renderer/Html/ScriptsRenderer.php
+++ b/libraries/src/Document/Renderer/Html/ScriptsRenderer.php
@@ -186,7 +186,11 @@ private function renderElement($item): string
 
         // Check if script uses media version.
         if ($version && !str_contains($src, '?') && ($mediaVersion || $version !== 'auto')) {
-            $src .= '?' . ($version === 'auto' ? $mediaVersion : $version);
+            $src .= '?' . match ($version) {
+                'auto'    => $mediaVersion,
+                'nocache' => 'nocache-' . rand(0, 1_000_000),
+                default   => $version,
+            };
         }
 
         $buffer .= $tab;
@@ -358,7 +362,11 @@ private function renderImportmap(array &$assets)
 
             // Check if script uses media version.
             if ($version && !str_contains($src, '?') && !str_ends_with($src, '/') && ($mediaVersion || $version !== 'auto')) {
-                $src .= '?' . ($version === 'auto' ? $mediaVersion : $version);
+                $src .= '?' . match ($version) {
+                    'auto'    => $mediaVersion,
+                    'nocache' => 'nocache-' . rand(0, 1_000_000),
+                    default   => $version,
+                };
             }
 
             if (!$esmScope) {
diff --git a/libraries/src/Document/Renderer/Html/StylesRenderer.php b/libraries/src/Document/Renderer/Html/StylesRenderer.php
index 45a6aa39a7a4d..b6ddbcae15ecf 100644
--- a/libraries/src/Document/Renderer/Html/StylesRenderer.php
+++ b/libraries/src/Document/Renderer/Html/StylesRenderer.php
@@ -175,7 +175,11 @@ private function renderElement($item): string
 
         // Check if script uses media version.
         if ($version && !str_contains($src, '?') && ($mediaVersion || $version !== 'auto')) {
-            $src .= '?' . ($version === 'auto' ? $mediaVersion : $version);
+            $src .= '?' . match ($version) {
+                'auto'    => $mediaVersion,
+                'nocache' => 'nocache-' . rand(0, 1_000_000),
+                default   => $version,
+            };
         }
 
         $buffer .= $tab;
diff --git a/libraries/src/Encrypt/AES/Mcrypt.php b/libraries/src/Encrypt/AES/Mcrypt.php
index 207b70e46b375..663ab58606ff6 100644
--- a/libraries/src/Encrypt/AES/Mcrypt.php
+++ b/libraries/src/Encrypt/AES/Mcrypt.php
@@ -20,7 +20,7 @@
  *
  * @since    4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Will be removed without replacement
  */
 class Mcrypt extends AbstractAES implements AesInterface
diff --git a/libraries/src/Encrypt/Aes.php b/libraries/src/Encrypt/Aes.php
index e6525abea0a8b..e307662bf8771 100644
--- a/libraries/src/Encrypt/Aes.php
+++ b/libraries/src/Encrypt/Aes.php
@@ -51,7 +51,7 @@ class Aes
      * @param   string          $mode     Encryption mode. Can be ecb or cbc. We recommend using cbc.
      * @param   string          $priority Priority which adapter we should try first
      *
-     * @deprecated  4.3 $strength will be removed in 6.0
+     * @deprecated  4.3 $strength will be removed in 7.0
      */
     public function __construct($key, $strength = 128, $mode = 'cbc', $priority = 'openssl')
     {
diff --git a/libraries/src/Event/AbstractImmutableEvent.php b/libraries/src/Event/AbstractImmutableEvent.php
index 2c521d8bf8d27..d64668f9259a9 100644
--- a/libraries/src/Event/AbstractImmutableEvent.php
+++ b/libraries/src/Event/AbstractImmutableEvent.php
@@ -62,7 +62,7 @@ public function __construct(string $name, array $arguments = [])
      * @since   4.0.0
      * @throws  \BadMethodCallException
      */
-    public function offsetSet($name, $value)
+    public function offsetSet($name, $value): void
     {
         // B/C check for plugins which use $event['result'] = $result;
         if ($name === 'result') {
@@ -95,7 +95,7 @@ public function offsetSet($name, $value)
      * @since   4.0.0
      * @throws  \BadMethodCallException
      */
-    public function offsetUnset($name)
+    public function offsetUnset($name): void
     {
         throw new \BadMethodCallException(
             \sprintf(
diff --git a/libraries/src/Event/CoreEventAware.php b/libraries/src/Event/CoreEventAware.php
index 42ec3f37c6c75..bcee9232b9c27 100644
--- a/libraries/src/Event/CoreEventAware.php
+++ b/libraries/src/Event/CoreEventAware.php
@@ -154,6 +154,7 @@ trait CoreEventAware
         'onExtensionAfterUpdate'     => Extension\AfterUpdateEvent::class,
         'onExtensionBeforeSave'      => Model\BeforeSaveEvent::class,
         'onExtensionAfterSave'       => Model\AfterSaveEvent::class,
+        'onExtensionBeforeDelete'    => Model\BeforeDeleteEvent::class,
         'onExtensionAfterDelete'     => Model\AfterDeleteEvent::class,
         'onExtensionChangeState'     => Model\BeforeChangeStateEvent::class,
         'onJoomlaBeforeAutoupdate'   => Extension\BeforeJoomlaAutoupdateEvent::class,
diff --git a/libraries/src/Extension/ExtensionHelper.php b/libraries/src/Extension/ExtensionHelper.php
index 6182bf8008d5c..9d52b7dc900be 100644
--- a/libraries/src/Extension/ExtensionHelper.php
+++ b/libraries/src/Extension/ExtensionHelper.php
@@ -173,11 +173,13 @@ class ExtensionHelper
         ['plugin', 'ldap', 'authentication', 0],
 
         // Core plugin extensions - behaviour
-        ['plugin', 'compat', 'behaviour', 0],
         ['plugin', 'compat6', 'behaviour', 0],
         ['plugin', 'taggable', 'behaviour', 0],
         ['plugin', 'versionable', 'behaviour', 0],
 
+        // Core plugin extensions - captcha
+        ['plugin', 'powcaptcha', 'captcha', 0],
+
         // Core plugin extensions - content
         ['plugin', 'confirmconsent', 'content', 0],
         ['plugin', 'contact', 'content', 0],
@@ -220,6 +222,8 @@ class ExtensionHelper
         ['plugin', 'integer', 'fields', 0],
         ['plugin', 'list', 'fields', 0],
         ['plugin', 'media', 'fields', 0],
+        ['plugin', 'note', 'fields', 0],
+        ['plugin', 'number', 'fields', 0],
         ['plugin', 'radio', 'fields', 0],
         ['plugin', 'sql', 'fields', 0],
         ['plugin', 'subform', 'fields', 0],
@@ -365,6 +369,7 @@ class ExtensionHelper
 
         // Core template extensions - site
         ['template', 'cassiopeia', '', 0],
+        ['template', 'cassiopeia_extended', '', 0],
     ];
 
     /**
@@ -404,7 +409,7 @@ public static function getCoreExtensionIds()
         }
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'));
 
@@ -480,7 +485,7 @@ public static function getExtensionRecord(string $element, string $type, ?int $c
 
         if (!\array_key_exists($key, self::$loadedExtensions)) {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__extensions'))
                 ->where(
diff --git a/libraries/src/Extension/LegacyComponent.php b/libraries/src/Extension/LegacyComponent.php
index 6374512b4f85f..dcb61435781a4 100644
--- a/libraries/src/Extension/LegacyComponent.php
+++ b/libraries/src/Extension/LegacyComponent.php
@@ -242,7 +242,7 @@ public function createRouter(CMSApplicationInterface $application, AbstractMenu
         if (class_exists($class)) {
             $reflection = new \ReflectionClass($class);
 
-            if (\in_array('Joomla\\CMS\\Component\\Router\\RouterInterface', $reflection->getInterfaceNames())) {
+            if (\in_array(RouterInterface::class, $reflection->getInterfaceNames())) {
                 return new $class($application, $menu);
             }
         }
diff --git a/libraries/src/Extension/Service/Provider/MVCFactory.php b/libraries/src/Extension/Service/Provider/MVCFactory.php
index 171cb665c3790..7f5af202e8e41 100644
--- a/libraries/src/Extension/Service/Provider/MVCFactory.php
+++ b/libraries/src/Extension/Service/Provider/MVCFactory.php
@@ -9,16 +9,26 @@
 
 namespace Joomla\CMS\Extension\Service\Provider;
 
+use Joomla\CMS\Cache\CacheControllerFactoryAwareInterface;
 use Joomla\CMS\Cache\CacheControllerFactoryInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormFactoryAwareInterface;
 use Joomla\CMS\Form\FormFactoryInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryInterface;
+use Joomla\CMS\Mail\MailerFactoryAwareInterface;
 use Joomla\CMS\Mail\MailerFactoryInterface;
 use Joomla\CMS\MVC\Factory\ApiMVCFactory;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Router\SiteRouter;
+use Joomla\CMS\Router\SiteRouterAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareInterface;
 use Joomla\CMS\User\UserFactoryInterface;
+use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -67,22 +77,85 @@ public function register(Container $container)
         $container->set(
             MVCFactoryInterface::class,
             function (Container $container) {
-                if (\Joomla\CMS\Factory::getApplication()->isClient('api')) {
-                    $factory = new ApiMVCFactory($this->namespace);
-                } else {
-                    $factory = new \Joomla\CMS\MVC\Factory\MVCFactory($this->namespace);
-                }
-
-                $factory->setFormFactory($container->get(FormFactoryInterface::class));
-                $factory->setDispatcher($container->get(DispatcherInterface::class));
-                $factory->setDatabase($container->get(DatabaseInterface::class));
-                $factory->setSiteRouter($container->get(SiteRouter::class));
-                $factory->setCacheControllerFactory($container->get(CacheControllerFactoryInterface::class));
-                $factory->setUserFactory($container->get(UserFactoryInterface::class));
-                $factory->setMailerFactory($container->get(MailerFactoryInterface::class));
+                $factory = $this->createMVCFactory();
+
+                $this->injectServicesIntoFactory($factory, $container);
 
                 return $factory;
             }
         );
     }
+
+    /**
+     * Return component namespace
+     *
+     * @return  string
+     *
+     * @since   6.2.0
+     */
+    protected function getNamespace(): string
+    {
+        return $this->namespace;
+    }
+
+    /**
+     * Create MVC Factory
+     *
+     * @return  MVCFactoryInterface
+     *
+     * @since   6.2.0
+     */
+    protected function createMVCFactory(): MVCFactoryInterface
+    {
+        if (Factory::getApplication()->isClient('api')) {
+            return new ApiMVCFactory($this->namespace);
+        }
+
+        return new \Joomla\CMS\MVC\Factory\MVCFactory($this->namespace);
+    }
+
+    /**
+     * Inject services from container into MVC Factory
+     *
+     * @param   MVCFactoryInterface  $factory    The MVC Factory
+     * @param   Container            $container  The DI container
+     *
+     * @return  void
+     *
+     * @since   6.2.0
+     */
+    protected function injectServicesIntoFactory(MVCFactoryInterface $factory, Container $container): void
+    {
+        if ($factory instanceof FormFactoryAwareInterface) {
+            $factory->setFormFactory($container->get(FormFactoryInterface::class));
+        }
+
+        if ($factory instanceof DispatcherAwareInterface) {
+            $factory->setDispatcher($container->get(DispatcherInterface::class));
+        }
+
+        if ($factory instanceof DatabaseAwareInterface) {
+            $factory->setDatabase($container->get(DatabaseInterface::class));
+        }
+
+        if ($factory instanceof SiteRouterAwareInterface) {
+            $factory->setSiteRouter($container->get(SiteRouter::class));
+        }
+
+        if ($factory instanceof CacheControllerFactoryAwareInterface) {
+            $factory->setCacheControllerFactory($container->get(CacheControllerFactoryInterface::class));
+        }
+
+        if ($factory instanceof UserFactoryAwareInterface) {
+            $factory->setUserFactory($container->get(UserFactoryInterface::class));
+        }
+
+        if ($factory instanceof MailerFactoryAwareInterface) {
+            $factory->setMailerFactory($container->get(MailerFactoryInterface::class));
+        }
+
+        if ($factory instanceof LanguageFactoryAwareInterface) {
+            $factory->setLanguageFactory($container->get(LanguageFactoryInterface::class));
+        }
+    }
 }
diff --git a/libraries/src/Factory.php b/libraries/src/Factory.php
index 76a6ff1fc1084..0480bb97193fc 100644
--- a/libraries/src/Factory.php
+++ b/libraries/src/Factory.php
@@ -61,7 +61,7 @@ abstract class Factory
      * @var         \JConfig
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the configuration object within the application
      *              Example:
      *              Factory::getApplication()->getConfig();
@@ -90,7 +90,7 @@ abstract class Factory
      * @var         Session
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the session service in the DI container or get from the application object
      *              Example:
      *              Factory::getApplication()->getSession();
@@ -103,7 +103,7 @@ abstract class Factory
      * @var         Language
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the language service in the DI container or get from the application object
      *              Example:
      *              Factory::getApplication()->getLanguage();
@@ -116,7 +116,7 @@ abstract class Factory
      * @var         Document
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *               Use the document service in the DI container or get from the application object
      *               Example:
      *               Factory::getApplication()->getDocument();
@@ -129,7 +129,7 @@ abstract class Factory
      * @var         DatabaseDriver
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the database service in the DI container
      *              Example:
      *              Factory::getContainer()->get(DatabaseInterface::class);
@@ -175,7 +175,7 @@ public static function getApplication()
      * @see         Registry
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the configuration object within the application
      *              Example:
      *              Factory::getApplication()->getConfig();
@@ -256,7 +256,7 @@ public static function getContainer(): Container
      * @see         Session
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the session service in the DI container or get from the application object
      *              Example:
      *              Factory::getApplication()->getSession();
@@ -285,7 +285,7 @@ public static function getSession(array $options = [])
      * @see         Language
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the language service in the DI container or get from the application object
      *              Example:
      *              Factory::getApplication()->getLanguage();
@@ -318,7 +318,7 @@ public static function getLanguage()
      * @see         Document
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the document service in the DI container or get from the application object
      *              Example:
      *              Factory::getApplication()->getDocument();
@@ -353,7 +353,7 @@ public static function getDocument()
      * @see         User
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Load the user service from the dependency injection container or get from the application object
      *              Example:
      *              Factory::getApplication()->getIdentity();
@@ -397,7 +397,7 @@ public static function getUser($id = null)
      * @see         Cache
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the cache controller factory instead
      *              Example:
      *              Factory::getContainer()->get(CacheControllerFactoryInterface::class)->createCacheController($handler, $options);
@@ -443,7 +443,7 @@ public static function getCache($group = '', $handler = 'callback', $storage = n
      * @see         DatabaseDriver
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the database service in the DI container
      *              Example:
      *              Factory::getContainer()->get(DatabaseInterface::class);
@@ -479,7 +479,7 @@ public static function getDbo()
      * @see     Mail
      * @since   1.7.0
      *
-     * @deprecated  4.4.0 will be removed in 6.0
+     * @deprecated  4.4.0 will be removed in 7.0
      *              Use the mailer service in the DI container and create a mailer from there
      *              Example:
      *              Factory::getContainer()->get(MailerFactoryInterface::class)->createMailer();
@@ -523,11 +523,11 @@ public static function getDate($time = 'now', $tzOffset = null)
 
                 if (!class_exists($classname)) {
                     // The class does not exist, default to Date
-                    $classname = 'Joomla\\CMS\\Date\\Date';
+                    $classname = Date::class;
                 }
             } else {
                 // No tag, so default to Date
-                $classname = 'Joomla\\CMS\\Date\\Date';
+                $classname = Date::class;
             }
         }
 
@@ -554,7 +554,7 @@ public static function getDate($time = 'now', $tzOffset = null)
      * @see         Registry
      * @since       1.7.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the configuration object within the application.
      *              Example: Factory::getApplication()->getConfig();
      */
@@ -638,7 +638,7 @@ protected static function createContainer(): Container
      * @see         DatabaseDriver
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the database service in the DI container
      *              Example:
      *              Factory::getContainer()->get(DatabaseInterface::class);
@@ -701,7 +701,7 @@ protected static function createDbo()
      * @see     Mail
      * @since   1.7.0
      *
-     * @deprecated  4.4.0 will be removed in 6.0
+     * @deprecated  4.4.0 will be removed in 7.0
      *              Use the mailer service in the DI container and create a mailer from there
      *              Example:
      *              Factory::getContainer()->get(MailerFactoryInterface::class)->createMailer();
@@ -724,7 +724,7 @@ protected static function createMailer()
      * @see         Language
      * @since       1.7.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Load the language service from the dependency injection container or via $app->getLanguage()
      *              Example: Factory::getContainer()->get(LanguageFactoryInterface::class)->createLanguage($locale, $debug)
      */
@@ -755,7 +755,7 @@ protected static function createLanguage()
      * @see         Document
      * @since       1.7.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Load the document service from the dependency injection container or via $app->getDocument()
      *              Example: Factory::getContainer()->get(FactoryInterface::class)->createDocument($type, $attributes);
      */
diff --git a/libraries/src/Feed/FeedFactory.php b/libraries/src/Feed/FeedFactory.php
index 675d3e0bd466b..0e694775dc53a 100644
--- a/libraries/src/Feed/FeedFactory.php
+++ b/libraries/src/Feed/FeedFactory.php
@@ -9,7 +9,9 @@
 
 namespace Joomla\CMS\Feed;
 
-use Joomla\CMS\Http\HttpFactory;
+use Joomla\CMS\Feed\Parser\AtomParser;
+use Joomla\CMS\Feed\Parser\RssParser;
+use Joomla\Http\HttpFactory;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -27,7 +29,10 @@ class FeedFactory
      * @var    array  The list of registered parser classes for feeds.
      * @since  3.1.4
      */
-    protected $parsers = ['rss' => 'Joomla\\CMS\\Feed\\Parser\\RssParser', 'feed' => 'Joomla\\CMS\\Feed\\Parser\\AtomParser'];
+    protected $parsers = [
+        'rss'  => RssParser::class,
+        'feed' => AtomParser::class,
+    ];
 
     /**
      * Method to load a URI into the feed reader for parsing.
@@ -54,7 +59,7 @@ public function getFeed($uri)
             $options->set('userAgent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:41.0) Gecko/20100101 Firefox/41.0');
 
             try {
-                $response = HttpFactory::getHttp($options)->get($uri);
+                $response = (new HttpFactory())->getHttp($options)->get($uri);
             } catch (\RuntimeException $e) {
                 throw new \RuntimeException('Unable to open the feed.', $e->getCode(), $e);
             }
diff --git a/libraries/src/Filter/InputFilter.php b/libraries/src/Filter/InputFilter.php
index de1b5bd6427b3..fcdf648c472c5 100644
--- a/libraries/src/Filter/InputFilter.php
+++ b/libraries/src/Filter/InputFilter.php
@@ -34,8 +34,8 @@ class InputFilter extends BaseInputFilter
      * @since 4.0.0
      */
     public const FORBIDDEN_FILE_EXTENSIONS = [
-        'php', 'phps', 'pht', 'phtml', 'php3', 'php4', 'php5', 'php6', 'php7', 'asp',
-        'php8', 'phar', 'inc', 'pl', 'cgi', 'fcgi', 'java', 'jar', 'py', 'aspx',
+        'asp', 'php', 'phps', 'pht', 'phtml', 'php3', 'php4', 'php5', 'php6', 'php7',  'php8', 'phar',
+        'inc', 'pl', 'cgi', 'fcgi', 'java', 'jar', 'py', 'aspx', 'shtml', 'shtm', 'sht', 'stm',
     ];
 
     /**
@@ -152,8 +152,11 @@ public function emailToPunycode($text)
 
         if (preg_match_all($pattern, $text, $matches)) {
             foreach ($matches[0] as $match) {
-                $match  = (string) str_replace(['?', '"'], '', $match);
-                $text   = (string) str_replace($match, PunycodeHelper::emailToPunycode($match), $text);
+                try {
+                    $match = (string) str_replace(['?', '"'], '', $match);
+                    $text  = (string) str_replace($match, PunycodeHelper::emailToPunycode($match), $text);
+                } catch (\Exception) {
+                }
             }
         }
 
@@ -498,7 +501,7 @@ protected function stripUSC($source)
      *
      * @return  array  Filtered array of attribute pairs
      *
-     * @since 5.4.2
+     * @since 6.0.2
      */
     protected function cleanAttributes(array $attrSet)
     {
diff --git a/libraries/src/Filter/OutputFilter.php b/libraries/src/Filter/OutputFilter.php
index a15f5bb21d3a2..144453843476c 100644
--- a/libraries/src/Filter/OutputFilter.php
+++ b/libraries/src/Filter/OutputFilter.php
@@ -38,7 +38,7 @@ public static function linkXHTMLSafe($input)
     {
         $regex = 'href="([^"]*(&(amp;){0})[^"]*)*?"';
 
-        return preg_replace_callback("#$regex#i", ['\\Joomla\\CMS\\Filter\\OutputFilter', 'ampReplaceCallback'], $input);
+        return preg_replace_callback("#$regex#i", [static::class, 'ampReplaceCallback'], $input);
     }
 
     /**
diff --git a/libraries/src/Form/Field/AccessiblemediaField.php b/libraries/src/Form/Field/AccessiblemediaField.php
index 2c379d6908e48..0bfdd5e6c3092 100644
--- a/libraries/src/Form/Field/AccessiblemediaField.php
+++ b/libraries/src/Form/Field/AccessiblemediaField.php
@@ -9,6 +9,8 @@
 
 namespace Joomla\CMS\Form\Field;
 
+use Joomla\CMS\Language\Text;
+
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
@@ -68,6 +70,14 @@ class AccessiblemediaField extends SubformField
      */
     protected $layout;
 
+    /**
+     * Media types like 'images, audios, documents, videos'
+     *
+     * @var    string
+     * @since  6.1.0
+     */
+    protected $types;
+
     /**
      * Method to get certain otherwise inaccessible properties from the form field object.
      *
@@ -84,6 +94,7 @@ public function __get($name)
             case 'preview':
             case 'previewHeight':
             case 'previewWidth':
+            case 'types':
                 return $this->$name;
         }
 
@@ -105,6 +116,7 @@ public function __set($name, $value)
         switch ($name) {
             case 'directory':
             case 'preview':
+            case 'types':
                 $this->$name = (string) $value;
                 break;
 
@@ -146,7 +158,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
          * most likely within a custom field of type subform
          * and the value is a stdClass with properties
          * imagefile and alt_text. So it is fine.
-        */
+         */
         if (\is_string($value)) {
             json_decode($value);
 
@@ -156,30 +168,39 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
                  * If the value is not empty and is not a valid JSON string,
                  * it is most likely a custom field created in Joomla 3 and
                  * the value is a string that contains the file name.
-                */
+                 */
                 if (is_file(JPATH_ROOT . '/' . $value)) {
                     $value = '{"imagefile":"' . $value . '","alt_text":""}';
                 } else {
                     $value = '';
                 }
             }
-        } elseif (
-            !\is_object($value)
-            || !property_exists($value, 'imagefile')
-            || !property_exists($value, 'alt_text')
-        ) {
+        } elseif (!\is_object($value)) {
             return false;
+        } else {
+            $mediaTypes         = explode(',', (string) ($element['types'] ?? 'images'));
+            $requiredProperties = \in_array('images', $mediaTypes, true) ? ['imagefile', 'alt_text'] : ['file'];
+
+            foreach ($requiredProperties as $property) {
+                if (!property_exists($value, $property)) {
+                    return false;
+                }
+            }
         }
 
         if (!parent::setup($element, $value, $group)) {
             return false;
         }
 
-        $this->directory     = (string) $this->element['directory'];
-        $this->preview       = (string) $this->element['preview'];
-        $this->previewHeight = isset($this->element['preview_height']) ? (int) $this->element['preview_height'] : 200;
-        $this->previewWidth  = isset($this->element['preview_width']) ? (int) $this->element['preview_width'] : 200;
+        $this->directory     = (string)$this->element['directory'];
+        $this->preview       = (string)$this->element['preview'];
+        $this->previewHeight = isset($this->element['preview_height']) ? (int)$this->element['preview_height'] : 200;
+        $this->previewWidth  = isset($this->element['preview_width']) ? (int)$this->element['preview_width'] : 200;
+        $this->types         = isset($this->element['types']) ? (string)$this->element['types'] : 'images';
+        $mediaTypes          = explode(',', $this->types);
+        $fieldName           = (\in_array('images', $mediaTypes)) ? 'imagefile' : 'file';
 
+        // Build the form source
         $xml = <<<XML
 <?xml version="1.0" encoding="utf-8"?>
 <form>
@@ -188,18 +209,21 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 		label="JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_LABEL"
 	>
 		<field
-			name="imagefile"
+			name="$fieldName"
 			type="media"
 			label="JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_IMAGEFILE_LABEL"
 			directory="$this->directory"
 			preview="$this->preview"
 			preview_width="$this->previewWidth"
 			preview_height="$this->previewHeight"
+			types="$this->types"
 			schemes="http,https,ftp,ftps,data,file"
 			validate="url"
 			relative="true"
 		/>
-
+XML;
+        if (\in_array('images', $mediaTypes)) {
+            $xml .= <<<XML
 		<field
 			name="alt_text"
 			type="text"
@@ -212,13 +236,88 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 			label="JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_ALT_EMPTY_LABEL"
 			description="JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_ALT_EMPTY_DESC"
 		/>
+XML;
+        }
+        if (\in_array('videos', $mediaTypes) && $this->element['video_poster'] == 1) {
+            $xml .= <<<XML
+		<field
+			name="poster"
+			type="media"
+			label="JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_VIDEO_POSTER_LABEL"
+			directory="$this->directory"
+			preview="$this->preview"
+			preview_width="$this->previewWidth"
+			preview_height="$this->previewHeight"
+			types="images"
+			schemes="http,https,ftp,ftps,data,file"
+			validate="url"
+			relative="true"
+		/>
+XML;
+        }
+        if (\in_array('documents', $mediaTypes)) {
+            $xml .= <<<XML
+		<field
+			name="linktext"
+			type="text"
+			label="JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_LINKTEXT_LABEL"
+			description="JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_LINKTEXT_DESC"
+			filter="string"
+			hint="JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_LINKTEXT_DEFAULT_VALUE"
+		/>
+XML;
+        }
+        $xml .= <<<XML
 	</fieldset>
 </form>
 XML;
+
         $this->formsource = $xml;
 
         $this->layout = 'joomla.form.field.media.accessiblemedia';
 
         return true;
     }
+
+    /**
+     * Method to get the field input markup.
+     *
+     * @return  string  The field input markup.
+     *
+     * @since   6.1.0
+     */
+    protected function getInput()
+    {
+        $subForm = $this->loadSubForm();
+
+        $mediaTypes = explode(',', $this->types);
+        $label      = '';
+        if (\count($mediaTypes) > 1) {
+            $labels = [];
+
+            foreach ($mediaTypes as $type) {
+                $const    = 'JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_MEDIA_TYPE_' . strtoupper($type);
+                $labels[] = Text::_($const);
+            }
+
+            if (!empty($labels)) {
+                $label = Text::sprintf('JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_LABEL', implode(', ', $labels));
+            }
+        } else {
+            $label = Text::_('JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_MEDIA_TYPE_' . strtoupper($mediaTypes[0]));
+        }
+
+        $fieldName = (\in_array('images', $mediaTypes)) ? 'imagefile' : 'file';
+        if (!empty($label) && $subForm->getField($fieldName)) {
+            $subForm->setFieldAttribute($fieldName, 'label', $label);
+        }
+
+        if ($subForm && $subForm->getField('linktext')) {
+            $subForm->setFieldAttribute('linktext', 'default', Text::_('JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_LINKTEXT_DEFAULT_VALUE'));
+        }
+
+        $this->form = $subForm;
+
+        return parent::getInput();
+    }
 }
diff --git a/libraries/src/Form/Field/AliastagField.php b/libraries/src/Form/Field/AliastagField.php
index 33893f4d2909c..aacc6d885bfd1 100644
--- a/libraries/src/Form/Field/AliastagField.php
+++ b/libraries/src/Form/Field/AliastagField.php
@@ -43,7 +43,7 @@ protected function getOptions()
     {
         // Get list of tag type alias
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     'DISTINCT ' . $db->quoteName('type_alias', 'value'),
diff --git a/libraries/src/Form/Field/AuthorField.php b/libraries/src/Form/Field/AuthorField.php
index 4a456e87bae0e..9eef053fdba28 100644
--- a/libraries/src/Form/Field/AuthorField.php
+++ b/libraries/src/Form/Field/AuthorField.php
@@ -54,7 +54,7 @@ protected function getOptions()
             $db = $this->getDatabase();
 
             // Construct the query
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('u.id', 'value'),
diff --git a/libraries/src/Form/Field/CalendarField.php b/libraries/src/Form/Field/CalendarField.php
index 5d76831d0a67e..90751a58a84d8 100644
--- a/libraries/src/Form/Field/CalendarField.php
+++ b/libraries/src/Form/Field/CalendarField.php
@@ -192,6 +192,14 @@ public function __get($name)
     public function __set($name, $value)
     {
         switch ($name) {
+            case 'value':
+                if ($value instanceof \DateTimeInterface) {
+                    $this->value = $value->format('Y-m-d H:i:s');
+                } else {
+                    $this->value = (string) $value;
+                }
+                break;
+
             case 'maxlength':
             case 'maxyear':
             case 'minyear':
diff --git a/libraries/src/Form/Field/ChromestyleField.php b/libraries/src/Form/Field/ChromestyleField.php
index 0d446326f76c2..a932a46bb9e22 100644
--- a/libraries/src/Form/Field/ChromestyleField.php
+++ b/libraries/src/Form/Field/ChromestyleField.php
@@ -218,7 +218,7 @@ protected function getTemplates()
         $db = $this->getDatabase();
 
         // Get the database object and a new query object.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the query.
         $query->select(
diff --git a/libraries/src/Form/Field/ComponentlayoutField.php b/libraries/src/Form/Field/ComponentlayoutField.php
index 8e043cefabbb8..fb5ec948c485e 100644
--- a/libraries/src/Form/Field/ComponentlayoutField.php
+++ b/libraries/src/Form/Field/ComponentlayoutField.php
@@ -90,7 +90,7 @@ protected function getInput()
 
             // Get the database object and a new query object.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Build the query.
             $query->select(
diff --git a/libraries/src/Form/Field/ComponentsField.php b/libraries/src/Form/Field/ComponentsField.php
index f1fea01e44a48..dea455d7cda22 100644
--- a/libraries/src/Form/Field/ComponentsField.php
+++ b/libraries/src/Form/Field/ComponentsField.php
@@ -42,7 +42,7 @@ class ComponentsField extends ListField
     protected function getOptions()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('name', 'text'),
diff --git a/libraries/src/Form/Field/ContenttypeField.php b/libraries/src/Form/Field/ContenttypeField.php
index f12cbc8973acd..7abf9ee1837de 100644
--- a/libraries/src/Form/Field/ContenttypeField.php
+++ b/libraries/src/Form/Field/ContenttypeField.php
@@ -64,7 +64,7 @@ protected function getOptions()
     {
         $lang  = Factory::getLanguage();
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.type_id', 'value'),
diff --git a/libraries/src/Form/Field/DateField.php b/libraries/src/Form/Field/DateField.php
new file mode 100644
index 0000000000000..6b628630a8cac
--- /dev/null
+++ b/libraries/src/Form/Field/DateField.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+use Joomla\CMS\Form\FormField;
+
+/**
+ * Date field
+ *
+ * @since   6.0.0
+ */
+class DateField extends FormField
+{
+    /**
+     * The form field type.
+     *
+     * @var     string
+     *
+     * @since   6.0.0
+     */
+    protected $type = 'Date';
+
+    /**
+     * Name of the layout being used to render the field
+     *
+     * @var    string
+     *
+     * @since   6.0.0
+     */
+    protected $layout = 'joomla.form.field.date';
+
+    /**
+     * Min value Y-m-d
+     *
+     * @var string
+     *
+     * @since   6.0.0
+     */
+    protected $dateMin = '';
+
+    /**
+     * Max value Y-m-d
+     *
+     * @var string
+     *
+     * @since   6.0.0
+     */
+    protected $dateMax = '';
+
+    /**
+     * Method to attach a Form object to the field.
+     *
+     * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+     * @param   mixed              $value    The form field value to validate.
+     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+     *                                       full field name would end up being "bar[foo]".
+     *
+     * @return  boolean  True on success.
+     *
+     * @since   6.0.0
+     */
+    public function setup(\SimpleXMLElement $element, $value, $group = null)
+    {
+        if (!parent::setup($element, $value, $group)) {
+            return false;
+        }
+
+        foreach (['min', 'max'] as $attr) {
+            $this->__set($attr, (string) $element[$attr]);
+        }
+
+        return true;
+    }
+
+    /**
+     * Method to get certain otherwise inaccessible properties from the form field object.
+     *
+     * @param   string  $name  The property name for which to get the value.
+     *
+     * @return  mixed  The property value or null.
+     *
+     * @since   6.0.0
+     */
+    public function __get($name)
+    {
+        switch ($name) {
+            case 'min':
+                return $this->dateMin;
+            case 'max':
+                return $this->dateMax;
+            default:
+                return parent::__get($name);
+        }
+    }
+
+    /**
+     * Method to set certain otherwise inaccessible properties of the form field object.
+     *
+     * @param   string  $name   The property name for which to set the value.
+     * @param   mixed   $value  The value of the property.
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    public function __set($name, $value)
+    {
+        switch ($name) {
+            case 'value':
+                if ($value instanceof \DateTimeInterface) {
+                    $this->value = $value->format('Y-m-d');
+                } else {
+                    $this->value = (string) $value;
+                }
+                break;
+            case 'min':
+                $this->dateMin = (string) $value;
+                break;
+            case 'max':
+                $this->dateMax = (string) $value;
+                break;
+            default:
+                parent::__set($name, $value);
+        }
+    }
+
+    /**
+     * Method to get the data to be passed to the layout for rendering.
+     *
+     * @return  array
+     *
+     * @since   6.0.0
+     */
+    protected function getLayoutData()
+    {
+        $data = parent::getLayoutData();
+
+        $data['min'] = $this->dateMin;
+        $data['max'] = $this->dateMax;
+
+        return $data;
+    }
+}
diff --git a/libraries/src/Form/Field/DatetimeField.php b/libraries/src/Form/Field/DatetimeField.php
new file mode 100644
index 0000000000000..6a15f8ec0528a
--- /dev/null
+++ b/libraries/src/Form/Field/DatetimeField.php
@@ -0,0 +1,263 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormField;
+use Joomla\Registry\Registry;
+
+/**
+ * DateTime field
+ *
+ * @since   6.0.0
+ */
+class DatetimeField extends FormField
+{
+    /**
+     * The form field type.
+     *
+     * @var     string
+     *
+     * @since   6.0.0
+     */
+    protected $type = 'DateTime';
+
+    /**
+     * Name of the layout being used to render the field
+     *
+     * @var    string
+     *
+     * @since   6.0.0
+     */
+    protected $layout = 'joomla.form.field.datetime';
+
+    /**
+     * Min value Y-m-dTH:i
+     *
+     * @var string
+     *
+     * @since   6.0.0
+     */
+    protected $dateMin = '';
+
+    /**
+     * Max value Y-m-dTH:i
+     *
+     * @var string
+     *
+     * @since   6.0.0
+     */
+    protected $dateMax = '';
+
+    /**
+     * The filter.
+     *
+     * @var string
+     *
+     * @since   6.0.0
+     */
+    protected $filter = '';
+
+    /**
+     * Method to attach a Form object to the field.
+     *
+     * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
+     * @param   mixed              $value    The form field value to validate.
+     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     *                                       For example if the field has name="foo" and the group value is set to "bar" then the
+     *                                       full field name would end up being "bar[foo]".
+     *
+     * @return  boolean  True on success.
+     *
+     * @since   6.0.0
+     */
+    public function setup(\SimpleXMLElement $element, $value, $group = null)
+    {
+        if (!parent::setup($element, $value, $group)) {
+            return false;
+        }
+
+        foreach (['min', 'max', 'filter'] as $attr) {
+            $this->__set($attr, (string) $element[$attr]);
+        }
+
+        return true;
+    }
+
+    /**
+     * Method to get certain otherwise inaccessible properties from the form field object.
+     *
+     * @param   string  $name  The property name for which to get the value.
+     *
+     * @return  mixed  The property value or null.
+     *
+     * @since   6.0.0
+     */
+    public function __get($name)
+    {
+        switch ($name) {
+            case 'min':
+                return $this->dateMin;
+
+            case 'max':
+                return $this->dateMax;
+
+            case 'filter':
+                return $this->filter;
+
+            default:
+                return parent::__get($name);
+        }
+    }
+
+    /**
+     * Method to set certain otherwise inaccessible properties of the form field object.
+     *
+     * @param   string  $name   The property name for which to set the value.
+     * @param   mixed   $value  The value of the property.
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    public function __set($name, $value)
+    {
+        switch ($name) {
+            case 'value':
+                if ($value instanceof \DateTimeInterface) {
+                    $this->value = $value->format('Y-m-d H:i:s');
+                } else {
+                    $this->value = (string) $value;
+                }
+                break;
+
+            case 'min':
+                $this->dateMin = (string) $value;
+                break;
+
+            case 'max':
+                $this->dateMax = (string) $value;
+                break;
+
+            case 'filter':
+                $this->filter = (string) $value;
+                break;
+
+            default:
+                parent::__set($name, $value);
+        }
+    }
+
+    /**
+     * Method to get the data to be passed to the layout for rendering.
+     *
+     * @return  array
+     *
+     * @since   6.0.0
+     */
+    protected function getLayoutData()
+    {
+        $data = parent::getLayoutData();
+
+        $data['min']    = $this->dateMin;
+        $data['max']    = $this->dateMax;
+        $data['filter'] = $this->filter;
+
+        return $data;
+    }
+
+    /**
+     * Method to get the field input markup.
+     *
+     * @return  string  The field input markup.
+     *
+     * @since   6.0.0
+     */
+    protected function getInput()
+    {
+        $data = $this->collectLayoutData();
+
+        if ($this->value) {
+            $app   = Factory::getApplication();
+            $value = Factory::getDate($this->value, 'UTC');
+
+            switch (strtoupper($this->filter)) {
+                case 'SERVER_UTC':
+                    // Convert a date to UTC based on the server timezone.
+                    $value->setTimezone(new \DateTimeZone($app->get('offset')));
+
+                    // Transform the date string.
+                    $data['value'] = $value->format('Y-m-d\TH:i', true, false);
+                    break;
+
+                case 'USER_UTC':
+                    // Convert a date to UTC based on the user timezone.
+                    $value->setTimezone(new \DateTimeZone($app->getIdentity()->getParam('timezone', $app->get('offset'))));
+
+                    // Transform the date string.
+                    $data['value'] = $value->format('Y-m-d\TH:i', true, false);
+                    break;
+
+                default:
+                    $data['value'] = $value->format('Y-m-d\TH:i', false, false);
+            }
+        }
+
+        return $this->getRenderer($this->layout)->render($data);
+    }
+
+    /**
+     * Method to filter a field value.
+     *
+     * @param   mixed      $value  The optional value to use as the default for the field.
+     * @param   string     $group  The optional dot-separated form group path on which to find the field.
+     * @param   ?Registry  $input  An optional Registry object with the entire data set to filter
+     *                             against the entire form.
+     *
+     * @return  mixed   The filtered value.
+     *
+     * @since   6.0.0
+     */
+    public function filter($value, $group = null, ?Registry $input = null)
+    {
+        // Make sure there is a valid SimpleXMLElement.
+        if (!($this->element instanceof \SimpleXMLElement)) {
+            throw new \UnexpectedValueException(\sprintf('%s `element` is not an instance of SimpleXMLElement', __METHOD__));
+        }
+
+        if (!$value) {
+            return '';
+        }
+
+        $app = Factory::getApplication();
+
+        switch (strtoupper($this->filter)) {
+            // Convert a date to UTC based on the server timezone offset.
+            case 'SERVER_UTC':
+                // Return an SQL formatted datetime string in UTC.
+                $return = Factory::getDate($value, $app->get('offset'))->toSql();
+                break;
+
+                // Convert a date to UTC based on the user timezone offset.
+            case 'USER_UTC':
+                // Get the user timezone setting defaulting to the server timezone setting.
+                $offset = $app->getIdentity()->getParam('timezone', $app->get('offset'));
+
+                // Return an SQL formatted datetime string in UTC.
+                $return = Factory::getDate($value, $offset)->toSql();
+                break;
+
+            default:
+                $return = parent::filter($value, $group, $input);
+        }
+
+        return $return;
+    }
+}
diff --git a/libraries/src/Form/Field/EditorField.php b/libraries/src/Form/Field/EditorField.php
index 647ad1de252a5..2c298cc5bf5d4 100644
--- a/libraries/src/Form/Field/EditorField.php
+++ b/libraries/src/Form/Field/EditorField.php
@@ -205,8 +205,8 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
         $result = parent::setup($element, $value, $group);
 
         if ($result === true) {
-            $this->height      = $this->element['height'] ? (string) $this->element['height'] : '500';
-            $this->width       = $this->element['width'] ? (string) $this->element['width'] : '100%';
+            $this->height      = $this->element['height'] ? (string) $this->element['height'] : '';
+            $this->width       = $this->element['width'] ? (string) $this->element['width'] : '';
             $this->assetField  = $this->element['asset_field'] ? (string) $this->element['asset_field'] : 'asset_id';
             $this->authorField = $this->element['created_by_field'] ? (string) $this->element['created_by_field'] : 'created_by';
             $this->asset       = $this->form->getValue($this->assetField) ?: (string) $this->element['asset_id'];
@@ -283,7 +283,7 @@ protected function getEditor()
                 $db = $this->getDatabase();
 
                 // Build the query.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('element'))
                     ->from($db->quoteName('#__extensions'))
                     ->where(
diff --git a/libraries/src/Form/Field/EnumField.php b/libraries/src/Form/Field/EnumField.php
new file mode 100644
index 0000000000000..65648a525fa91
--- /dev/null
+++ b/libraries/src/Form/Field/EnumField.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Form\Field;
+
+// No direct access
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+use Joomla\CMS\Language\Text;
+
+/**
+ * Renders a <select> list whose options are the cases of a PHP enum.
+ *
+ * Usage:
+ *   <field name="ticket_type" type="enum" enum="Jed\Component\Tickets\Administrator\Enum\TicketType" />
+ *
+ * The option value is the case's backing value (for a backed enum) or its name (for a pure enum).
+ * The option text is the case's name, or - if a "prefix" attribute is given - the translation of
+ * "{PREFIX}_{CASE_NAME}" (uppercased).
+ *
+ * @since 6.2.0
+ */
+class EnumField extends ListField
+{
+    /**
+     * The enum field type.
+     *
+     * @var   string
+     * @since 6.2.0
+     */
+    protected $type = 'enum';
+
+    /**
+     * Method to get the field options.
+     *
+     * @return array The field option objects.
+     *
+     * @since 6.2.0
+     */
+    protected function getOptions(): array
+    {
+        $enumClass = (string) $this->element['enum'];
+
+        if ($enumClass === '' || !enum_exists($enumClass)) {
+            throw new \InvalidArgumentException(
+                \sprintf('Field "%s" needs a valid "enum" attribute (got "%s").', $this->name, $enumClass)
+            );
+        }
+
+        $prefix  = (string) $this->element['prefix'];
+        $options = [];
+
+        /** @var \UnitEnum $case */
+        foreach ($enumClass::cases() as $case) {
+            $options[] = (object) [
+                'value' => $case instanceof \BackedEnum ? $case->value : $case->name,
+                'text'  => $prefix !== '' ? Text::_(strtoupper($prefix . '_' . $case->name)) : $case->name,
+            ];
+        }
+
+        // Merge any additional options (e.g. a blank "please select") from the XML definition.
+        return array_merge(parent::getOptions(), $options);
+    }
+}
diff --git a/libraries/src/Form/Field/FrontendlanguageField.php b/libraries/src/Form/Field/FrontendlanguageField.php
index 28a8b2c456cdb..576150a877a9d 100644
--- a/libraries/src/Form/Field/FrontendlanguageField.php
+++ b/libraries/src/Form/Field/FrontendlanguageField.php
@@ -42,7 +42,7 @@ protected function getOptions()
     {
         // Get the database object and a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select('a.lang_code AS value, a.title AS text')
             ->from($db->quoteName('#__languages') . ' AS a')
diff --git a/libraries/src/Form/Field/GroupedlistField.php b/libraries/src/Form/Field/GroupedlistField.php
index 2b39a99f2d6ae..f8859b655c64c 100644
--- a/libraries/src/Form/Field/GroupedlistField.php
+++ b/libraries/src/Form/Field/GroupedlistField.php
@@ -52,10 +52,7 @@ class GroupedlistField extends FormField
     protected function getGroups()
     {
         $groups = [];
-        $label  = $this->layout === 'joomla.form.field.groupedlist-fancy-select' ? '' : 0;
-        // To be able to display an out-of-group option when using grouped list with fancy-select,
-        // this one should be in an empty group. This allows you to have a placeholder option with a non-empty value.
-        // Choices.js issue about mixed options with optgroup: https://github.com/Choices-js/Choices/pull/1110
+        $label  = 0;
 
         foreach ($this->element->children() as $element) {
             switch ($element->getName()) {
diff --git a/libraries/src/Form/Field/HeadertagField.php b/libraries/src/Form/Field/HeadertagField.php
index 951e0ac513429..a810cfbbf03e7 100644
--- a/libraries/src/Form/Field/HeadertagField.php
+++ b/libraries/src/Form/Field/HeadertagField.php
@@ -39,7 +39,7 @@ class HeadertagField extends ListField
      */
     protected function getOptions()
     {
-        $options = [];
+        $options = parent::getOptions();
         $tags    = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'div'];
 
         // Create one new option object for each tag
diff --git a/libraries/src/Form/Field/MenuField.php b/libraries/src/Form/Field/MenuField.php
index 976ddd7740257..a0de0c3f9c27f 100644
--- a/libraries/src/Form/Field/MenuField.php
+++ b/libraries/src/Form/Field/MenuField.php
@@ -46,7 +46,7 @@ protected function getGroups()
         $showAll    = (string) $this->element['showAll'] === 'true';
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id'),
@@ -59,7 +59,7 @@ protected function getGroups()
             ->order(
                 [
                     $db->quoteName('client_id'),
-                    $db->quoteName('title'),
+                    $db->quoteName('ordering'),
                 ]
             );
 
diff --git a/libraries/src/Form/Field/MenuitemField.php b/libraries/src/Form/Field/MenuitemField.php
index 4dfc8174493a5..3affb0bdccad3 100644
--- a/libraries/src/Form/Field/MenuitemField.php
+++ b/libraries/src/Form/Field/MenuitemField.php
@@ -176,7 +176,7 @@ protected function getGroups()
         if ($menuType) {
             // If the menutype is empty, group the items by menutype.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__menu_types'))
                 ->where($db->quoteName('menutype') . ' = :menuType')
diff --git a/libraries/src/Form/Field/ModalSelectField.php b/libraries/src/Form/Field/ModalSelectField.php
index 8a56938b6001a..47be5e1906d7f 100644
--- a/libraries/src/Form/Field/ModalSelectField.php
+++ b/libraries/src/Form/Field/ModalSelectField.php
@@ -272,7 +272,7 @@ protected function getValueTitle()
         if ($this->value && $this->sql_title_table && $this->sql_title_column && $this->sql_title_key) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName($this->sql_title_column))
                     ->from($db->quoteName($this->sql_title_table))
                     ->where($db->quoteName($this->sql_title_key) . ' = :value')
diff --git a/libraries/src/Form/Field/ModulelayoutField.php b/libraries/src/Form/Field/ModulelayoutField.php
index b66d0ec53c79f..9679b181ca75c 100644
--- a/libraries/src/Form/Field/ModulelayoutField.php
+++ b/libraries/src/Form/Field/ModulelayoutField.php
@@ -88,7 +88,7 @@ protected function getInput()
 
             // Get the database object and a new query object.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Build the query.
             $query->select(
diff --git a/libraries/src/Form/Field/ModuletagField.php b/libraries/src/Form/Field/ModuletagField.php
index a5431ae34d3bf..a5432b51380e6 100644
--- a/libraries/src/Form/Field/ModuletagField.php
+++ b/libraries/src/Form/Field/ModuletagField.php
@@ -39,8 +39,8 @@ class ModuletagField extends ListField
      */
     protected function getOptions()
     {
-        $options = [];
-        $tags    = ['address', 'article', 'aside', 'details', 'div', 'footer', 'header', 'main', 'nav', 'section', 'summary'];
+        $options = parent::getOptions();
+        $tags    = ['address', 'article', 'aside', 'details', 'div', 'footer', 'header', 'main', 'nav', 'search', 'section', 'summary'];
 
         // Create one new option object for each tag
         foreach ($tags as $tag) {
diff --git a/libraries/src/Form/Field/OrderingField.php b/libraries/src/Form/Field/OrderingField.php
index cc9abf9987205..a02acbb771258 100644
--- a/libraries/src/Form/Field/OrderingField.php
+++ b/libraries/src/Form/Field/OrderingField.php
@@ -153,7 +153,7 @@ protected function getQuery()
     {
         $categoryId = (int) $this->form->getValue('catid');
         $db         = $this->getDatabase();
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->select($db->quoteName('ct') . '.*')
             ->from($db->quoteName('#__content_types', 'ct'))
             ->where($db->quoteName('ct.type_alias') . ' = :alias')
@@ -171,7 +171,7 @@ protected function getQuery()
             $title    = $ucmMapCommon[0]->core_title;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select([$db->quoteName($ordering, 'value'), $db->quoteName($title, 'text')])
             ->from($db->quoteName(json_decode($ucmRow->table)->special->dbtable))
             ->where($db->quoteName('catid') . ' = :categoryId')
diff --git a/libraries/src/Form/Field/PluginsField.php b/libraries/src/Form/Field/PluginsField.php
index 9d7091c3b16da..95c9d788ddfe3 100644
--- a/libraries/src/Form/Field/PluginsField.php
+++ b/libraries/src/Form/Field/PluginsField.php
@@ -125,7 +125,7 @@ protected function getOptions()
 
         // Get list of plugins
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('element', 'value'),
diff --git a/libraries/src/Form/Field/RadiobasicField.php b/libraries/src/Form/Field/RadiobasicField.php
index 6ca0642b69ee3..a3d07f41f346f 100644
--- a/libraries/src/Form/Field/RadiobasicField.php
+++ b/libraries/src/Form/Field/RadiobasicField.php
@@ -19,7 +19,7 @@
  *
  * @since      4.0.0
  *
- * @deprecated 5.2 will be moved to the b/c plugin in 6.0 and removed in 7.0
+ * @deprecated 5.2 will be moved to the b/c plugin in 7.0 and removed in 8.0
  *             Use \Joomla\CMS\Form\Field\RadioField instead
  */
 class RadiobasicField extends ListField
diff --git a/libraries/src/Form/Field/RulesField.php b/libraries/src/Form/Field/RulesField.php
index efba2a77bc206..6cee9ed2d84e7 100644
--- a/libraries/src/Form/Field/RulesField.php
+++ b/libraries/src/Form/Field/RulesField.php
@@ -253,7 +253,7 @@ protected function getInput()
         if (empty($this->assetId)) {
             // Get the component asset id as fallback.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__assets'))
                 ->where($db->quoteName('name') . ' = :component')
@@ -276,7 +276,7 @@ protected function getInput()
             // In this case we need to get the component rules too.
             $db = $this->getDatabase();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('parent_id'))
                 ->from($db->quoteName('#__assets'))
                 ->where($db->quoteName('id') . ' = :assetId')
diff --git a/libraries/src/Form/Field/SqlField.php b/libraries/src/Form/Field/SqlField.php
index ffed770e3fd4e..3e8059e1ab240 100644
--- a/libraries/src/Form/Field/SqlField.php
+++ b/libraries/src/Form/Field/SqlField.php
@@ -208,7 +208,7 @@ protected function processQuery($conditions, $filters, $defaults)
         $db = $this->getDatabase();
 
         // Get the query object
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select fields
         $query->select($conditions['select']);
diff --git a/libraries/src/Form/Field/TagField.php b/libraries/src/Form/Field/TagField.php
index d5e6afc8be28b..b1b3e0323196a 100644
--- a/libraries/src/Form/Field/TagField.php
+++ b/libraries/src/Form/Field/TagField.php
@@ -133,7 +133,7 @@ protected function getOptions()
         $isRemoteSearch = $this->isRemoteSearch();
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id', 'value'),
@@ -181,7 +181,7 @@ protected function getOptions()
         // Preload only active values and 30 most used tags or fill up
         if ($isRemoteSearch) {
             // Load the most $prefillLimit used tags
-            $topQuery = $db->getQuery(true)
+            $topQuery = $db->createQuery()
                 ->select($db->quoteName('tag_id'))
                 ->from($db->quoteName('#__contentitem_tag_map'))
                 ->group($db->quoteName('tag_id'))
diff --git a/libraries/src/Form/Field/TemplatestyleField.php b/libraries/src/Form/Field/TemplatestyleField.php
index 8a88b3214c26c..a92b9efe71432 100644
--- a/libraries/src/Form/Field/TemplatestyleField.php
+++ b/libraries/src/Form/Field/TemplatestyleField.php
@@ -142,7 +142,7 @@ protected function getGroups()
 
         // Get the database object and a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the query.
         $query->select(
diff --git a/libraries/src/Form/Field/TimeField.php b/libraries/src/Form/Field/TimeField.php
index 8977a6a76dc7a..a9bf4ab699d7d 100644
--- a/libraries/src/Form/Field/TimeField.php
+++ b/libraries/src/Form/Field/TimeField.php
@@ -9,7 +9,9 @@
 
 namespace Joomla\CMS\Form\Field;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -17,7 +19,7 @@
 
 /**
  * Form Field class for the Joomla Platform.
- * Provides a select list of integers with specified first, last and step values.
+ * Provides a Time input.
  *
  * @since  4.0.0
  */
@@ -63,6 +65,15 @@ class TimeField extends FormField
      */
     protected $layout = 'joomla.form.field.time';
 
+    /**
+     * The filter.
+     *
+     * @var string
+     *
+     * @since   6.0.0
+     */
+    protected $filter = '';
+
     /**
      * Method to set certain otherwise inaccessible properties of the form field object.
      *
@@ -76,12 +87,24 @@ class TimeField extends FormField
     public function __set($name, $value)
     {
         switch ($name) {
+            case 'value':
+                if ($value instanceof \DateTimeInterface) {
+                    $this->value = $value->format('H:i:s');
+                } else {
+                    $this->value = (string) $value;
+                }
+                break;
+
             case 'max':
             case 'min':
             case 'step':
                 $this->$name = (int) $value;
                 break;
 
+            case 'filter':
+                $this->filter = (string) $value;
+                break;
+
             default:
                 parent::__set($name, $value);
         }
@@ -110,6 +133,10 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
             $this->max  = isset($this->element['max']) ? (int) $this->element['max'] : null;
             $this->min  = isset($this->element['min']) ? (int) $this->element['min'] : null;
             $this->step = isset($this->element['step']) ? (int) $this->element['step'] : null;
+
+            if ($this->element['filter']) {
+                $this->__set('filter', $element['filter']);
+            }
         }
 
         return $return;
@@ -130,6 +157,7 @@ public function __get($name)
             case 'min':
             case 'max':
             case 'step':
+            case 'filter':
                 return $this->$name;
         }
 
@@ -145,7 +173,35 @@ public function __get($name)
      */
     protected function getInput()
     {
-        return $this->getRenderer($this->layout)->render($this->collectLayoutData());
+        $data = $this->collectLayoutData();
+
+        if ($this->value) {
+            $app   = Factory::getApplication();
+            $value = Factory::getDate($this->value, 'UTC');
+
+            switch (strtoupper($this->filter)) {
+                case 'SERVER_UTC':
+                    // Convert a date to UTC based on the server timezone.
+                    $value->setTimezone(new \DateTimeZone($app->get('offset')));
+
+                    // Transform the date string.
+                    $data['value'] = $value->format('H:i:s', true, false);
+                    break;
+
+                case 'USER_UTC':
+                    // Convert a date to UTC based on the user timezone.
+                    $value->setTimezone(new \DateTimeZone($app->getIdentity()->getParam('timezone', $app->get('offset'))));
+
+                    // Transform the date string.
+                    $data['value'] = $value->format('H:i:s', true, false);
+                    break;
+
+                default:
+                    $data['value'] = $value->format('H:i:s', false, false);
+            }
+        }
+
+        return $this->getRenderer($this->layout)->render($data);
     }
 
     /**
@@ -160,11 +216,60 @@ protected function getLayoutData()
         $data = parent::getLayoutData();
 
         $extraData = [
-            'min'  => $this->min,
-            'max'  => $this->max,
-            'step' => $this->step,
+            'min'    => $this->min,
+            'max'    => $this->max,
+            'step'   => $this->step,
+            'filter' => $this->filter,
         ];
 
         return array_merge($data, $extraData);
     }
+
+    /**
+     * Method to filter a field value.
+     *
+     * @param   mixed      $value  The optional value to use as the default for the field.
+     * @param   string     $group  The optional dot-separated form group path on which to find the field.
+     * @param   ?Registry  $input  An optional Registry object with the entire data set to filter
+     *                             against the entire form.
+     *
+     * @return  mixed   The filtered value.
+     *
+     * @since   6.0.0
+     */
+    public function filter($value, $group = null, ?Registry $input = null)
+    {
+        // Make sure there is a valid SimpleXMLElement.
+        if (!($this->element instanceof \SimpleXMLElement)) {
+            throw new \UnexpectedValueException(\sprintf('%s `element` is not an instance of SimpleXMLElement', __METHOD__));
+        }
+
+        if (!$value) {
+            return '';
+        }
+
+        $app = Factory::getApplication();
+
+        switch (strtoupper($this->filter)) {
+            // Convert a date to UTC based on the server timezone offset.
+            case 'SERVER_UTC':
+                // Return an SQL formatted datetime string in UTC.
+                $return = Factory::getDate($value, $app->get('offset'))->toSql();
+                break;
+
+                // Convert a date to UTC based on the user timezone offset.
+            case 'USER_UTC':
+                // Get the user timezone setting defaulting to the server timezone setting.
+                $offset = $app->getIdentity()->getParam('timezone', $app->get('offset'));
+
+                // Return an SQL formatted datetime string in UTC.
+                $return = Factory::getDate($value, $offset)->toSql();
+                break;
+
+            default:
+                $return = parent::filter($value, $group, $input);
+        }
+
+        return $return;
+    }
 }
diff --git a/libraries/src/Form/Field/TransitionField.php b/libraries/src/Form/Field/TransitionField.php
index 0ffdccec55498..a9291fa9165f0 100644
--- a/libraries/src/Form/Field/TransitionField.php
+++ b/libraries/src/Form/Field/TransitionField.php
@@ -79,6 +79,15 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
             } else {
                 $this->workflowStage = $input->getInt('id');
             }
+
+            $db = $this->getDatabase();
+
+            $query = $db->getQuery(true)
+                ->select($db->quoteName('workflow_id'))
+                ->from($db->quoteName('#__workflow_stages'))
+                ->where($db->quoteName('id') . ' = ' . (int) $this->workflowStage);
+
+            $this->form->setFieldAttribute('transition', 'workflow_id', (int) $db->setQuery($query)->loadResult());
         }
 
         return $result;
@@ -98,7 +107,7 @@ protected function getGroups()
         $extension     = $this->extension;
         $workflowStage = (int) $this->workflowStage;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('t.id', 'value'),
@@ -150,7 +159,7 @@ function ($item) use ($user, $component) {
         }
 
         // Get workflow stage title
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__workflow_stages'))
             ->where($db->quoteName('id') . ' = :stage')
diff --git a/libraries/src/Form/Field/UserField.php b/libraries/src/Form/Field/UserField.php
index 24b187e89867a..91f6530fe98ef 100644
--- a/libraries/src/Form/Field/UserField.php
+++ b/libraries/src/Form/Field/UserField.php
@@ -37,7 +37,7 @@ class UserField extends FormField
      *
      * @var   array
      * @since 3.5
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     protected $groups = null;
 
@@ -46,7 +46,7 @@ class UserField extends FormField
      *
      * @var   array
      * @since 3.5
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     protected $excluded = null;
 
diff --git a/libraries/src/Form/Field/WorkflowstageField.php b/libraries/src/Form/Field/WorkflowstageField.php
index 6145028899086..2761947243985 100644
--- a/libraries/src/Form/Field/WorkflowstageField.php
+++ b/libraries/src/Form/Field/WorkflowstageField.php
@@ -91,7 +91,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     protected function getGroups()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select distinct stages for existing articles
         $query
diff --git a/libraries/src/Form/Filter/IntarrayFilter.php b/libraries/src/Form/Filter/IntarrayFilter.php
index f3eab0b540ec8..4225b31e05945 100644
--- a/libraries/src/Form/Filter/IntarrayFilter.php
+++ b/libraries/src/Form/Filter/IntarrayFilter.php
@@ -43,7 +43,7 @@ class IntarrayFilter implements FormFilterInterface
     public function filter(\SimpleXMLElement $element, $value, $group = null, ?Registry $input = null, ?Form $form = null)
     {
         if (strtoupper((string) $element['filter']) === 'INT_ARRAY') {
-            @trigger_error('`INT_ARRAY` form filter is deprecated and will be removed in 5.0. Use `Intarray` instead', E_USER_DEPRECATED);
+            @trigger_error('`INT_ARRAY` form filter is deprecated and will be removed in 7.0. Use `Intarray` instead', E_USER_DEPRECATED);
         }
 
         if (\is_object($value)) {
diff --git a/libraries/src/Form/Filter/UrlFilter.php b/libraries/src/Form/Filter/UrlFilter.php
index a6d478a6b35ce..35516350d2795 100644
--- a/libraries/src/Form/Filter/UrlFilter.php
+++ b/libraries/src/Form/Filter/UrlFilter.php
@@ -87,7 +87,10 @@ public function filter(\SimpleXMLElement $element, $value, $group = null, ?Regis
             }
         }
 
-        $value = PunycodeHelper::urlToPunycode($value);
+        try {
+            $value = PunycodeHelper::urlToPunycode($value);
+        } catch (\Exception) {
+        }
 
         return $value;
     }
diff --git a/libraries/src/Form/Form.php b/libraries/src/Form/Form.php
index b7929cb25c1fc..233748de35ffa 100644
--- a/libraries/src/Form/Form.php
+++ b/libraries/src/Form/Form.php
@@ -1466,7 +1466,7 @@ protected function loadField($element, $group = null, $value = null)
             try {
                 $field->setDatabase($this->getDatabase());
             } catch (DatabaseNotFoundException) {
-                @trigger_error('Database must be set, this will not be caught anymore in 5.0.', E_USER_DEPRECATED);
+                @trigger_error('Database must be set, this will not be caught anymore in 7.0.', E_USER_DEPRECATED);
                 $field->setDatabase(Factory::getContainer()->get(DatabaseInterface::class));
             }
         }
@@ -1681,7 +1681,7 @@ public static function addFilterPath($new = null)
      *
      * @since   1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the FormFactory service from the container
      *              Example: Factory::getContainer()->get(FormFactoryInterface::class)->createForm($name, $options);
      *
diff --git a/libraries/src/Form/FormField.php b/libraries/src/Form/FormField.php
index ae60376c7af0c..9ffbb015c1bd9 100644
--- a/libraries/src/Form/FormField.php
+++ b/libraries/src/Form/FormField.php
@@ -9,6 +9,7 @@
 
 namespace Joomla\CMS\Form;
 
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Form\Field\SubformField;
@@ -21,6 +22,7 @@
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\Exception\DatabaseNotFoundException;
+use Joomla\Filesystem\Path;
 use Joomla\Registry\Registry;
 use Joomla\String\Normalise;
 use Joomla\String\StringHelper;
@@ -398,6 +400,14 @@ abstract class FormField implements DatabaseAwareInterface, CurrentUserInterface
      */
     protected $renderLabelLayout = 'joomla.form.renderlabel';
 
+    /**
+     * Additional layout paths to look for layout files
+     *
+     * @var   array
+     * @since 6.0.0
+     */
+    protected $layoutPaths = [];
+
     /**
      * The data-attribute name and values of the form field.
      * For example, data-action-type="click" data-action-type="change"
@@ -425,7 +435,7 @@ public function __construct($form = null)
 
         // Detect the field type if not set
         if (!isset($this->type)) {
-            $parts = Normalise::fromCamelCase(\get_called_class(), true);
+            $parts = Normalise::fromCamelCase(static::class, true);
 
             if ($parts[0] === 'J') {
                 $this->type = StringHelper::ucfirst($parts[\count($parts) - 1], '_');
@@ -474,6 +484,7 @@ public function __get($name)
             case 'validationtext':
             case 'showon':
             case 'parentclass':
+            case 'layoutPaths':
                 return $this->$name;
 
             case 'input':
@@ -591,6 +602,10 @@ public function __set($name, $value)
                 $this->$name = (int) $value;
                 break;
 
+            case 'layoutIncludePath':
+                $this->layoutPaths = \is_array($value) ? $value : explode(',', (string) $value);
+                break;
+
             default:
                 // Detect data attribute(s)
                 if (str_starts_with($name, 'data-')) {
@@ -658,7 +673,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
         $attributes = [
             'multiple', 'name', 'id', 'hint', 'class', 'description', 'labelclass', 'onchange', 'onclick', 'validate', 'pattern', 'validationtext',
             'default', 'required', 'disabled', 'readonly', 'autofocus', 'hidden', 'autocomplete', 'spellcheck', 'translateHint', 'translateLabel',
-            'translate_label', 'translateDescription', 'translate_description', 'size', 'showon', ];
+            'translate_label', 'translateDescription', 'translate_description', 'size', 'showon', 'layoutIncludePath'];
 
         $this->default = isset($element['value']) ? (string) $element['value'] : $this->default;
 
@@ -1060,7 +1075,13 @@ public function renderField($options = [])
 
         $data = array_merge($this->collectLayoutData(), $data);
 
-        return $this->getRenderer($this->renderLayout)->render($data);
+        $renderer = $this->getRenderer($this->renderLayout);
+
+        if (isset($options['layoutIncludePath']) && is_dir(Path::check($options['layoutIncludePath']))) {
+            $renderer->addIncludePaths($options['layoutIncludePath']);
+        }
+
+        return $renderer->render($data);
     }
 
     /**
@@ -1099,7 +1120,7 @@ public function filter($value, $group = null, ?Registry $input = null)
                     return \call_user_func(explode('::', $filter), $value);
                 }
 
-                /** @deprecated Can be removed with Joomla 6.0 since the class alias is deprecated since Joomla 4.0*/
+                /** @deprecated Can be removed with Joomla 7.0 since the class alias is deprecated since Joomla 4.0*/
                 [$class, $method] = explode('::', $filter);
                 if ($class === 'JComponentHelper') {
                     throw new \UnexpectedValueException(
@@ -1108,7 +1129,7 @@ public function filter($value, $group = null, ?Registry $input = null)
                             \get_class($this),
                             $this->element['name'],
                             $class,
-                            '\\Joomla\\CMS\\Component\\ComponentHelper'
+                            ComponentHelper::class
                         )
                     );
                 }
@@ -1218,7 +1239,7 @@ public function validate($value, $group = null, ?Registry $input = null)
                 try {
                     $rule->setDatabase($this->getDatabase());
                 } catch (DatabaseNotFoundException) {
-                    @trigger_error('Database must be set, this will not be caught anymore in 5.0.', E_USER_DEPRECATED);
+                    @trigger_error('Database must be set, this will not be caught anymore in 7.0.', E_USER_DEPRECATED);
                     $rule->setDatabase(Factory::getContainer()->get(DatabaseInterface::class));
                 }
             }
@@ -1243,7 +1264,7 @@ public function validate($value, $group = null, ?Registry $input = null)
                 try {
                     $rule->setDatabase($this->getDatabase());
                 } catch (DatabaseNotFoundException) {
-                    @trigger_error('Database must be set, this will not be caught anymore in 5.0.', E_USER_DEPRECATED);
+                    @trigger_error('Database must be set, this will not be caught anymore in 7.0.', E_USER_DEPRECATED);
                     $rule->setDatabase(Factory::getContainer()->get(DatabaseInterface::class));
                 }
             }
@@ -1372,7 +1393,13 @@ protected function getLayoutPaths()
     {
         $renderer = new FileLayout('default');
 
-        return $renderer->getDefaultIncludePaths();
+        $paths = $renderer->getDefaultIncludePaths();
+
+        foreach ($this->layoutPaths as $path) {
+            array_unshift($paths, JPATH_ROOT . '/' . ltrim((string) $path, '/'));
+        }
+
+        return $paths;
     }
 
     /**
diff --git a/libraries/src/Form/FormRule.php b/libraries/src/Form/FormRule.php
index 7efa6265a35c8..6dc65159cc487 100644
--- a/libraries/src/Form/FormRule.php
+++ b/libraries/src/Form/FormRule.php
@@ -5,31 +5,16 @@
  *
  * @copyright  (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
- *
- * Remove phpcs exception with deprecated constant JCOMPAT_UNICODE_PROPERTIES
- * @phpcs:disable PSR1.Files.SideEffects
  */
 
 namespace Joomla\CMS\Form;
 
+// phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
 
 use Joomla\Registry\Registry;
 
-// Detect if we have full UTF-8 and unicode PCRE support.
-if (!\defined('JCOMPAT_UNICODE_PROPERTIES')) {
-    /**
-     * Flag indicating UTF-8 and PCRE support is present
-     *
-     * @const  boolean
-     * @since  1.6
-     *
-     * @deprecated  4.0 will be removed in 6.0
-     *              Will be removed without replacement (Also remove phpcs exception)
-     */
-    \define('JCOMPAT_UNICODE_PROPERTIES', (bool) @preg_match('/\pL/u', 'a'));
-}
-
 /**
  * Form Rule class for the Joomla Platform.
  *
diff --git a/libraries/src/Form/Rule/EmailRule.php b/libraries/src/Form/Rule/EmailRule.php
index 0d1b41ea79ffc..37b5b3599eef9 100644
--- a/libraries/src/Form/Rule/EmailRule.php
+++ b/libraries/src/Form/Rule/EmailRule.php
@@ -161,7 +161,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, ?Registr
         if ($unique && !$multiple) {
             // Get the database object and a new query object.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Get the extra field check attribute.
             $userId = ($form instanceof Form) && $form->getValue('id')
diff --git a/libraries/src/Form/Rule/ExistsRule.php b/libraries/src/Form/Rule/ExistsRule.php
index d313c5a5a7381..78e8e8c24f51c 100644
--- a/libraries/src/Form/Rule/ExistsRule.php
+++ b/libraries/src/Form/Rule/ExistsRule.php
@@ -64,7 +64,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, ?Registr
 
         // Set and query the database.
         $exists = $db->setQuery(
-            $db->getQuery(true)
+            $db->createQuery()
                 ->select('COUNT(*)')
                 ->from($db->quoteName($existsTable))
                 ->where($db->quoteName($existsColumn) . ' = ' . $db->quote($value))
diff --git a/libraries/src/Form/Rule/UrlRule.php b/libraries/src/Form/Rule/UrlRule.php
index c129932c72634..93466d5b9c5c3 100644
--- a/libraries/src/Form/Rule/UrlRule.php
+++ b/libraries/src/Form/Rule/UrlRule.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormRule;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\String\PunycodeHelper;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
 use Joomla\Uri\UriHelper;
@@ -112,10 +113,22 @@ public function test(\SimpleXMLElement $element, $value, $group = null, ?Registr
             return false;
         }
 
-        // The best we can do for the rest is make sure that the strings are valid UTF-8
-        // and the port is an integer.
-        if (\array_key_exists('host', $urlParts) && !StringHelper::valid((string) $urlParts['host'])) {
-            return false;
+        /**
+         * The best we can do for the rest is make sure that the strings are valid UTF-8,
+         * the host labels are valid (can be converted to punycode) and the port is an integer.
+         */
+        if (\array_key_exists('host', $urlParts)) {
+            if (!StringHelper::valid((string) $urlParts['host'])) {
+                return false;
+            }
+
+            foreach (explode('.', (string) $urlParts['host']) as $hostLabel) {
+                try {
+                    PunycodeHelper::toPunycode($hostLabel);
+                } catch (\Exception) {
+                    return false;
+                }
+            }
         }
 
         if (\array_key_exists('port', $urlParts) && 0 === (int) $urlParts['port']) {
diff --git a/libraries/src/Form/Rule/UserIdRule.php b/libraries/src/Form/Rule/UserIdRule.php
index 2babb2c7811a1..6e793fe74d3e5 100644
--- a/libraries/src/Form/Rule/UserIdRule.php
+++ b/libraries/src/Form/Rule/UserIdRule.php
@@ -56,7 +56,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, ?Registr
 
         // Get the database object and a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the query.
         $query->select('COUNT(*)')
diff --git a/libraries/src/Form/Rule/UsernameRule.php b/libraries/src/Form/Rule/UsernameRule.php
index 304b19b7a1c79..975ddbba14af5 100644
--- a/libraries/src/Form/Rule/UsernameRule.php
+++ b/libraries/src/Form/Rule/UsernameRule.php
@@ -48,7 +48,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, ?Registr
     {
         // Get the database object and a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Get the extra field check attribute.
         $userId = ($form instanceof Form) ? (int) $form->getValue('id') : 0;
diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php
index dbcf82efbec7d..6bf2503162718 100644
--- a/libraries/src/HTML/HTMLHelper.php
+++ b/libraries/src/HTML/HTMLHelper.php
@@ -47,7 +47,7 @@ abstract class HTMLHelper
      *
      * @var    string[]
      * @since  1.5
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      */
     protected static $includePaths = [];
 
@@ -56,7 +56,7 @@ abstract class HTMLHelper
      *
      * @var    callable[]
      * @since  1.6
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      */
     protected static $registry = [];
 
@@ -77,7 +77,7 @@ abstract class HTMLHelper
      * @return  array  Contains lowercase key, prefix, file, function.
      *
      * @since       1.6
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the service registry instead
      *              HTMLHelper::getServiceRegistry()->getService($file);
      */
@@ -90,17 +90,17 @@ protected static function extract($key)
 
         if (\count($parts) === 3) {
             @trigger_error(
-                'Support for a three segment service key is deprecated and will be removed in Joomla 6.0, use the service registry instead',
+                'Support for a three segment service key is deprecated and will be removed in Joomla 7.0, use the service registry instead',
                 E_USER_DEPRECATED
             );
         }
 
-        $prefix = \count($parts) === 3 ? array_shift($parts) : 'Joomla\\CMS\\HTML\\HTMLHelper';
+        $prefix = \count($parts) === 3 ? array_shift($parts) : HTMLHelper::class;
         $file   = \count($parts) === 2 ? array_shift($parts) : '';
         $func   = array_shift($parts);
 
         if (strtolower($prefix) === 'jhtml') {
-            $prefix = 'Joomla\\CMS\\HTML\\HTMLHelper';
+            $prefix = HTMLHelper::class;
         }
 
         return [strtolower($prefix . '.' . $file . '.' . $func), $prefix, $file, $func];
@@ -166,7 +166,7 @@ final public static function _(string $key, ...$methodArgs)
                     throw new \InvalidArgumentException(\sprintf('%s not found.', $className), 500);
                 }
 
-                // @deprecated with 5.0 remove with 6.0 or 7.0 (depends on other relevant code)
+                // @deprecated with 5.0 remove with 7.0 (depends on other relevant code)
                 $className = 'JHtml' . ucfirst($file);
 
                 \JLoader::register($className, $path);
@@ -204,14 +204,14 @@ final public static function _(string $key, ...$methodArgs)
      * @return  boolean  True if the function is callable
      *
      * @since       1.6
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the service registry instead
      *              HTMLHelper::getServiceRegistry()->register($key, $function);
      */
     public static function register($key, callable $function)
     {
         @trigger_error(
-            'Support for registering functions is deprecated and will be removed in Joomla 6.0, use the service registry instead',
+            'Support for registering functions is deprecated and will be removed in Joomla 7.0, use the service registry instead',
             E_USER_DEPRECATED
         );
 
@@ -230,13 +230,13 @@ public static function register($key, callable $function)
      * @return  boolean  True if a set key is unset
      *
      * @since       1.6
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the service registry instead
      */
     public static function unregister($key)
     {
         @trigger_error(
-            'Support for registering functions is deprecated and will be removed in Joomla 6.0, use the service registry instead',
+            'Support for registering functions is deprecated and will be removed in Joomla 7.0, use the service registry instead',
             E_USER_DEPRECATED
         );
 
@@ -1196,13 +1196,13 @@ public static function calendar($value, $name, $id, $format = '%Y-%m-%d', $attri
      * @return  array  An array with directory elements
      *
      * @since       1.5
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the service registry instead
      */
     public static function addIncludePath($path = '')
     {
         @trigger_error(
-            'Support for registering lookup paths is deprecated and will be removed in Joomla 6.0, use the service registry instead',
+            'Support for registering lookup paths is deprecated and will be removed in Joomla 7.0, use the service registry instead',
             E_USER_DEPRECATED
         );
 
diff --git a/libraries/src/HTML/Helpers/Access.php b/libraries/src/HTML/Helpers/Access.php
index 027773d755c98..aa44bd6b5f576 100644
--- a/libraries/src/HTML/Helpers/Access.php
+++ b/libraries/src/HTML/Helpers/Access.php
@@ -52,7 +52,7 @@ abstract class Access
     public static function level($name, $selected, $attribs = '', $params = true, $id = false)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id', 'value'),
@@ -241,7 +241,7 @@ public static function assetgroups()
     {
         if (empty(static::$asset_groups)) {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('a.id', 'value'),
diff --git a/libraries/src/HTML/Helpers/AdminLanguage.php b/libraries/src/HTML/Helpers/AdminLanguage.php
index 8b54fcdb2cee8..1377fab82dfd9 100644
--- a/libraries/src/HTML/Helpers/AdminLanguage.php
+++ b/libraries/src/HTML/Helpers/AdminLanguage.php
@@ -11,7 +11,6 @@
 
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -58,7 +57,7 @@ public static function existing($all = false, $translate = false)
         }
 
         if ($all) {
-            $all_option = [new CMSObject(['value' => '*', 'text' => $translate ? Text::alt('JALL', 'language') : 'JALL_LANGUAGE'])];
+            $all_option = [(object) ['value' => '*', 'text' => $translate ? Text::alt('JALL', 'language') : 'JALL_LANGUAGE']];
 
             return array_merge($all_option, static::$items);
         }
diff --git a/libraries/src/HTML/Helpers/Behavior.php b/libraries/src/HTML/Helpers/Behavior.php
index c42cf74f03d34..9ab23463247da 100644
--- a/libraries/src/HTML/Helpers/Behavior.php
+++ b/libraries/src/HTML/Helpers/Behavior.php
@@ -40,7 +40,7 @@ abstract class Behavior
      *
      * @since   3.3
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the webasset manager instead
      *              Example: Factory::getApplication()->getDocument()->getWebAssetManager()->useScript('core');
      */
@@ -61,7 +61,7 @@ public static function core()
      *
      * @since   3.4
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the webasset manager instead
      *              Example: Factory::getApplication()->getDocument()->getWebAssetManager()->useScript('form.validate');
      */
@@ -87,7 +87,7 @@ public static function formvalidator()
      *
      * @since   1.5
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the webasset manager instead
      *              Example: Factory::getApplication()->getDocument()->getWebAssetManager()->useScript('awesomplete');
      */
@@ -105,7 +105,7 @@ public static function combobox()
      *
      * @since   1.7
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the webasset manager instead
      *              Example:
      *              Factory::getApplication()->getDocument()->getWebAssetManager()->useScript('multiselect');
@@ -134,7 +134,7 @@ public static function multiselect($id = 'adminForm')
      *
      * @since   1.5
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the webasset manager instead
      *              Example: Factory::getApplication()->getDocument()->getWebAssetManager()->useScript('keepalive');
      */
@@ -158,7 +158,7 @@ public static function keepalive()
      *
      * @since   2.5
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the script directly
      */
     public static function highlighter(array $terms, $start = 'highlighter-start', $end = 'highlighter-end', $className = 'highlight', $tag = 'span')
diff --git a/libraries/src/HTML/Helpers/Bootstrap.php b/libraries/src/HTML/Helpers/Bootstrap.php
index 488e55f610647..62c9da3f8e353 100644
--- a/libraries/src/HTML/Helpers/Bootstrap.php
+++ b/libraries/src/HTML/Helpers/Bootstrap.php
@@ -627,7 +627,7 @@ public static function toast($selector = '', $options = []): void
      *
      * @since   3.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Will be removed without replacement
      *              Load the different scripts with their individual method calls
      */
diff --git a/libraries/src/HTML/Helpers/Category.php b/libraries/src/HTML/Helpers/Category.php
index c69ced782dfef..ad22848c4d200 100644
--- a/libraries/src/HTML/Helpers/Category.php
+++ b/libraries/src/HTML/Helpers/Category.php
@@ -54,13 +54,14 @@ public static function options($extension, $config = ['filter.published' => [0,
             $db     = Factory::getDbo();
             $user   = Factory::getUser();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('a.id'),
                         $db->quoteName('a.title'),
                         $db->quoteName('a.level'),
                         $db->quoteName('a.language'),
+                        $db->quoteName('a.published'),
                     ]
                 )
                 ->from($db->quoteName('#__categories', 'a'))
@@ -119,6 +120,13 @@ public static function options($extension, $config = ['filter.published' => [0,
                 $repeat      = ($item->level - 1 >= 0) ? $item->level - 1 : 0;
                 $item->title = str_repeat('- ', $repeat) . $item->title;
 
+                // Add status text for unpublished and archived categories
+                if (isset($item->published) && $item->published === 0) {
+                    $item->title .= ' (' . Text::_('JUNPUBLISHED') . ')';
+                } elseif (isset($item->published) && $item->published === 2) {
+                    $item->title .= ' (' . Text::_('JARCHIVED') . ')';
+                }
+
                 if ($item->language !== '*') {
                     $item->title .= ' (' . $item->language . ')';
                 }
@@ -142,68 +150,11 @@ public static function options($extension, $config = ['filter.published' => [0,
      */
     public static function categories($extension, $config = ['filter.published' => [0, 1]])
     {
-        $hash = md5($extension . '.' . serialize($config));
+        $items = static::options($extension, $config);
 
-        if (!isset(static::$items[$hash])) {
-            $config = (array) $config;
-            $user   = Factory::getUser();
-            $db     = Factory::getDbo();
-            $query  = $db->getQuery(true)
-                ->select(
-                    [
-                        $db->quoteName('a.id'),
-                        $db->quoteName('a.title'),
-                        $db->quoteName('a.level'),
-                        $db->quoteName('a.parent_id'),
-                        $db->quoteName('a.language'),
-                    ]
-                )
-                ->from($db->quoteName('#__categories', 'a'))
-                ->where($db->quoteName('a.parent_id') . ' > 0');
-
-            // Filter on extension.
-            $query->where($db->quoteName('extension') . ' = :extension')
-                ->bind(':extension', $extension);
-
-            // Filter on user level.
-            if (!$user->authorise('core.admin')) {
-                $query->whereIn($db->quoteName('a.access'), $user->getAuthorisedViewLevels());
-            }
+        // Special "Add to root" option:
+        $items[] = HTMLHelper::_('select.option', '1', Text::_('JLIB_HTML_ADD_TO_ROOT'));
 
-            // Filter on the published state
-            if (isset($config['filter.published'])) {
-                if (is_numeric($config['filter.published'])) {
-                    $query->where($db->quoteName('a.published') . ' = :published')
-                        ->bind(':published', $config['filter.published'], ParameterType::INTEGER);
-                } elseif (\is_array($config['filter.published'])) {
-                    $config['filter.published'] = ArrayHelper::toInteger($config['filter.published']);
-                    $query->whereIn($db->quoteName('a.published'), $config['filter.published']);
-                }
-            }
-
-            $query->order($db->quoteName('a.lft'));
-
-            $db->setQuery($query);
-            $items = $db->loadObjectList();
-
-            // Assemble the list options.
-            static::$items[$hash] = [];
-
-            foreach ($items as &$item) {
-                $repeat      = ($item->level - 1 >= 0) ? $item->level - 1 : 0;
-                $item->title = str_repeat('- ', $repeat) . $item->title;
-
-                if ($item->language !== '*') {
-                    $item->title .= ' (' . $item->language . ')';
-                }
-
-                static::$items[$hash][] = HTMLHelper::_('select.option', $item->id, $item->title);
-            }
-
-            // Special "Add to root" option:
-            static::$items[$hash][] = HTMLHelper::_('select.option', '1', Text::_('JLIB_HTML_ADD_TO_ROOT'));
-        }
-
-        return static::$items[$hash];
+        return $items;
     }
 }
diff --git a/libraries/src/HTML/Helpers/ContentLanguage.php b/libraries/src/HTML/Helpers/ContentLanguage.php
index f00c0f0dbd6a5..f2d75728bba17 100644
--- a/libraries/src/HTML/Helpers/ContentLanguage.php
+++ b/libraries/src/HTML/Helpers/ContentLanguage.php
@@ -11,7 +11,6 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -48,7 +47,7 @@ public static function existing($all = false, $translate = false)
         if (empty(static::$items)) {
             // Get the database object and a new query object.
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Build the query.
             $query->select(
@@ -68,7 +67,7 @@ public static function existing($all = false, $translate = false)
         }
 
         if ($all) {
-            $all_option = [new CMSObject(['value' => '*', 'text' => $translate ? Text::alt('JALL', 'language') : 'JALL_LANGUAGE'])];
+            $all_option = [(object) ['value' => '*', 'text' => $translate ? Text::alt('JALL', 'language') : 'JALL_LANGUAGE']];
 
             return array_merge($all_option, static::$items);
         }
diff --git a/libraries/src/HTML/Helpers/FormBehavior.php b/libraries/src/HTML/Helpers/FormBehavior.php
index dca083606fdf7..c9022d9f0b240 100644
--- a/libraries/src/HTML/Helpers/FormBehavior.php
+++ b/libraries/src/HTML/Helpers/FormBehavior.php
@@ -23,7 +23,7 @@
  *
  * @since       3.0
  *
- * @deprecated  4.0 will be removed in 6.0
+ * @deprecated  4.0 will be removed in 7.0
  *              Will be removed without replacement
  *              Use choice.js instead
  *              Example:
diff --git a/libraries/src/HTML/Helpers/Grid.php b/libraries/src/HTML/Helpers/Grid.php
index 8dd523b468ece..15319d107b7fe 100644
--- a/libraries/src/HTML/Helpers/Grid.php
+++ b/libraries/src/HTML/Helpers/Grid.php
@@ -89,7 +89,7 @@ public static function sort($title, $order, $direction = 'asc', $selected = '',
      */
     public static function checkall($name = 'checkall-toggle', $action = 'Joomla.checkAll(this)')
     {
-        HTMLHelper::_('behavior.core');
+        Factory::getApplication()->getDocument()->getWebAssetManager()->useScript('core');
 
         return '<input class="form-check-input" autocomplete="off" type="checkbox" name="' . $name . '" value="" title="' . Text::_('JGLOBAL_CHECK_ALL') . '" onclick="' . $action . '">';
     }
@@ -111,17 +111,12 @@ public static function checkall($name = 'checkall-toggle', $action = 'Joomla.che
      */
     public static function id($rowNum, $recId, $checkedOut = false, $name = 'cid', $stub = 'cb', $title = '', $formId = null)
     {
-        if ($formId !== null) {
-            return $checkedOut ? '' : '<label for="' . $stub . $rowNum . '"><span class="visually-hidden">' . Text::_('JSELECT')
-            . ' ' . htmlspecialchars($title, ENT_COMPAT, 'UTF-8') . '</span></label>'
-            . '<input class="form-check-input" type="checkbox" id="' . $stub . $rowNum . '" name="' . $name . '[]" value="' . $recId
-                . '" onclick="Joomla.isChecked(this.checked, \'' . $formId . '\');">';
-        }
+        Factory::getApplication()->getDocument()->getWebAssetManager()->useScript('list-view');
 
         return $checkedOut ? '' : '<label for="' . $stub . $rowNum . '"><span class="visually-hidden">' . Text::_('JSELECT')
         . ' ' . htmlspecialchars($title, ENT_COMPAT, 'UTF-8') . '</span></label>'
-        . '<input class="form-check-input" autocomplete="off" type="checkbox" id="' . $stub . $rowNum . '" name="' . $name . '[]" value="' . $recId
-            . '" onclick="Joomla.isChecked(this.checked);">';
+        . '<input class="form-check-input js-grid-item-is-checked" autocomplete="off" type="checkbox" id="' . $stub . $rowNum
+            . '" name="' . $name . '[]" value="' . $recId . '"' . ($formId !== null ? ' data-item-form-id="' . $formId . '"' : '') . '>';
     }
 
     /**
diff --git a/libraries/src/HTML/Helpers/Jquery.php b/libraries/src/HTML/Helpers/Jquery.php
index 73e5abd1d7a05..673bfb01a4e0c 100644
--- a/libraries/src/HTML/Helpers/Jquery.php
+++ b/libraries/src/HTML/Helpers/Jquery.php
@@ -44,7 +44,7 @@ abstract class Jquery
      *
      * @since   3.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use webasset manager instead
      *              Example:
      *              $wa = Factory::getApplication()->getDocument()->getWebAssetManager();
diff --git a/libraries/src/HTML/Helpers/ListHelper.php b/libraries/src/HTML/Helpers/ListHelper.php
index 21940aa4c1eda..c6eaed0aeb54b 100644
--- a/libraries/src/HTML/Helpers/ListHelper.php
+++ b/libraries/src/HTML/Helpers/ListHelper.php
@@ -179,7 +179,7 @@ public static function ordering($name, $query, $attribs = null, $selected = null
     public static function users($name, $active, $nouser = 0, $javascript = null, $order = 'name')
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('u.id', 'value'),
diff --git a/libraries/src/HTML/Helpers/Menu.php b/libraries/src/HTML/Helpers/Menu.php
index a4885061ac346..38a109996c46d 100644
--- a/libraries/src/HTML/Helpers/Menu.php
+++ b/libraries/src/HTML/Helpers/Menu.php
@@ -57,7 +57,7 @@ public static function menus($clientId = 0)
         if (!isset(static::$menus[$key])) {
             $db = Factory::getDbo();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('id'),
@@ -70,7 +70,7 @@ public static function menus($clientId = 0)
                 ->order(
                     [
                         $db->quoteName('client_id'),
-                        $db->quoteName('title'),
+                        $db->quoteName('ordering'),
                     ]
                 );
 
@@ -105,7 +105,7 @@ public static function menuItems($config = [])
             $menus    = static::menus($clientId);
 
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('a.id', 'value'),
@@ -245,7 +245,7 @@ public static function ordering(&$row, $id)
     {
         if ($id) {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('ordering', 'value'),
@@ -293,7 +293,7 @@ public static function linkOptions($all = false, $unassigned = false, $clientId
         $db = Factory::getDbo();
 
         // Get a list of the menu items
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('m.id'),
diff --git a/libraries/src/HTML/Helpers/Select.php b/libraries/src/HTML/Helpers/Select.php
index 89a7ce33963c2..b1a956af258fa 100644
--- a/libraries/src/HTML/Helpers/Select.php
+++ b/libraries/src/HTML/Helpers/Select.php
@@ -145,7 +145,7 @@ public static function genericlist(
                 ->registerAndUseScript(
                     'webcomponent.select-colour',
                     'system/fields/select-colour.min.js',
-                    ['dependencies' => ['wcpolyfill']],
+                    ['dependencies' => ['core']],
                     ['type'         => 'module']
                 );
         }
@@ -193,7 +193,7 @@ public static function groupedlist($data, $name, $options = [])
         // Set default options and overwrite with anything passed in
         $options = array_merge(
             HTMLHelper::$formatOptions,
-            ['format.depth' => 0, 'group.items' => 'items', 'group.label' => 'text', 'group.label.toHtml' => true, 'id' => false],
+            ['format.depth' => 0, 'group.items' => 'items', 'group.label' => 'text', 'group.attr' => 'attr', 'group.class' => 'class', 'group.label.toHtml' => true, 'id' => false],
             $options
         );
 
@@ -228,9 +228,11 @@ public static function groupedlist($data, $name, $options = [])
         $groupIndent = str_repeat($options['format.indent'], $options['format.depth']++);
 
         foreach ($data as $dataKey => $group) {
-            $label   = $dataKey;
-            $id      = '';
-            $noGroup = \is_int($dataKey);
+            $label        = $dataKey;
+            $id           = '';
+            $groupClass   = '';
+            $groupAttribs = '';
+            $noGroup      = \is_int($dataKey);
 
             if ($options['group.items'] == null) {
                 // Sub-list is an associative array
@@ -248,6 +250,16 @@ public static function groupedlist($data, $name, $options = [])
                     $id      = $group[$options['group.id']];
                     $noGroup = false;
                 }
+
+                if (isset($options['group.class'], $group[$options['group.class']])) {
+                    $groupClass = $group[$options['group.class']];
+                    $noGroup    = false;
+                }
+
+                if (isset($options['group.attr'], $group[$options['group.attr']])) {
+                    $groupAttribs = $group[$options['group.attr']];
+                    $noGroup      = false;
+                }
             } elseif (\is_object($group)) {
                 // Sub-list is in a property of an object
                 $subList = $group->{$options['group.items']};
@@ -261,6 +273,16 @@ public static function groupedlist($data, $name, $options = [])
                     $id      = $group->{$options['group.id']};
                     $noGroup = false;
                 }
+
+                if (isset($options['group.class'], $group->{$options['group.class']})) {
+                    $groupClass = $group->{$options['group.class']};
+                    $noGroup    = false;
+                }
+
+                if (isset($options['group.attr'], $group->{$options['group.attr']})) {
+                    $groupAttribs = $group->{$options['group.attr']};
+                    $noGroup      = false;
+                }
             } else {
                 throw new \RuntimeException('Invalid group contents.', 1);
             }
@@ -268,9 +290,22 @@ public static function groupedlist($data, $name, $options = [])
             if ($noGroup) {
                 $html .= static::options($subList, $options);
             } else {
-                $html .= $groupIndent . '<optgroup' . (empty($id) ? '' : ' id="' . $id . '"') . ' label="'
-                    . ($options['group.label.toHtml'] ? htmlspecialchars($label, ENT_COMPAT, 'UTF-8') : $label) . '">' . $options['format.eol']
-                    . static::options($subList, $options) . $groupIndent . '</optgroup>' . $options['format.eol'];
+                if (\is_array($groupAttribs)) {
+                    $groupAttribs = ArrayHelper::toString($groupAttribs);
+                }
+
+                $html .= $groupIndent
+                    . '<optgroup'
+                    . (empty($id) ? '' : ' id="' . $id . '"')
+                    . ' label="' . ($options['group.label.toHtml'] ? htmlspecialchars($label, ENT_COMPAT, 'UTF-8') : $label) . '"'
+                    . (empty($groupClass) ? '' : ' class="' . $groupClass . '"')
+                    . (empty($groupAttribs) ? '' : ' ' . $groupAttribs)
+                    . '>'
+                    . $options['format.eol']
+                    . static::options($subList, $options)
+                    . $groupIndent
+                    . '</optgroup>'
+                    . $options['format.eol'];
             }
         }
 
@@ -547,9 +582,19 @@ public static function options($arr, $optKey = 'value', $optText = 'text', $sele
             $key = (string) $key;
 
             if ($key === '<OPTGROUP>' && $options['groups']) {
+                @trigger_error(
+                    'Support for optgroup workaround is deprecated and will be removed in 8.0. Use select.groupedlist instead.',
+                    E_USER_DEPRECATED
+                );
+
                 $html .= $baseIndent . '<optgroup label="' . ($options['list.translate'] ? Text::_($text) : $text) . '">' . $options['format.eol'];
                 $baseIndent = str_repeat($options['format.indent'], ++$options['format.depth']);
             } elseif ($key === '</OPTGROUP>' && $options['groups']) {
+                @trigger_error(
+                    'Support for optgroup workaround is deprecated and will be removed in 8.0. Use select.groupedlist instead.',
+                    E_USER_DEPRECATED
+                );
+
                 $baseIndent = str_repeat($options['format.indent'], --$options['format.depth']);
                 $html .= $baseIndent . '</optgroup>' . $options['format.eol'];
             } else {
diff --git a/libraries/src/HTML/Helpers/SortableList.php b/libraries/src/HTML/Helpers/SortableList.php
index 61728dc7b25f8..df32c34508a1b 100644
--- a/libraries/src/HTML/Helpers/SortableList.php
+++ b/libraries/src/HTML/Helpers/SortableList.php
@@ -20,7 +20,7 @@
  *
  * @since  3.0
  *
- * @deprecated  4.0 will be removed in 6.0
+ * @deprecated  4.0 will be removed in 7.0
  *              Sortable List will be deprecated in favour of a new dragula script in 4.0
  */
 abstract class SortableList
@@ -39,7 +39,7 @@ abstract class SortableList
      *
      * @since   3.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the new dragula script
      *              Example: JHtml::_('draggablelist.draggable') and add a class of js-draggable to the tbody element of the table
      */
diff --git a/libraries/src/HTML/Helpers/Tag.php b/libraries/src/HTML/Helpers/Tag.php
index 0657edcbcf8f8..932dd49bf2afd 100644
--- a/libraries/src/HTML/Helpers/Tag.php
+++ b/libraries/src/HTML/Helpers/Tag.php
@@ -53,7 +53,7 @@ public static function options($config = ['filter.published' => [0, 1]])
         if (!isset(static::$items[$hash])) {
             $config = (array) $config;
             $db     = Factory::getDbo();
-            $query  = $db->getQuery(true)
+            $query  = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('a.id'),
@@ -117,7 +117,7 @@ public static function tags($config = ['filter.published' => [0, 1]])
         $hash   = md5(serialize($config));
         $config = (array) $config;
         $db     = Factory::getDbo();
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id'),
@@ -167,7 +167,7 @@ public static function tags($config = ['filter.published' => [0, 1]])
      *
      * @since   3.1
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Will be removed without replacement
      */
     public static function ajaxfield($selector = '#jform_tags', $allowCustom = true)
diff --git a/libraries/src/HTML/Helpers/User.php b/libraries/src/HTML/Helpers/User.php
index 0a7bb53b739b3..37ac4a988425d 100644
--- a/libraries/src/HTML/Helpers/User.php
+++ b/libraries/src/HTML/Helpers/User.php
@@ -70,7 +70,7 @@ public static function groups($includeSuperAdmin = false)
     public static function userlist()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id', 'value'),
diff --git a/libraries/src/HTML/Helpers/WorkflowStage.php b/libraries/src/HTML/Helpers/WorkflowStage.php
index 6c71b86d293c0..5ba87d01cb388 100644
--- a/libraries/src/HTML/Helpers/WorkflowStage.php
+++ b/libraries/src/HTML/Helpers/WorkflowStage.php
@@ -37,7 +37,7 @@ public static function existing($options)
     {
         // Get the database object and a new query object.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the query.
         $query->select(
diff --git a/libraries/src/Helper/AuthenticationHelper.php b/libraries/src/Helper/AuthenticationHelper.php
index 5d82bf3aa47ca..b1e3c64b6870f 100644
--- a/libraries/src/Helper/AuthenticationHelper.php
+++ b/libraries/src/Helper/AuthenticationHelper.php
@@ -31,7 +31,7 @@ abstract class AuthenticationHelper
      *
      * @since   3.6.3
      *
-     * @deprecated  4.2 will be removed in 6.0
+     * @deprecated  4.2 will be removed in 7.0
      *              Will be removed without replacement
      */
     public static function getTwoFactorMethods()
diff --git a/libraries/src/Helper/CMSHelper.php b/libraries/src/Helper/CMSHelper.php
index cb2a8accb5418..8d96cc8a25ff7 100644
--- a/libraries/src/Helper/CMSHelper.php
+++ b/libraries/src/Helper/CMSHelper.php
@@ -79,7 +79,7 @@ public function getCurrentLanguage($detectBrowser = true)
     public function getLanguageId($langCode)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('lang_id'))
             ->from($db->quoteName('#__languages'))
             ->where($db->quoteName('lang_code') . ' = :language')
diff --git a/libraries/src/Helper/ContentHelper.php b/libraries/src/Helper/ContentHelper.php
index bc9dda2b28183..0d703f8978121 100644
--- a/libraries/src/Helper/ContentHelper.php
+++ b/libraries/src/Helper/ContentHelper.php
@@ -92,7 +92,7 @@ public static function countRelations(&$items, $config)
             case 'tag_assigments':
                 $recid_col = 'ct.' . $config->group_col;
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->from($db->quoteName('#__contentitem_tag_map', 'ct'))
                     ->join(
                         'INNER',
@@ -106,7 +106,7 @@ public static function countRelations(&$items, $config)
             case 'category_or_group':
                 $recid_col = 'c.' . $config->group_col;
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->from($db->quoteName($related_tbl, 'c'));
                 break;
 
@@ -244,7 +244,7 @@ public static function getCurrentLanguage($detectBrowser = true)
     public static function getLanguageId($langCode)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('lang_id'))
             ->from($db->quoteName('#__languages'))
             ->where($db->quoteName('lang_code') . ' = :language')
diff --git a/libraries/src/Helper/LibraryHelper.php b/libraries/src/Helper/LibraryHelper.php
index 6c17ed4d1bc50..dbfe55911dc89 100644
--- a/libraries/src/Helper/LibraryHelper.php
+++ b/libraries/src/Helper/LibraryHelper.php
@@ -113,7 +113,7 @@ public static function saveParams($element, $params)
             // Save params in DB
             $db           = Factory::getContainer()->get(DatabaseInterface::class);
             $paramsString = $params->toString();
-            $query        = $db->getQuery(true)
+            $query        = $db->createQuery()
                 ->update($db->quoteName('#__extensions'))
                 ->set($db->quoteName('params') . ' = :params')
                 ->where($db->quoteName('type') . ' = ' . $db->quote('library'))
@@ -148,7 +148,7 @@ protected static function loadLibrary($element)
     {
         $loader = function ($element) {
             $db    = Factory::getContainer()->get(DatabaseInterface::class);
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['extension_id', 'element', 'params', 'enabled'], ['id', 'option', null, null]))
                 ->from($db->quoteName('#__extensions'))
                 ->where($db->quoteName('type') . ' = ' . $db->quote('library'))
diff --git a/libraries/src/Helper/MediaHelper.php b/libraries/src/Helper/MediaHelper.php
index 623b8e5976851..00f8893c29e68 100644
--- a/libraries/src/Helper/MediaHelper.php
+++ b/libraries/src/Helper/MediaHelper.php
@@ -519,7 +519,22 @@ private static function isValidSvg($file, $shouldLogErrors = true): bool
 
         if ($isValid === false || \count($svgErrors)) {
             if ($shouldLogErrors) {
-                Factory::getApplication()->enqueueMessage(Text::_('JLIB_MEDIA_ERROR_WARNIEXSS'), 'error');
+                $messages = [];
+
+                foreach ($svgErrors as $error) {
+                    $messages[] = Text::sprintf(
+                        'JLIB_MEDIA_ERROR_SVG_ISSUE',
+                        htmlspecialchars($error['message'] ?? Text::_('JLIB_MEDIA_ERROR_SVG_UNKNOWN'), ENT_QUOTES, 'UTF-8')
+                    );
+                }
+
+                $messageText = Text::_('JLIB_MEDIA_ERROR_WARNIEXSS');
+
+                if (!empty($messages)) {
+                    $messageText .= '<br>' . implode('<br>', $messages);
+                }
+
+                Factory::getApplication()->enqueueMessage($messageText, 'error');
             }
 
             return false;
diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php
index c84d3c0b28815..8ae3d7dfcf28f 100644
--- a/libraries/src/Helper/ModuleHelper.php
+++ b/libraries/src/Helper/ModuleHelper.php
@@ -411,10 +411,10 @@ public static function getModuleList()
         $cacheId = implode(',', $groups) . '.' . $clientId . '.' . $itemId;
 
         $db      = Factory::getDbo();
-        $query   = $db->getQuery(true);
+        $query   = $db->createQuery();
         $nowDate = Factory::getDate()->toSql();
 
-        $query->select($db->quoteName(['m.id', 'm.title', 'm.module', 'm.position', 'm.content', 'm.showtitle', 'm.params', 'mm.menuid']))
+        $query->select($db->quoteName(['m.id', 'm.title', 'm.module', 'm.position', 'm.content', 'm.showtitle', 'm.params', 'mm.menuid', 'e.custom_data']))
             ->from($db->quoteName('#__modules', 'm'))
             ->join(
                 'LEFT',
@@ -716,15 +716,16 @@ public static function &getModuleById($id)
      */
     protected static function createDummyModule(): \stdClass
     {
-        $module            = new \stdClass();
-        $module->id        = 0;
-        $module->title     = '';
-        $module->module    = '';
-        $module->position  = '';
-        $module->content   = '';
-        $module->showtitle = 0;
-        $module->control   = '';
-        $module->params    = '';
+        $module                 = new \stdClass();
+        $module->id             = 0;
+        $module->title          = '';
+        $module->module         = '';
+        $module->position       = '';
+        $module->content        = '';
+        $module->showtitle      = 0;
+        $module->control        = '';
+        $module->params         = '';
+        $module->custom_data    = '';
 
         return $module;
     }
diff --git a/libraries/src/Helper/RouteHelper.php b/libraries/src/Helper/RouteHelper.php
index b63349b08d789..884286c0fda13 100644
--- a/libraries/src/Helper/RouteHelper.php
+++ b/libraries/src/Helper/RouteHelper.php
@@ -208,7 +208,7 @@ protected function findItem($needles = [])
      * Fetches the category route
      *
      * @param   mixed   $catid      Category ID or CategoryNode instance
-     * @param   mixed   $language   Language code
+     * @param   string  $language   Language code
      * @param   string  $extension  Extension to lookup
      *
      * @return  string
@@ -217,7 +217,7 @@ protected function findItem($needles = [])
      *
      * @throws  \InvalidArgumentException
      */
-    public static function getCategoryRoute($catid, $language = 0, $extension = '')
+    public static function getCategoryRoute($catid, $language = null, $extension = '')
     {
         // Note: $extension is required but has to be an optional argument in the function call due to argument order
         if (empty($extension)) {
@@ -242,7 +242,7 @@ public static function getCategoryRoute($catid, $language = 0, $extension = '')
                 'category' => [$id],
             ];
 
-            if ($language && $language !== '*' && Multilanguage::isEnabled()) {
+            if (!empty($language) && $language !== '*' && Multilanguage::isEnabled()) {
                 $link .= '&lang=' . $language;
                 $needles['language'] = $language;
             }
diff --git a/libraries/src/Helper/TagsHelper.php b/libraries/src/Helper/TagsHelper.php
index 66944dd46d9e2..d461b60ddf266 100644
--- a/libraries/src/Helper/TagsHelper.php
+++ b/libraries/src/Helper/TagsHelper.php
@@ -12,7 +12,6 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Table\CoreContent;
-use Joomla\CMS\Table\Table;
 use Joomla\CMS\Table\TableInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
@@ -102,7 +101,7 @@ public function addTagMapping($ucmId, TableInterface $table, $tags = [])
         $db     = $table->getDbo();
         $key    = $table->getKeyName();
         $item   = $table->$key;
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->select($db->quoteName('ct') . '.type_id')
             ->from($db->quoteName('#__content_types', 'ct'))
             ->where($db->quoteName('ct.type_alias') . ' = :alias')
@@ -123,7 +122,7 @@ public function addTagMapping($ucmId, TableInterface $table, $tags = [])
             return true;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->insert('#__contentitem_tag_map');
         $query->columns(
             [
@@ -185,7 +184,7 @@ public static function convertPathsToNames($tags)
 
                 $db = Factory::getDbo();
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select(
                         [
                             $db->quoteName('alias'),
@@ -327,10 +326,8 @@ public function deleteTagData(TableInterface $table, $contentItemId)
             throw new \InvalidArgumentException('Multiple primary keys are not supported as a content item id');
         }
 
-        $result = $this->unTagItem($contentItemId[$key], $table);
-
-        /** @var  CoreContent $coreContentTable */
-        $coreContentTable = Table::getInstance('CoreContent');
+        $result           = $this->unTagItem($contentItemId[$key], $table);
+        $coreContentTable = new CoreContent(Factory::getDbo());
 
         return $result && $coreContentTable->deleteByContentId($contentItemId[$key], $this->typeAlias);
     }
@@ -353,7 +350,7 @@ public function getItemTags($contentType, $id, $getTagData = true)
 
         // Initialize some variables.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('m.tag_id'))
             ->from($db->quoteName('#__contentitem_tag_map', 'm'))
             ->where(
@@ -414,7 +411,7 @@ public function getMultipleItemTags($contentType, array $ids, $getTagData = true
         /** @var DatabaseInterface $db */
         $db = Factory::getContainer()->get(DatabaseInterface::class);
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['m.tag_id', 'm.content_item_id']))
             ->from($db->quoteName('#__contentitem_tag_map', 'm'))
             ->where(
@@ -493,7 +490,7 @@ public function getTagIds($ids, $prefix)
         $db = Factory::getDbo();
 
         // Load the tags.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('t.id'))
             ->from($db->quoteName('#__tags', 't'))
             ->join('INNER', $db->quoteName('#__contentitem_tag_map', 'm'), $db->quoteName('m.tag_id') . ' = ' . $db->quoteName('t.id'))
@@ -539,7 +536,7 @@ public function getTagItemsQuery(
     ) {
         // Create a new query object.
         $db       = Factory::getDbo();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
         $user     = Factory::getUser();
         $nullDate = $db->getNullDate();
         $nowDate  = Factory::getDate()->toSql();
@@ -717,7 +714,7 @@ public function getTagNames($tagIds)
             $tagIds = ArrayHelper::toInteger($tagIds);
 
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__tags'))
                 ->whereIn($db->quoteName('id'), $tagIds)
@@ -779,7 +776,7 @@ public static function getTypes($arrayType = 'objectList', $selectTypes = null,
     {
         // Initialize some variables.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*');
 
         if (!empty($selectTypes)) {
@@ -830,6 +827,26 @@ public static function getTypes($arrayType = 'objectList', $selectTypes = null,
      * @deprecated  5.3 will be removed in 7.0
      */
     public function postStoreProcess(TableInterface $table, $newTags = [], $replace = true)
+    {
+        @trigger_error('7.0 Method postStoreProcess() is deprecated, use postStore() instead.', \E_USER_DEPRECATED);
+
+        $this->postStore($table, (array) $newTags, (bool) $replace);
+    }
+
+    /**
+     * Function that handles saving tags used in a table class after a store().
+     *
+     * @param   TableInterface  $table    Table being processed.
+     * @param   array           $newTags  Array of new tags.
+     * @param   boolean         $replace  Flag indicating if all existing tags should be replaced.
+     *                                    This flag takes precedence before $remove.
+     * @param   boolean         $remove   Flag indicating if the tags in $newTags should be removed.
+     *
+     * @return  boolean
+     *
+     * @since   6.0.0
+     */
+    public function postStore(TableInterface $table, array $newTags = [], bool $replace = true, bool $remove = false): bool
     {
         if (!empty($table->newTags) && empty($newTags)) {
             $newTags = $table->newTags;
@@ -850,10 +867,10 @@ public function postStoreProcess(TableInterface $table, $newTags = [], $replace
             } else {
                 // Process the tags
                 $data             = $this->getRowData($table);
-                $coreContentTable = Table::getInstance('CoreContent');
+                $coreContentTable = new CoreContent(Factory::getDbo());
                 $db               = Factory::getDbo();
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('ct') . '.*')
                     ->from($db->quoteName('#__content_types', 'ct'))
                     ->where($db->quoteName('ct.type_alias') . ' = :alias')
@@ -892,7 +909,7 @@ public function postStoreProcess(TableInterface $table, $newTags = [], $replace
                     $ucmData['special']['ucm_id'] = $ucmData['common']['ucm_id'];
                 }
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('ucm_id'))
                     ->from($db->quoteName('#__ucm_base'))
                     ->where(
@@ -913,7 +930,11 @@ public function postStoreProcess(TableInterface $table, $newTags = [], $replace
                 $ucmId     = $coreContentTable->core_content_id;
 
                 // Store the tag data if the article data was saved and run related methods.
-                $result = $result && $this->tagItem($ucmId, $table, $newTags, $replace);
+                if ($remove) {
+                    $result = $result && $this->unTagItem($ucmId, $table, $newTags);
+                } else {
+                    $result = $result && $this->tagItem($ucmId, $table, $newTags, $replace);
+                }
             }
         }
 
@@ -969,7 +990,7 @@ public function preStoreProcess(TableInterface $table, $newTags = [])
     public static function searchTags($filters = [])
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id', 'value'),
@@ -1079,7 +1100,7 @@ public function tagDeleteInstances($tagId)
 
         // Delete the old tag maps.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__contentitem_tag_map'))
             ->where($db->quoteName('tag_id') . ' = :id')
             ->bind(':id', $tagId, ParameterType::INTEGER);
@@ -1143,7 +1164,7 @@ public function unTagItem($contentId, TableInterface $table, $tags = [])
         $key   = $table->getKeyName();
         $id    = (int) $table->$key;
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__contentitem_tag_map'))
             ->where(
                 [
@@ -1182,7 +1203,7 @@ public function getTags($tagIds)
             $tagIds = ArrayHelper::toInteger($tagIds);
 
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select([$db->quoteName('id'), $db->quoteName('title')])
                 ->from($db->quoteName('#__tags'))
                 ->whereIn($db->quoteName('id'), $tagIds)
diff --git a/libraries/src/Helper/UserGroupsHelper.php b/libraries/src/Helper/UserGroupsHelper.php
index 13693231dc7f1..421471fae2c57 100644
--- a/libraries/src/Helper/UserGroupsHelper.php
+++ b/libraries/src/Helper/UserGroupsHelper.php
@@ -198,7 +198,7 @@ public function total()
         if ($this->total === null) {
             $db = Factory::getDbo();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName('id') . ')')
                 ->from($db->quoteName('#__usergroups'));
 
@@ -226,7 +226,7 @@ public function load($id)
 
         $db = Factory::getDbo();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('id') . ' = :id')
@@ -256,7 +256,7 @@ public function loadAll()
 
         $db = Factory::getDbo();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__usergroups'))
             ->order($db->quoteName('lft') . ' ASC');
diff --git a/libraries/src/Http/Http.php b/libraries/src/Http/Http.php
index a49ba3f8ab9c9..e9c7f29fa8634 100644
--- a/libraries/src/Http/Http.php
+++ b/libraries/src/Http/Http.php
@@ -20,6 +20,8 @@
  * HTTP client class.
  *
  * @since  1.7.3
+ * @deprecated  6.0 will be removed in 8.0
+ *              Use Joomla\Http\Http instead
  */
 class Http extends FrameworkHttp
 {
@@ -30,8 +32,10 @@ class Http extends FrameworkHttp
      *                                                    these will be added to the request headers.
      * @param   ?FrameworkTransportInterface  $transport  The HTTP transport object.
      *
-     * @since   1.7.3
      * @throws  \InvalidArgumentException
+     * @since   1.7.3
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\Http::__construct() instead
      */
     public function __construct($options = [], ?FrameworkTransportInterface $transport = null)
     {
diff --git a/libraries/src/Http/HttpFactory.php b/libraries/src/Http/HttpFactory.php
index 7bc49a085969e..cde93e5cca893 100644
--- a/libraries/src/Http/HttpFactory.php
+++ b/libraries/src/Http/HttpFactory.php
@@ -20,6 +20,8 @@
  * HTTP factory class.
  *
  * @since  3.0.0
+ * @deprecated  6.0 will be removed in 8.0
+ *              Use Joomla\Http\HttpFactory instead
  */
 class HttpFactory
 {
@@ -31,8 +33,10 @@ class HttpFactory
      *
      * @return  Http
      *
-     * @since   3.0.0
      * @throws  \RuntimeException
+     * @since   3.0.0
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\HttpFactory::getHttp() instead
      */
     public static function getHttp($options = [], $adapters = null)
     {
@@ -64,6 +68,8 @@ public static function getHttp($options = [], $adapters = null)
      * @return  TransportInterface|boolean  Interface sub-class or boolean false if no adapters are available
      *
      * @since   3.0.0
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\HttpFactory::getAvailableDriver() instead
      */
     public static function getAvailableDriver($options = [], $default = null)
     {
@@ -101,6 +107,8 @@ public static function getAvailableDriver($options = [], $default = null)
      * @return  array  An array of available transport handlers
      *
      * @since   3.0.0
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\HttpFactory::getHttpTransports() instead
      */
     public static function getHttpTransports()
     {
diff --git a/libraries/src/Http/Response.php b/libraries/src/Http/Response.php
index 345ee82e2c042..6d79b7bd719f3 100644
--- a/libraries/src/Http/Response.php
+++ b/libraries/src/Http/Response.php
@@ -20,9 +20,50 @@
  *
  * @since       1.7.3
  *
- * @deprecated  4.0 will be removed in 6.0
+ * @deprecated  4.0 will be removed in 7.0
  *              Use Joomla\Http\Response instead
  */
 class Response extends FrameworkResponse
 {
+    /**
+     * Magic getter for backward compatibility with the 1.x Joomla Framework API
+     *
+     * @param   string  $name  The variable to return
+     *
+     * @return  mixed
+     *
+     * @since   6.0.0
+     * @deprecated  6.0 will be removed in 8.0
+     *              Access data via the PSR-7 ResponseInterface instead
+     */
+    public function __get($name)
+    {
+        switch (strtolower($name)) {
+            case 'body':
+                $stream = $this->getBody();
+                $stream->rewind();
+                return $stream->getContents();
+
+            case 'code':
+                return $this->getStatusCode();
+
+            case 'headers':
+                return $this->getHeaders();
+
+            default:
+                $trace = debug_backtrace();
+
+                trigger_error(
+                    \sprintf(
+                        'Undefined property via __get(): %s in %s on line %s',
+                        $name,
+                        $trace[0]['file'],
+                        $trace[0]['line']
+                    ),
+                    E_USER_NOTICE
+                );
+
+                break;
+        }
+    }
 }
diff --git a/libraries/src/Http/Transport/CurlTransport.php b/libraries/src/Http/Transport/CurlTransport.php
index 9f5e6ca9e42cc..a526f3f6865af 100644
--- a/libraries/src/Http/Transport/CurlTransport.php
+++ b/libraries/src/Http/Transport/CurlTransport.php
@@ -27,6 +27,8 @@
  * HTTP transport class for using cURL.
  *
  * @since  1.7.3
+ * @deprecated  6.0 will be removed in 8.0
+ *              Use Joomla\Http\Transport\Curl instead
  */
 class CurlTransport extends AbstractTransport implements TransportInterface
 {
@@ -42,8 +44,10 @@ class CurlTransport extends AbstractTransport implements TransportInterface
      *
      * @return  Response
      *
-     * @since   1.7.3
      * @throws  \RuntimeException
+     * @since   1.7.3
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\Transport\Curl::request() instead
      */
     public function request($method, UriInterface $uri, $data = null, array $headers = [], $timeout = null, $userAgent = null)
     {
@@ -214,8 +218,10 @@ public function request($method, UriInterface $uri, $data = null, array $headers
      *
      * @return  Response
      *
-     * @since   1.7.3
      * @throws  InvalidResponseCodeException
+     * @since   1.7.3
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\Transport\Curl::getResponse() instead
      */
     protected function getResponse($content, $info)
     {
@@ -273,6 +279,8 @@ protected function getResponse($content, $info)
      * @return boolean true if available, else false
      *
      * @since   3.0.0
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\Transport\Curl::isSupported() instead
      */
     public static function isSupported()
     {
@@ -285,6 +293,8 @@ public static function isSupported()
      * @return  boolean
      *
      * @since   3.0.0
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\Transport\Curl::redirectsAllowed() instead
      */
     private function redirectsAllowed()
     {
diff --git a/libraries/src/Http/Transport/SocketTransport.php b/libraries/src/Http/Transport/SocketTransport.php
index 64607f346e2a0..dcd37c25aacaf 100644
--- a/libraries/src/Http/Transport/SocketTransport.php
+++ b/libraries/src/Http/Transport/SocketTransport.php
@@ -26,6 +26,8 @@
  * HTTP transport class for using sockets directly.
  *
  * @since  1.7.3
+ * @deprecated  6.0 will be removed in 8.0
+ *              Use Joomla\Http\Transport\Socket instead
  */
 class SocketTransport extends AbstractTransport implements TransportInterface
 {
@@ -47,8 +49,10 @@ class SocketTransport extends AbstractTransport implements TransportInterface
      *
      * @return  Response
      *
-     * @since   1.7.3
      * @throws  \RuntimeException
+     * @since   1.7.3
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\Transport\Socket::request() instead
      */
     public function request($method, UriInterface $uri, $data = null, array $headers = [], $timeout = null, $userAgent = null)
     {
@@ -150,8 +154,10 @@ public function request($method, UriInterface $uri, $data = null, array $headers
      *
      * @return  Response
      *
-     * @since   1.7.3
      * @throws  InvalidResponseCodeException
+     * @since   1.7.3
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\Transport\Socket::getResponse() instead
      */
     protected function getResponse($content)
     {
@@ -194,8 +200,10 @@ protected function getResponse($content)
      *
      * @return  resource  Socket connection resource.
      *
-     * @since   1.7.3
      * @throws  \RuntimeException
+     * @since   1.7.3
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\Transport\Socket::connect() instead
      */
     protected function connect(UriInterface $uri, $timeout = null)
     {
@@ -276,6 +284,8 @@ protected function connect(UriInterface $uri, $timeout = null)
      * @return  boolean   True if available else false
      *
      * @since   3.0.0
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\Transport\Socket::isSupported() instead
      */
     public static function isSupported()
     {
diff --git a/libraries/src/Http/Transport/StreamTransport.php b/libraries/src/Http/Transport/StreamTransport.php
index 3a0cb9fb4eb13..5e440725b86bc 100644
--- a/libraries/src/Http/Transport/StreamTransport.php
+++ b/libraries/src/Http/Transport/StreamTransport.php
@@ -27,6 +27,8 @@
  * HTTP transport class for using PHP streams.
  *
  * @since  1.7.3
+ * @deprecated  6.0 will be removed in 8.0
+ *              Use Joomla\Http\Transport\Stream instead
  */
 class StreamTransport extends AbstractTransport implements TransportInterface
 {
@@ -42,8 +44,10 @@ class StreamTransport extends AbstractTransport implements TransportInterface
      *
      * @return  Response
      *
-     * @since   1.7.3
      * @throws  \RuntimeException
+     * @since   1.7.3
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use Joomla\Http\Transport\Stream::request() instead
      */
     public function request($method, UriInterface $uri, $data = null, array $headers = [], $timeout = null, $userAgent = null)
     {
@@ -196,8 +200,10 @@ public function request($method, UriInterface $uri, $data = null, array $headers
      *
      * @return  Response
      *
-     * @since   1.7.3
      * @throws  InvalidResponseCodeException
+     * @since   1.7.3
+     * @deprecated  6.0 will be removed in 8.0
+     *               Use Joomla\Http\Transport\Stream::getResponse() instead
      */
     protected function getResponse(array $headers, $body)
     {
@@ -225,6 +231,8 @@ protected function getResponse(array $headers, $body)
      * @return  boolean  true if available else false
      *
      * @since   3.0.0
+     * @deprecated  6.0 will be removed in 8.0
+     *               Use Joomla\Http\Transport\Stream::isSupported() instead
      */
     public static function isSupported()
     {
diff --git a/libraries/src/Http/TransportInterface.php b/libraries/src/Http/TransportInterface.php
index 4d40986073bcb..c9246ecabb629 100644
--- a/libraries/src/Http/TransportInterface.php
+++ b/libraries/src/Http/TransportInterface.php
@@ -20,7 +20,7 @@
  *
  * @since       1.7.3
  *
- * @deprecated  4.0 will be removed in 6.0
+ * @deprecated  4.0 will be removed in 7.0
  *              Implement Joomla\Http\TransportInterface instead
  */
 interface TransportInterface extends FrameworkTransportInterface
diff --git a/libraries/src/Image/Image.php b/libraries/src/Image/Image.php
index 2ce0229f317ce..624ab44a8ae04 100644
--- a/libraries/src/Image/Image.php
+++ b/libraries/src/Image/Image.php
@@ -367,27 +367,6 @@ public function createThumbnails($thumbSizes, $creationMethod = self::SCALE_INSI
         return $thumbsCreated;
     }
 
-    /**
-     * Method to create thumbnails from the current image and save them to disk. It allows creation by resizing or cropping the original image.
-     *
-     * @param   mixed    $thumbSizes       string or array of strings. Example: $thumbSizes = ['150x75','250x150'];
-     * @param   integer  $creationMethod   1-3 resize $scaleMethod | 4 create cropping
-     * @param   string   $thumbsFolder     destination thumbs folder. null generates a thumbs folder in the image folder
-     *
-     * @return  array
-     *
-     * @since   2.5.0
-     * @throws  \LogicException
-     * @throws  \InvalidArgumentException
-     *
-     * @deprecated  4.0 will be removed in 6.0
-     *              Use \Joomla\CMS\Image\createThumbnails instead
-     */
-    public function createThumbs($thumbSizes, $creationMethod = self::SCALE_INSIDE, $thumbsFolder = null)
-    {
-        return $this->createThumbnails($thumbSizes, $creationMethod, $thumbsFolder, false);
-    }
-
     /**
      * Method to crop the current image.
      *
diff --git a/libraries/src/Input/Cli.php b/libraries/src/Input/Cli.php
index 445ba54d2e4e7..b236e025325bb 100644
--- a/libraries/src/Input/Cli.php
+++ b/libraries/src/Input/Cli.php
@@ -10,6 +10,7 @@
 namespace Joomla\CMS\Input;
 
 use Joomla\CMS\Filter\InputFilter;
+use Joomla\Input\Input;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -20,7 +21,7 @@
  *
  * @since       1.7.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 class Cli extends Input
@@ -31,7 +32,7 @@ class Cli extends Input
      * @var    string
      * @since  1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the `joomla/console` package instead
      */
     public $executable;
@@ -43,7 +44,7 @@ class Cli extends Input
      * @var    array
      * @since  1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the `joomla/console` package instead
      */
     public $args = [];
@@ -56,7 +57,7 @@ class Cli extends Input
      *
      * @since   1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the `joomla/console` package instead
      */
     public function __construct(?array $source = null, array $options = [])
@@ -81,7 +82,7 @@ public function __construct(?array $source = null, array $options = [])
      *
      * @since   3.0.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the `joomla/console` package instead
      */
     public function serialize()
@@ -106,7 +107,7 @@ public function serialize()
      *
      * @since   3.0.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the `joomla/console` package instead
      */
     public function unserialize($input)
@@ -131,7 +132,7 @@ public function unserialize($input)
      *
      * @since   1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the `joomla/console` package instead
      */
     protected function parseArguments()
diff --git a/libraries/src/Installer/Adapter/ComponentAdapter.php b/libraries/src/Installer/Adapter/ComponentAdapter.php
index 217484b99f88d..e3f29700545fc 100644
--- a/libraries/src/Installer/Adapter/ComponentAdapter.php
+++ b/libraries/src/Installer/Adapter/ComponentAdapter.php
@@ -16,8 +16,9 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Table\Asset;
+use Joomla\CMS\Table\Category;
 use Joomla\CMS\Table\Extension;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Menu;
 use Joomla\CMS\Table\Update;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\Folder;
@@ -338,8 +339,7 @@ protected function createExtensionRoot()
      */
     protected function finaliseInstall()
     {
-        /** @var Update $update */
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
 
         // Clobber any possible pending updates
         $uid = $update->find(
@@ -378,8 +378,7 @@ protected function finaliseInstall()
             Log::add(Text::_('JLIB_INSTALLER_ABORT_COMP_UPDATESITEMENUS_FAILED'), Log::WARNING, 'jerror');
         }
 
-        /** @var Asset $asset */
-        $asset = Table::getInstance('Asset');
+        $asset = new Asset($this->getDatabase());
 
         // Check if an asset already exists for this extension and create it if not
         if (!$asset->loadByName($this->extension->element)) {
@@ -418,7 +417,7 @@ protected function finaliseUninstall(): bool
         $db = $this->getDatabase();
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__schemas'))
             ->where($db->quoteName('extension_id') . ' = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
@@ -426,7 +425,7 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Remove the component container in the assets table.
-        $asset = Table::getInstance('Asset');
+        $asset = new Asset($this->getDatabase());
 
         if ($asset->loadByName($this->getElement())) {
             $asset->delete();
@@ -436,7 +435,7 @@ protected function finaliseUninstall(): bool
         $extensionNameWithWildcard = $extensionName . '.%';
 
         // Remove categories for this component
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__categories'))
             ->where(
                 [
@@ -451,10 +450,11 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Rebuild the categories for correct lft/rgt
-        Table::getInstance('category')->rebuild();
+        $table = new Category($db);
+        $table->rebuild();
 
         // Clobber any possible pending updates
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
         $uid    = $update->find(
             [
                 'element'   => $this->extension->element,
@@ -668,7 +668,7 @@ public function prepareDiscoverInstall()
             // Try to delete existing failed records before retrying
             $db = $this->getDatabase();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('extension_id'))
                 ->from($db->quoteName('#__extensions'))
                 ->where(
@@ -692,8 +692,7 @@ public function prepareDiscoverInstall()
                     $this->_removeAdminMenus($eid);
 
                     // Remove the extension record itself
-                    /** @var Extension $extensionTable */
-                    $extensionTable = Table::getInstance('extension');
+                    $extensionTable = new Extension($this->getDatabase());
                     $extensionTable->delete($eid);
                 }
             }
@@ -857,7 +856,7 @@ protected function storeExtension($deleteExisting = false)
             // Try to delete existing failed records before retrying
             $db = $this->getDatabase();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('extension_id'))
                 ->from($db->quoteName('#__extensions'))
                 ->where(
@@ -881,8 +880,7 @@ protected function storeExtension($deleteExisting = false)
                     $this->_removeAdminMenus($eid);
 
                     // Remove the extension record itself
-                    /** @var Extension $extensionTable */
-                    $extensionTable = Table::getInstance('extension');
+                    $extensionTable = new Extension($this->getDatabase());
                     $extensionTable->delete($eid);
                 }
             }
@@ -938,7 +936,7 @@ protected function _buildAdminMenus($componentId = null)
         $option = $this->element;
 
         // If a component exists with this option in the table within the protected menutype 'main' then we don't need to add menus
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('m.id'),
@@ -1148,11 +1146,10 @@ protected function _removeAdminMenus($id)
     {
         $db = $this->getDatabase();
 
-        /** @var  \Joomla\CMS\Table\Menu  $table */
-        $table = Table::getInstance('menu');
+        $table = new Menu($db);
 
         // Get the ids of the menu items
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__menu'))
             ->where(
@@ -1221,7 +1218,7 @@ protected function _updateMenus($componentId, $clientId = null)
 
         // Update all menu items which contain 'index.php?option=com_extension' or 'index.php?option=com_extension&...'
         // to use the new component id.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__menu'))
             ->set($db->quoteName('component_id') . ' = :componentId')
             ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
@@ -1288,7 +1285,7 @@ public function discover()
                 $manifest_details = Installer::parseXMLInstallFile(
                     JPATH_SITE . '/components/' . $component . '/' . str_replace('com_', '', $component) . '.xml'
                 );
-                $extension                 = Table::getInstance('extension');
+                $extension                 = new Extension($this->getDatabase());
                 $extension->type           = 'component';
                 $extension->client_id      = 0;
                 $extension->element        = $component;
@@ -1307,7 +1304,7 @@ public function discover()
                 $manifest_details = Installer::parseXMLInstallFile(
                     JPATH_ADMINISTRATOR . '/components/' . $component . '/' . str_replace('com_', '', $component) . '.xml'
                 );
-                $extension                 = Table::getInstance('extension');
+                $extension                 = new Extension($this->getDatabase());
                 $extension->type           = 'component';
                 $extension->client_id      = 1;
                 $extension->element        = $component;
@@ -1325,7 +1322,7 @@ public function discover()
                 $manifest_details = Installer::parseXMLInstallFile(
                     JPATH_API . '/components/' . $component . '/' . str_replace('com_', '', $component) . '.xml'
                 );
-                $extension                 = Table::getInstance('extension');
+                $extension                 = new Extension($this->getDatabase());
                 $extension->type           = 'component';
                 $extension->client_id      = 3;
                 $extension->element        = $component;
@@ -1392,8 +1389,7 @@ protected function _createAdminMenuItem(array &$data, $parentId)
     {
         $db = $this->getDatabase();
 
-        /** @var  \Joomla\CMS\Table\Menu  $table */
-        $table  = Table::getInstance('menu');
+        $table = new Menu($db);
 
         try {
             $table->setLocation($parentId, 'last-child');
@@ -1411,7 +1407,7 @@ protected function _createAdminMenuItem(array &$data, $parentId)
             $home         = $data['home'];
 
             // The menu item already exists. Delete it and retry instead of throwing an error.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__menu'))
                 ->where(
@@ -1440,8 +1436,7 @@ protected function _createAdminMenuItem(array &$data, $parentId)
                 return false;
             }
 
-            /** @var  \Joomla\CMS\Table\Menu $temporaryTable */
-            $temporaryTable = Table::getInstance('menu');
+            $temporaryTable = new Menu($db);
             $temporaryTable->delete($menu_id, true);
             $temporaryTable->load($parentId);
             $temporaryTable->rebuild($parentId, $temporaryTable->lft, $temporaryTable->level, $temporaryTable->path);
diff --git a/libraries/src/Installer/Adapter/FileAdapter.php b/libraries/src/Installer/Adapter/FileAdapter.php
index 94bf439616450..570f8720626af 100644
--- a/libraries/src/Installer/Adapter/FileAdapter.php
+++ b/libraries/src/Installer/Adapter/FileAdapter.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Update;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Folder;
@@ -109,7 +109,7 @@ protected function copyBaseFiles()
     protected function finaliseInstall()
     {
         // Clobber any possible pending updates
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
 
         $uid = $update->find(
             [
@@ -183,7 +183,7 @@ protected function finaliseUninstall(): bool
         $db = $this->getDatabase();
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete('#__schemas')
             ->where('extension_id = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
@@ -191,7 +191,7 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Clobber any possible pending updates
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
         $uid    = $update->find(
             [
                 'element' => $this->extension->element,
@@ -456,7 +456,7 @@ protected function extensionExistsInSystem($extension = null)
         // Get a database connector object
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('type') . ' = ' . $db->quote('file'))
diff --git a/libraries/src/Installer/Adapter/LanguageAdapter.php b/libraries/src/Installer/Adapter/LanguageAdapter.php
index ee220fdac5114..504ddd3ecaad5 100644
--- a/libraries/src/Installer/Adapter/LanguageAdapter.php
+++ b/libraries/src/Installer/Adapter/LanguageAdapter.php
@@ -10,6 +10,7 @@
 namespace Joomla\CMS\Installer\Adapter;
 
 use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Cache\CacheControllerFactoryInterface;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
@@ -19,7 +20,7 @@
 use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Extension;
 use Joomla\CMS\Table\Update;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\Folder;
@@ -107,7 +108,7 @@ protected function finaliseUninstall(): bool
 
         // Remove the schema version
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__schemas'))
             ->where($db->quoteName('extension_id') . ' = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
@@ -115,7 +116,7 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Clobber any possible pending updates
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
         $uid    = $update->find(
             [
                 'element' => $this->extension->element,
@@ -128,7 +129,7 @@ protected function finaliseUninstall(): bool
         }
 
         // Clean installed languages cache.
-        Factory::getCache()->clean('com_languages');
+        $this->cleanLanguagesCache();
 
         // Remove the extension table entry
         $this->extension->delete();
@@ -417,7 +418,7 @@ protected function _install($cname, $basePath, $clientId, &$element)
         }
 
         // Add an entry to the extension table with a whole heap of defaults
-        $row               = Table::getInstance('extension');
+        $row               = new Extension($this->getDatabase());
         $row->name         = $this->name;
         $row->type         = 'language';
         $row->element      = $this->tag;
@@ -444,8 +445,7 @@ protected function _install($cname, $basePath, $clientId, &$element)
         }
 
         // Clobber any possible pending updates
-        /** @var Update $update */
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
         $uid    = $update->find(['element' => $this->tag, 'type' => 'language', 'folder' => '']);
 
         if ($uid) {
@@ -453,7 +453,7 @@ protected function _install($cname, $basePath, $clientId, &$element)
         }
 
         // Clean installed languages cache.
-        Factory::getCache()->clean('com_languages');
+        $this->cleanLanguagesCache();
 
         return $row->extension_id;
     }
@@ -480,7 +480,7 @@ protected function getSefString($itemLanguageTag)
 
         // Get the sef value of all current content languages.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('sef'))
             ->from($db->quoteName('#__languages'));
         $db->setQuery($query);
@@ -575,7 +575,7 @@ public function update()
          */
 
         // Clobber any possible pending updates
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
         $uid    = $update->find(['element' => $this->tag, 'type' => 'language', 'client_id' => $clientId]);
 
         if ($uid) {
@@ -583,7 +583,7 @@ public function update()
         }
 
         // Update an entry to the extension table
-        $row = Table::getInstance('extension');
+        $row = new Extension($this->getDatabase());
         $eid = $row->find(['element' => $this->tag, 'type' => 'language', 'client_id' => $clientId]);
 
         if ($eid) {
@@ -607,7 +607,7 @@ public function update()
         $row->changelogurl   = (string) $this->getManifest()->changelogurl;
 
         // Clean installed languages cache.
-        Factory::getCache()->clean('com_languages');
+        $this->cleanLanguagesCache();
 
         if (!$row->check() || !$row->store()) {
             // Install failed, roll back changes
@@ -651,7 +651,7 @@ public function discover()
                 }
 
                 $manifest_details          = Installer::parseXMLInstallFile($manifestfile);
-                $extension                 = Table::getInstance('extension');
+                $extension                 = new Extension($this->getDatabase());
                 $extension->type           = 'language';
                 $extension->client_id      = $clientId;
                 $extension->element        = $language;
@@ -711,7 +711,7 @@ public function discover_install()
         }
 
         // Clean installed languages cache.
-        Factory::getCache()->clean('com_languages');
+        $this->cleanLanguagesCache();
 
         return $this->parent->extension->extension_id;
     }
@@ -766,7 +766,7 @@ private function resetUserLanguage(): void
 
         // Setting the language of users which have this language as the default language
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id'),
@@ -786,7 +786,7 @@ private function resetUserLanguage(): void
         $count = 0;
 
         // Prepare the query.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__users'))
             ->set($db->quoteName('params') . ' = :registry')
             ->where($db->quoteName('id') . ' = :userId')
@@ -822,7 +822,7 @@ private function resetUserLanguage(): void
      */
     protected function createContentLanguage($tag)
     {
-        $tableLanguage = Table::getInstance('language');
+        $tableLanguage = new \Joomla\CMS\Table\Language($this->getDatabase());
 
         // Check if content language already exists.
         if ($tableLanguage->load(['lang_code' => $tag])) {
@@ -849,7 +849,7 @@ protected function createContentLanguage($tag)
             $contentLanguageNativeTitle = $siteLanguageManifest['nativeName'];
         }
 
-        // Try to load a language string from the installation language var. Will be removed in 4.0.
+        // Try to load a language string from the installation language var. Will be removed in 7.0.
         if ($contentLanguageNativeTitle === $contentLanguageTitle) {
             $manifestfile = JPATH_INSTALLATION . '/language/' . $tag . '/langmetadata.xml';
 
@@ -900,4 +900,18 @@ protected function createContentLanguage($tag)
             );
         }
     }
+
+    /**
+     * Cleans the languages cache
+     *
+     * @return  void
+     *
+     * @since   6.2.0
+     */
+    private function cleanLanguagesCache(): void
+    {
+        $this->getContainer()->get(CacheControllerFactoryInterface::class)
+            ->createCacheController('callback', ['defaultgroup' => ''])
+            ->clean('com_languages');
+    }
 }
diff --git a/libraries/src/Installer/Adapter/LibraryAdapter.php b/libraries/src/Installer/Adapter/LibraryAdapter.php
index b02cd13080c0e..7a39408c48b5c 100644
--- a/libraries/src/Installer/Adapter/LibraryAdapter.php
+++ b/libraries/src/Installer/Adapter/LibraryAdapter.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Installer\Manifest\LibraryManifest;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Extension;
 use Joomla\CMS\Table\Update;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\File;
@@ -55,7 +55,7 @@ protected function checkExtensionInFilesystem()
 
                 // Clear the cached data
                 $this->currentExtensionId = null;
-                $this->extension          = Table::getInstance('Extension', '\\Joomla\\CMS\\Table\\', ['dbo' => $this->getDatabase()]);
+                $this->extension          = new Extension($this->getDatabase());
 
                 // From this point we'll consider this an update
                 $this->setRoute('update');
@@ -92,8 +92,7 @@ protected function copyBaseFiles()
     protected function finaliseInstall()
     {
         // Clobber any possible pending updates
-        /** @var Update $update */
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
         $uid    = $update->find(
             [
                 'element' => $this->element,
@@ -169,7 +168,7 @@ protected function finaliseUninstall(): bool
         $db = $this->getDatabase();
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete('#__schemas')
             ->where('extension_id = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
@@ -177,7 +176,7 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Clobber any possible pending updates
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
         $uid    = $update->find(
             [
                 'element' => $this->extension->element,
@@ -462,7 +461,7 @@ public function discover()
             $element       = str_replace([$mainFolder . DIRECTORY_SEPARATOR, '.xml'], '', $file);
             $manifestCache = Installer::parseXMLInstallFile($file);
 
-            $extension                 = Table::getInstance('extension');
+            $extension                 = new Extension($this->getDatabase());
             $extension->type           = 'library';
             $extension->client_id      = 0;
             $extension->element        = $element;
diff --git a/libraries/src/Installer/Adapter/ModuleAdapter.php b/libraries/src/Installer/Adapter/ModuleAdapter.php
index 595dd360c72a4..366cbd6681b10 100644
--- a/libraries/src/Installer/Adapter/ModuleAdapter.php
+++ b/libraries/src/Installer/Adapter/ModuleAdapter.php
@@ -14,7 +14,9 @@
 use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Extension;
+use Joomla\CMS\Table\Module;
+use Joomla\CMS\Table\Update;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\Folder;
 use Joomla\Utilities\ArrayHelper;
@@ -46,6 +48,17 @@ class ModuleAdapter extends InstallerAdapter
      */
     protected $scriptElement = null;
 
+    /**
+     * The list of current files that are installed and is read
+     * from the manifest on disk in the update area to handle doing a diff
+     * and deleting files that are in the old files list and not in the new
+     * files list.
+     *
+     * @var    array
+     * @since  6.1.0
+     * */
+    protected $oldFiles = null;
+
     /**
      * Method to check if the extension is already present in the database
      *
@@ -89,7 +102,7 @@ protected function checkExistingExtension()
     protected function copyBaseFiles()
     {
         // Copy all necessary files
-        if ($this->parent->parseFiles($this->getManifest()->files, -1) === false) {
+        if ($this->parent->parseFiles($this->getManifest()->files, -1, $this->oldFiles) === false) {
             throw new \RuntimeException(Text::_('JLIB_INSTALLER_ABORT_MOD_COPY_FILES'));
         }
 
@@ -131,7 +144,7 @@ public function discover()
         foreach ($site_list as $module) {
             if (file_exists(JPATH_SITE . "/modules/$module/$module.xml")) {
                 $manifest_details          = Installer::parseXMLInstallFile(JPATH_SITE . "/modules/$module/$module.xml");
-                $extension                 = Table::getInstance('extension');
+                $extension                 = new Extension($this->getDatabase());
                 $extension->type           = 'module';
                 $extension->client_id      = $site_info->id;
                 $extension->element        = $module;
@@ -147,7 +160,7 @@ public function discover()
         foreach ($admin_list as $module) {
             if (file_exists(JPATH_ADMINISTRATOR . "/modules/$module/$module.xml")) {
                 $manifest_details          = Installer::parseXMLInstallFile(JPATH_ADMINISTRATOR . "/modules/$module/$module.xml");
-                $extension                 = Table::getInstance('extension');
+                $extension                 = new Extension($this->getDatabase());
                 $extension->type           = 'module';
                 $extension->client_id      = $admin_info->id;
                 $extension->element        = $module;
@@ -174,7 +187,7 @@ public function discover()
     protected function finaliseInstall()
     {
         // Clobber any possible pending updates
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
         $uid    = $update->find(
             [
                 'element'   => $this->element,
@@ -217,7 +230,7 @@ protected function finaliseUninstall(): bool
         $retval = true;
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete('#__schemas')
             ->where('extension_id = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
@@ -249,7 +262,7 @@ protected function finaliseUninstall(): bool
             $modules = ArrayHelper::toInteger($modules);
 
             // Wipe out any items assigned to menus
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__modules_menu'))
                 ->whereIn($db->quoteName('moduleid'), $modules);
             $db->setQuery($query);
@@ -262,8 +275,7 @@ protected function finaliseUninstall(): bool
             }
 
             // Wipe out any instances in the modules table
-            /** @var \Joomla\CMS\Table\Module $module */
-            $module = Table::getInstance('Module');
+            $module = new Module($db);
 
             foreach ($modules as $modInstanceId) {
                 $module->load($modInstanceId);
@@ -277,7 +289,7 @@ protected function finaliseUninstall(): bool
 
         // Now we will no longer need the module object, so let's delete it and free up memory
         $this->extension->delete($this->extension->extension_id);
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__modules'))
             ->where($db->quoteName('module') . ' = :element')
             ->where($db->quoteName('client_id') . ' = :client_id')
@@ -527,6 +539,28 @@ protected function setupUninstall()
         $this->loadLanguage(($this->extension->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE) . '/modules/' . $element);
     }
 
+    /**
+     * Method to setup the update routine for the adapter
+     *
+     * @return  void
+     *
+     * @since   6.1.0
+     */
+    protected function setupUpdates()
+    {
+        // Create a new installer because findManifest sets stuff; side effects!
+        $tmpInstaller = new Installer();
+        $tmpInstaller->setDatabase($this->getDatabase());
+
+        // Look in the extension root
+        $tmpInstaller->setPath('source', $this->parent->getPath('extension_root'));
+
+        if ($tmpInstaller->findManifest()) {
+            $old_manifest   = $tmpInstaller->getManifest();
+            $this->oldFiles = $old_manifest->files;
+        }
+    }
+
     /**
      * Method to store the extension to the database
      *
@@ -635,8 +669,7 @@ protected function storeExtension()
             // Create unpublished module
             $name = preg_replace('#[\*?]#', '', Text::_($this->name));
 
-            /** @var \Joomla\CMS\Table\Module $module */
-            $module            = Table::getInstance('module');
+            $module            = new Module($this->getDatabase());
             $module->title     = $name;
             $module->content   = '';
             $module->module    = $this->element;
@@ -669,7 +702,7 @@ protected function _rollback_menu($arg)
         $moduleId = $arg['id'];
 
         // Remove the entry from the #__modules_menu table
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__modules_menu'))
             ->where($db->quoteName('moduleid') . ' = :module_id')
             ->bind(':module_id', $moduleId, ParameterType::INTEGER);
@@ -700,7 +733,7 @@ protected function _rollback_module($arg)
         $moduleId = $arg['id'];
 
         // Remove the entry from the #__modules table
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__modules'))
             ->where($db->quoteName('id') . ' = :module_id')
             ->bind(':module_id', $moduleId, ParameterType::INTEGER);
diff --git a/libraries/src/Installer/Adapter/PackageAdapter.php b/libraries/src/Installer/Adapter/PackageAdapter.php
index 0f036f853a307..97208284ba037 100644
--- a/libraries/src/Installer/Adapter/PackageAdapter.php
+++ b/libraries/src/Installer/Adapter/PackageAdapter.php
@@ -18,7 +18,6 @@
 use Joomla\CMS\Installer\Manifest\PackageManifest;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Table\Table;
 use Joomla\CMS\Table\Update;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
@@ -206,8 +205,7 @@ protected function createExtensionRoot()
     protected function finaliseInstall()
     {
         // Clobber any possible pending updates
-        /** @var Update $update */
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
         $uid    = $update->find(
             [
                 'element' => $this->element,
@@ -222,7 +220,7 @@ protected function finaliseInstall()
         // Set the package ID for each of the installed extensions to track the relationship
         if (!empty($this->installedIds)) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__extensions'))
                 ->set($db->quoteName('package_id') . ' = :id')
                 ->whereIn($db->quoteName('extension_id'), $this->installedIds)
@@ -309,7 +307,7 @@ protected function finaliseUninstall(): bool
         $db = $this->getDatabase();
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__schemas'))
             ->where($db->quoteName('extension_id') . ' = :extension_id')
             ->bind(':extension_id', $this->extension->extension_id, ParameterType::INTEGER);
@@ -317,7 +315,7 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Clobber any possible pending updates
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
         $uid    = $update->find(
             [
                 'element' => $this->extension->element,
@@ -655,7 +653,7 @@ protected function _getExtensionId($type, $id, $client, $group)
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where(
diff --git a/libraries/src/Installer/Adapter/PluginAdapter.php b/libraries/src/Installer/Adapter/PluginAdapter.php
index 6c88916efb059..07c43f359d921 100644
--- a/libraries/src/Installer/Adapter/PluginAdapter.php
+++ b/libraries/src/Installer/Adapter/PluginAdapter.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Extension;
 use Joomla\CMS\Table\Update;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\File;
@@ -163,8 +163,7 @@ protected function createExtensionRoot()
     protected function finaliseInstall()
     {
         // Clobber any possible pending updates
-        /** @var Update $update */
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
         $uid    = $update->find(
             [
                 'element' => $this->element,
@@ -206,7 +205,7 @@ protected function finaliseUninstall(): bool
         $db = $this->getDatabase();
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete('#__schemas')
             ->where('extension_id = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
@@ -545,7 +544,7 @@ public function discover()
 
                 $element = empty($manifest_details['filename']) ? $file : $manifest_details['filename'];
 
-                $extension                 = Table::getInstance('extension');
+                $extension                 = new Extension($this->getDatabase());
                 $extension->type           = 'plugin';
                 $extension->client_id      = 0;
                 $extension->element        = $element;
@@ -575,7 +574,7 @@ public function discover()
                     $element = empty($manifest_details['filename']) ? $file : $manifest_details['filename'];
 
                     // Ignore example plugins
-                    $extension                 = Table::getInstance('extension');
+                    $extension                 = new Extension($this->getDatabase());
                     $extension->type           = 'plugin';
                     $extension->client_id      = 0;
                     $extension->element        = $element;
diff --git a/libraries/src/Installer/Adapter/TemplateAdapter.php b/libraries/src/Installer/Adapter/TemplateAdapter.php
index b3f4444736c54..0af93bed7c80a 100644
--- a/libraries/src/Installer/Adapter/TemplateAdapter.php
+++ b/libraries/src/Installer/Adapter/TemplateAdapter.php
@@ -15,7 +15,7 @@
 use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Extension;
 use Joomla\CMS\Table\Update;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\Folder;
@@ -140,8 +140,7 @@ protected function copyBaseFiles()
     protected function finaliseInstall()
     {
         // Clobber any possible pending updates
-        /** @var Update $update */
-        $update = Table::getInstance('update');
+        $update = new Update($this->getDatabase());
 
         $uid = $update->find(
             [
@@ -180,14 +179,14 @@ protected function finaliseInstall()
     protected function finaliseUninstall(): bool
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $element     = $this->extension->element;
         $clientId    = $this->extension->client_id;
         $extensionId = $this->extension->extension_id;
 
         // Set menu that assigned to the template back to default template
-        $subQuery = $db->getQuery(true)
+        $subQuery = $db->createQuery()
             ->select($db->quoteName('s.id'))
             ->from($db->quoteName('#__template_styles', 's'))
             ->where(
@@ -208,7 +207,7 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Remove the template's styles
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__template_styles'))
             ->where(
                 [
@@ -222,7 +221,7 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__schemas'))
             ->where($db->quoteName('extension_id') . ' = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
@@ -230,7 +229,7 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Remove any overrides
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__template_overrides'))
             ->where($db->quoteName('template') . ' = :template')
             ->bind(':template', $element);
@@ -238,7 +237,7 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Clobber any possible pending updates
-        $update = Table::getInstance('update');
+        $update = new Update($db);
         $uid    = $update->find(
             [
                 'element'   => $this->extension->element,
@@ -315,7 +314,7 @@ protected function parseQueries()
     {
         if (\in_array($this->route, ['install', 'discover_install'])) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $lang  = Factory::getLanguage();
             $debug = $lang->setDebug(false);
 
@@ -463,7 +462,7 @@ protected function setupUninstall()
         }
 
         // Deny removing a parent template if there are children
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__template_styles'))
             ->where(
@@ -481,7 +480,7 @@ protected function setupUninstall()
         }
 
         // Deny remove default template
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__template_styles'))
             ->where(
@@ -622,7 +621,7 @@ public function discover()
                 }
 
                 $manifest_details          = Installer::parseXMLInstallFile(JPATH_SITE . "/templates/$template/templateDetails.xml");
-                $extension                 = Table::getInstance('extension');
+                $extension                 = new Extension($this->getDatabase());
                 $extension->type           = 'template';
                 $extension->client_id      = $site_info->id;
                 $extension->element        = $template;
@@ -643,7 +642,7 @@ public function discover()
                 }
 
                 $manifest_details          = Installer::parseXMLInstallFile(JPATH_ADMINISTRATOR . "/templates/$template/templateDetails.xml");
-                $extension                 = Table::getInstance('extension');
+                $extension                 = new Extension($this->getDatabase());
                 $extension->type           = 'template';
                 $extension->client_id      = $admin_info->id;
                 $extension->element        = $template;
diff --git a/libraries/src/Installer/Installer.php b/libraries/src/Installer/Installer.php
index c0004580d9a68..a2f62883bf9db 100644
--- a/libraries/src/Installer/Installer.php
+++ b/libraries/src/Installer/Installer.php
@@ -9,7 +9,6 @@
 
 namespace Joomla\CMS\Installer;
 
-use Joomla\CMS\Adapter\Adapter;
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Event\Extension\AfterInstallEvent;
 use Joomla\CMS\Event\Extension\AfterUninstallEvent;
@@ -20,6 +19,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\Object\LegacyErrorHandlingTrait;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Extension;
 use Joomla\CMS\Table\Table;
@@ -42,9 +43,35 @@
  *
  * @since  3.1
  */
-class Installer extends Adapter implements DatabaseAwareInterface
+class Installer implements DatabaseAwareInterface
 {
     use DatabaseAwareTrait;
+    use LegacyErrorHandlingTrait;
+    use LegacyPropertyManagementTrait;
+
+    /**
+     * Array of installer adapters
+     *
+     * @var    string[]|InstallerAdapter[]
+     * @since  6.0.0
+     */
+    private $adapters = [];
+
+    /**
+     * Adapter Class Prefix
+     *
+     * @var    string
+     * @since  6.0.0
+     */
+    private $classprefix = '\\Joomla\\CMS\\Installer\\Adapter';
+
+    /**
+     * Base Path for the installer adapters
+     *
+     * @var    string
+     * @since  6.0.0
+     */
+    private $adapterfolder;
 
     /**
      * Array of paths needed by the installer
@@ -176,9 +203,11 @@ class Installer extends Adapter implements DatabaseAwareInterface
      */
     public function __construct($basepath = __DIR__, $classprefix = '\\Joomla\\CMS\\Installer\\Adapter', $adapterfolder = 'Adapter')
     {
-        parent::__construct($basepath, $classprefix, $adapterfolder);
+        $this->adapterfolder = $basepath . '/' . $adapterfolder;
+        $this->classprefix   = $classprefix;
+        $this->loadAdapters();
 
-        $this->extension = Table::getInstance('extension');
+        $this->extension = Table::getInstance('Extension');
     }
 
     /**
@@ -551,7 +580,7 @@ public function abort($msg = null, $type = null)
                 case 'extension':
                     // Get database connector object
                     $db     = $this->getDatabase();
-                    $query  = $db->getQuery(true);
+                    $query  = $db->createQuery();
                     $stepId = (int) $step['id'];
 
                     // Remove the entry from the #__extensions table
@@ -574,13 +603,20 @@ public function abort($msg = null, $type = null)
                     break;
 
                 default:
-                    if ($type && \is_object($this->_adapters[$type])) {
+                    if ($type) {
+                        try {
+                            $adapter = $this->getAdapter($type);
+                        } catch (\InvalidArgumentException $e) {
+                            $stepval = false;
+                            break;
+                        }
+
                         // Build the name of the custom rollback method for the type
                         $method = '_rollback_' . $step['type'];
 
                         // Custom rollback method handler
-                        if (method_exists($this->_adapters[$type], $method)) {
-                            $stepval = $this->_adapters[$type]->$method($step);
+                        if (method_exists($adapter, $method)) {
+                            $stepval = $adapter->$method($step);
                         }
                     } else {
                         // Set it to false
@@ -703,7 +739,7 @@ public function discover_install($eid = null)
         $type   = $this->extension->type;
         $params = ['extension' => $this->extension, 'route' => 'discover_install'];
 
-        $adapter = $this->loadAdapter($type, $params);
+        $adapter = $this->getAdapter($type, $params);
 
         if (!\is_object($adapter)) {
             return false;
@@ -775,7 +811,7 @@ public function discover()
         $results = [];
 
         foreach ($this->getAdapters() as $adapter) {
-            $instance = $this->loadAdapter($adapter);
+            $instance = $this->getAdapter($adapter);
 
             // Joomla! 1.5 installation adapter legacy support
             if (method_exists($instance, 'discover')) {
@@ -865,7 +901,7 @@ public function uninstall($type, $identifier)
     {
         $params = ['extension' => $this->extension, 'route' => 'uninstall'];
 
-        $adapter = $this->loadAdapter($type, $params);
+        $adapter = $this->getAdapter($type, $params);
 
         if (!\is_object($adapter)) {
             return false;
@@ -921,7 +957,7 @@ public function refreshManifestCache($eid)
             }
 
             // Fetch the adapter
-            $adapter = $this->loadAdapter($this->extension->type);
+            $adapter = $this->getAdapter($this->extension->type);
 
             if (!\is_object($adapter)) {
                 return false;
@@ -972,7 +1008,11 @@ public function setupInstall($route = 'install', $returnAdapter = false)
         $params = ['route' => $route, 'manifest' => $this->getManifest()];
 
         // Load the adapter
-        $adapter = $this->loadAdapter($type, $params);
+        $adapter = $this->getAdapter($type, $params);
+
+        // Ensure cached adapter always points to the current extension
+        $adapter->setManifest($params['manifest']);
+        $adapter->setRoute($params['route']);
 
         if ($returnAdapter) {
             return $adapter;
@@ -994,7 +1034,7 @@ public function setupInstall($route = 'install', $returnAdapter = false)
     public function parseQueries(\SimpleXMLElement $element)
     {
         // Get the database connector object
-        $db = & $this->_db;
+        $db = $this->getDatabase();
 
         if (!$element || !\count($element->children())) {
             // Either the tag does not exist or has no children therefore we return zero files processed.
@@ -1043,7 +1083,7 @@ public function parseSQLFiles($element)
             return 0;
         }
 
-        $db          = &$this->_db;
+        $db          = $this->getDatabase();
         $dbDriver    = $db->getServerType();
         $updateCount = 0;
 
@@ -1150,7 +1190,7 @@ public function setSchemaVersion(\SimpleXMLElement $schema, $eid)
                     usort($files, 'version_compare');
 
                     // Update the database
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->delete('#__schemas')
                         ->where('extension_id = :extension_id')
                         ->bind(':extension_id', $eid, ParameterType::INTEGER);
@@ -1236,7 +1276,7 @@ public function parseSchemaUpdates(\SimpleXMLElement $schema, $eid)
         $files = str_replace('.sql', '', $files);
         usort($files, 'version_compare');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('version_id')
             ->from('#__schemas')
             ->where('extension_id = :extension_id')
@@ -1365,7 +1405,7 @@ protected function updateSchemaTable(int $eid, string $version, bool $update = f
              */
             $db->transactionStart();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete('#__schemas')
                 ->where('extension_id = :extension_id')
                 ->bind(':extension_id', $eid, ParameterType::INTEGER);
@@ -2120,7 +2160,7 @@ public function generateManifestCache()
     public function cleanDiscoveredExtension($type, $element, $folder = '', $client = 0)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__extensions'))
             ->where('type = :type')
             ->where('element = :element')
@@ -2349,25 +2389,21 @@ public static function parseXMLInstallFile($path)
     }
 
     /**
-     * Gets a list of available install adapters.
+     * Discover all adapters in the adapterfolder path
      *
-     * @param   array  $options  An array of options to inject into the adapter
-     * @param   array  $custom   Array of custom install adapters
-     *
-     * @return  string[]  An array of the class names of available install adapters.
+     * @return  void
      *
-     * @since   3.4
+     * @since  6.0.0
      */
-    public function getAdapters($options = [], array $custom = [])
+    protected function loadAdapters()
     {
-        $files    = new \DirectoryIterator($this->_basepath . '/' . $this->_adapterfolder);
-        $adapters = [];
+        $files    = new \DirectoryIterator($this->adapterfolder);
 
         // Process the core adapters
         foreach ($files as $file) {
             $fileName = $file->getFilename();
 
-            // Only load for php files.
+            // Only load php files.
             if (!$file->isFile() || $file->getExtension() !== 'php') {
                 continue;
             }
@@ -2375,17 +2411,17 @@ public function getAdapters($options = [], array $custom = [])
             // Derive the class name from the filename.
             $name  = str_ireplace('.php', '', trim($fileName));
             $name  = str_ireplace('adapter', '', trim($name));
-            $class = rtrim($this->_classprefix, '\\') . '\\' . ucfirst($name) . 'Adapter';
+            $class = rtrim($this->classprefix, '\\') . '\\' . ucfirst($name) . 'Adapter';
 
             if (!class_exists($class)) {
                 // Not namespaced
-                $class = $this->_classprefix . ucfirst($name);
+                $class = $this->classprefix . ucfirst($name);
             }
 
             // Core adapters should autoload based on classname, keep this fallback just in case
             if (!class_exists($class)) {
                 // Try to load the adapter object
-                \JLoader::register($class, $this->_basepath . '/' . $this->_adapterfolder . '/' . $fileName);
+                \JLoader::register($class, $this->adapterfolder . '/' . $fileName);
 
                 if (!class_exists($class)) {
                     // Skip to next one
@@ -2393,66 +2429,124 @@ public function getAdapters($options = [], array $custom = [])
                 }
             }
 
-            $adapters[] = $name;
+            $this->adapters[strtolower($name)] = $class;
         }
+    }
 
-        // Add any custom adapters if specified
-        if (\count($custom) >= 1) {
+    /**
+     * Gets a list of available install adapters.
+     *
+     * @param   array  $options  An array of options to inject into the adapter
+     * @param   array  $custom   Array of custom install adapters
+     *
+     * @return  string[]  An array of the class names of available install adapters.
+     *
+     * @since   3.4
+     */
+    public function getAdapters($options = [], array $custom = [])
+    {
+        if (\count($custom)) {
             foreach ($custom as $adapter) {
                 // Setup the class name
                 // @todo - Can we abstract this to not depend on the Joomla class namespace without PHP namespaces?
-                $class = $this->_classprefix . ucfirst(trim($adapter));
+                $class = $this->classprefix . ucfirst(trim($adapter));
 
                 // If the class doesn't exist we have nothing left to do but look at the next type. We did our best.
                 if (!class_exists($class)) {
                     continue;
                 }
 
-                $adapters[] = str_ireplace('.php', '', $fileName);
+                $this->adapters[$adapter] = $class;
             }
         }
 
-        return $adapters;
+        return array_keys($this->adapters);
     }
 
     /**
-     * Method to load an adapter instance
+     * Get an install adapter instance
      *
-     * @param   string  $adapter  Adapter name
+     * @param   string  $name     Adapter name
      * @param   array   $options  Adapter options
      *
      * @return  InstallerAdapter
      *
-     * @since   3.4
      * @throws  \InvalidArgumentException
+     * @since   6.0.0
      */
-    public function loadAdapter($adapter, $options = [])
+    public function getAdapter($name, $options = [])
     {
-        $class = rtrim($this->_classprefix, '\\') . '\\' . ucfirst($adapter) . 'Adapter';
+        $name = strtolower($name);
 
-        if (!class_exists($class)) {
-            // Not namespaced
-            $class = $this->_classprefix . ucfirst($adapter);
+        if (!isset($this->adapters[$name])) {
+            throw new \InvalidArgumentException(\sprintf('The %s install adapter does not exist.', $name));
         }
 
-        if (!class_exists($class)) {
-            throw new \InvalidArgumentException(\sprintf('The %s install adapter does not exist.', $adapter));
+        if (\is_string($this->adapters[$name])) {
+            $class = $this->adapters[$name];
+
+            // Ensure the adapter type is part of the options array
+            $options['type'] = $name;
+
+            // Check for a possible service from the container otherwise manually instantiate the class
+            if (Factory::getContainer()->has($class)) {
+                return Factory::getContainer()->get($class);
+            }
+
+            $adapter = new $class($this, $this->getDatabase(), $options);
+
+            if ($adapter instanceof ContainerAwareInterface) {
+                $adapter->setContainer(Factory::getContainer());
+            }
+
+            $this->adapters[$name] = $adapter;
         }
 
-        // Ensure the adapter type is part of the options array
-        $options['type'] = $adapter;
+        return $this->adapters[$name];
+    }
 
-        // Check for a possible service from the container otherwise manually instantiate the class
-        if (Factory::getContainer()->has($class)) {
-            return Factory::getContainer()->get($class);
+    /**
+     * Method to load an adapter instance
+     *
+     * @param   string  $adapter  Adapter name
+     * @param   array   $options  Adapter options
+     *
+     * @return  InstallerAdapter
+     *
+     * @throws  \InvalidArgumentException
+     * @since   3.4
+     * @deprecated  6.0 will be removed in 8.0
+     *              Use getAdapter() instead
+     */
+    public function loadAdapter($adapter, $options = [])
+    {
+        return $this->getAdapter($adapter, $options);
+    }
+
+    /**
+     * Set an adapter by name
+     *
+     * @param   string                   $name     Adapter name
+     * @param   InstallerAdapter|string  $adapter  Adapter object or class name
+     *
+     * @return  boolean  True if successful
+     *
+     * @since   6.0.0
+     */
+    public function setAdapter($name, $adapter)
+    {
+        if (\is_object($adapter)) {
+            $this->adapters[$name] = $adapter;
+
+            return true;
         }
 
-        $adapter = new $class($this, $this->getDatabase(), $options);
+        if (class_exists($adapter)) {
+            $this->adapters[$name] = $adapter;
 
-        if ($adapter instanceof ContainerAwareInterface) {
-            $adapter->setContainer(Factory::getContainer());
+            return true;
         }
 
-        return $adapter;
+        return false;
     }
 }
diff --git a/libraries/src/Installer/InstallerAdapter.php b/libraries/src/Installer/InstallerAdapter.php
index 944e188617c7c..b38bfbe0e7cc9 100644
--- a/libraries/src/Installer/InstallerAdapter.php
+++ b/libraries/src/Installer/InstallerAdapter.php
@@ -164,13 +164,13 @@ public function __construct(Installer $parent, DatabaseDriver $db, array $option
 
         // Get a generic TableExtension instance for use if not already loaded
         if (!($this->extension instanceof TableInterface)) {
-            $this->extension = Table::getInstance('extension');
+            $this->extension = Table::getInstance('Extension');
         }
 
         // Sanity check, make sure the type is set by taking the adapter name from the class name
         if (!$this->type) {
             // This assumes the adapter short class name in its namespace is `<foo>Adapter`, replace this logic in subclasses if needed
-            $reflection = new \ReflectionClass(\get_called_class());
+            $reflection = new \ReflectionClass(static::class);
             $this->type = str_replace('Adapter', '', $reflection->getShortName());
         }
 
@@ -190,7 +190,7 @@ public function __construct(Installer $parent, DatabaseDriver $db, array $option
      */
     protected function canUninstallPackageChild($packageId)
     {
-        $package = Table::getInstance('extension');
+        $package = new Extension(Factory::getDbo());
 
         // If we can't load this package ID, we have a corrupt database
         if (!$package->load((int) $packageId)) {
@@ -958,7 +958,7 @@ protected function setupScriptfile()
         // Load the installer from the file
         if (!file_exists($manifestScriptFile)) {
             @trigger_error(
-                'Installer file must exist when defined. In version 5.0 this will crash.',
+                'Installer file must exist when defined. In version 7.0 this will crash.',
                 E_USER_DEPRECATED
             );
 
@@ -983,7 +983,7 @@ protected function setupScriptfile()
         // When none is set, then use the legacy way
         if (!$container->has(InstallerScriptInterface::class)) {
             @trigger_error(
-                'Legacy installer files are deprecated and will be removed in 6.0. Use a service provider instead.',
+                'Legacy installer files are deprecated and will be removed in 7.0. Use a service provider instead.',
                 E_USER_DEPRECATED
             );
 
@@ -1006,6 +1006,10 @@ function (Container $container) use ($classname) {
         // Create a new instance
         $this->parent->manifestClass = $container->get(InstallerScriptInterface::class);
 
+        if (method_exists($this->parent->manifestClass, 'setApplication')) {
+            $this->parent->manifestClass->setApplication(Factory::getApplication());
+        }
+
         // Set the database
         if ($this->parent->manifestClass instanceof DatabaseAwareInterface) {
             $this->parent->manifestClass->setDatabase($container->get(DatabaseInterface::class));
@@ -1281,7 +1285,7 @@ public function update()
      *
      * @since   4.2.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use getDatabase() instead of directly accessing _db
      */
     public function __get($name)
diff --git a/libraries/src/Installer/InstallerHelper.php b/libraries/src/Installer/InstallerHelper.php
index 963c9bb7a2f2d..db864c96aa480 100644
--- a/libraries/src/Installer/InstallerHelper.php
+++ b/libraries/src/Installer/InstallerHelper.php
@@ -12,7 +12,6 @@
 use Joomla\Archive\Archive;
 use Joomla\CMS\Event\Installer\BeforePackageDownloadEvent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -21,6 +20,8 @@
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Folder;
 use Joomla\Filesystem\Path;
+use Joomla\Http\HttpFactory;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -85,8 +86,12 @@ public static function downloadPackage($url, $target = false)
         $url     = $event->getArgument('url', $url);
         $headers = $event->getArgument('headers', $headers);
 
+        $options = new Registry();
+        $options->set('userAgent', $version->getUserAgent('Joomla', true, false));
+
+        // Get the file
         try {
-            $response = HttpFactory::getHttp()->get($url, $headers);
+            $response = (new HttpFactory())->getHttp($options)->get($url, $headers);
         } catch (\RuntimeException $exception) {
             Log::add(Text::sprintf('JLIB_INSTALLER_ERROR_DOWNLOAD_SERVER_CONNECT', $exception->getMessage()), Log::WARNING, 'jerror');
 
diff --git a/libraries/src/Installer/InstallerScript.php b/libraries/src/Installer/InstallerScript.php
index 9ab2b78d72843..6bbe30d41126d 100644
--- a/libraries/src/Installer/InstallerScript.php
+++ b/libraries/src/Installer/InstallerScript.php
@@ -175,7 +175,7 @@ public function getInstances($isModule)
         $extension = $this->extension;
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the item(s) and retrieve the id
         if ($isModule) {
@@ -263,7 +263,7 @@ public function setParams($paramArray = null, $type = 'edit', $id = 0)
         $paramsString = json_encode($params);
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName($this->paramTable))
             ->set('params = :params')
             ->where($column . ' = :id')
@@ -298,7 +298,7 @@ public function getItemArray($element, $table, $column, $identifier)
         $paramType = is_numeric($identifier) ? ParameterType::INTEGER : ParameterType::STRING;
 
         // Build the query
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName($element))
             ->from($db->quoteName($table))
             ->where($db->quoteName($column) . ' = :id')
diff --git a/libraries/src/Installer/InstallerScriptTrait.php b/libraries/src/Installer/InstallerScriptTrait.php
new file mode 100644
index 0000000000000..b92384f61a2fe
--- /dev/null
+++ b/libraries/src/Installer/InstallerScriptTrait.php
@@ -0,0 +1,331 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Installer;
+
+use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Application\CMSApplicationInterface;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Log\Log;
+use Joomla\Filesystem\File;
+use Joomla\Filesystem\Folder;
+use Joomla\Filesystem\Path;
+
+trait InstallerScriptTrait
+{
+    /**
+     * The extension name. This should be set in the installer script.
+     *
+     * @var    string
+     * @since  6.0.0
+     */
+    protected string $extension;
+
+    /**
+     * Minimum PHP version required to install the extension
+     *
+     * @var    string
+     * @since  6.0.0
+     */
+    protected string $minimumPhp;
+
+    /**
+     * Minimum Joomla! version required to install the extension
+     *
+     * @var    string
+     * @since  6.0.0
+     */
+    protected string $minimumJoomla;
+
+    /**
+     * Allow downgrades of your extension
+     *
+     * Use at your own risk as if there is a change in functionality people may wish to downgrade.
+     *
+     * @var    boolean
+     * @since  6.0.0
+     */
+    protected bool $allowDowngrades = false;
+
+    /**
+     * A list of files to be deleted
+     *
+     * @var    array
+     * @since  6.0.0
+     */
+    protected array $deleteFiles = [];
+
+    /**
+     * A list of folders to be deleted
+     *
+     * @var    array
+     * @since  6.0.0
+     */
+    protected array $deleteFolders = [];
+
+    /**
+     * The application object
+     *
+     * @var    CMSApplicationInterface
+     *
+     * @since  6.0.0
+     */
+    private CMSApplicationInterface $application;
+
+    /**
+     * Function called after the extension is installed.
+     *
+     * @param   InstallerAdapter  $adapter  The adapter calling this method
+     *
+     * @return  boolean  True on success
+     *
+     * @since   6.0.0
+     */
+    public function install(InstallerAdapter $adapter): bool
+    {
+        return true;
+    }
+
+    /**
+     * Function called after the extension is updated.
+     *
+     * @param   InstallerAdapter  $adapter  The adapter calling this method
+     *
+     * @return  boolean  True on success
+     *
+     * @since   6.0.0
+     */
+    public function update(InstallerAdapter $adapter): bool
+    {
+        return true;
+    }
+
+    /**
+     * Function called after the extension is uninstalled.
+     *
+     * @param   InstallerAdapter  $adapter  The adapter calling this method
+     *
+     * @return  boolean  True on success
+     *
+     * @since   6.0.0
+     */
+    public function uninstall(InstallerAdapter $adapter): bool
+    {
+        return true;
+    }
+
+    /**
+     * Function called before extension installation/update/removal procedure commences.
+     *
+     * @param   string            $type     The type of change (install or discover_install, update, uninstall)
+     * @param   InstallerAdapter  $adapter  The adapter calling this method
+     *
+     * @return  boolean  True on success
+     *
+     * @since   6.0.0
+     */
+    public function preflight(string $type, InstallerAdapter $adapter): bool
+    {
+        $this->extension = $adapter->getName();
+
+        if (!$this->checkCompatibility($type, $adapter)) {
+            return false;
+        }
+
+        if (!$this->checkDowngrade($type, $adapter)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Function called after extension installation/update/removal procedure commences.
+     *
+     * @param   string            $type     The type of change (install or discover_install, update, uninstall)
+     * @param   InstallerAdapter  $adapter  The adapter calling this method
+     *
+     * @return  boolean  True on success
+     *
+     * @since   6.0.0
+     */
+    public function postflight(string $type, InstallerAdapter $adapter): bool
+    {
+        $this->removeFiles();
+
+        return true;
+    }
+
+    /**
+     * Check if the extension passes the minimum requirements to be installed
+     *
+     * @return  boolean  True on success
+     *
+     * @since   6.0.0
+     */
+    protected function checkCompatibility(string $type, InstallerAdapter $adapter): bool
+    {
+        // Check for the minimum PHP version before continuing
+        if (!empty($this->minimumPhp) && version_compare(PHP_VERSION, $this->minimumPhp, '<')) {
+            Log::add(Text::sprintf('JLIB_INSTALLER_MINIMUM_PHP', $this->minimumPhp), Log::WARNING, 'jerror');
+
+            return false;
+        }
+
+        // Check for the minimum Joomla version before continuing
+        if (!empty($this->minimumJoomla) && version_compare(JVERSION, $this->minimumJoomla, '<')) {
+            Log::add(Text::sprintf('JLIB_INSTALLER_MINIMUM_JOOMLA', $this->minimumJoomla), Log::WARNING, 'jerror');
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Check if the extension is allowed to be downgraded
+     *
+     * @return  boolean  False when downgrade not allowed and new version is lower than old version otherwise true
+     *
+     * @since   6.0.0
+     */
+    protected function checkDowngrade(string $type, InstallerAdapter $adapter): bool
+    {
+        if ($type !== 'update' || $this->allowDowngrades) {
+            return true;
+        }
+
+        $oldManifest = $this->getOldManifest($adapter);
+
+        if ($oldManifest !== null && $oldManifest->version && version_compare($oldManifest->version, $adapter->getManifest()->version, '>')) {
+            Log::add(Text::_('JLIB_INSTALLER_ERROR_DOWNGRADE'), Log::WARNING, 'jerror');
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the manifest file if it exists or null
+     *
+     * @param InstallerAdapter $adapter
+     *
+     * @return SimpleXMLElement|null
+     *
+     * @since   6.0.0
+     */
+    protected function getOldManifest(InstallerAdapter $adapter): ?\SimpleXMLElement
+    {
+        $client = ApplicationHelper::getClientInfo('administrator', true);
+
+        $pathname = 'extension_' . $client->name;
+
+        $manifestPath = $adapter->getParent()->getPath($pathname) . '/' . $adapter->getParent()->getPath('manifest');
+
+        return is_file($manifestPath) ? $adapter->getParent()->isManifest($manifestPath) : null;
+    }
+
+    /**
+     * Remove the files and folders in the given array from
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    protected function removeFiles(): void
+    {
+        if (!empty($this->deleteFiles)) {
+            foreach ($this->deleteFiles as $file) {
+                if (is_file(Path::check(JPATH_ROOT . $file)) && !File::delete(JPATH_ROOT . $file)) {
+                    Log::add(Text::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $file));
+                }
+            }
+        }
+
+        if (!empty($this->deleteFolders)) {
+            foreach ($this->deleteFolders as $folder) {
+                if (is_dir(Path::check(JPATH_ROOT . $folder)) && !Folder::delete(JPATH_ROOT . $folder)) {
+                    Log::add(Text::sprintf('JLIB_INSTALLER_ERROR_FILE_FOLDER', $folder));
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns the internal application or null when not set.
+     *
+     * @return  CMSApplicationInterface|null
+     *
+     * @since   6.0.0
+     */
+    protected function getApplication(): ?CMSApplicationInterface
+    {
+        return $this->application;
+    }
+
+    /**
+     * Sets the application to use.
+     *
+     * @param   CMSApplicationInterface  $application  The application
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    public function setApplication(CMSApplicationInterface $application): void
+    {
+        $this->application = $application;
+    }
+
+    /**
+     * Creates the dashboard menu module
+     *
+     * @param string $dashboard The name of the dashboard
+     * @param string $preset    The name of the menu preset
+     *
+     * @return  void
+     *
+     * @throws \Exception
+     * @since   6.0.0
+     */
+    protected function addDashboardMenuModule(string $dashboard, string $preset)
+    {
+        $model  = $this->getApplication()->bootComponent('com_modules')->getMVCFactory()->createModel('Module', 'Administrator', ['ignore_request' => true]);
+        $module = [
+            'id'         => 0,
+            'asset_id'   => 0,
+            'language'   => '*',
+            'note'       => '',
+            'published'  => 1,
+            'assignment' => 0,
+            'client_id'  => 1,
+            'showtitle'  => 0,
+            'content'    => '',
+            'module'     => 'mod_submenu',
+            'position'   => 'cpanel-' . $dashboard,
+        ];
+
+        // Try to get a translated module title, otherwise fall back to a fixed string.
+        $titleKey         = strtoupper('COM_' . $this->extension . '_DASHBOARD_' . $dashboard . '_TITLE');
+        $title            = Text::_($titleKey);
+        $module['title']  = ($title === $titleKey) ? ucfirst($dashboard) . ' Dashboard' : $title;
+
+        $module['access'] = (int) $this->getApplication()->get('access', 1);
+        $module['params'] = [
+            'menutype' => '*',
+            'preset'   => $preset,
+            'style'    => 'System-none',
+        ];
+
+        if (!$model->save($module)) {
+            $this->getApplication()->enqueueMessage(Text::sprintf('JLIB_INSTALLER_ERROR_COMP_INSTALL_FAILED_TO_CREATE_DASHBOARD', $model->getError()));
+        }
+    }
+}
diff --git a/libraries/src/Installer/LegacyInstallerScript.php b/libraries/src/Installer/LegacyInstallerScript.php
index df655e9959708..2a41433c64a95 100644
--- a/libraries/src/Installer/LegacyInstallerScript.php
+++ b/libraries/src/Installer/LegacyInstallerScript.php
@@ -180,7 +180,7 @@ private function callOnScript(string $name, array $arguments): bool
             try {
                 $this->installerScript->setDatabase($this->getDatabase());
             } catch (DatabaseNotFoundException) {
-                @trigger_error(\sprintf('Database must be set, this will not be caught anymore in 6.0 in %s.', __METHOD__), E_USER_DEPRECATED);
+                @trigger_error(\sprintf('Database must be set, this will not be caught anymore in 7.0 in %s.', __METHOD__), E_USER_DEPRECATED);
                 $this->installerScript->setDatabase(Factory::getContainer()->get(DatabaseInterface::class));
             }
         }
diff --git a/libraries/src/Language/Associations.php b/libraries/src/Language/Associations.php
index 34e993e0422a2..b1d3032efa4b0 100644
--- a/libraries/src/Language/Associations.php
+++ b/libraries/src/Language/Associations.php
@@ -11,8 +11,8 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -28,16 +28,16 @@ class Associations
     /**
      * Get the associations.
      *
-     * @param   string   $extension   The name of the component.
-     * @param   string   $tablename   The name of the table.
-     * @param   string   $context     The context
-     * @param   integer  $id          The primary key value.
-     * @param   string   $pk          The name of the primary key in the given $table.
-     * @param   string   $aliasField  If the table has an alias field set it here. Null to not use it
-     * @param   string   $catField    If the table has a catid field set it here. Null to not use it
-     * @param   array    $advClause   Additional advanced 'where' clause; use c as parent column key, c2 as associations column key
+     * @param   string     $extension   The name of the component.
+     * @param   string     $tablename   The name of the table.
+     * @param   string     $context     The context
+     * @param   int|int[]  $id          The primary key value or array of primary keys.
+     * @param   string     $pk          The name of the primary key in the given $table.
+     * @param   string     $aliasField  If the table has an alias field set it here. Null to not use it
+     * @param   string     $catField    If the table has a catid field set it here. Null to not use it
+     * @param   array      $advClause   Additional advanced 'where' clause; use c as parent column key, c2 as associations column key
      *
-     * @return  array  The associated items
+     * @return  array  The associated items, optionally grouped by primary key.
      *
      * @since   3.1
      *
@@ -56,17 +56,14 @@ public static function getAssociations(
         // To avoid doing duplicate database queries.
         static $multilanguageAssociations = [];
 
-        // Cast before creating cache key.
-        $id = (int) $id;
-
         // Multilanguage association array key. If the key is already in the array we don't need to run the query again, just return it.
-        $queryKey = md5(serialize(array_merge([$extension, $tablename, $context, $id], $advClause)));
+        $queryKey = md5(serialize(array_merge([$extension, $tablename, $context, print_r($id, true)], $advClause)));
 
         if (!isset($multilanguageAssociations[$queryKey])) {
             $multilanguageAssociations[$queryKey] = [];
 
             $db                 = Factory::getDbo();
-            $query              = $db->getQuery(true);
+            $query              = $db->createQuery();
             $categoriesExtraSql = '';
 
             if ($tablename === '#__categories') {
@@ -74,7 +71,7 @@ public static function getAssociations(
                 $query->bind(':extension1', $extension);
             }
 
-            $query->select($db->quoteName('c2.language'))
+            $query->select([$db->quoteName('c2.language'), $db->quoteName('c.' . $pk) . ' AS ' . $db->quoteName('pk')])
                 ->from($db->quoteName($tablename, 'c'))
                 ->join(
                     'INNER',
@@ -124,8 +121,9 @@ public static function getAssociations(
                     );
             }
 
-            $query->where($db->quoteName('c.' . $pk) . ' = :id')
-                ->bind(':id', $id, ParameterType::INTEGER);
+            $ids = ArrayHelper::toInteger((array) $id);
+
+            $query->where($db->quoteName('c.' . $pk) . 'IN(' . implode(',', $query->bindArray($ids)) . ')');
 
             if ($tablename === '#__categories') {
                 $query->where($db->quoteName('c.extension') . ' = :extension3')
@@ -141,17 +139,33 @@ public static function getAssociations(
 
             $db->setQuery($query);
 
-            try {
-                $items = $db->loadObjectList('language');
-            } catch (\RuntimeException $e) {
-                throw new \Exception($e->getMessage(), 500, $e);
-            }
+            if (\is_array($id)) {
+                try {
+                    $items = $db->loadObjectList();
+                } catch (\RuntimeException $e) {
+                    throw new \Exception($e->getMessage(), 500, $e);
+                }
 
-            if ($items) {
-                foreach ($items as $tag => $item) {
+                // Group by id
+                foreach ($items as $item) {
                     // Do not return itself as result
                     if ((int) $item->{$pk} !== $id) {
-                        $multilanguageAssociations[$queryKey][$tag] = $item;
+                        $multilanguageAssociations[$queryKey][$item->pk][$item->language] = $item;
+                    }
+                }
+            } else {
+                try {
+                    $items = $db->loadObjectList('language');
+                } catch (\RuntimeException $e) {
+                    throw new \Exception($e->getMessage(), 500, $e);
+                }
+
+                if ($items) {
+                    foreach ($items as $tag => $item) {
+                        // Do not return itself as result
+                        if ((int) $item->{$pk} !== $id) {
+                            $multilanguageAssociations[$queryKey][$tag] = $item;
+                        }
                     }
                 }
             }
@@ -176,17 +190,17 @@ public static function isEnabled()
         // Status of language filter parameter.
         static $enabled = false;
 
-        if (Multilanguage::isEnabled()) {
-            // If already tested, don't test again.
-            if (!$tested) {
+        // If already tested, don't test again.
+        if (!$tested) {
+            $tested = true;
+
+            if (Multilanguage::isEnabled()) {
                 $plugin = PluginHelper::getPlugin('system', 'languagefilter');
 
                 if (!empty($plugin)) {
                     $params   = new Registry($plugin->params);
                     $enabled  = (bool) $params->get('item_associations', true);
                 }
-
-                $tested = true;
             }
         }
 
diff --git a/libraries/src/Language/Language.php b/libraries/src/Language/Language.php
index 7c2089f7a5867..8e70048bb05e5 100644
--- a/libraries/src/Language/Language.php
+++ b/libraries/src/Language/Language.php
@@ -9,6 +9,7 @@
 
 namespace Joomla\CMS\Language;
 
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\Language\Language as BaseLanguage;
 use Joomla\String\StringHelper;
@@ -40,6 +41,22 @@ class Language extends BaseLanguage
      */
     protected $strings = [];
 
+    /**
+     * Cached fallback chains, keyed by language tag.
+     *
+     * @var    array
+     * @since  6.2.0
+     */
+    protected $fallbackChains = [];
+
+    /**
+     * Cached admin fallback overrides (language tag => fallback tag), or null until first read.
+     *
+     * @var    array|null
+     * @since  6.2.0
+     */
+    protected $fallbackOverrides = null;
+
     /**
      * Name of the transliterator function for this language.
      *
@@ -62,7 +79,7 @@ class Language extends BaseLanguage
      * @var    callable
      * @since  1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     protected $ignoredSearchWordsCallback = null;
 
@@ -72,7 +89,7 @@ class Language extends BaseLanguage
      * @var    callable
      * @since  1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     protected $lowerLimitSearchWordCallback = null;
 
@@ -82,7 +99,7 @@ class Language extends BaseLanguage
      * @var    callable
      * @since  1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     protected $upperLimitSearchWordCallback = null;
 
@@ -92,7 +109,7 @@ class Language extends BaseLanguage
      * @var    callable
      * @since  1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     protected $searchDisplayedCharactersNumberCallback = null;
 
@@ -204,7 +221,7 @@ public function __construct($lang = null, $debug = false)
      *
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the language factory instead
      *              Example: Factory::getContainer()->get(LanguageFactoryInterface::class)->createLanguage($lang, $debug);
      */
@@ -406,7 +423,7 @@ public function setPluralSuffixesCallback(callable $function)
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     public function getIgnoredSearchWords()
     {
@@ -424,7 +441,7 @@ public function getIgnoredSearchWords()
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     public function getIgnoredSearchWordsCallback()
     {
@@ -440,7 +457,7 @@ public function getIgnoredSearchWordsCallback()
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     public function setIgnoredSearchWordsCallback(callable $function)
     {
@@ -457,7 +474,7 @@ public function setIgnoredSearchWordsCallback(callable $function)
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     public function getLowerLimitSearchWord()
     {
@@ -475,7 +492,7 @@ public function getLowerLimitSearchWord()
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     public function getLowerLimitSearchWordCallback()
     {
@@ -491,7 +508,7 @@ public function getLowerLimitSearchWordCallback()
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     public function setLowerLimitSearchWordCallback(callable $function)
     {
@@ -508,7 +525,7 @@ public function setLowerLimitSearchWordCallback(callable $function)
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     public function getUpperLimitSearchWord()
     {
@@ -526,7 +543,7 @@ public function getUpperLimitSearchWord()
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     public function getUpperLimitSearchWordCallback()
     {
@@ -542,7 +559,7 @@ public function getUpperLimitSearchWordCallback()
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     public function setUpperLimitSearchWordCallback(callable $function)
     {
@@ -559,7 +576,7 @@ public function setUpperLimitSearchWordCallback(callable $function)
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     public function getSearchDisplayedCharactersNumber()
     {
@@ -577,7 +594,7 @@ public function getSearchDisplayedCharactersNumber()
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     public function getSearchDisplayedCharactersNumberCallback()
     {
@@ -593,7 +610,7 @@ public function getSearchDisplayedCharactersNumberCallback()
      *
      * @since   1.7.0
      *
-     * @deprecated  4.4 will be removed in 6.0 without replacement
+     * @deprecated  4.4 will be removed in 7.0 without replacement
      */
     public function setSearchDisplayedCharactersNumberCallback(callable $function)
     {
@@ -629,6 +646,13 @@ public function load($extension = 'joomla', $basePath = JPATH_BASE, $lang = null
             $this->load($extension, $basePath, $this->default, false, true);
         }
 
+        // Load the fallback chain next, weakest first, so missing strings are filled per key.
+        if (!$this->debug) {
+            foreach (array_reverse($this->getFallbackChain($lang)) as $fallbackLang) {
+                $this->load($extension, $basePath, $fallbackLang, $reload, false);
+            }
+        }
+
         $path = LanguageHelper::getLanguagePath($basePath, $lang);
 
         $internal = $extension === 'joomla' || $extension == '';
@@ -661,6 +685,86 @@ public function load($extension = 'joomla', $basePath = JPATH_BASE, $lang = null
         return false;
     }
 
+    /**
+     * Resolves the ordered fallback chain for a language tag, strongest first.
+     *
+     * The fallback of a tag is taken from the com_languages override, else from the optional
+     * <fallback> element of its langmetadata.xml. The chain stops at a language without a fallback,
+     * the site default, or a cycle, and excludes both the requested language and the site default.
+     *
+     * @param   string  $lang  The language tag to resolve the fallback chain for.
+     *
+     * @return  string[]  Ordered list of fallback language tags, strongest first.
+     *
+     * @since   6.2.0
+     */
+    protected function getFallbackChain($lang)
+    {
+        if (isset($this->fallbackChains[$lang])) {
+            return $this->fallbackChains[$lang];
+        }
+
+        $chain     = [];
+        $seen      = [$lang => true];
+        $next      = $lang;
+        $overrides = $this->getFallbackOverrides();
+
+        while (true) {
+            if (isset($overrides[$next])) {
+                $fallback = $overrides[$next];
+            } else {
+                $metadata = ($next === $this->lang ? $this->metadata : LanguageHelper::getMetadata($next)) ?: [];
+                $fallback = $metadata['fallback'] ?? '';
+            }
+
+            if ($fallback === '' || $fallback === $this->default || isset($seen[$fallback])) {
+                break;
+            }
+
+            $chain[]         = $fallback;
+            $seen[$fallback] = true;
+            $next            = $fallback;
+        }
+
+        $this->fallbackChains[$lang] = $chain;
+
+        return $chain;
+    }
+
+    /**
+     * Reads and caches the administrator fallback overrides (tag => fallback) from the
+     * com_languages options. Returns an empty map when the component parameters are not yet available.
+     *
+     * @return  array  Map of language tag => fallback tag.
+     *
+     * @since   6.2.0
+     */
+    protected function getFallbackOverrides()
+    {
+        if ($this->fallbackOverrides !== null) {
+            return $this->fallbackOverrides;
+        }
+
+        $this->fallbackOverrides = [];
+
+        try {
+            $overrides = ComponentHelper::getParams('com_languages')->get('fallback_overrides');
+        } catch (\Throwable $e) {
+            return $this->fallbackOverrides;
+        }
+
+        foreach ((array) $overrides as $override) {
+            $tag      = trim((string) ($override->tag ?? ''));
+            $fallback = trim((string) ($override->fallback ?? ''));
+
+            if ($tag !== '' && $fallback !== '') {
+                $this->fallbackOverrides[$tag] = $fallback;
+            }
+        }
+
+        return $this->fallbackOverrides;
+    }
+
     /**
      * Loads a language file.
      *
diff --git a/libraries/src/Language/LanguageFactoryAwareInterface.php b/libraries/src/Language/LanguageFactoryAwareInterface.php
new file mode 100644
index 0000000000000..9fe91526c8e24
--- /dev/null
+++ b/libraries/src/Language/LanguageFactoryAwareInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Interface to be implemented by classes depending on a language factory.
+ *
+ * @since  6.2.0
+ */
+interface LanguageFactoryAwareInterface
+{
+    /**
+     * Set the language factory to use.
+     *
+     * @param   ?LanguageFactoryInterface  $languageFactory  The language factory to use.
+     *
+     * @return  void
+     *
+     * @since   6.2.0
+     */
+    public function setLanguageFactory(?LanguageFactoryInterface $languageFactory = null): void;
+}
diff --git a/libraries/src/Language/LanguageFactoryAwareTrait.php b/libraries/src/Language/LanguageFactoryAwareTrait.php
new file mode 100644
index 0000000000000..7bf010931b229
--- /dev/null
+++ b/libraries/src/Language/LanguageFactoryAwareTrait.php
@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Language;
+
+use Joomla\CMS\Factory;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Defines the trait for a LanguageFactoryInterface aware class.
+ *
+ * @since  6.2.0
+ */
+trait LanguageFactoryAwareTrait
+{
+    /**
+     * LanguageFactoryInterface
+     *
+     * @var    LanguageFactoryInterface
+     * @since  6.2.0
+     */
+    private $languageFactory;
+
+    /**
+     * Get the LanguageFactoryInterface.
+     *
+     * @return  LanguageFactoryInterface
+     *
+     * @since   6.2.0
+     * @throws  \UnexpectedValueException May be thrown if the LanguageFactory has not been set.
+     */
+    protected function getLanguageFactory(): LanguageFactoryInterface
+    {
+        if ($this->languageFactory) {
+            return $this->languageFactory;
+        }
+
+        @trigger_error(
+            \sprintf('LanguageFactory must be set in %s. This will not be caught anymore in 8.0', __METHOD__),
+            E_USER_DEPRECATED
+        );
+
+        return Factory::getContainer()->get(LanguageFactoryInterface::class);
+    }
+
+    /**
+     * Set the language factory to use.
+     *
+     * @param   ?LanguageFactoryInterface  $languageFactory  The language factory to use.
+     *
+     * @return  void
+     *
+     * @since   6.2.0
+     */
+    public function setLanguageFactory(?LanguageFactoryInterface $languageFactory = null): void
+    {
+        $this->languageFactory = $languageFactory;
+    }
+}
diff --git a/libraries/src/Language/LanguageHelper.php b/libraries/src/Language/LanguageHelper.php
index 0a366ece2ed7a..4ea01ea0bfbc1 100644
--- a/libraries/src/Language/LanguageHelper.php
+++ b/libraries/src/Language/LanguageHelper.php
@@ -15,7 +15,9 @@
 use Joomla\CMS\Installer\Installer;
 use Joomla\CMS\Log\Log;
 use Joomla\Database\DatabaseInterface;
+use Joomla\Filesystem\Exception\FilesystemException;
 use Joomla\Filesystem\File;
+use Joomla\Filesystem\Folder;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
@@ -111,6 +113,11 @@ public static function detectLanguage()
                 $browserLang         = substr($browserLang, 0, strcspn($browserLang, ';'));
                 $primary_browserLang = substr($browserLang, 0, 2);
 
+                // Some browser return only "fr" or "de", so let's try to use it like "fr-fr" or "de-de"
+                if (\strlen($browserLang) == 2) {
+                    $browserLang = $browserLang . '-' . $browserLang;
+                }
+
                 foreach ($systemLangs as $systemLang) {
                     // Take off 3 letters iso code languages as they can't match browsers' languages and default them to en
                     $Jinstall_lang = $systemLang->lang_code;
@@ -169,7 +176,7 @@ public static function getLanguages($key = 'default')
                     $languages = $cache->get('languages');
                 } else {
                     $db    = Factory::getDbo();
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select('*')
                         ->from($db->quoteName('#__languages'))
                         ->where($db->quoteName('published') . ' = 1')
@@ -231,7 +238,7 @@ public static function getInstalledLanguages(
             } else {
                 $db ??= Factory::getContainer()->get(DatabaseInterface::class);
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select(
                         [
                             $db->quoteName('element'),
@@ -380,7 +387,7 @@ public static function getContentLanguages(
             } else {
                 $db = Factory::getDbo();
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('*')
                     ->from($db->quoteName('#__languages'));
 
@@ -444,6 +451,23 @@ public static function parseIniFile($fileName, $debug = false)
             return [];
         }
 
+        $cacheFile = JPATH_CACHE . '/language/' . ltrim(str_replace([JPATH_ROOT, '/'], ['', '-'], $fileName), '-') . '.' . filemtime($fileName) . '.php';
+
+        if (is_file($cacheFile)) {
+            $result = include $cacheFile;
+
+            if (\is_array($result)) {
+                return $result;
+            }
+
+            // When $result is not an array, the cache file is corrupted, we will delete it and have it regenerated
+            try {
+                File::delete($cacheFile);
+            } catch (FilesystemException $e) {
+                // We ignore the error, as the file is for caching only.
+            }
+        }
+
         // This was required for https://github.com/joomla/joomla-cms/issues/17198 but not sure what server setup
         // issue it is solving
         $disabledFunctions      = explode(',', \ini_get('disable_functions'));
@@ -471,10 +495,40 @@ public static function parseIniFile($fileName, $debug = false)
             restore_error_handler();
         }
 
+        if (!\is_array($strings)) {
+            $strings = [];
+        }
+
         // Ini files are processed in the "RAW" mode of parse_ini_string, leaving escaped quotes untouched - lets postprocess them
         $strings = str_replace('\"', '"', $strings);
 
-        return \is_array($strings) ? $strings : [];
+        // Write cache
+        try {
+            Folder::create(\dirname($cacheFile));
+
+            $data         = "<?php\ndefined('_JEXEC') or die;\nreturn " . var_export($strings, true) . ";\n";
+            $bytesWritten = file_put_contents($cacheFile, $data);
+
+            if ($bytesWritten === false || $bytesWritten < \strlen($data)) {
+                if (is_file($cacheFile)) {
+                    File::delete($cacheFile);
+                }
+
+                throw new FilesystemException('Unable to write cache file');
+            }
+        } catch (FilesystemException) {
+            try {
+                Log::add(
+                    Text::sprintf('JLIB_LANGUAGE_ERROR_CANNOT_WRITE_CACHE', str_replace(JPATH_ROOT, '', $cacheFile)),
+                    Log::WARNING,
+                    'language'
+                );
+            } catch (\RuntimeException) {
+                // Ignore logging errors
+            }
+        }
+
+        return $strings;
     }
 
     /**
diff --git a/libraries/src/Language/Multilanguage.php b/libraries/src/Language/Multilanguage.php
index 3b2465702bf5b..d9a4c80189522 100644
--- a/libraries/src/Language/Multilanguage.php
+++ b/libraries/src/Language/Multilanguage.php
@@ -11,6 +11,8 @@
 
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Menu\MenuItem;
+use Joomla\CMS\Menu\SiteMenu;
 use Joomla\Database\DatabaseInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -67,7 +69,7 @@ public static function isEnabled(?CMSApplication $app = null, ?DatabaseInterface
         if (!$tested) {
             // Determine status of language filter plugin.
             $db    = $db ?: Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('enabled'))
                 ->from($db->quoteName('#__extensions'))
                 ->where(
@@ -89,40 +91,15 @@ public static function isEnabled(?CMSApplication $app = null, ?DatabaseInterface
     /**
      * Method to return a list of language home page menu items.
      *
-     * @param   ?DatabaseInterface  $db  The database
-     *
-     * @return  array of menu objects.
+     * @return  MenuItem[] array of menu item objects.
      *
      * @since   3.5
      */
-    public static function getSiteHomePages(?DatabaseInterface $db = null)
+    public static function getSiteHomePages()
     {
-        // To avoid doing duplicate database queries.
-        static $multilangSiteHomePages = null;
-
-        if (!isset($multilangSiteHomePages)) {
-            // Check for Home pages languages.
-            $db    = $db ?: Factory::getDbo();
-            $query = $db->getQuery(true)
-                ->select(
-                    [
-                        $db->quoteName('language'),
-                        $db->quoteName('id'),
-                    ]
-                )
-                ->from($db->quoteName('#__menu'))
-                ->where(
-                    [
-                        $db->quoteName('home') . ' = ' . $db->quote('1'),
-                        $db->quoteName('published') . ' = 1',
-                        $db->quoteName('client_id') . ' = 0',
-                    ]
-                );
-            $db->setQuery($query);
-
-            $multilangSiteHomePages = $db->loadObjectList('language');
-        }
+        /** @var SiteMenu $menu */
+        $menu = Factory::getApplication()->getMenu('site');
 
-        return $multilangSiteHomePages;
+        return $menu->getHomepages();
     }
 }
diff --git a/libraries/src/Language/Text.php b/libraries/src/Language/Text.php
index 15af9680d16ab..c941b4ce99dc5 100644
--- a/libraries/src/Language/Text.php
+++ b/libraries/src/Language/Text.php
@@ -10,7 +10,6 @@
 namespace Joomla\CMS\Language;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -328,7 +327,7 @@ public static function script($string = null, $jsSafe = false, $interpretBackSla
         if ($string === null) {
             @trigger_error(
                 \sprintf(
-                    'As of 3.7.0, passing a null value for the first argument of %1$s() is deprecated and will not be supported in 4.0.'
+                    'As of 3.7.0, passing a null value for the first argument of %1$s() is deprecated and will not be supported in 7.0.'
                     . ' Use the %2$s::getScriptStrings() method to get the strings from the JavaScript language store instead.',
                     __METHOD__,
                     __CLASS__
@@ -351,7 +350,8 @@ public static function script($string = null, $jsSafe = false, $interpretBackSla
 
         // Add the string to the array if not null.
         if ($string !== null) {
-            $doc = Factory::getDocument();
+            $app = Factory::getApplication();
+            $doc = $app->getDocument();
 
             // Get previously added strings
             $strings = $doc->getScriptOptions('joomla.jtext');
@@ -362,7 +362,7 @@ public static function script($string = null, $jsSafe = false, $interpretBackSla
             static::$strings[$key] = $strings[$key];
 
             // Load core.js dependency
-            HTMLHelper::_('behavior.core');
+            $doc->getWebAssetManager()->useScript('core');
 
             // Update Joomla.Text script options
             $doc->addScriptOptions('joomla.jtext', $strings, false);
diff --git a/libraries/src/Log/Log.php b/libraries/src/Log/Log.php
index 7027dada9e235..5069319b4e42c 100644
--- a/libraries/src/Log/Log.php
+++ b/libraries/src/Log/Log.php
@@ -330,7 +330,7 @@ protected function addLogEntry(LogEntry $entry)
                 } else {
                     @trigger_error(
                         \sprintf(
-                            'Attempting to automatically resolve loggers to the %s namespace is deprecated as of 4.0 and will be removed in 5.0.'
+                            'Attempting to automatically resolve loggers to the %s namespace is deprecated as of 4.0 and will be removed in 7.0.'
                             . ' Use the logger registry instead.',
                             __NAMESPACE__
                         ),
diff --git a/libraries/src/Log/Logger/DatabaseLogger.php b/libraries/src/Log/Logger/DatabaseLogger.php
index eee2dd67f7865..502d5d9bed116 100644
--- a/libraries/src/Log/Logger/DatabaseLogger.php
+++ b/libraries/src/Log/Logger/DatabaseLogger.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Log\LogEntry;
 use Joomla\CMS\Log\Logger;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseFactory;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -171,6 +172,6 @@ protected function connect()
             'prefix'   => $this->prefix,
         ];
 
-        $this->db = DatabaseDriver::getInstance($options);
+        $this->db = (new DatabaseFactory())->getDriver($options['driver'], $options);
     }
 }
diff --git a/libraries/src/Log/Logger/FormattedtextLogger.php b/libraries/src/Log/Logger/FormattedtextLogger.php
index 874fb5d0ad92a..030bec8d57730 100644
--- a/libraries/src/Log/Logger/FormattedtextLogger.php
+++ b/libraries/src/Log/Logger/FormattedtextLogger.php
@@ -40,7 +40,7 @@ class FormattedtextLogger extends Logger
      * @var    string
      * @since  1.7.0
      */
-    protected $format = '{DATETIME}	{PRIORITY}	{CLIENTIP}	{CATEGORY}	{MESSAGE}';
+    protected $format = "{DATETIME}\t{PRIORITY}\t{CLIENTIP}\t{CATEGORY}\t{MESSAGE}";
 
     /**
      * The parsed fields from the format string.
diff --git a/libraries/src/Log/Logger/W3cLogger.php b/libraries/src/Log/Logger/W3cLogger.php
index 65e7c2a3758d9..c836e058410fb 100644
--- a/libraries/src/Log/Logger/W3cLogger.php
+++ b/libraries/src/Log/Logger/W3cLogger.php
@@ -31,7 +31,7 @@ class W3cLogger extends FormattedtextLogger
      * @var    string
      * @since  1.7.0
      */
-    protected $format = '{DATE}	{TIME}	{PRIORITY}	{CLIENTIP}	{CATEGORY}	{MESSAGE}';
+    protected $format = "{DATE}\t{TIME}\t{PRIORITY}\t{CLIENTIP}\t{CATEGORY}\t{MESSAGE}";
 
     /**
      * Constructor.
diff --git a/libraries/src/MVC/Controller/AdminController.php b/libraries/src/MVC/Controller/AdminController.php
index a831e46600fad..a4ff729a77032 100644
--- a/libraries/src/MVC/Controller/AdminController.php
+++ b/libraries/src/MVC/Controller/AdminController.php
@@ -159,13 +159,7 @@ public function delete()
             $this->postDeleteHook($model, $cid);
         }
 
-        $this->setRedirect(
-            Route::_(
-                'index.php?option=' . $this->option . '&view=' . $this->view_list
-                . $this->getRedirectToListAppend(),
-                false
-            )
-        );
+        $this->setRedirect($this->getRedirectUrlToList());
     }
 
     /**
@@ -241,13 +235,7 @@ public function publish()
             }
         }
 
-        $this->setRedirect(
-            Route::_(
-                'index.php?option=' . $this->option . '&view=' . $this->view_list
-                . $this->getRedirectToListAppend(),
-                false
-            )
-        );
+        $this->setRedirect($this->getRedirectUrlToList());
     }
 
     /**
@@ -271,7 +259,7 @@ public function reorder()
         $model  = $this->getModel();
         $return = $model->reorder($ids, $inc);
 
-        $redirect = Route::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false);
+        $redirect = $this->getRedirectUrlToList();
 
         if ($return === false) {
             // Reorder failed.
@@ -317,7 +305,7 @@ public function saveorder()
         // Save the ordering
         $return = $model->saveorder($pks, $order);
 
-        $redirect = Route::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false);
+        $redirect = $this->getRedirectUrlToList();
 
         if ($return === false) {
             // Reorder failed
@@ -358,10 +346,7 @@ public function checkin()
             // Checkin failed.
             $message = Text::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError());
             $this->setRedirect(
-                Route::_(
-                    'index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(),
-                    false
-                ),
+                $this->getRedirectUrlToList(),
                 $message,
                 'error'
             );
@@ -371,13 +356,7 @@ public function checkin()
 
         // Checkin succeeded.
         $message = Text::plural($this->text_prefix . '_N_ITEMS_CHECKED_IN', \count($ids));
-        $this->setRedirect(
-            Route::_(
-                'index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(),
-                false
-            ),
-            $message
-        );
+        $this->setRedirect($this->getRedirectUrlToList(), $message);
 
         return true;
     }
@@ -452,7 +431,7 @@ public function runTransition()
 
         $return = $model->executeTransition($pks, $transitionId);
 
-        $redirect = Route::_('index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(), false);
+        $redirect = $this->getRedirectUrlToList();
 
         if ($return === false) {
             // Transition change failed.
@@ -469,6 +448,21 @@ public function runTransition()
         return true;
     }
 
+    /**
+     * Gets the URL to redirect to the list view.
+     *
+     * @return  string  The redirect URL.
+     *
+     * @since   6.1.0
+     */
+    protected function getRedirectUrlToList(): string
+    {
+        return Route::_(
+            'index.php?option=' . $this->option . '&view=' . $this->view_list . $this->getRedirectToListAppend(),
+            false
+        );
+    }
+
     /**
      * Gets the URL arguments to append to a list redirect.
      *
diff --git a/libraries/src/MVC/Controller/ApiController.php b/libraries/src/MVC/Controller/ApiController.php
index 879445030452a..2c5cefcc1ec73 100644
--- a/libraries/src/MVC/Controller/ApiController.php
+++ b/libraries/src/MVC/Controller/ApiController.php
@@ -9,6 +9,7 @@
 
 namespace Joomla\CMS\MVC\Controller;
 
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\Access\Exception\NotAllowed;
 use Joomla\CMS\Application\CMSWebApplicationInterface;
 use Joomla\CMS\Component\ComponentHelper;
@@ -18,8 +19,9 @@
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\CMS\MVC\Model\State;
 use Joomla\CMS\MVC\View\JsonApiView;
+use Joomla\CMS\Response\JsonResponse;
 use Joomla\Input\Input;
-use Joomla\String\Inflector;
+use Joomla\Registry\Registry;
 use Tobscure\JsonApi\Exception\InvalidParameterException;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -108,7 +110,7 @@ class ApiController extends BaseController
      */
     public function __construct($config = [], ?MVCFactoryInterface $factory = null, ?CMSWebApplicationInterface $app = null, ?Input $input = null)
     {
-        $this->modelState = new State();
+        $this->modelState = new Registry();
 
         parent::__construct($config, $factory, $app, $input);
 
@@ -165,7 +167,8 @@ public function displayItem($id = null)
             throw new \RuntimeException($e->getMessage());
         }
 
-        $modelName = $this->input->get('model', Inflector::singularize($this->contentType));
+        $inflector = InflectorFactory::create()->build();
+        $modelName = $this->input->get('model', $inflector->singularize($this->contentType));
 
         // Create the model, ignoring request data so we can safely set the state in the request from the controller
         $model = $this->getModel($modelName, '', ['ignore_request' => true, 'state' => $this->modelState]);
@@ -296,7 +299,9 @@ public function displayList()
      */
     public function delete($id = null)
     {
-        if (!$this->app->getIdentity()->authorise('core.delete', $this->option)) {
+        if (
+            !$this->allowDelete()
+        ) {
             throw new NotAllowed('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED', 403);
         }
 
@@ -304,7 +309,8 @@ public function delete($id = null)
             $id = $this->input->get('id', 0, 'int');
         }
 
-        $modelName = $this->input->get('model', Inflector::singularize($this->contentType));
+        $inflector = InflectorFactory::create()->build();
+        $modelName = $this->input->get('model', $inflector->singularize($this->contentType));
 
         /** @var \Joomla\CMS\MVC\Model\AdminModel $model */
         $model = $this->getModel($modelName, '', ['ignore_request' => true]);
@@ -318,6 +324,36 @@ public function delete($id = null)
             if ($model->getError() !== false) {
                 throw new \RuntimeException($model->getError(), 500);
             }
+
+            // If the model has set a 409 status code in the session, we return a 409 http status codee
+            if ($this->app->getSession()->get('http_status_code_409', false)) {
+                $this->app->getSession()->clear('http_status_code_409');
+                $this->app->setHeader('status', 409, true);
+                $this->app->setHeader('Content-Type', 'application/json');
+                $this->app->sendHeaders();
+                $body = [
+                    'status'  => 'Conflict',
+                    'code'    => 409,
+                    'message' => 'Resource not in state that can be deleted, must be trashed before it can be deleted',
+                ];
+                echo new JsonResponse($body);
+                $this->app->close();
+            }
+        }
+
+        // If the model has set a 404 status code in the session, we return a 404 http status codee
+        if ($this->app->getSession()->get('http_status_code_404', false)) {
+            $this->app->getSession()->clear('http_status_code_404');
+            $this->app->setHeader('status', 404, true);
+            $this->app->setHeader('Content-Type', 'application/json');
+            $this->app->sendHeaders();
+            $body = [
+                'status'  => 'not found',
+                'code'    => 404,
+                'message' => 'Resource not found',
+            ];
+            echo new JsonResponse($body);
+            $this->app->close();
         }
 
         $this->app->setHeader('status', 204);
@@ -354,7 +390,8 @@ public function add()
     public function edit()
     {
         /** @var \Joomla\CMS\MVC\Model\AdminModel $model */
-        $model = $this->getModel(Inflector::singularize($this->contentType));
+        $inflector = InflectorFactory::create()->build();
+        $model     = $this->getModel($inflector->singularize($this->contentType));
 
         if (!$model) {
             throw new \RuntimeException(Text::_('JLIB_APPLICATION_ERROR_MODEL_CREATE'));
@@ -403,7 +440,8 @@ public function edit()
     protected function save($recordKey = null)
     {
         /** @var \Joomla\CMS\MVC\Model\AdminModel $model */
-        $model = $this->getModel(Inflector::singularize($this->contentType));
+        $inflector = InflectorFactory::create()->build();
+        $model     = $this->getModel($inflector->singularize($this->contentType));
 
         if (!$model) {
             throw new \RuntimeException(Text::_('JLIB_APPLICATION_ERROR_MODEL_CREATE'));
@@ -513,7 +551,13 @@ protected function save($recordKey = null)
      */
     protected function allowEdit($data = [], $key = 'id')
     {
-        return $this->app->getIdentity()->authorise('core.edit', $this->option);
+        $user = $this->app->getIdentity();
+
+        if (!$user->authorise('core.manage', $this->option)) {
+            return false;
+        }
+
+        return $user->authorise('core.edit', $this->option);
     }
 
     /**
@@ -531,9 +575,32 @@ protected function allowAdd($data = [])
     {
         $user = $this->app->getIdentity();
 
+        if (!$user->authorise('core.manage', $this->option)) {
+            return false;
+        }
+
         return $user->authorise('core.create', $this->option) || \count($user->getAuthorisedCategories($this->option, 'core.create'));
     }
 
+    /**
+     * Method to check if it's allowed to delete a record
+     *
+     * @return  boolean
+     *
+     * @since   6.1.3
+     */
+    protected function allowDelete(): bool
+    {
+        $user = $this->app->getIdentity();
+
+        // Require generic management permissions for the component
+        if (!$user->authorise('core.manage', $this->option)) {
+            return false;
+        }
+
+        return $user->authorise('core.delete', $this->option);
+    }
+
     /**
      * Method to allow extended classes to manipulate the data to be saved for an extension.
      *
diff --git a/libraries/src/MVC/Controller/BaseController.php b/libraries/src/MVC/Controller/BaseController.php
index 2ad02cc2eb192..2a02250d6d435 100644
--- a/libraries/src/MVC/Controller/BaseController.php
+++ b/libraries/src/MVC/Controller/BaseController.php
@@ -12,6 +12,8 @@
 use Joomla\Application\AbstractApplication;
 use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Application\CMSWebApplicationInterface;
+use Joomla\CMS\Cache\CacheControllerFactoryAwareInterface;
+use Joomla\CMS\Cache\CacheControllerFactoryAwareTrait;
 use Joomla\CMS\Cache\Exception\CacheExceptionInterface;
 use Joomla\CMS\Document\DocumentAwareInterface;
 use Joomla\CMS\Factory;
@@ -49,10 +51,15 @@
  *
  * @since  2.5.5
  */
-class BaseController implements ControllerInterface, DispatcherAwareInterface, LoggerAwareInterface
+class BaseController implements
+    ControllerInterface,
+    DispatcherAwareInterface,
+    LoggerAwareInterface,
+    CacheControllerFactoryAwareInterface
 {
     use LoggerAwareTrait;
     use DispatcherAwareTrait;
+    use CacheControllerFactoryAwareTrait;
 
     /**
      * The base path of the controller
@@ -200,7 +207,7 @@ class BaseController implements ControllerInterface, DispatcherAwareInterface, L
      *
      * @since   3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Will be removed without replacement. Get the model through the MVCFactory instead
      */
     public static function addModelPath($path, $prefix = '')
@@ -261,7 +268,7 @@ public static function createFileName($type, $parts = [])
      *
      * @since       3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Get the controller through the MVCFactory instead
      *              Example: Factory::getApplication()->bootComponent($option)->getMVCFactory()->createController(...);
      *
@@ -378,7 +385,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null,
         $this->input = $input ?: $this->app->getInput();
 
         /**
-         * @deprecated This is to maintain b/c with the J4.0 implementation of BaseController. In Joomla 6.0 this will be
+         * @deprecated This is to maintain b/c with the J4.0 implementation of BaseController. In Joomla 7.0 this will be
          *             removed and instead the logger should be injected by the MVCFactory using
          *             BaseController::setLogger()
          */
@@ -391,7 +398,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null,
         }
 
         // Determine the methods to exclude from the base class.
-        $xMethods = get_class_methods('\\Joomla\\CMS\\MVC\\Controller\\BaseController');
+        $xMethods = get_class_methods(BaseController::class);
 
         // Get the public methods in this class using reflection.
         $r        = new \ReflectionClass($this);
@@ -545,7 +552,7 @@ protected function checkEditId($context, $id)
                         $context,
                         $id,
                         (int) $result,
-                        str_replace("\n", ' ', print_r($values, 1))
+                        json_encode($values)
                     ),
                     ['category' => 'controller']
                 );
@@ -688,7 +695,8 @@ public function display($cachable = false, $urlparams = [])
 
             try {
                 /** @var \Joomla\CMS\Cache\Controller\ViewController $cache */
-                $cache = Factory::getCache($option, 'view');
+                $cache = $this->getCacheControllerFactory()
+                    ->createCacheController('view', ['defaultgroup' => $option]);
                 $cache->get($view, 'display');
             } catch (CacheExceptionInterface) {
                 $view->display();
@@ -918,7 +926,7 @@ protected function holdEditId($context, $id)
                         'Holding edit ID %s.%s %s',
                         $context,
                         $id,
-                        str_replace("\n", ' ', print_r($values, 1))
+                        json_encode($values)
                     ),
                     ['category' => 'controller']
                 );
@@ -1048,7 +1056,7 @@ protected function releaseEditId($context, $id)
                         'Releasing edit ID %s.%s %s',
                         $context,
                         $id,
-                        str_replace("\n", ' ', print_r($values, 1))
+                        json_encode($values)
                     ),
                     ['category' => 'controller']
                 );
@@ -1220,7 +1228,7 @@ protected function prepareViewModel(ViewInterface $view)
      * Get the event dispatcher.
      *
      * The override was made to keep a backward compatibility for legacy component.
-     * TODO: Remove the override in 6.0
+     * TODO: Remove the override in 7.0
      *
      * @return  DispatcherInterface
      *
@@ -1231,7 +1239,7 @@ public function getDispatcher()
     {
         if (!$this->dispatcher) {
             @trigger_error(
-                \sprintf('Dispatcher for %s should be set through MVC factory. It will throw an exception in 6.0', __CLASS__),
+                \sprintf('Dispatcher for %s should be set through MVC factory. It will throw an exception in 7.0', __CLASS__),
                 E_USER_DEPRECATED
             );
 
diff --git a/libraries/src/MVC/Controller/FormController.php b/libraries/src/MVC/Controller/FormController.php
index 2da2087177f46..4c0ef9ef5774b 100644
--- a/libraries/src/MVC/Controller/FormController.php
+++ b/libraries/src/MVC/Controller/FormController.php
@@ -10,9 +10,11 @@
 namespace Joomla\CMS\MVC\Controller;
 
 use Doctrine\Inflector\InflectorFactory;
+use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Application\CMSWebApplicationInterface;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Event\Model;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormFactoryAwareInterface;
 use Joomla\CMS\Form\FormFactoryAwareTrait;
 use Joomla\CMS\Form\FormFactoryInterface;
@@ -173,13 +175,7 @@ public function add()
             // Set the internal error and also the redirect error.
             $this->setMessage(Text::_('JLIB_APPLICATION_ERROR_CREATE_RECORD_NOT_PERMITTED'), 'error');
 
-            $this->setRedirect(
-                Route::_(
-                    'index.php?option=' . $this->option . '&view=' . $this->view_list
-                        . $this->getRedirectToListAppend(),
-                    false
-                )
-            );
+            $this->setRedirect($this->getRedirectUrlToList());
 
             return false;
         }
@@ -188,13 +184,7 @@ public function add()
         $this->app->setUserState($context . '.data', null);
 
         // Redirect to the edit screen.
-        $this->setRedirect(
-            Route::_(
-                'index.php?option=' . $this->option . '&view=' . $this->view_item
-                    . $this->getRedirectToItemAppend(),
-                false
-            )
-        );
+        $this->setRedirect($this->getRedirectUrlToItem());
 
         return true;
     }
@@ -318,20 +308,10 @@ public function cancel($key = null)
         }
 
         $recordId = $this->input->getInt($key);
+        $checkin  = $table->hasField('checked_out') && $table->hasField('checked_out_time');
 
-        // Attempt to check-in the current record.
-        if ($recordId && $table->hasField('checked_out') && $model->checkin($recordId) === false) {
-            // Check-in failed, go back to the record and display a notice.
-            $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'error');
-
-            $this->setRedirect(
-                Route::_(
-                    'index.php?option=' . $this->option . '&view=' . $this->view_item
-                        . $this->getRedirectToItemAppend($recordId, $key),
-                    false
-                )
-            );
-
+        // Attempt to check-in the current record. If not success, go back to the record and display a notice
+        if ($recordId && $checkin && !$this->attemptCheckin($model, $recordId, $key)) {
             return false;
         }
 
@@ -339,19 +319,17 @@ public function cancel($key = null)
         $this->releaseEditId($context, $recordId);
         $this->app->setUserState($context . '.data', null);
 
-        $url = 'index.php?option=' . $this->option . '&view=' . $this->view_list
-            . $this->getRedirectToListAppend();
-
         // Check if there is a return value
         $return = $this->input->get('return', null, 'base64');
 
         if (!\is_null($return) && Uri::isInternal(base64_decode($return))) {
-            $url = base64_decode($return);
+            // If a return param exists and is internal, redirect to it.
+            $this->setRedirect(Route::_(base64_decode($return), false));
+        } else {
+            // Otherwise use the standard list URL helper.
+            $this->setRedirect($this->getRedirectUrlToList());
         }
 
-        // Redirect to the list screen.
-        $this->setRedirect(Route::_($url, false));
-
         return true;
     }
 
@@ -388,36 +366,20 @@ public function edit($key = null, $urlVar = null)
 
         // Get the previous record id (if any) and the current record id.
         $recordId = (int) (\count($cid) ? $cid[0] : $this->input->getInt($urlVar));
-        $checkin  = $table->hasField('checked_out');
 
         // Access check.
         if (!$this->allowEdit([$key => $recordId], $key)) {
             $this->setMessage(Text::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'), 'error');
 
-            $this->setRedirect(
-                Route::_(
-                    'index.php?option=' . $this->option . '&view=' . $this->view_list
-                        . $this->getRedirectToListAppend(),
-                    false
-                )
-            );
+            $this->setRedirect($this->getRedirectUrlToList());
 
             return false;
         }
 
-        // Attempt to check-out the new record for editing and redirect.
-        if ($checkin && !$model->checkout($recordId)) {
-            // Check-out failed, display a notice but allow the user to see the record.
-            $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_CHECKOUT_FAILED', $model->getError()), 'error');
-
-            $this->setRedirect(
-                Route::_(
-                    'index.php?option=' . $this->option . '&view=' . $this->view_item
-                        . $this->getRedirectToItemAppend($recordId, $urlVar),
-                    false
-                )
-            );
+        $checkin = $table->hasField('checked_out') && $table->hasField('checked_out_time');
 
+        // Attempt to check-out the new record. If failed, display a notice but allow the user to see the record
+        if ($checkin && !$this->attemptCheckout($model, $recordId, $urlVar)) {
             return false;
         }
 
@@ -425,13 +387,7 @@ public function edit($key = null, $urlVar = null)
         $this->holdEditId($context, $recordId);
         $this->app->setUserState($context . '.data', null);
 
-        $this->setRedirect(
-            Route::_(
-                'index.php?option=' . $this->option . '&view=' . $this->view_item
-                    . $this->getRedirectToItemAppend($recordId, $urlVar),
-                false
-            )
-        );
+        $this->setRedirect($this->getRedirectUrlToItem($recordId, $urlVar));
 
         return true;
     }
@@ -456,6 +412,22 @@ public function getModel($name = '', $prefix = '', $config = ['ignore_request' =
         return parent::getModel($name, $prefix, $config);
     }
 
+    /**
+     * Gets the redirect URL to an item.
+     *
+     * @param   integer  $recordId  The primary key id for the item.
+     * @param   string   $urlVar    The name of the URL variable for the id.
+     *
+     * @return  string  The redirect URL to the item.
+     *
+     * @since   6.1.0
+     */
+    protected function getRedirectUrlToItem($recordId = null, $urlVar = 'id'): string
+    {
+        return Route::_('index.php?option=' . $this->option . '&view=' . $this->view_item
+            . $this->getRedirectToItemAppend($recordId, $urlVar), false);
+    }
+
     /**
      * Gets the URL arguments to append to an item redirect.
      *
@@ -496,6 +468,22 @@ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
         return $append;
     }
 
+    /**
+     * Gets the redirect URL to a list.
+     *
+     * @return  string  The redirect URL to the list.
+     *
+     * @since   6.1.0
+     */
+    protected function getRedirectUrlToList(): string
+    {
+        return Route::_(
+            'index.php?option=' . $this->option . '&view=' . $this->view_list
+            . $this->getRedirectToListAppend(),
+            false
+        );
+    }
+
     /**
      * Gets the URL arguments to append to a list redirect.
      *
@@ -519,6 +507,22 @@ protected function getRedirectToListAppend()
         return $append;
     }
 
+    /**
+     * Function that allows child controller access and modify to model data
+     * before the data is saved. The method must return the modified $validData array
+     *
+     * @param   BaseDatabaseModel  $model      The data model object.
+     * @param   array              $validData  The validated data.
+     *
+     * @return  array
+     *
+     * @since   6.1.0
+     */
+    protected function preSaveHook(BaseDatabaseModel $model, array $validData = []): array
+    {
+        return $validData;
+    }
+
     /**
      * Function that allows child controller access to model data
      * after the data has been saved.
@@ -552,7 +556,7 @@ public function save($key = null, $urlVar = null)
         $model   = $this->getModel();
         $table   = $model->getTable();
         $data    = $this->input->post->get('jform', [], 'array');
-        $checkin = $table->hasField('checked_out');
+        $checkin = $table->hasField('checked_out') && $table->hasField('checked_out_time');
         $context = "$this->option.edit.$this->context";
         $task    = $this->getTask();
 
@@ -571,21 +575,13 @@ public function save($key = null, $urlVar = null)
         // Populate the row id from the session.
         $data[$key] = $recordId;
 
+        // Give child classes a chance to preprocess the data.
+        $data = $this->preprocessSaveData($data);
+
         // The save2copy task needs to be handled slightly differently.
         if ($task === 'save2copy') {
-            // Check-in the original row.
-            if ($checkin && $model->checkin($data[$key]) === false) {
-                // Check-in failed. Go back to the item and display a notice.
-                $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'error');
-
-                $this->setRedirect(
-                    Route::_(
-                        'index.php?option=' . $this->option . '&view=' . $this->view_item
-                            . $this->getRedirectToItemAppend($recordId, $urlVar),
-                        false
-                    )
-                );
-
+            // Check-in the original row. If failed, go back to the record and display a notice
+            if ($checkin && !$this->attemptCheckin($model, $recordId, $urlVar)) {
                 return false;
             }
 
@@ -599,13 +595,7 @@ public function save($key = null, $urlVar = null)
         if (!$this->allowSave($data, $key)) {
             $this->setMessage(Text::_('JLIB_APPLICATION_ERROR_SAVE_NOT_PERMITTED'), 'error');
 
-            $this->setRedirect(
-                Route::_(
-                    'index.php?option=' . $this->option . '&view=' . $this->view_list
-                        . $this->getRedirectToListAppend(),
-                    false
-                )
-            );
+            $this->setRedirect($this->getRedirectUrlToList());
 
             return false;
         }
@@ -620,63 +610,29 @@ public function save($key = null, $urlVar = null)
             return false;
         }
 
-        // Send an object which can be modified through the plugin event
-        $objData = (object) $data;
-        $this->getDispatcher()->dispatch(
-            'onContentNormaliseRequestData',
-            new Model\NormaliseRequestDataEvent('onContentNormaliseRequestData', [
-                'context' => $this->option . '.' . $this->context,
-                'data'    => $objData,
-                'subject' => $form,
-            ])
-        );
-        $data = (array) $objData;
+        // Allow plugins to normalize/modify the data before validation.
+        $data = $this->normalizeRequestData($form, $data);
 
         // Test whether the data is valid.
         $validData = $model->validate($form, $data);
 
         // Check for validation errors.
         if ($validData === false) {
-            // Get the validation messages.
-            $errors = $model->getErrors();
-
-            // Push up to three validation messages out to the user.
-            for ($i = 0, $n = \count($errors); $i < $n && $i < 3; $i++) {
-                if ($errors[$i] instanceof \Exception) {
-                    $this->app->enqueueMessage($errors[$i]->getMessage(), CMSWebApplicationInterface::MSG_ERROR);
-                } else {
-                    $this->app->enqueueMessage($errors[$i], CMSWebApplicationInterface::MSG_ERROR);
-                }
-            }
+            // Push up to validation error messages out to the user.
+            $this->handleSaveDataValidationErrorMessages($model->getErrors());
 
             /**
              * We need the filtered value of calendar fields because the UTC normalisation is
              * done in the filter and on output. This would apply the Timezone offset on
              * reload. We set the calendar values we save to the processed date.
              */
-            $filteredData = $form->filter($data);
-
-            foreach ($form->getFieldset() as $field) {
-                if ($field->type === 'Calendar') {
-                    $fieldName = $field->fieldname;
-
-                    if (isset($filteredData[$fieldName])) {
-                        $data[$fieldName] = $filteredData[$fieldName];
-                    }
-                }
-            }
+            $data = $this->applyFilterForCalendarFieldsToRequestData($form, $data);
 
             // Save the data in the session.
             $this->app->setUserState($context . '.data', $data);
 
             // Redirect back to the edit screen.
-            $this->setRedirect(
-                Route::_(
-                    'index.php?option=' . $this->option . '&view=' . $this->view_item
-                        . $this->getRedirectToItemAppend($recordId, $urlVar),
-                    false
-                )
-            );
+            $this->setRedirect($this->getRedirectUrlToItem($recordId, $urlVar));
 
             return false;
         }
@@ -685,6 +641,9 @@ public function save($key = null, $urlVar = null)
             $validData['tags'] = [];
         }
 
+        // Invoke the preSaveHook method to allow for the child class to modify $validData before save.
+        $validData = $this->preSaveHook($model, $validData);
+
         // Attempt to save the data.
         if (!$model->save($validData)) {
             // Save the data in the session.
@@ -693,40 +652,21 @@ public function save($key = null, $urlVar = null)
             // Redirect back to the edit screen.
             $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_SAVE_FAILED', $model->getError()), 'error');
 
-            $this->setRedirect(
-                Route::_(
-                    'index.php?option=' . $this->option . '&view=' . $this->view_item
-                        . $this->getRedirectToItemAppend($recordId, $urlVar),
-                    false
-                )
-            );
+            $this->setRedirect($this->getRedirectUrlToItem($recordId, $urlVar));
 
             return false;
         }
 
         // Save succeeded, so check-in the record.
-        if ($checkin && $model->checkin($validData[$key]) === false) {
+        if ($checkin && $validData[$key] && !$this->attemptCheckin($model, $validData[$key], $urlVar)) {
             // Save the data in the session.
             $this->app->setUserState($context . '.data', $validData);
 
-            // Check-in failed, so go back to the record and display a notice.
-            $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'error');
-
-            $this->setRedirect(
-                Route::_(
-                    'index.php?option=' . $this->option . '&view=' . $this->view_item
-                        . $this->getRedirectToItemAppend($recordId, $urlVar),
-                    false
-                )
-            );
-
             return false;
         }
 
-        $langKey = $this->text_prefix . ($recordId === 0 && $this->app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS';
-        $prefix  = $this->app->getLanguage()->hasKey($langKey) ? $this->text_prefix : 'JLIB_APPLICATION';
-
-        $this->setMessage(Text::_($prefix . ($recordId === 0 && $this->app->isClient('site') ? '_SUBMIT' : '') . '_SAVE_SUCCESS'));
+        // Set the message after successful save.
+        $this->setSaveSuccessMessage($recordId);
 
         // Redirect the user and adjust session state based on the chosen task.
         switch ($task) {
@@ -738,13 +678,7 @@ public function save($key = null, $urlVar = null)
                 $model->checkout($recordId);
 
                 // Redirect back to the edit screen.
-                $this->setRedirect(
-                    Route::_(
-                        'index.php?option=' . $this->option . '&view=' . $this->view_item
-                            . $this->getRedirectToItemAppend($recordId, $urlVar),
-                        false
-                    )
-                );
+                $this->setRedirect($this->getRedirectUrlToItem($recordId, $urlVar));
                 break;
 
             case 'save2new':
@@ -753,13 +687,7 @@ public function save($key = null, $urlVar = null)
                 $this->app->setUserState($context . '.data', null);
 
                 // Redirect back to the edit screen.
-                $this->setRedirect(
-                    Route::_(
-                        'index.php?option=' . $this->option . '&view=' . $this->view_item
-                            . $this->getRedirectToItemAppend(null, $urlVar),
-                        false
-                    )
-                );
+                $this->setRedirect($this->getRedirectUrlToItem(null, $urlVar));
                 break;
 
             default:
@@ -767,18 +695,16 @@ public function save($key = null, $urlVar = null)
                 $this->releaseEditId($context, $recordId);
                 $this->app->setUserState($context . '.data', null);
 
-                $url = 'index.php?option=' . $this->option . '&view=' . $this->view_list
-                    . $this->getRedirectToListAppend();
-
                 // Check if there is a return value
                 $return = $this->input->get('return', null, 'base64');
 
                 if (!\is_null($return) && Uri::isInternal(base64_decode($return))) {
-                    $url = base64_decode($return);
+                    // Route the provided return URL if internal
+                    $this->setRedirect(Route::_(base64_decode($return), false));
+                } else {
+                    // Otherwise use the standard list URL helper.
+                    $this->setRedirect($this->getRedirectUrlToList());
                 }
-
-                // Redirect to the list screen.
-                $this->setRedirect(Route::_($url, false));
                 break;
         }
 
@@ -823,22 +749,12 @@ public function reload($key = null, $urlVar = null)
 
         // Check if it is allowed to edit or create the data
         if (($recordId && !$this->allowEdit($data, $key)) || (!$recordId && !$this->allowAdd($data))) {
-            $this->setRedirect(
-                Route::_(
-                    'index.php?option=' . $this->option . '&view=' . $this->view_list
-                        . $this->getRedirectToListAppend(),
-                    false
-                )
-            );
+            $this->setRedirect($this->getRedirectUrlToList());
             $this->redirect();
         }
 
         // The redirect url
-        $redirectUrl = Route::_(
-            'index.php?option=' . $this->option . '&view=' . $this->view_item .
-                $this->getRedirectToItemAppend($recordId, $urlVar),
-            false
-        );
+        $redirectUrl = $this->getRedirectUrlToItem($recordId, $urlVar);
 
         /** @var \Joomla\CMS\Form\Form $form */
         $form = $model->getForm($data, false);
@@ -848,6 +764,139 @@ public function reload($key = null, $urlVar = null)
          * done in the filter and on output. This would apply the Timezone offset on
          * reload. We set the calendar values we save to the processed date.
          */
+        $data = $this->applyFilterForCalendarFieldsToRequestData($form, $data);
+
+        // Save the data in the session.
+        $this->app->setUserState($this->option . '.edit.' . $this->context . '.data', $data);
+
+        $this->setRedirect($redirectUrl);
+        $this->redirect();
+    }
+
+    /**
+     * Method to preprocess data gotten from the request before further processing. Child controllers can use this to
+     * manipulate data before checking access, validation, and saving.
+     *
+     * @param   array  $data  The data array.
+     *
+     * @return  array  The processed data array.
+     *
+     * @since   6.1.0
+     */
+    protected function preprocessSaveData(array $data): array
+    {
+        return $data;
+    }
+
+    /**
+     * Method to perform checkin of a record.
+     *
+     * @param   BaseDatabaseModel  $model     The model object.
+     * @param   string|int         $recordId  The primary key id for the item.
+     * @param   string             $urlVar    The name of the URL variable for the id.
+     *
+     * @return  boolean  True if successful, false otherwise and internal error is set.
+     *
+     * @since   6.1.0
+     */
+    protected function attemptCheckin(BaseDatabaseModel $model, $recordId, $urlVar): bool
+    {
+        if ($model->checkin($recordId) === false) {
+            // Check-in failed, go back to the record and display a notice.
+            $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_CHECKIN_FAILED', $model->getError()), 'error');
+
+            $this->setRedirect($this->getRedirectUrlToItem($recordId, $urlVar));
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Method to perform checkout of a record.
+     *
+     * @param   BaseDatabaseModel  $model     The model object.
+     * @param   string|int         $recordId  The primary key id for the item.
+     * @param   string             $urlVar    The name of the URL variable for the id.
+     *
+     * @return  boolean  True if successful, false otherwise and internal error is set.
+     *
+     * @since   6.1.0
+     */
+    protected function attemptCheckout(BaseDatabaseModel $model, $recordId, $urlVar): bool
+    {
+        if ($model->checkout($recordId) === false) {
+            // Check-out failed, display a notice but allow the user to see the record.
+            $this->setMessage(Text::sprintf('JLIB_APPLICATION_ERROR_CHECKOUT_FAILED', $model->getError()), 'error');
+
+            $this->setRedirect($this->getRedirectUrlToItem($recordId, $urlVar));
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Method to normalize the request data through the plugin event.
+     *
+     * @param   Form   $form  The form object.
+     * @param   array  $data  The data array.
+     *
+     * @return  array  The normalized data.
+     *
+     * @since   6.1.0
+     */
+    protected function normalizeRequestData(Form $form, array $data): array
+    {
+        // Send an object which can be modified through the plugin event
+        $objData = (object) $data;
+        $this->getDispatcher()->dispatch(
+            'onContentNormaliseRequestData',
+            new Model\NormaliseRequestDataEvent('onContentNormaliseRequestData', [
+                'context' => $this->option . '.' . $this->context,
+                'data'    => $objData,
+                'subject' => $form,
+            ])
+        );
+
+        return (array) $objData;
+    }
+
+    /**
+     * Method to handle save data validation errors.
+     *
+     * @param   array  $errors  The array of validation errors.
+     *
+     * @return  void
+     *
+     * @since   6.1.0
+     */
+    protected function handleSaveDataValidationErrorMessages(array $errors): void
+    {
+        // Push up to three validation messages out to the user.
+        for ($i = 0, $n = \count($errors); $i < $n && $i < 3; $i++) {
+            if ($errors[$i] instanceof \Exception) {
+                $this->app->enqueueMessage($errors[$i]->getMessage(), CMSApplicationInterface::MSG_ERROR);
+            } else {
+                $this->app->enqueueMessage($errors[$i], CMSApplicationInterface::MSG_ERROR);
+            }
+        }
+    }
+
+    /**
+     * Method to apply filter and merge filtered calendar fields data to request data.
+     *
+     * @param   Form   $form  The form object.
+     * @param   array  $data  The request data array.
+     *
+     * @return  array  The request data array with filter applied for calendar fields.
+     *
+     * @since   6.1.0
+     */
+    protected function applyFilterForCalendarFieldsToRequestData(Form $form, array $data): array
+    {
         $filteredData = $form->filter($data);
 
         foreach ($form->getFieldset() as $field) {
@@ -866,11 +915,31 @@ public function reload($key = null, $urlVar = null)
             }
         }
 
-        // Save the data in the session.
-        $this->app->setUserState($this->option . '.edit.' . $this->context . '.data', $data);
+        return $data;
+    }
 
-        $this->setRedirect($redirectUrl);
-        $this->redirect();
+    /**
+     * Method to set the save success message.
+     *
+     * @param   int  $recordId  The record id.
+     *
+     * @return  void
+     *
+     * @since   6.1.0
+     */
+    protected function setSaveSuccessMessage($recordId): void
+    {
+        $suffix = ($recordId === 0 && $this->app->isClient('site'))
+            ? '_SUBMIT_SAVE_SUCCESS'
+            : '_SAVE_SUCCESS';
+
+        $langKey = $this->text_prefix . $suffix;
+
+        $prefix = $this->app->getLanguage()->hasKey($langKey)
+            ? $this->text_prefix
+            : 'JLIB_APPLICATION';
+
+        $this->setMessage(Text::_($prefix . $suffix));
     }
 
     /**
@@ -880,7 +949,7 @@ public function reload($key = null, $urlVar = null)
      *
      * @since   3.9.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              It is handled by regular save method now.
      */
     public function editAssociations()
diff --git a/libraries/src/MVC/Factory/MVCFactory.php b/libraries/src/MVC/Factory/MVCFactory.php
index b21b3a1021f54..5806fd91e8ff9 100644
--- a/libraries/src/MVC/Factory/MVCFactory.php
+++ b/libraries/src/MVC/Factory/MVCFactory.php
@@ -15,6 +15,8 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormFactoryAwareInterface;
 use Joomla\CMS\Form\FormFactoryAwareTrait;
+use Joomla\CMS\Language\LanguageFactoryAwareInterface;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Mail\MailerFactoryAwareInterface;
 use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\MVC\Model\ModelInterface;
@@ -41,7 +43,7 @@
  *
  * @since  3.10.0
  */
-class MVCFactory implements MVCFactoryInterface, FormFactoryAwareInterface, SiteRouterAwareInterface, UserFactoryAwareInterface, MailerFactoryAwareInterface
+class MVCFactory implements MVCFactoryInterface, FormFactoryAwareInterface, SiteRouterAwareInterface, UserFactoryAwareInterface, MailerFactoryAwareInterface, LanguageFactoryAwareInterface
 {
     use FormFactoryAwareTrait;
     use DispatcherAwareTrait;
@@ -50,6 +52,7 @@ class MVCFactory implements MVCFactoryInterface, FormFactoryAwareInterface, Site
     use CacheControllerFactoryAwareTrait;
     use UserFactoryAwareTrait;
     use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * The namespace to create the objects from.
@@ -115,6 +118,7 @@ public function createController($name, $prefix, array $config, CMSApplicationIn
         $this->setCacheControllerOnObject($controller);
         $this->setUserFactoryOnObject($controller);
         $this->setMailerFactoryOnObject($controller);
+        $this->setLanguageFactoryOnObject($controller);
 
         if ($controller instanceof LoggerAwareInterface && $this->logger !== null) {
             $controller->setLogger($this->logger);
@@ -166,12 +170,13 @@ public function createModel($name, $prefix = '', array $config = [])
         $this->setCacheControllerOnObject($model);
         $this->setUserFactoryOnObject($model);
         $this->setMailerFactoryOnObject($model);
+        $this->setLanguageFactoryOnObject($model);
 
         if ($model instanceof DatabaseAwareInterface) {
             try {
                 $model->setDatabase($this->getDatabase());
             } catch (DatabaseNotFoundException) {
-                @trigger_error('Database must be set, this will not be caught anymore in 5.0.', E_USER_DEPRECATED);
+                @trigger_error('Database must be set, this will not be caught anymore in 7.0.', E_USER_DEPRECATED);
                 $model->setDatabase(Factory::getContainer()->get(DatabaseInterface::class));
             }
         }
@@ -267,7 +272,7 @@ public function createTable($name, $prefix = '', array $config = [])
         try {
             $db = \array_key_exists('dbo', $config) ? $config['dbo'] : $this->getDatabase();
         } catch (DatabaseNotFoundException) {
-            @trigger_error('Database must be set, this will not be caught anymore in 5.0.', E_USER_DEPRECATED);
+            @trigger_error('Database must be set, this will not be caught anymore in 7.0.', E_USER_DEPRECATED);
             $db = Factory::getContainer()->get(DatabaseInterface::class);
         }
 
@@ -434,4 +439,26 @@ private function setMailerFactoryOnObject($object): void
             // Ignore it
         }
     }
+
+    /**
+     * Sets the internal mailer factory on the given object.
+     *
+     * @param   object  $object  The object
+     *
+     * @return  void
+     *
+     * @since   6.2.0
+     */
+    private function setLanguageFactoryOnObject($object): void
+    {
+        if (!$object instanceof LanguageFactoryAwareInterface) {
+            return;
+        }
+
+        try {
+            $object->setLanguageFactory($this->getLanguageFactory());
+        } catch (\UnexpectedValueException) {
+            // Ignore it
+        }
+    }
 }
diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php
index 164cecfebef24..ba95f39aaeef7 100644
--- a/libraries/src/MVC/Model/AdminModel.php
+++ b/libraries/src/MVC/Model/AdminModel.php
@@ -18,13 +18,14 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
+use Joomla\CMS\Table\Category;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Table\TableInterface;
 use Joomla\CMS\Tag\TaggableTableInterface;
 use Joomla\CMS\UCM\UCMType;
+use Joomla\CMS\Versioning\VersionableModelInterface;
 use Joomla\Database\ParameterType;
 use Joomla\Registry\Registry;
 use Joomla\String\StringHelper;
@@ -325,7 +326,13 @@ public function batch($commands, $pks, $contexts)
 
         foreach ($this->batch_commands as $identifier => $command) {
             if (!empty($commands[$identifier])) {
-                if (!$this->$command($commands[$identifier], $pks, $contexts)) {
+                if ($command === 'batchTag') {
+                    $removeTags = ArrayHelper::getValue($commands, 'tag_addremove', 'a') === 'r';
+
+                    if (!$this->batchTags($commands[$identifier], $pks, $contexts, $removeTags)) {
+                        return false;
+                    }
+                } elseif (!$this->$command($commands[$identifier], $pks, $contexts)) {
                     return false;
                 }
 
@@ -447,6 +454,19 @@ protected function batchCopy($value, $pks, $contexts)
                 continue;
             }
 
+            $assetName = $contexts[$pk];
+
+            // Records might not have own assets id's but their categories
+            if (!$this->table->hasField('asset_id') && $this->table->hasField('catid')) {
+                $assetName = $this->option . '.category.' . (int) $this->table->catid;
+            }
+
+            if (!$this->user->authorise('core.edit', $assetName)) {
+                $this->setError(Text::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
+                return false;
+            }
+
             // Check for asset_id
             if ($this->table->hasField($this->table->getColumnAlias('asset_id'))) {
                 $oldAssetId = $this->table->asset_id;
@@ -503,7 +523,7 @@ protected function batchCopy($value, $pks, $contexts)
                 $dbType = strtolower($db->getServerType());
 
                 // Copy rules
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
                 $query->clear()
                     ->update($db->quoteName('#__assets', 't'));
 
@@ -697,6 +717,23 @@ protected function batchMove($value, $pks, $contexts)
      * @deprecated  5.3 will be removed in 7.0
      */
     protected function batchTag($value, $pks, $contexts)
+    {
+        return $this->batchTags($value, $pks, $contexts);
+    }
+
+    /**
+     * Batch tag a list of item.
+     *
+     * @param   integer  $value       The value of the new tag.
+     * @param   array    $pks         An array of row IDs.
+     * @param   array    $contexts    An array of item contexts.
+     * @param   boolean  $removeTags  Flag indicating whether the tags in $value have to be removed.
+     *
+     * @return  boolean  True if successful, false otherwise and internal error is set.
+     *
+     * @since   6.0.0
+     */
+    protected function batchTags($value, $pks, $contexts, $removeTags = false)
     {
         // Initialize re-usable member properties, and re-usable local variables
         $this->initBatch();
@@ -713,6 +750,7 @@ protected function batchTag($value, $pks, $contexts)
                         'subject'     => $this->table,
                         'newTags'     => $tags,
                         'replaceTags' => false,
+                        'removeTags'  => $removeTags,
                     ]
                 );
 
@@ -861,7 +899,7 @@ public function delete(&$pks)
                     // Multilanguage: if associated, delete the item in the _associations table
                     if ($this->associationsContext && Associations::isEnabled()) {
                         $db    = $this->getDatabase();
-                        $query = $db->getQuery(true)
+                        $query = $db->createQuery()
                             ->select(
                                 [
                                     'COUNT(*) AS ' . $db->quoteName('count'),
@@ -884,7 +922,7 @@ public function delete(&$pks)
                         $row = $db->loadAssoc();
 
                         if (!empty($row['count'])) {
-                            $query = $db->getQuery(true)
+                            $query = $db->createQuery()
                                 ->delete($db->quoteName('#__associations'))
                                 ->where(
                                     [
@@ -911,6 +949,12 @@ public function delete(&$pks)
                         return false;
                     }
 
+                    if ($this instanceof VersionableModelInterface) {
+                        $typeAlias = $this->typeAlias ?: $this->option . '.' . $this->name;
+
+                        $this->deleteHistory($typeAlias, $pk);
+                    }
+
                     // Trigger the after event.
                     $dispatcher->dispatch($this->event_after_delete, new Model\AfterDeleteEvent($this->event_after_delete, [
                         'context' => $context,
@@ -927,14 +971,28 @@ public function delete(&$pks)
                         return false;
                     }
 
+                    if (Factory::getApplication()->isClient('api')) {
+                        $session = Factory::getApplication()->getSession();
+                        $session->set('http_status_code_409', true);
+                    }
+
                     Log::add(Text::_('JLIB_APPLICATION_ERROR_DELETE_NOT_PERMITTED'), Log::WARNING, 'jerror');
 
                     return false;
                 }
             } else {
-                $this->setError($table->getError());
+                $error = $this->getError();
+                if ($error) {
+                    $this->setError($table->getError());
 
-                return false;
+                    return false;
+                }
+                if (Factory::getApplication()->isClient('api')) {
+                    $session = Factory::getApplication()->getSession();
+                    $session->set('http_status_code_404', true);
+                }
+
+                return true;
             }
         }
 
@@ -1005,9 +1063,9 @@ public function getItem($pk = null)
             }
         }
 
-        // Convert to the CMSObject before adding other data.
-        $properties = $table->getProperties(1);
-        $item       = ArrayHelper::toObject($properties, CMSObject::class);
+        // Convert to \stdClass before adding other data
+        $properties = get_object_vars($table);
+        $item       = ArrayHelper::toObject($properties);
 
         if (property_exists($item, 'params')) {
             $registry     = new Registry($item->params);
@@ -1351,7 +1409,7 @@ public function save($data)
             // Get associationskey for edited item
             $db    = $this->getDatabase();
             $id    = (int) $table->$key;
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('key'))
                 ->from($db->quoteName('#__associations'))
                 ->where($db->quoteName('context') . ' = :context')
@@ -1363,7 +1421,7 @@ public function save($data)
 
             if ($associations || $oldKey !== null) {
                 // Deleting old associations for the associated items
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__associations'))
                     ->where($db->quoteName('context') . ' = :context')
                     ->bind(':context', $this->associationsContext);
@@ -1392,7 +1450,7 @@ public function save($data)
             if (\count($associations) > 1) {
                 // Adding new association for these items
                 $key   = md5(json_encode($associations));
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->insert($db->quoteName('#__associations'))
                     ->columns(
                         [
@@ -1419,6 +1477,10 @@ public function save($data)
             }
         }
 
+        if ($this instanceof VersionableModelInterface) {
+            $this->saveHistory($data, $this->typeAlias);
+        }
+
         if ($app->getInput()->get('task') == 'editAssociations') {
             return $this->redirectToAssociations($data);
         }
@@ -1517,7 +1579,7 @@ protected function checkCategoryId($categoryId)
     {
         // Check that the category exists
         if ($categoryId) {
-            $categoryTable = Table::getInstance('Category');
+            $categoryTable = new Category($this->getDatabase());
 
             if (!$categoryTable->load($categoryId)) {
                 if ($error = $categoryTable->getError()) {
@@ -1611,7 +1673,7 @@ public function initBatch()
      *
      * @since   3.9.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              It is handled by regular save method now.
      */
     public function editAssociations($data)
diff --git a/libraries/src/MVC/Model/BaseDatabaseModel.php b/libraries/src/MVC/Model/BaseDatabaseModel.php
index 9504cd59fb275..5411e66ccc6e3 100644
--- a/libraries/src/MVC/Model/BaseDatabaseModel.php
+++ b/libraries/src/MVC/Model/BaseDatabaseModel.php
@@ -98,14 +98,14 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
         }
 
         /**
-         * @deprecated  4.3 will be Removed in 6.0
+         * @deprecated  4.3 will be Removed in 7.0
          *              Database instance is injected through the setter function,
          *              subclasses should not use the db instance in constructor anymore
          */
         $db = \array_key_exists('dbo', $config) ? $config['dbo'] : Factory::getDbo();
 
         if ($db) {
-            @trigger_error('Database is not available in constructor in 6.0.', E_USER_DEPRECATED);
+            @trigger_error('Database is not available in constructor in 7.0.', E_USER_DEPRECATED);
             $this->setDatabase($db);
 
             // Is needed, when models use the deprecated MVC DatabaseAwareTrait, as the trait is overriding the local functions
@@ -155,7 +155,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
     protected function _getList($query, $limitstart = 0, $limit = 0)
     {
         if (\is_string($query)) {
-            $query = $this->getDatabase()->getQuery(true)->setQuery($query);
+            $query = $this->getDatabase()->createQuery()->setQuery($query);
         }
 
         $query->setLimit($limit, $limitstart);
@@ -340,8 +340,8 @@ protected function bootComponent($component): ComponentInterface
     /**
      * Get the event dispatcher.
      *
-     * The override was made to keep a backward compatibility for legacy component.
-     * TODO: Remove the override in 6.0
+     * The override was made to keep a backward compatibility for legacy component .
+     * TODO: Remove the override ONLY when support of Legacy components will be removed (components without Dispatcher and MVCFactory).
      *
      * @return  DispatcherInterface
      *
@@ -352,7 +352,7 @@ public function getDispatcher()
     {
         if (!$this->dispatcher) {
             @trigger_error(
-                \sprintf('Dispatcher for %s should be set through MVC factory. It will throw an exception in 6.0', __CLASS__),
+                \sprintf('Dispatcher for %s should be set through MVC factory. It will throw an exception in 7.0', __CLASS__),
                 E_USER_DEPRECATED
             );
 
@@ -371,7 +371,7 @@ public function getDispatcher()
      *
      * @since   4.1.0
      *
-     * @deprecated 4.4 will be removed in 6.0. Use $this->getDispatcher() directly.
+     * @deprecated 4.4 will be removed in 7.0. Use $this->getDispatcher() directly.
      */
     protected function dispatchEvent(EventInterface $event)
     {
@@ -379,7 +379,7 @@ protected function dispatchEvent(EventInterface $event)
 
         @trigger_error(
             \sprintf(
-                'Method %s is deprecated and will be removed in 6.0. Use getDispatcher()->dispatch() directly.',
+                'Method %s is deprecated and will be removed in 7.0. Use getDispatcher()->dispatch() directly.',
                 __METHOD__
             ),
             E_USER_DEPRECATED
@@ -394,7 +394,7 @@ protected function dispatchEvent(EventInterface $event)
      * @since   4.2.0
      * @throws  \UnexpectedValueException
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use getDatabase() instead
      *              Example: $model->getDatabase();
      */
@@ -416,7 +416,7 @@ public function getDbo()
      *
      * @since   4.2.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use setDatabase() instead
      *              Example: $model->setDatabase($db);
      */
@@ -438,7 +438,7 @@ public function setDbo(?DatabaseInterface $db = null)
      *
      * @since   4.2.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use getDatabase() instead of directly accessing _db
      */
     public function __get($name)
diff --git a/libraries/src/MVC/Model/BaseModel.php b/libraries/src/MVC/Model/BaseModel.php
index 28bd72cb8d11e..0bdd552760543 100644
--- a/libraries/src/MVC/Model/BaseModel.php
+++ b/libraries/src/MVC/Model/BaseModel.php
@@ -89,7 +89,7 @@ public function __construct($config = [])
      *
      * @since       3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Will be removed without replacement. Get the model through the MVCFactory + namespace instead
      *
      * @see LegacyModelLoaderTrait::getInstance()
diff --git a/libraries/src/MVC/Model/DatabaseAwareTrait.php b/libraries/src/MVC/Model/DatabaseAwareTrait.php
deleted file mode 100644
index 2eb1917ee562e..0000000000000
--- a/libraries/src/MVC/Model/DatabaseAwareTrait.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
- * Joomla! Content Management System
- *
- * @copyright  (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\CMS\MVC\Model;
-
-use Joomla\Database\DatabaseInterface;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-/**
- * Database aware trait.
- *
- * @since  4.0.0
- *
- * @deprecated  4.3 will be removed in 6.0
- *              Use the trait from the database package
- *              Example: \Joomla\Database\DatabaseAwareTrait
- */
-trait DatabaseAwareTrait
-{
-    /**
-     * The database driver.
-     *
-     * @var    DatabaseInterface
-     * @since  4.0.0
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Use the trait from the database package
-     *              Example: \Joomla\Database\DatabaseAwareTrait::$databaseAwareTraitDatabase
-     */
-    protected $_db;
-
-    /**
-     * Get the database driver.
-     *
-     * @return  DatabaseInterface  The database driver.
-     *
-     * @since   4.0.0
-     * @throws  \UnexpectedValueException
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Use the trait from the database package
-     *              Example: \Joomla\Database\DatabaseAwareTrait::getDatabase()
-     */
-    public function getDbo()
-    {
-        if ($this->_db) {
-            return $this->_db;
-        }
-
-        throw new \UnexpectedValueException('Database driver not set in ' . __CLASS__);
-    }
-
-    /**
-     * Set the database driver.
-     *
-     * @param   ?DatabaseInterface  $db  The database driver.
-     *
-     * @return  void
-     *
-     * @since   4.0.0
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Use the trait from the database package
-     *              Example: \Joomla\Database\DatabaseAwareTrait::setDatabase()
-     */
-    public function setDbo(?DatabaseInterface $db = null)
-    {
-        $this->_db = $db;
-    }
-}
diff --git a/libraries/src/MVC/Model/FormModel.php b/libraries/src/MVC/Model/FormModel.php
index 0664707647d82..545ae15e0f844 100644
--- a/libraries/src/MVC/Model/FormModel.php
+++ b/libraries/src/MVC/Model/FormModel.php
@@ -199,7 +199,7 @@ public function validate($form, $data, $group = null)
 
         if (!empty($dispatcher->getListeners('onUserBeforeDataValidation'))) {
             @trigger_error(
-                'The `onUserBeforeDataValidation` event is deprecated and will be removed in 6.0.'
+                'The `onUserBeforeDataValidation` event is deprecated and will be removed in 7.0.'
                 . 'Use the `onContentBeforeValidateData` event instead.',
                 E_USER_DEPRECATED
             );
diff --git a/libraries/src/MVC/Model/LegacyModelLoaderTrait.php b/libraries/src/MVC/Model/LegacyModelLoaderTrait.php
index 61a73f15dee41..86e3db687ac2e 100644
--- a/libraries/src/MVC/Model/LegacyModelLoaderTrait.php
+++ b/libraries/src/MVC/Model/LegacyModelLoaderTrait.php
@@ -26,7 +26,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Will be removed without replacement
  */
 trait LegacyModelLoaderTrait
@@ -41,7 +41,7 @@ trait LegacyModelLoaderTrait
      *
      * @since       3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Will be removed without replacement
      */
     protected static function _createFileName($type, $parts = [])
@@ -60,7 +60,7 @@ protected static function _createFileName($type, $parts = [])
      *
      * @since       3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Will be removed without replacement. Get the model through the MVCFactory instead
      *              Example: Factory::getApplication()->bootComponent('com_xxx')->getMVCFactory()->createModel($type, $prefix, $config);
      */
@@ -114,7 +114,7 @@ public static function getInstance($type, $prefix = '', $config = [])
      *
      * @since       3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Will be removed without replacement. Get the model through the MVCFactory instead
      */
     public static function addTablePath($path)
@@ -133,7 +133,7 @@ public static function addTablePath($path)
      *
      * @since       4.0.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Will be removed without replacement
      */
     private static function createModelFromComponent($type, $prefix = '', $config = []): ?ModelInterface
diff --git a/libraries/src/MVC/Model/ListModel.php b/libraries/src/MVC/Model/ListModel.php
index 1ef86f7d17281..3d427a73fc1cc 100644
--- a/libraries/src/MVC/Model/ListModel.php
+++ b/libraries/src/MVC/Model/ListModel.php
@@ -89,16 +89,6 @@ class ListModel extends BaseDatabaseModel implements FormFactoryAwareInterface,
      */
     protected $htmlFormName = 'adminForm';
 
-    /**
-     * A list of filter variables to not merge into the model's state
-     *
-     * @var        array
-     * @since      3.4.5
-     * @deprecated  4.0 will be removed in 6.0
-     *              Use $filterForbiddenList instead
-     */
-    protected $filterBlacklist = [];
-
     /**
      * A list of forbidden filter variables to not merge into the model's state
      *
@@ -107,16 +97,6 @@ class ListModel extends BaseDatabaseModel implements FormFactoryAwareInterface,
      */
     protected $filterForbiddenList = [];
 
-    /**
-     * A list of forbidden variables to not merge into the model's state
-     *
-     * @var        array
-     * @since      3.4.5
-     * @deprecated  4.0 will be removed in 6.0
-     *              Use $listForbiddenList instead
-     */
-    protected $listBlacklist = ['select'];
-
     /**
      * A list of forbidden variables to not merge into the model's state
      *
@@ -147,22 +127,6 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
         if (empty($this->context)) {
             $this->context = strtolower($this->option . '.' . $this->getName());
         }
-
-        /**
-         * @deprecated  4.0 will be removed in 6.0
-         *              Use $this->filterForbiddenList instead
-         */
-        if (!empty($this->filterBlacklist)) {
-            $this->filterForbiddenList = array_merge($this->filterBlacklist, $this->filterForbiddenList);
-        }
-
-        /**
-         * @deprecated  4.0 will be removed in 6.0
-         *              Use $this->listForbiddenList instead
-         */
-        if (!empty($this->listBlacklist)) {
-            $this->listForbiddenList = array_merge($this->listBlacklist, $this->listForbiddenList);
-        }
     }
 
     /**
@@ -299,7 +263,7 @@ public function getItems()
      */
     protected function getListQuery()
     {
-        return $this->getDatabase()->getQuery(true);
+        return $this->getDatabase()->createQuery();
     }
 
     /**
@@ -427,7 +391,7 @@ public function getFilterForm($data = [], $loadData = true)
     {
         // Try to locate the filter form automatically. Example: ContentModelArticles => "filter_articles"
         if (empty($this->filterFormName)) {
-            $classNameParts = explode('Model', \get_called_class());
+            $classNameParts = explode('Model', static::class);
 
             if (\count($classNameParts) >= 2) {
                 $this->filterFormName = 'filter_' . str_replace('\\', '', strtolower($classNameParts[1]));
diff --git a/libraries/src/MVC/Model/WorkflowBehaviorTrait.php b/libraries/src/MVC/Model/WorkflowBehaviorTrait.php
index 232f6bcabee96..c3012931fe1bf 100644
--- a/libraries/src/MVC/Model/WorkflowBehaviorTrait.php
+++ b/libraries/src/MVC/Model/WorkflowBehaviorTrait.php
@@ -83,7 +83,7 @@ public function setUpWorkflow($extension)
         if (method_exists($this, 'getDatabase')) {
             $db = $this->getDatabase();
         } else {
-            @trigger_error('From 6.0 implementing the getDatabase method will be mandatory.', E_USER_DEPRECATED);
+            @trigger_error('From 7.0 implementing the getDatabase method will be mandatory.', E_USER_DEPRECATED);
             $db = Factory::getContainer()->get(DatabaseDriver::class);
         }
 
@@ -341,6 +341,10 @@ protected function addTransitionField(Form $form, $data)
         $field->addAttribute('label', 'COM_CONTENT_WORKFLOW_STAGE');
         $field->addAttribute('extension', $extension);
 
+        if ($this->workflowEnabled) {
+            $field->addAttribute('layout', 'joomla.form.field.groupedlist-transition');
+        }
+
         $form->setField($field);
 
         $table = $this->getTable();
diff --git a/libraries/src/MVC/View/AbstractView.php b/libraries/src/MVC/View/AbstractView.php
index a754c187fc501..b405de861dda0 100644
--- a/libraries/src/MVC/View/AbstractView.php
+++ b/libraries/src/MVC/View/AbstractView.php
@@ -50,7 +50,7 @@ abstract class AbstractView implements ViewInterface, DispatcherAwareInterface,
      * @var    Document
      * @since  3.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be made private in 7.0
      *             Use $this->getDocument() instead
      */
     public $document;
@@ -297,7 +297,7 @@ public function setDocument(Document $document): void
      * Get the event dispatcher.
      *
      * The override was made to keep a backward compatibility for legacy component.
-     * TODO: Remove the override in 6.0
+     * TODO: Remove the override ONLY when support of Legacy components will be removed (components without Dispatcher and MVCFactory).
      *
      * @return  DispatcherInterface
      *
@@ -308,7 +308,7 @@ public function getDispatcher()
     {
         if (!$this->dispatcher) {
             @trigger_error(
-                \sprintf('Dispatcher for %s should be set through MVC factory. It will throw an exception in 6.0', __CLASS__),
+                \sprintf('Dispatcher for %s should be set through MVC factory. It will throw an exception in 7.0', __CLASS__),
                 E_USER_DEPRECATED
             );
 
@@ -327,7 +327,7 @@ public function getDispatcher()
      *
      * @since   4.1.0
      *
-     * @deprecated 4.4 will be removed in 6.0. Use $this->getDispatcher() directly.
+     * @deprecated 4.4 will be removed in 7.0. Use $this->getDispatcher() directly.
      */
     protected function dispatchEvent(EventInterface $event)
     {
@@ -335,7 +335,7 @@ protected function dispatchEvent(EventInterface $event)
 
         @trigger_error(
             \sprintf(
-                'Method %s is deprecated and will be removed in 6.0. Use getDispatcher()->dispatch() directly.',
+                'Method %s is deprecated and will be removed in 7.0. Use getDispatcher()->dispatch() directly.',
                 __METHOD__
             ),
             E_USER_DEPRECATED
diff --git a/libraries/src/MVC/View/CategoryFeedView.php b/libraries/src/MVC/View/CategoryFeedView.php
index d2b15a2b93a52..7e47a124473b5 100644
--- a/libraries/src/MVC/View/CategoryFeedView.php
+++ b/libraries/src/MVC/View/CategoryFeedView.php
@@ -45,7 +45,7 @@ public function display($tpl = null)
         $contentType    = $extension . '.' . $this->viewName;
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('ct') . '.*')
             ->from($db->quoteName('#__content_types', 'ct'))
             ->where($db->quoteName('ct.type_alias') . ' = :alias')
diff --git a/libraries/src/MVC/View/CategoryView.php b/libraries/src/MVC/View/CategoryView.php
index b0f7fb5e751b2..e61e64f79bfc2 100644
--- a/libraries/src/MVC/View/CategoryView.php
+++ b/libraries/src/MVC/View/CategoryView.php
@@ -10,6 +10,10 @@
 namespace Joomla\CMS\MVC\View;
 
 use Joomla\CMS\Categories\CategoryNode;
+use Joomla\CMS\Event\Content\AfterDisplayEvent;
+use Joomla\CMS\Event\Content\AfterTitleEvent;
+use Joomla\CMS\Event\Content\BeforeDisplayEvent;
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\TagsHelper;
 use Joomla\CMS\Language\Text;
@@ -184,7 +188,8 @@ public function commonCategoryDisplay()
         $this->pageclass_sfx = htmlspecialchars($params->get('pageclass_sfx', ''));
 
         if ($this->runPlugins) {
-            PluginHelper::importPlugin('content');
+            $dispatcher = $this->getDispatcher();
+            PluginHelper::importPlugin('content', null, true, $dispatcher);
 
             foreach ($items as $itemElement) {
                 $itemElement        = (object) $itemElement;
@@ -193,25 +198,34 @@ public function commonCategoryDisplay()
                 // For some plugins.
                 !empty($itemElement->description) ? $itemElement->text = $itemElement->description : $itemElement->text = '';
 
-                Factory::getApplication()->triggerEvent('onContentPrepare', [$this->extension . '.category', $itemElement, $itemElement->params, 0]);
-
-                $results = Factory::getApplication()->triggerEvent(
-                    'onContentAfterTitle',
-                    [$this->extension . '.category', $itemElement, $itemElement->core_params ?? $itemElement->params, 0]
+                $dispatcher->dispatch(
+                    'onContentPrepare',
+                    new ContentPrepareEvent('onContentPrepare', [
+                        'context' => $this->extension . '.category',
+                        'subject' => $itemElement,
+                        'params'  => $itemElement->params,
+                        'page'    => 0,
+                    ])
                 );
-                $itemElement->event->afterDisplayTitle = trim(implode("\n", $results));
 
-                $results = Factory::getApplication()->triggerEvent(
-                    'onContentBeforeDisplay',
-                    [$this->extension . '.category', $itemElement, $itemElement->core_params ?? $itemElement->params, 0]
-                );
-                $itemElement->event->beforeDisplayContent = trim(implode("\n", $results));
+                $contentEventArguments = [
+                    'context' => $this->extension . '.category',
+                    'subject' => $itemElement,
+                    'params'  => $itemElement->core_params ?? $itemElement->params,
+                    'page'    => 0,
+                ];
 
-                $results = Factory::getApplication()->triggerEvent(
-                    'onContentAfterDisplay',
-                    [$this->extension . '.category', $itemElement, $itemElement->core_params ?? $itemElement->params, 0]
-                );
-                $itemElement->event->afterDisplayContent = trim(implode("\n", $results));
+                $contentEvents = [
+                    'afterDisplayTitle'    => new AfterTitleEvent('onContentAfterTitle', $contentEventArguments),
+                    'beforeDisplayContent' => new BeforeDisplayEvent('onContentBeforeDisplay', $contentEventArguments),
+                    'afterDisplayContent'  => new AfterDisplayEvent('onContentAfterDisplay', $contentEventArguments),
+                ];
+
+                foreach ($contentEvents as $resultKey => $event) {
+                    $results = $dispatcher->dispatch($event->getName(), $event)->getArgument('result', []);
+
+                    $itemElement->event->{$resultKey} = trim(implode("\n", $results));
+                }
 
                 if ($itemElement->text) {
                     $itemElement->description = $itemElement->text;
diff --git a/libraries/src/MVC/View/FormView.php b/libraries/src/MVC/View/FormView.php
index 9d0e421818e88..6591073732f40 100644
--- a/libraries/src/MVC/View/FormView.php
+++ b/libraries/src/MVC/View/FormView.php
@@ -12,9 +12,17 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
+use Joomla\CMS\Language\Associations;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\MVC\Model\AdminModel;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Router\Route;
 use Joomla\CMS\Table\TableInterface;
+use Joomla\CMS\Toolbar\Toolbar;
 use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\CMS\Versioning\VersionableModelInterface;
+use Joomla\CMS\Versioning\VersionableTableInterface;
+use Joomla\Component\Associations\Administrator\Helper\AssociationsHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -64,6 +72,13 @@ class FormView extends HtmlView
      */
     protected $canDo;
 
+    /**
+     * Array of fieldsets not to display
+     *
+     * @var    string[]
+     */
+    public $ignore_fieldsets = [];
+
     /**
      * The toolbar title
      *
@@ -85,6 +100,13 @@ class FormView extends HtmlView
      */
     protected $previewLink;
 
+    /**
+     * The jooa11y link
+     *
+     * @var string
+     */
+    protected $jooa11yLink;
+
     /**
      * The help link
      *
@@ -92,6 +114,20 @@ class FormView extends HtmlView
      */
     protected $helpLink;
 
+    /**
+     * Set to true, if saving to menu should be supported
+     *
+     * @var boolean
+     */
+    protected $supportSaveMenu = false;
+
+    /**
+     * Holds the extension for categories, if available
+     *
+     * @var string
+     */
+    protected $categorySection;
+
     /**
      * Constructor
      *
@@ -105,6 +141,14 @@ public function __construct(array $config)
             $this->helpLink = $config['help_link'];
         }
 
+        if (isset($config['preview_link'])) {
+            $this->previewLink = $config['preview_link'];
+        }
+
+        if (isset($config['jooa11y_link'])) {
+            $this->jooa11yLink = $config['jooa11y_link'];
+        }
+
         if (isset($config['toolbar_icon'])) {
             $this->toolbarIcon = $config['toolbar_icon'];
         } else {
@@ -127,14 +171,13 @@ public function __construct(array $config)
      */
     public function display($tpl = null)
     {
+        $model = $this->getModel();
+
+        $model->setUseExceptions(true);
+
         // Prepare view data
         $this->initializeView();
 
-        // Check for errors.
-        if (\count($errors = $this->get('Errors'))) {
-            throw new GenericDataException(implode("\n", $errors), 500);
-        }
-
         // Build toolbar
         $this->addToolbar();
 
@@ -148,10 +191,15 @@ public function display($tpl = null)
      */
     protected function initializeView()
     {
-        $this->form  = $this->get('Form');
-        $this->item  = $this->get('Item');
-        $this->state = $this->get('State');
-        $table       = $this->get('Table');
+        /**
+         * @var AdminModel
+         */
+        $model = $this->getModel();
+
+        $this->form  = $model->getForm();
+        $this->item  = $model->getItem();
+        $this->state = $model->getState();
+        $table       = $model->getTable();
 
         $this->keyName = $table instanceof TableInterface ? $table->getKeyName() : 'id';
         $action        = empty($this->item->{$this->keyName}) ? '_NEW' : '_EDIT';
@@ -175,81 +223,161 @@ protected function addToolbar()
         $userId     = $user->id;
         $isNew      = empty($this->item->{$this->keyName});
         $viewName   = $this->getName();
-        $checkedOut = $this->getModel()->isCheckedOut($this->item);
+        $checkedOut = !$isNew && $this->getModel()->isCheckedOut($this->item);
         $canDo      = $this->canDo;
 
+        /**
+         * @var Toolbar $toolbar
+         */
+        $toolbar = $this->getDocument()->getToolbar();
+
         ToolbarHelper::title(
             $this->toolbarTitle,
             $this->toolbarIcon
         );
 
         // For new records, check the create permission.
-        if ($isNew && $canDo->get('core.create')) {
-            ToolbarHelper::saveGroup(
-                [
-                    ['apply', $viewName . '.apply'],
-                    ['save', $viewName . '.save'],
-                    ['save2new', $viewName . '.save2new'],
-                ],
-                'btn-success'
-            );
+        if ($isNew) {
+            if ($canDo->get('core.create') || (isset($this->categorySection) && \count($user->getAuthorisedCategories($this->categorySection, 'core.create')) > 0)) {
+                $toolbar->apply($viewName . '.apply');
+
+                $saveGroup = $toolbar->dropdownButton('save-group');
+
+                $saveGroup->configure(
+                    function (Toolbar $childBar) use ($user, $viewName) {
+                        $childBar->save($viewName . '.save');
+
+                        if ($this->supportSaveMenu && $user->authorise('core.create', 'com_menus.menu')) {
+                            $childBar->save($viewName . '.save2menu', 'JTOOLBAR_SAVE_TO_MENU');
+                        }
 
-            ToolbarHelper::cancel($viewName . '.cancel');
+                        $childBar->save2new($viewName . '.save2new');
+                    }
+                );
+            }
+
+            $toolbar->cancel($viewName . '.cancel', 'JTOOLBAR_CANCEL');
         } else {
+            $itemEditable = $canDo->get('core.edit');
+
             // Since it's an existing record, check the edit permission, or fall back to edit own if the owner.
             if (property_exists($this->item, 'created_by')) {
-                $itemEditable = $canDo->get('core.edit') || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);
-            } else {
-                $itemEditable = $canDo->get('core.edit');
+                $itemEditable = $itemEditable || ($canDo->get('core.edit.own') && $this->item->created_by == $userId);
             }
 
-            $toolbarButtons = [];
-
-            // Can't save the record if it's checked out and editable
             if (!$checkedOut && $itemEditable) {
-                $toolbarButtons[] = ['apply', $viewName . '.apply'];
-                $toolbarButtons[] = ['save', $viewName . '.save'];
+                $toolbar->apply($viewName . '.apply');
+            }
 
-                // We can save this record, but check the create permission to see if we can return to make a new one.
-                if ($canDo->get('core.create')) {
-                    $toolbarButtons[] = ['save2new', $viewName . '.save2new'];
+            $saveGroup = $toolbar->dropdownButton('save-group');
+
+            $saveGroup->configure(
+                function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo, $user, $viewName) {
+                    // Can't save the record if it's checked out and editable
+                    if (!$checkedOut && $itemEditable) {
+                        $childBar->save($viewName . '.save');
+
+                        // We can save this record, but check the create permission to see if we can return to make a new one.
+                        if ($canDo->get('core.create')) {
+                            $childBar->save2new($viewName . '.save2new');
+                        }
+                    }
+
+                    // If checked out, we can still save2menu
+                    if ($this->supportSaveMenu && $user->authorise('core.create', 'com_menus.menu')) {
+                        $childBar->save($viewName . '.save2menu', 'JTOOLBAR_SAVE_TO_MENU');
+                    }
+
+                    // If checked out, we can still save
+                    if ($canDo->get('core.create')) {
+                        $childBar->save2copy($viewName . '.save2copy');
+                    }
                 }
-            }
+            );
 
-            // If checked out, we can still save
-            if ($canDo->get('core.create')) {
-                $toolbarButtons[] = ['save2copy', $viewName . '.save2copy'];
-            }
+            $toolbar->cancel($viewName . '.cancel', 'JTOOLBAR_CLOSE');
 
-            ToolbarHelper::saveGroup(
-                $toolbarButtons,
-                'btn-success'
-            );
+            if ($this->isVersionHistoryAvailable() && $itemEditable) {
+                $toolbar->versions(
+                    $this->option . '.' . $viewName,
+                    $this->item->{$this->keyName}
+                );
+            }
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $itemEditable) {
-                ToolbarHelper::versions($this->option . '.' . $viewName, $this->item->id);
+            if ($this->previewLink) {
+                $toolbar->preview(Route::link('site', $this->previewLink, true), Text::_('JGLOBAL_PREVIEW'))
+                    ->bodyHeight(80)
+                    ->modalWidth(90);
             }
 
-            if (!$isNew && $this->previewLink) {
-                ToolbarHelper::preview($this->previewLink, Text::_('JGLOBAL_PREVIEW'), 'eye', 80, 90);
+            if ($this->jooa11yLink && PluginHelper::isEnabled('system', 'jooa11y')) {
+                $toolbar->jooa11y(Route::link('site', $this->jooa11yLink, true), 'JGLOBAL_JOOA11Y')
+                    ->bodyHeight(80)
+                    ->modalWidth(90);
             }
 
-            ToolbarHelper::cancel($viewName . '.cancel', 'JTOOLBAR_CLOSE');
+            if (
+                Associations::isEnabled() &&
+                ComponentHelper::isEnabled('com_associations') &&
+                AssociationsHelper::hasSupport($this->option)
+            ) {
+                $toolbar->standardButton('contract', 'JTOOLBAR_ASSOCIATIONS', $viewName . '.editAssociations')
+                    ->icon('icon-contract')
+                    ->listCheck(false);
+            }
         }
 
-        ToolbarHelper::divider();
+        $toolbar->divider();
 
         if ($this->form instanceof Form) {
             $formConfig  = $this->form->getXml()->config->inlinehelp;
 
             if ($formConfig && (string) $formConfig['button'] === 'show') {
                 $targetClass = (string) $formConfig['targetclass'] ?: 'hide-aware-inline-help';
-                ToolbarHelper::inlinehelp($targetClass);
+
+                $toolbar->inlinehelp($targetClass);
             }
         }
 
         if ($this->helpLink) {
-            ToolbarHelper::help($this->helpLink);
+            $toolbar->help($this->helpLink);
         }
     }
+
+    /**
+     * Method to check if version history is available for this view.
+     *
+     *
+     * @return  boolean  True if version history is available, false otherwise.
+     *
+     * @since   __DEPPLOY_VERSION__
+     */
+    protected function isVersionHistoryAvailable(): bool
+    {
+        if (!ComponentHelper::isEnabled('com_contenthistory')) {
+            return false;
+        }
+
+        if (!$this->state->get('params')->get('save_history', 0)) {
+            return false;
+        }
+
+        $model = $this->getModel();
+
+        // Check if the view support version history uses modern implementation
+        if ($model instanceof VersionableModelInterface) {
+            return true;
+        }
+
+        // Check if view support version history uses legacy implementation
+        if (PluginHelper::isEnabled('behaviour', 'versionable')) {
+            $table = $model->getTable();
+
+            if ($table instanceof VersionableTableInterface) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }
diff --git a/libraries/src/MVC/View/HtmlView.php b/libraries/src/MVC/View/HtmlView.php
index aefdf17f69680..e2b04263a35d1 100644
--- a/libraries/src/MVC/View/HtmlView.php
+++ b/libraries/src/MVC/View/HtmlView.php
@@ -203,7 +203,7 @@ public function display($tpl = null)
 
         $result = $this->loadTemplate($tpl);
 
-        $eventResult = $app->getDispatcher()->dispatch(
+        $event = $app->getDispatcher()->dispatch(
             'onAfterDisplay',
             AbstractEvent::create(
                 'onAfterDisplay',
@@ -216,9 +216,7 @@ public function display($tpl = null)
             )
         );
 
-        $eventResult->getArgument('used', false);
-
-        echo $result;
+        echo $event->getArgument('source', $result);
     }
 
     /**
@@ -372,16 +370,22 @@ public function loadTemplate($tpl = null)
         // Clean the template name
         $layoutTemplate  = isset($layoutTemplate) ? preg_replace('/[^A-Z0-9_-]/i', '', $layoutTemplate) : $layoutTemplate;
 
-        try {
-            // Load the language file for the template
-            $lang = $this->getLanguage();
-        } catch (\UnexpectedValueException $e) {
-            $lang = Factory::getApplication()->getLanguage();
-        }
+        if (Factory::getApplication()->getDocument()->getType() !== 'html') {
+            try {
+                // Load the language file for the template
+                $lang = $this->getLanguage();
+            } catch (\UnexpectedValueException $e) {
+                $lang = Factory::getApplication()->getLanguage();
+            }
 
-        $lang->load('tpl_' . $template->template, JPATH_BASE)
-            || $lang->load('tpl_' . $template->parent, JPATH_THEMES . '/' . $template->parent)
-            || $lang->load('tpl_' . $template->template, JPATH_THEMES . '/' . $template->template);
+            if ($template->parent) {
+                $lang->load('tpl_' . $template->parent, JPATH_THEMES . '/' . $template->parent)
+                    || $lang->load('tpl_' . $template->parent, JPATH_BASE);
+            }
+
+            $lang->load('tpl_' . $template->template, JPATH_BASE)
+                || $lang->load('tpl_' . $template->template, JPATH_THEMES . '/' . $template->template);
+        }
 
         // Change the template folder if alternative layout is in different template
         if (isset($layoutTemplate) && $layoutTemplate !== '_' && $layoutTemplate != $template->template) {
diff --git a/libraries/src/MVC/View/ListView.php b/libraries/src/MVC/View/ListView.php
index e36f955f986dc..23fdcc13875de 100644
--- a/libraries/src/MVC/View/ListView.php
+++ b/libraries/src/MVC/View/ListView.php
@@ -12,7 +12,6 @@
 use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\FileLayout;
 use Joomla\CMS\Toolbar\ToolbarHelper;
 use Joomla\Registry\Registry;
 
@@ -34,7 +33,7 @@ class ListView extends HtmlView
      *
      * @var  array
      */
-    protected $items;
+    protected $items = [];
 
     /**
      * The pagination object
@@ -69,7 +68,7 @@ class ListView extends HtmlView
      *
      * @var  array
      */
-    public $activeFilters;
+    public $activeFilters = [];
 
     /**
      * The sidebar markup
@@ -92,6 +91,13 @@ class ListView extends HtmlView
      */
     protected $toolbarIcon;
 
+    /**
+     * The flag which determine whether we want to show archive button
+     *
+     * @var boolean
+     */
+    protected $supportsArchive = false;
+
     /**
      * The flag which determine whether we want to show batch button
      *
@@ -99,6 +105,23 @@ class ListView extends HtmlView
      */
     protected $supportsBatch = true;
 
+    /**
+     * The flag which determine if the current user is allowed to perform batch actions. It is
+     * used in layout to determine if we need to render batch layout
+     *
+     * @var boolean
+     */
+    protected $batchAllowed = false;
+
+    /**
+     * Holds the extension for categories, if available
+     *
+     * @var string
+     *
+     * @since 6.0.0
+     */
+    protected $categorySection;
+
     /**
      * The help link for the view
      *
@@ -106,6 +129,15 @@ class ListView extends HtmlView
      */
     protected $helpLink;
 
+    /**
+     * Is this view an Empty State
+     *
+     * @var   boolean
+     *
+     * @since 6.0.0
+     */
+    private $isEmptyState = false;
+
     /**
      * Constructor
      *
@@ -132,6 +164,10 @@ public function __construct(array $config)
             $this->supportsBatch = $config['supports_batch'];
         }
 
+        if (isset($config['category'])) {
+            $this->categorySection = $config['category'];
+        }
+
         if (isset($config['help_link'])) {
             $this->helpLink = $config['help_link'];
         }
@@ -152,16 +188,21 @@ public function __construct(array $config)
      */
     public function display($tpl = null)
     {
+        $model = $this->getModel();
+
+        $model->setUseExceptions(true);
+
         // Prepare view data
         $this->initializeView();
 
-        // Check for errors.
-        if (\count($errors = $this->get('Errors'))) {
-            throw new GenericDataException(implode("\n", $errors), 500);
+        if (!\count($this->items) && \is_callable([$model, 'getIsEmptyState']) && $this->isEmptyState = $model->getIsEmptyState()) {
+            $this->setLayout('emptystate');
         }
 
-        // Build toolbar
-        $this->addToolbar();
+        // We don't need toolbar in the modal window.
+        if ($this->getLayout() !== 'modal') {
+            $this->addToolbar();
+        }
 
         parent::display($tpl);
     }
@@ -187,11 +228,20 @@ protected function initializeView()
             $this->sidebar = HTMLHelper::_('sidebar.render');
         }
 
-        $this->items         = $this->get('Items');
-        $this->pagination    = $this->get('Pagination');
-        $this->state         = $this->get('State');
-        $this->filterForm    = $this->get('FilterForm');
-        $this->activeFilters = $this->get('ActiveFilters');
+        $model = $this->getModel();
+
+        $this->items         = $model->getItems();
+        $this->pagination    = $model->getPagination();
+        $this->state         = $model->getState();
+        $this->filterForm    = $model->getFilterForm();
+        $this->activeFilters = $model->getActiveFilters();
+
+        // Add form control fields
+        if ($this->filterForm !== null) {
+            $this->filterForm
+                ->addControlField('task')
+                ->addControlField('boxchecked', '0');
+        }
     }
 
     /**
@@ -206,68 +256,88 @@ protected function addToolbar()
         $canDo = $this->canDo;
         $user  = $this->getCurrentUser();
 
-        // Get the toolbar object instance
-        $bar = $this->getDocument()->getToolbar();
+        /**
+         * @var \Joomla\CMS\Toolbar\Toolbar $toolbar
+         */
+        $toolbar = $this->getDocument()->getToolbar();
 
         $viewName         = $this->getName();
         $singularViewName = InflectorFactory::create()->build()->singularize($viewName);
 
         ToolbarHelper::title(Text::_($this->toolbarTitle), $this->toolbarIcon);
 
-        if ($canDo->get('core.create')) {
-            ToolbarHelper::addNew($singularViewName . '.add');
+        // @todo here we should add category support with some parameters
+        if ($canDo->get('core.create') || (isset($this->categorySection) && \count($user->getAuthorisedCategories($this->categorySection, 'core.create')) > 0)) {
+            $toolbar->addNew($singularViewName . '.add');
         }
 
-        if (($canDo->get('core.edit')) || ($canDo->get('core.edit.own'))) {
-            ToolbarHelper::editList($singularViewName . '.edit');
-        }
+        if (!$this->isEmptyState && $canDo->get('core.edit.state')) {
+            /** @var  \Joomla\CMS\Toolbar\Button\DropdownButton $dropdown */
+            $dropdown = $toolbar->dropdownButton('status-group', 'JTOOLBAR_CHANGE_STATUS')
+                ->toggleSplit(false)
+                ->icon('icon-ellipsis-h')
+                ->buttonClass('btn btn-action')
+                ->listCheck(true);
+
+            $childBar = $dropdown->getChildToolbar();
 
-        if ($canDo->get('core.edit.state')) {
-            ToolbarHelper::publish($viewName . '.publish', 'JTOOLBAR_PUBLISH', true);
-            ToolbarHelper::unpublish($viewName . '.unpublish', 'JTOOLBAR_UNPUBLISH', true);
+            $childBar->publish($viewName . '.publish')->listCheck(true);
+            $childBar->unpublish($viewName . '.unpublish')->listCheck(true);
 
             if (isset($this->items[0]->featured)) {
-                ToolbarHelper::custom($viewName . '.featured', 'featured', '', 'JFEATURE', true);
-                ToolbarHelper::custom($viewName . '.unfeatured', 'unfeatured', '', 'JUNFEATURE', true);
+                $childBar->standardButton('featured', 'JFEATURE', $viewName . '.featured')->listCheck(true);
+                $childBar->standardButton('unfeatured', 'JUNFEATURE', $viewName . '.unfeatured')->listCheck(true);
             }
 
-            ToolbarHelper::archiveList($viewName . '.archive');
-            ToolbarHelper::checkin($viewName . '.checkin');
-        }
+            if ($this->supportsArchive) {
+                $childBar->archive($viewName . '.archive')->listCheck(true);
+            }
 
-        // Add a batch button
-        if (
-            $this->supportsBatch && $user->authorise('core.create', $this->option)
-            && $user->authorise('core.edit', $this->option)
-            && $user->authorise('core.edit.state', $this->option)
-        ) {
-            $title = Text::_('JTOOLBAR_BATCH');
+            if ($user->authorise('core.admin')) {
+                $childBar->checkin($viewName . '.checkin');
+            }
 
-            // Instantiate a new LayoutFile instance and render the popup button
-            $layout = new FileLayout('joomla.toolbar.popup');
+            if ($this->state->get('filter.published') != -2) {
+                $childBar->trash($viewName . '.trash')->listCheck(true);
+            }
 
-            $dhtml = $layout->render(['title' => $title]);
-            $bar->appendButton('Custom', $dhtml, 'batch');
+            // Add a batch button
+            if (
+                $this->supportsBatch && $user->authorise('core.create', $this->option)
+                && $user->authorise('core.create', $this->option)
+                && $user->authorise('core.edit', $this->option)
+            ) {
+                $childBar->popupButton('batch', 'JTOOLBAR_BATCH')
+                    ->popupType('inline')
+                    ->textHeader(Text::_($this->option . '_BATCH_OPTIONS'))
+                    ->url('#joomla-dialog-batch')
+                    ->modalWidth('800px')
+                    ->modalHeight('fit-content')
+                    ->listCheck(true);
+
+                $this->batchAllowed = true;
+            }
         }
 
         if (
-            $canDo->get('core.delete') &&
-            (
-                $this->state->get('filter.state') == -2 ||
-                $this->state->get('filter.published') == -2
+            !$this->isEmptyState
+            && $canDo->get('core.delete')
+            && (
+                $this->state->get('filter.state') == -2
+                || $this->state->get('filter.published') == -2
             )
         ) {
-            ToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', $viewName . '.delete', 'JTOOLBAR_DELETE_FROM_TRASH');
-        } elseif ($canDo->get('core.edit.state')) {
-            ToolbarHelper::trash($viewName . '.trash');
+            $toolbar->delete($viewName . '.delete', 'JTOOLBAR_DELETE_FROM_TRASH')
+                ->message('JGLOBAL_CONFIRM_DELETE')
+                ->listCheck(true);
         }
 
         if ($user->authorise('core.admin', $this->option) || $user->authorise('core.options', $this->option)) {
-            ToolbarHelper::preferences($this->option);
+            $toolbar->preferences($this->option);
         }
 
         if ($this->helpLink) {
-            ToolbarHelper::help($this->helpLink);
+            $toolbar->help($this->helpLink);
         }
     }
 }
diff --git a/libraries/src/Mail/FormatConfigurableMailerInterface.php b/libraries/src/Mail/FormatConfigurableMailerInterface.php
new file mode 100644
index 0000000000000..7d98600f2285d
--- /dev/null
+++ b/libraries/src/Mail/FormatConfigurableMailerInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Mail;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Provides a common interface to send emails with HTML.
+ *
+ * @since  6.2.0
+ */
+interface FormatConfigurableMailerInterface
+{
+    /**
+    * Sets message type to HTML.
+    *
+    * @param   boolean  $ishtml  Boolean true or false.
+    *
+    * @return  FormatConfigurableMailerInterface  Returns this object for chaining.
+    *
+    * @since   6.2.0
+    */
+    public function isHtml($ishtml = true);
+}
diff --git a/libraries/src/Mail/Mail.php b/libraries/src/Mail/Mail.php
index 91a52379f3bc1..873bec62d7d02 100644
--- a/libraries/src/Mail/Mail.php
+++ b/libraries/src/Mail/Mail.php
@@ -25,7 +25,7 @@
  *
  * @since  1.7.0
  */
-class Mail extends PHPMailer implements MailerInterface
+class Mail extends PHPMailer implements MailerInterface, TransportConfigurableMailerInterface, FormatConfigurableMailerInterface
 {
     /**
      * Mail instances container.
@@ -33,7 +33,7 @@ class Mail extends PHPMailer implements MailerInterface
      * @var    Mail[]
      * @since  1.7.3
      *
-     * @deprecated  4.4.0 will be removed in 6.0
+     * @deprecated  4.4.0 will be removed in 7.0
      *              See getInstance() for more details
      */
     public static $instances = [];
@@ -105,7 +105,7 @@ public function __construct($exceptions = true)
      *
      * @since   4.4.0
      *
-     * @deprecated  4.4.0 will be removed in 6.0
+     * @deprecated  4.4.0 will be removed in 7.0
      *              Use the mailer service in the DI container and create a mailer from there
      *              Example:
      *              Factory::getContainer()->get(MailerFactoryInterface::class)->createMailer();
diff --git a/libraries/src/Mail/MailTemplate.php b/libraries/src/Mail/MailTemplate.php
index d2c80c5a428f3..6bfe11459efdd 100644
--- a/libraries/src/Mail/MailTemplate.php
+++ b/libraries/src/Mail/MailTemplate.php
@@ -17,6 +17,8 @@
 use Joomla\CMS\Layout\FileLayout;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
 use Joomla\Component\Mails\Administrator\Helper\MailsHelper;
+use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Path;
@@ -34,10 +36,12 @@
  */
 class MailTemplate
 {
+    use DatabaseAwareTrait;
+
     /**
      * Mailer object to send the actual mail.
      *
-     * @var    \Joomla\CMS\Mail\Mail
+     * @var    MailerInterface
      * @since  4.0.0
      */
     protected $mailer;
@@ -113,33 +117,48 @@ class MailTemplate
      * The language factory
      *
      * @var    LanguageFactoryInterface
-     * @since  5.4.7
+     * @since  6.2.0
      */
     protected LanguageFactoryInterface $languageFactory;
 
     /**
      * Constructor for the mail templating class
      *
-     * @param   string   $templateId  Id of the mail template.
-     * @param   string   $language    Language of the template to use.
-     * @param   ?Mail    $mailer      Mail object to send the mail with.
+     * @param   string                     $templateId       Id of the mail template.
+     * @param   string                     $language         Language of the template to use.
+     * @param   ?MailerInterface           $mailer           Mail object to send the mail with.
+     * @param   ?LanguageFactoryInterface  $languageFactory  The language factory.
+     * @param   ?DatabaseInterface         $db               The database.
      *
      * @since   4.0.0
      */
-    public function __construct($templateId, $language, ?Mail $mailer = null, ?LanguageFactoryInterface $languageFactory = null)
-    {
+    public function __construct(
+        $templateId,
+        $language,
+        ?MailerInterface $mailer = null,
+        ?LanguageFactoryInterface $languageFactory = null,
+        ?DatabaseInterface $db = null
+    ) {
         $this->template_id = $templateId;
         $this->language    = $language;
 
         if ($mailer) {
             $this->mailer = $mailer;
         } else {
+            @trigger_error('Mailer must be set, this will not be caught anymore in 8.0.', E_USER_DEPRECATED);
             $this->mailer = Factory::getMailer();
         }
 
+        $this->setDatabase($db ?? Factory::getContainer()->get(DatabaseInterface::class));
+
+        if ($db === null) {
+            @trigger_error('Database must be set, this will not be caught anymore in 8.0.', E_USER_DEPRECATED);
+        }
+
         if ($languageFactory) {
             $this->languageFactory = $languageFactory;
         } else {
+            @trigger_error('Language factory must be set, this will not be caught anymore in 8.0.', E_USER_DEPRECATED);
             $this->languageFactory = Factory::getContainer()->get(LanguageFactoryInterface::class);
         }
     }
@@ -233,6 +252,20 @@ public function addTemplateData($data, $plain = false)
         }
     }
 
+    /**
+     * Get the template data.
+     *
+     * @param   bool   $plain Data used for plain-text emails.
+     *
+     * @return array
+     *
+     * @since   6.1.0
+     */
+    public function getTemplateData($plain = false): array
+    {
+        return !$plain ? $this->data : $this->plain_data;
+    }
+
     /**
      * Mark tags as unsafe to ensure escaping in HTML mails
      *
@@ -261,7 +294,7 @@ public function send()
     {
         $config = ComponentHelper::getParams('com_mails');
 
-        $mail = static::getTemplate($this->template_id, $this->language);
+        $mail = $this->loadTemplate($this->template_id, $this->language);
 
         // If the Mail Template was not found in the db, we cannot send an email.
         if ($mail === null) {
@@ -281,7 +314,7 @@ public function send()
         }
 
         if ((int) $config->get('alternative_mailconfig', 0) === 1 && (int) $params->get('alternative_mailconfig', 0) === 1) {
-            if ($this->mailer->Mailer === 'smtp' || $params->get('mailer') === 'smtp') {
+            if ($this->mailer instanceof TransportConfigurableMailerInterface && $params->get('mailer') === 'smtp') {
                 $smtpauth   = ($params->get('smtpauth', $app->get('smtpauth')) == 0) ? null : 1;
                 $smtpuser   = $params->get('smtpuser', $app->get('smtpuser'));
                 $smtppass   = $params->get('smtppass', $app->get('smtppass'));
@@ -291,15 +324,15 @@ public function send()
                 $this->mailer->useSmtp($smtpauth, $smtphost, $smtpuser, $smtppass, $smtpsecure, $smtpport);
             }
 
-            if ($params->get('mailer') === 'sendmail') {
-                $this->mailer->isSendmail();
+            if ($this->mailer instanceof TransportConfigurableMailerInterface && $params->get('mailer') === 'sendmail') {
+                $this->mailer->useSendmail('joomla');
             }
 
             $mailfrom = $params->get('mailfrom', $app->get('mailfrom'));
             $fromname = $params->get('fromname', $app->get('fromname'));
 
             if (MailHelper::isEmailAddress($mailfrom)) {
-                $this->mailer->setFrom(MailHelper::cleanLine($mailfrom), MailHelper::cleanLine($fromname), false);
+                $this->mailer->setSender(MailHelper::cleanLine($mailfrom), MailHelper::cleanLine($fromname));
             }
 
             $replyTo     = $params->get('replyto', $replyTo);
@@ -342,7 +375,9 @@ public function send()
         }
 
         if ($mailStyle === 'html' || $mailStyle === 'both') {
-            $this->mailer->isHtml(true);
+            if ($this->mailer instanceof FormatConfigurableMailerInterface) {
+                $this->mailer->isHtml(true);
+            }
 
             // If HTML body is empty try to convert the Plain template to html
             if (!$htmlBody) {
@@ -396,7 +431,7 @@ public function send()
                     ]);
                 }
 
-                $htmlBody = $layoutFile->render(['mail' => $htmlBody, 'extra' => $this->layoutTemplateData], null);
+                $htmlBody = $layoutFile->render(['mail' => $htmlBody, 'extra' => $this->layoutTemplateData]);
 
                 $htmlBody = $this->replaceTags($language->_($htmlBody), $this->data);
             }
@@ -420,7 +455,7 @@ public function send()
                     break;
                 case 'to':
                 default:
-                    $this->mailer->addAddress($recipient->mail, $recipient->name);
+                    $this->mailer->addRecipient($recipient->mail, $recipient->name);
             }
         }
 
@@ -444,15 +479,29 @@ public function send()
             }
         }
 
+        $tmpAttachmentFiles = [];
         foreach ($this->attachments as $attachment) {
             if (is_file($attachment->file)) {
                 $this->mailer->addAttachment($attachment->file, $this->getAttachmentName($attachment->file, $attachment->name));
-            } else {
+            } elseif ($this->mailer instanceof Mail) {
                 $this->mailer->addStringAttachment($attachment->file, $attachment->name);
+            } else {
+                // If the mailer does not support string attachments, create a temporary file and attach it
+                $tmpFile = tempnam(JPATH_CACHE, 'mailattachment_');
+                if (file_put_contents($tmpFile, $attachment->file) !== false) {
+                    $this->mailer->addAttachment($tmpFile, $attachment->name);
+                    $tmpAttachmentFiles[] = $tmpFile;
+                }
             }
         }
 
-        return $this->mailer->Send();
+        $success = $this->mailer->send();
+
+        foreach ($tmpAttachmentFiles as $tmpFile) {
+            @unlink($tmpFile);
+        }
+
+        return $success;
     }
 
     /**
@@ -504,7 +553,7 @@ protected function replaceTags($text, $tags, $isHtml = false)
                             }
                         }
 
-                        $text = str_replace($match, $replacement, $text);
+                        $text = str_ireplace($match, $replacement, $text);
                     }
                 }
             } else {
@@ -513,7 +562,7 @@ protected function replaceTags($text, $tags, $isHtml = false)
                     $value = htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
                 }
 
-                $text = str_replace('{' . strtoupper($key) . '}', $value, $text);
+                $text = str_ireplace('{' . strtoupper($key) . '}', $value, $text);
             }
         }
 
@@ -521,19 +570,19 @@ protected function replaceTags($text, $tags, $isHtml = false)
     }
 
     /**
-     * Get a specific mail template
+     * Get a specific mail template for the given key and language.
      *
      * @param   string  $key       Template identifier
      * @param   string  $language  Language code of the template
      *
-     * @return  object|null  An object with the data of the mail, or null if the template not found in the db.
+     * @return  \stdClass|null  An object with the data of the mail, or null if the template not found in the db.
      *
-     * @since   4.0.0
+     * @since   6.2.0
      */
-    public static function getTemplate($key, $language)
+    protected function loadTemplate(string $key, string $language): ?\stdClass
     {
-        $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $db    = $this->getDatabase();
+        $query = $db->createQuery();
         $query->select('*')
             ->from($db->quoteName('#__mail_templates'))
             ->where($db->quoteName('template_id') . ' = :key')
@@ -550,6 +599,24 @@ public static function getTemplate($key, $language)
         return $mail;
     }
 
+    /**
+     * Get a specific mail template
+     *
+     * @param   string  $key       Template identifier
+     * @param   string  $language  Language code of the template
+     *
+     * @return  object|null  An object with the data of the mail, or null if the template not found in the db.
+     *
+     * @since   4.0.0
+     *
+     * @deprecated 6.2.0 this will be removed without replacement in 8.0
+     *             Use $app->bootComponent('com_mails')->getMVCFactory()->createModel('Template', 'Administrator')->getItem(); instead
+     */
+    public static function getTemplate($key, $language)
+    {
+        return (new self($key, $language))->loadTemplate($key, $language);
+    }
+
     /**
      * Insert a new mail template into the system
      *
@@ -562,24 +629,23 @@ public static function getTemplate($key, $language)
      * @return  boolean  True on success, false on failure
      *
      * @since   4.0.0
+     *
+     * @deprecated 6.2.0 this will be removed without replacement in 8.0
+     *             Use $app->bootComponent('com_mails')->getMVCFactory()->createModel('Template', 'Administrator')->save(); instead
      */
     public static function createTemplate($key, $subject, $body, $tags, $htmlbody = '')
     {
-        $db = Factory::getDbo();
-
-        $template              = new \stdClass();
-        $template->template_id = $key;
-        $template->language    = '';
-        $template->subject     = $subject;
-        $template->body        = $body;
-        $template->htmlbody    = $htmlbody;
-        $template->extension   = explode('.', $key, 2)[0] ?? '';
-        $template->attachments = '';
-        $params                = new \stdClass();
-        $params->tags          = (array) $tags;
-        $template->params      = json_encode($params);
-
-        return $db->insertObject('#__mail_templates', $template);
+        return Factory::getApplication()->bootComponent('com_mails')
+            ->getMVCFactory()->createModel('Template', 'Administrator')->save([
+                'template_id' => $key,
+                'language'    => '',
+                'subject'     => $subject,
+                'body'        => $body,
+                'htmlbody'    => $htmlbody,
+                'params'      => json_encode(['tags' => (array) $tags]),
+                'extension'   => explode('.', $key, 2)[0] ?? '',
+                'attachments' => '',
+            ]);
     }
 
     /**
@@ -594,22 +660,21 @@ public static function createTemplate($key, $subject, $body, $tags, $htmlbody =
      * @return  boolean  True on success, false on failure
      *
      * @since   4.0.0
+     *
+     * @deprecated 6.2.0 this will be removed without replacement in 8.0
+     *             Use $app->bootComponent('com_mails')->getMVCFactory()->createModel('Template', 'Administrator')->save(); instead
      */
     public static function updateTemplate($key, $subject, $body, $tags, $htmlbody = '')
     {
-        $db = Factory::getDbo();
-
-        $template              = new \stdClass();
-        $template->template_id = $key;
-        $template->language    = '';
-        $template->subject     = $subject;
-        $template->body        = $body;
-        $template->htmlbody    = $htmlbody;
-        $params                = new \stdClass();
-        $params->tags          = (array) $tags;
-        $template->params      = json_encode($params);
-
-        return $db->updateObject('#__mail_templates', $template, ['template_id', 'language']);
+        return Factory::getApplication()->bootComponent('com_mails')
+            ->getMVCFactory()->createModel('Template', 'Administrator')->save([
+                'template_id' => $key,
+                'language'    => '',
+                'subject'     => $subject,
+                'body'        => $body,
+                'htmlbody'    => $htmlbody,
+                'params'      => json_encode(['tags' => (array) $tags]),
+            ]);
     }
 
     /**
@@ -620,17 +685,14 @@ public static function updateTemplate($key, $subject, $body, $tags, $htmlbody =
      * @return  boolean  True on success, false on failure
      *
      * @since   4.0.0
+     *
+     * @deprecated 6.2.0 this will be removed without replacement in 8.0
+     *             Use $app->bootComponent('com_mails')->getMVCFactory()->createModel('Template', 'Administrator')->delete(); instead
      */
     public static function deleteTemplate($key)
     {
-        $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
-        $query->delete($db->quoteName('#__mail_templates'))
-            ->where($db->quoteName('template_id') . ' = :key')
-            ->bind(':key', $key);
-        $db->setQuery($query);
-
-        return $db->execute();
+        return Factory::getApplication()->bootComponent('com_mails')
+            ->getMVCFactory()->createModel('Template', 'Administrator')->delete($key);
     }
 
     /**
diff --git a/libraries/src/Mail/TransportConfigurableMailerInterface.php b/libraries/src/Mail/TransportConfigurableMailerInterface.php
new file mode 100644
index 0000000000000..afcbe612dbc5e
--- /dev/null
+++ b/libraries/src/Mail/TransportConfigurableMailerInterface.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Mail;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Provides a common interface to send emails through an SMTP or sendmail service.
+ *
+ * @since  6.2.0
+ */
+interface TransportConfigurableMailerInterface
+{
+    /**
+     * Use SMTP for sending the email.
+     *
+     * @param   string   $auth    SMTP Authentication [optional]
+     * @param   string   $host    SMTP Host [optional]
+     * @param   string   $user    SMTP Username [optional]
+     * @param   string   $pass    SMTP Password [optional]
+     * @param   string   $secure  Use secure methods
+     * @param   integer  $port    The SMTP port
+     *
+     * @return  boolean  True on success
+     *
+     * @since   6.2.0
+     */
+    public function useSmtp($auth = null, $host = null, $user = null, $pass = null, $secure = null, $port = 25);
+
+    /**
+     * Use sendmail for sending the email.
+     *
+     * @return  boolean  True on success
+     *
+     * @since   6.2.0
+     */
+    public function useSendmail($sendmail = null);
+}
diff --git a/libraries/src/Menu/AbstractMenu.php b/libraries/src/Menu/AbstractMenu.php
index eabff47616c84..f9e541f40edbc 100644
--- a/libraries/src/Menu/AbstractMenu.php
+++ b/libraries/src/Menu/AbstractMenu.php
@@ -59,7 +59,7 @@ abstract class AbstractMenu
      *
      * @since  1.7
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the MenuFactoryInterface from the container instead
      *              Example: Factory::getContainer()->get(MenuFactoryInterface::class)->createMenu($client, $options)
      */
@@ -117,7 +117,7 @@ public function __construct($options = [])
      *
      * @throws      \Exception
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use the MenuFactoryInterface from the container instead
      *              Example: Factory::getContainer()->get(MenuFactoryInterface::class)->createMenu($client, $options)
      */
@@ -395,6 +395,27 @@ protected function getUser()
             : $this->storedUser;
     }
 
+    /**
+     * Returns homepages per language.
+     *
+     * @return  MenuItem[]
+     *
+     * @since   6.1.0
+     */
+    public function getHomepages()
+    {
+        // Ensure that defaults are filled.
+        $this->getMenu();
+
+        $homepages = [];
+
+        foreach ($this->default as $language => $id) {
+            $homepages[$language] = $this->items[$id];
+        }
+
+        return $homepages;
+    }
+
     /**
      * Magic getter for the user object. Returns the injected
      * one if any, or the current one if none.
diff --git a/libraries/src/Menu/SiteMenu.php b/libraries/src/Menu/SiteMenu.php
index f99f6015006e8..c33b40c05049c 100644
--- a/libraries/src/Menu/SiteMenu.php
+++ b/libraries/src/Menu/SiteMenu.php
@@ -69,10 +69,10 @@ public function __construct($options = [])
     {
         // Extract the internal dependencies before calling the parent constructor since it calls $this->load()
         $this->app      = isset($options['app']) && $options['app'] instanceof CMSApplication ? $options['app'] : Factory::getApplication();
-        $this->language = isset($options['language']) && $options['language'] instanceof Language ? $options['language'] : Factory::getLanguage();
+        $this->language = isset($options['language']) && $options['language'] instanceof Language ? $options['language'] : null;
 
         if (!isset($options['db']) || !($options['db'] instanceof DatabaseDriver)) {
-            @trigger_error('Database will be mandatory in 5.0.', E_USER_DEPRECATED);
+            @trigger_error('Database will be mandatory in 7.0.', E_USER_DEPRECATED);
             $options['db'] = Factory::getContainer()->get(DatabaseDriver::class);
         }
 
@@ -93,7 +93,7 @@ public function load()
         $loader = function () {
             $currentDate = Factory::getDate()->toSql();
 
-            $query = $this->db->getQuery(true)
+            $query = $this->db->createQuery()
                 ->select(
                     $this->db->quoteName(
                         [
@@ -191,7 +191,7 @@ public function load()
             return false;
         }
 
-        foreach ($this->items as &$item) {
+        foreach ($this->items as $item) {
             // Get parent information.
             $parent_tree = [];
 
@@ -233,9 +233,10 @@ public function getItems($attributes, $values, $firstonly = false)
         if ($this->app->isClient('site')) {
             // Filter by language if not set
             if (($key = array_search('language', $attributes)) === false) {
-                if (Multilanguage::isEnabled()) {
+                if (Multilanguage::isEnabled() && ($this->language || $this->app->getLanguage())) {
+                    $language     = $this->language ?: $this->app->getLanguage();
                     $attributes[] = 'language';
-                    $values[]     = [Factory::getLanguage()->getTag(), '*'];
+                    $values[]     = [$language->getTag(), '*'];
                 }
             } elseif ($values[$key] === null) {
                 unset($attributes[$key], $values[$key]);
diff --git a/libraries/src/Object/CMSObject.php b/libraries/src/Object/CMSObject.php
index b94224ab4a009..d94bfd7db6a02 100644
--- a/libraries/src/Object/CMSObject.php
+++ b/libraries/src/Object/CMSObject.php
@@ -21,7 +21,7 @@
  *
  * @since       1.7.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.0 will be removed in 7.0
  *              Use \stdClass or \Joomla\Registry\Registry instead.
  *              Example: new \Joomla\Registry\Registry();
  */
@@ -52,7 +52,7 @@ public function __construct($properties = null)
      *
      * @since   1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  3.1.4 will be removed in 7.0
      *              Classes should provide their own __toString() implementation.
      */
     public function __toString()
diff --git a/libraries/src/Object/LegacyErrorHandlingTrait.php b/libraries/src/Object/LegacyErrorHandlingTrait.php
index 47686baaab9fb..44fba9af46134 100644
--- a/libraries/src/Object/LegacyErrorHandlingTrait.php
+++ b/libraries/src/Object/LegacyErrorHandlingTrait.php
@@ -30,7 +30,7 @@ trait LegacyErrorHandlingTrait
      *
      * @var    array
      * @since  1.7.0
-     * @deprecated  3.1.4  JError has been deprecated
+     * @deprecated  3.7.0  JError has been deprecated
      */
     // phpcs:disable PSR2.Classes.PropertyDeclaration
     protected $_errors = [];
diff --git a/libraries/src/Object/LegacyPropertyManagementTrait.php b/libraries/src/Object/LegacyPropertyManagementTrait.php
index 29537b8cb2674..0960e6536df71 100644
--- a/libraries/src/Object/LegacyPropertyManagementTrait.php
+++ b/libraries/src/Object/LegacyPropertyManagementTrait.php
@@ -19,7 +19,7 @@
  *
  * @since       4.3.0
  *
- * @deprecated  4.3.0 will be removed in 6.0
+ * @deprecated  4.3.0 will be removed in 7.0
  *              Will be removed without replacement
  *              Create proper setter functions for the individual properties or use a \Joomla\Registry\Registry
  */
@@ -35,7 +35,7 @@ trait LegacyPropertyManagementTrait
      *
      * @since   1.7.0
      *
-     * @deprecated 4.3.0 will be removed in 6.0
+     * @deprecated 4.3.0 will be removed in 7.0
      *             Defining dynamic properties should not be used anymore
      */
     public function def($property, $default = null)
@@ -57,7 +57,7 @@ public function def($property, $default = null)
      *
      * @see     CMSObject::getProperties()
      *
-     * @deprecated 4.3.0 will be removed in 6.0
+     * @deprecated 4.3.0 will be removed in 7.0
      *             Create a proper getter function for the property
      */
     public function get($property, $default = null)
@@ -80,7 +80,7 @@ public function get($property, $default = null)
      *
      * @see     CMSObject::get()
      *
-     * @deprecated 4.3.0 will be removed in 6.0
+     * @deprecated 4.3.0 will be removed in 7.0
      *             Create a proper getter function for the property
      */
     public function getProperties($public = true)
@@ -126,7 +126,7 @@ public function getProperties($public = true)
      *
      * @since   1.7.0
      *
-     * @deprecated 4.3.0 will be removed in 6.0
+     * @deprecated 4.3.0 will be removed in 7.0
      *             Create a proper setter function for the property
      */
     public function set($property, $value = null)
@@ -148,7 +148,7 @@ public function set($property, $value = null)
      *
      * @see     CMSObject::set()
      *
-     * @deprecated 4.3.0 will be removed in 6.0
+     * @deprecated 4.3.0 will be removed in 7.0
      *             Create a proper setter function for the property
      */
     public function setProperties($properties)
diff --git a/libraries/src/Pathway/Pathway.php b/libraries/src/Pathway/Pathway.php
index d4529618fec4c..ab15cc61c0602 100644
--- a/libraries/src/Pathway/Pathway.php
+++ b/libraries/src/Pathway/Pathway.php
@@ -59,7 +59,7 @@ class Pathway
      * @since       1.5
      * @throws      \RuntimeException
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Get the instance from the application
      *              Example:
      *              $app->getPathway()
diff --git a/libraries/src/Plugin/CMSPlugin.php b/libraries/src/Plugin/CMSPlugin.php
index d45a6a1dda94f..d134dd886f0d7 100644
--- a/libraries/src/Plugin/CMSPlugin.php
+++ b/libraries/src/Plugin/CMSPlugin.php
@@ -72,24 +72,36 @@ abstract class CMSPlugin implements DispatcherAwareInterface, PluginInterface, L
     protected $_type = null;
 
     /**
-     * Affects constructor behavior. If true, language files will be loaded automatically.
+     * If true, language files of the plugin will be loaded automatically.
+     *
+     * NOTE: Enabling this feature have a negative effect on performance,
+     * therefore it is recommended to load a language manually, in the respective event.
      *
      * @var    boolean
      * @since  3.1
      */
     protected $autoloadLanguage = false;
 
+    /**
+     * Internal flag for autoloadLanguage feature.
+     *
+     * @var   boolean
+     *
+     * @since   6.0.0
+     */
+    private $autoloadLanguageDone = false;
+
     /**
      * Should I try to detect and register legacy event listeners, i.e. methods which accept unwrapped arguments? While
      * this maintains a great degree of backwards compatibility to Joomla! 3.x-style plugins it is much slower. You are
      * advised to implement your plugins using proper Listeners, methods accepting an AbstractEvent as their sole
-     * parameter, for best performance. Also bear in mind that Joomla! 5.x onwards will only allow proper listeners,
+     * parameter, for best performance. Also bear in mind that Joomla! 7.0 onwards will only allow proper listeners,
      * removing support for legacy Listeners.
      *
      * @var    boolean
      * @since  4.0.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Implement your plugin methods accepting an AbstractEvent object
      *              Example:
      *              onEventTriggerName(AbstractEvent $event) {
@@ -154,11 +166,6 @@ public function __construct($config = [])
             $this->_type = $config['type'];
         }
 
-        // Load the language files if needed.
-        if ($this->autoloadLanguage) {
-            $this->loadLanguage();
-        }
-
         if (property_exists($this, 'app')) {
             @trigger_error('The application should be injected through setApplication() and requested through getApplication().', E_USER_DEPRECATED);
             $reflection  = new \ReflectionClass($this);
@@ -178,6 +185,11 @@ public function __construct($config = [])
                 $this->db = Factory::getDbo();
             }
         }
+
+        // Load the language files if needed.
+        if ($this->autoloadLanguage) {
+            $this->autoloadLanguage();
+        }
     }
 
     /**
@@ -193,11 +205,26 @@ public function __construct($config = [])
     public function loadLanguage($extension = '', $basePath = JPATH_ADMINISTRATOR)
     {
         if (empty($extension)) {
-            $extension = 'Plg_' . $this->_type . '_' . $this->_name;
+            $extension = 'plg_' . $this->_type . '_' . $this->_name;
         }
 
         $extension = strtolower($extension);
-        $lang      = $this->getApplication() ? $this->getApplication()->getLanguage() : Factory::getLanguage();
+        $app       = $this->getApplication() ?: Factory::getApplication();
+        $lang      = $app->getLanguage();
+
+        if (!$lang) {
+            // @TODO: Throw an exception in Joomla 7
+            @trigger_error(
+                \sprintf(
+                    'Trying to load language before Application is initialised is discouraged. This will throw an exception in 7.0. Plugin "%s/%s"',
+                    $this->_type,
+                    $this->_name
+                ),
+                E_USER_DEPRECATED
+            );
+
+            return false;
+        }
 
         // If language already loaded, don't load it again.
         if ($lang->getPaths($extension)) {
@@ -208,6 +235,45 @@ public function loadLanguage($extension = '', $basePath = JPATH_ADMINISTRATOR)
             || $lang->load($extension, JPATH_PLUGINS . '/' . $this->_type . '/' . $this->_name);
     }
 
+    /**
+     * Method to handle language autoload feature in safe way, only when the language is initialised.
+     *
+     * @return void
+     *
+     * @internal  The method does not expect to be called outside the CMSPlugin class.
+     *
+     * @since   6.0.0
+     */
+    final protected function autoloadLanguage(): void
+    {
+        if ($this->autoloadLanguageDone) {
+            return;
+        }
+
+        $app = $this->getApplication();
+
+        // Try to get Application from Factory
+        if (!$app) {
+            try {
+                $app = Factory::getApplication();
+            } catch (\Exception) {
+                // Cannot help here
+                return;
+            }
+        }
+
+        // Check whether language already initialised in the Application, otherwise wait for it
+        if (!$app->getLanguage()) {
+            $app->getDispatcher()->addListener('onAfterInitialise', function () {
+                $this->loadLanguage();
+            });
+        } else {
+            $this->loadLanguage();
+        }
+
+        $this->autoloadLanguageDone = true;
+    }
+
     /**
      * Registers legacy Listeners to the Dispatcher, emulating how plugins worked under Joomla! 3.x and below.
      *
@@ -337,7 +403,7 @@ function (AbstractEvent $event) use ($methodName) {
 
     /**
      * Registers a proper event listener, i.e. a method which accepts an AbstractEvent as its sole argument. This is the
-     * preferred way to implement plugins in Joomla! 4.x and will be the only possible method with Joomla! 5.x onwards.
+     * preferred way to implement plugins in Joomla! 4.x and will be the only possible method with Joomla! 7.0 onwards.
      *
      * @param   string  $methodName  The method name to register
      *
diff --git a/libraries/src/Plugin/PluginHelper.php b/libraries/src/Plugin/PluginHelper.php
index 08ac384b26d83..c7a1a1939fed1 100644
--- a/libraries/src/Plugin/PluginHelper.php
+++ b/libraries/src/Plugin/PluginHelper.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Event\DispatcherInterface;
+use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -231,16 +232,26 @@ protected static function import($plugin, $autocreate = true, ?DispatcherInterfa
 
         $plugin = Factory::getApplication()->bootPlugin($plugin->name, $plugin->type);
 
-        if ($dispatcher && $plugin instanceof DispatcherAwareInterface) {
-            $plugin->setDispatcher($dispatcher);
-        }
-
         if (!$autocreate) {
             return;
         }
 
-        // @TODO: Starting from 7.0 it should use $dispatcher->addSubscriber($plugin); for plugins which implement SubscriberInterface.
-        $plugin->registerListeners();
+        // Check for overridden registerListeners()
+        $reflection         = new \ReflectionClass($plugin);
+        $registerOverridden = $reflection->hasMethod('registerListeners') && $reflection->getMethod('registerListeners')->class !== CMSPlugin::class;
+
+        // @TODO: From 7.0 when registerListeners() will be removed from CMSPlugin checking for overridden registerListeners() need to be removed.
+        if ($plugin instanceof SubscriberInterface && !$registerOverridden) {
+            $dispatcher->addSubscriber($plugin);
+        } else {
+            // @TODO: From 7.0 when DispatcherAwareInterface will be removed from CMSPlugin this should be checked for all plugins.
+            if ($dispatcher && $plugin instanceof DispatcherAwareInterface) {
+                $plugin->setDispatcher($dispatcher);
+            }
+
+            // @TODO: From 7.0 it should use $dispatcher->addSubscriber($plugin); for plugins which implement SubscriberInterface.
+            $plugin->registerListeners();
+        }
     }
 
     /**
@@ -263,7 +274,7 @@ protected static function load()
 
         $loader = function () use ($levels) {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     $db->quoteName(
                         [
@@ -271,12 +282,14 @@ protected static function load()
                             'element',
                             'params',
                             'extension_id',
+                            'custom_data',
                         ],
                         [
                             'type',
                             'name',
                             'params',
                             'id',
+                            null,
                         ]
                     )
                 )
diff --git a/libraries/src/Router/Route.php b/libraries/src/Router/Route.php
index 8be615061a628..61ef044bd1afe 100644
--- a/libraries/src/Router/Route.php
+++ b/libraries/src/Router/Route.php
@@ -73,7 +73,7 @@ public static function _($url, $xhtml = true, $tls = self::TLS_IGNORE, $absolute
     {
         try {
             /**
-             * @deprecated  3.9 int conversion will be removed in 6.0
+             * @deprecated  3.9 int conversion will be removed in 7.0
              *              Before 3.9.7 this method silently converted $tls to integer
              */
             if (!\is_int($tls)) {
@@ -86,7 +86,7 @@ public static function _($url, $xhtml = true, $tls = self::TLS_IGNORE, $absolute
             }
 
             /**
-             * @deprecated  3.9 -1 as valid value will be removed in 6.0
+             * @deprecated  3.9 -1 as valid value will be removed in 7.0
              *              Before 3.9.7 this method accepted -1.
              */
             if ($tls === -1) {
@@ -99,8 +99,8 @@ public static function _($url, $xhtml = true, $tls = self::TLS_IGNORE, $absolute
             return static::link($client, $url, $xhtml, $tls, $absolute);
         } catch (\RuntimeException) {
             /**
-             * @deprecated  3.9 this method will not fail silently from 6.0
-             *              Before 3.9.0 this method failed silently on router error. This B/C will be removed in Joomla 6.0
+             * @deprecated  3.9 this method will not fail silently from 7.0
+             *              Before 3.9.0 this method failed silently on router error. This B/C will be removed in Joomla 7.0
              */
             return null;
         }
diff --git a/libraries/src/Router/Router.php b/libraries/src/Router/Router.php
index ff60e790c33dc..06d3a024f8db6 100644
--- a/libraries/src/Router/Router.php
+++ b/libraries/src/Router/Router.php
@@ -111,7 +111,7 @@ class Router
      *
      * @throws     \RuntimeException
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Inject the router or load it from the dependency injection container
      *              Example: Factory::getContainer()->get(SiteRouter::class);
      */
diff --git a/libraries/src/Service/Provider/Application.php b/libraries/src/Service/Provider/Application.php
index c3555a91c97d4..8e9ab01646389 100644
--- a/libraries/src/Service/Provider/Application.php
+++ b/libraries/src/Service/Provider/Application.php
@@ -16,9 +16,11 @@
 use Joomla\CMS\Cache\CacheControllerFactoryInterface;
 use Joomla\CMS\Console\CheckJoomlaUpdatesCommand;
 use Joomla\CMS\Console\CoreUpdateChannelCommand;
+use Joomla\CMS\Console\ExtensionDisableCommand;
 use Joomla\CMS\Console\ExtensionDiscoverCommand;
 use Joomla\CMS\Console\ExtensionDiscoverInstallCommand;
 use Joomla\CMS\Console\ExtensionDiscoverListCommand;
+use Joomla\CMS\Console\ExtensionEnableCommand;
 use Joomla\CMS\Console\ExtensionInstallCommand;
 use Joomla\CMS\Console\ExtensionRemoveCommand;
 use Joomla\CMS\Console\ExtensionsListCommand;
@@ -36,7 +38,6 @@
 use Joomla\CMS\Console\TasksRunCommand;
 use Joomla\CMS\Console\TasksStateCommand;
 use Joomla\CMS\Console\UpdateCoreCommand;
-use Joomla\CMS\Input\Input as CMSInput;
 use Joomla\CMS\Language\LanguageFactoryInterface;
 use Joomla\CMS\Menu\MenuFactoryInterface;
 use Joomla\CMS\User\UserFactoryInterface;
@@ -49,6 +50,7 @@
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
 use Joomla\Event\Priority;
+use Joomla\Input\Input as CMSInput;
 use Joomla\Session\SessionEvents;
 use Joomla\Session\SessionInterface;
 use Psr\Log\LoggerInterface;
@@ -155,6 +157,8 @@ function (Container $container) {
                         GetConfigurationCommand::getDefaultName()         => GetConfigurationCommand::class,
                         ExtensionsListCommand::getDefaultName()           => ExtensionsListCommand::class,
                         CheckJoomlaUpdatesCommand::getDefaultName()       => CheckJoomlaUpdatesCommand::class,
+                        ExtensionEnableCommand::getDefaultName()          => ExtensionEnableCommand::class,
+                        ExtensionDisableCommand::getDefaultName()         => ExtensionDisableCommand::class,
                         ExtensionRemoveCommand::getDefaultName()          => ExtensionRemoveCommand::class,
                         ExtensionInstallCommand::getDefaultName()         => ExtensionInstallCommand::class,
                         ExtensionDiscoverCommand::getDefaultName()        => ExtensionDiscoverCommand::class,
@@ -179,9 +183,9 @@ function (Container $container) {
                 'JApplicationApi',
                 function (Container $container) {
                     $app = new ApiApplication(null, $container->get('config'), null, $container);
-                    $app->setDispatcher($container->get('Joomla\Event\DispatcherInterface'));
+                    $app->setDispatcher($container->get(DispatcherInterface::class));
                     $app->setLogger($container->get(LoggerInterface::class));
-                    $app->setSession($container->get('Joomla\Session\SessionInterface'));
+                    $app->setSession($container->get(SessionInterface::class));
                     $app->setMenuFactory($container->get(MenuFactoryInterface::class));
 
                     // Ensure that session purging is configured now we have a dispatcher
diff --git a/libraries/src/Service/Provider/Console.php b/libraries/src/Service/Provider/Console.php
index 4dbdd2c04f2f3..f0631c7f8107c 100644
--- a/libraries/src/Service/Provider/Console.php
+++ b/libraries/src/Service/Provider/Console.php
@@ -11,9 +11,11 @@
 
 use Joomla\CMS\Console\CheckJoomlaUpdatesCommand;
 use Joomla\CMS\Console\CoreUpdateChannelCommand;
+use Joomla\CMS\Console\ExtensionDisableCommand;
 use Joomla\CMS\Console\ExtensionDiscoverCommand;
 use Joomla\CMS\Console\ExtensionDiscoverInstallCommand;
 use Joomla\CMS\Console\ExtensionDiscoverListCommand;
+use Joomla\CMS\Console\ExtensionEnableCommand;
 use Joomla\CMS\Console\ExtensionInstallCommand;
 use Joomla\CMS\Console\ExtensionRemoveCommand;
 use Joomla\CMS\Console\ExtensionsListCommand;
@@ -36,6 +38,7 @@
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -146,6 +149,22 @@ function (Container $container) {
             true
         );
 
+        $container->share(
+            ExtensionEnableCommand::class,
+            function (Container $container) {
+                return new ExtensionEnableCommand($container->get(DatabaseInterface::class));
+            },
+            true
+        );
+
+        $container->share(
+            ExtensionDisableCommand::class,
+            function (Container $container) {
+                return new ExtensionDisableCommand($container->get(DatabaseInterface::class));
+            },
+            true
+        );
+
         $container->share(
             ExtensionRemoveCommand::class,
             function (Container $container) {
@@ -157,7 +176,7 @@ function (Container $container) {
         $container->share(
             ExtensionInstallCommand::class,
             function (Container $container) {
-                return new ExtensionInstallCommand();
+                return new ExtensionInstallCommand($container->get(DatabaseInterface::class));
             },
             true
         );
@@ -203,6 +222,8 @@ function (Container $container) {
                     $container->get('config')->get('debug_lang')
                 ));
 
+                $command->setDispatcher($container->get(DispatcherInterface::class));
+
                 return $command;
             },
             true
diff --git a/libraries/src/Service/Provider/Database.php b/libraries/src/Service/Provider/Database.php
index 76a5d033d1240..d58b6918f524f 100644
--- a/libraries/src/Service/Provider/Database.php
+++ b/libraries/src/Service/Provider/Database.php
@@ -10,6 +10,7 @@
 namespace Joomla\CMS\Service\Provider;
 
 use Joomla\Database\DatabaseDriver;
+use Joomla\Database\DatabaseFactory;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\Mysql\MysqlDriver;
 use Joomla\DI\Container;
@@ -83,7 +84,6 @@ function (Container $container) {
                     }
 
                     $options = [
-                        'driver'   => $dbtype,
                         'host'     => $conf->get('host'),
                         'user'     => $conf->get('user'),
                         'password' => $conf->get('password'),
@@ -120,7 +120,7 @@ function (Container $container) {
                     }
 
                     try {
-                        $db = DatabaseDriver::getInstance($options);
+                        $db = (new DatabaseFactory())->getDriver($dbtype, $options);
                     } catch (\RuntimeException $e) {
                         if (!headers_sent()) {
                             header('HTTP/1.1 500 Internal Server Error');
diff --git a/libraries/src/Service/Provider/Input.php b/libraries/src/Service/Provider/Input.php
index f1d2f82dd3f6f..15e4286db0f4d 100644
--- a/libraries/src/Service/Provider/Input.php
+++ b/libraries/src/Service/Provider/Input.php
@@ -9,9 +9,9 @@
 
 namespace Joomla\CMS\Service\Provider;
 
-use Joomla\CMS\Input\Input as CMSInput;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
+use Joomla\Input\Input as CMSInput;
 
 /**
  * Service provider for the the Joomla Input object.
diff --git a/libraries/src/Service/Provider/Session.php b/libraries/src/Service/Provider/Session.php
index a65039891c7d3..4abcef0111e54 100644
--- a/libraries/src/Service/Provider/Session.php
+++ b/libraries/src/Service/Provider/Session.php
@@ -13,7 +13,6 @@
 use Joomla\CMS\Application\ConsoleApplication;
 use Joomla\CMS\Application\SiteApplication;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Input\Input as CMSInput;
 use Joomla\CMS\Installation\Application\InstallationApplication;
 use Joomla\CMS\Session\EventListener\MetadataManagerListener;
 use Joomla\CMS\Session\MetadataManager;
@@ -26,6 +25,7 @@
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Event\DispatcherInterface;
 use Joomla\Event\LazyServiceEventListener;
+use Joomla\Input\Input as CMSInput;
 use Joomla\Registry\Registry;
 use Joomla\Session\HandlerInterface;
 use Joomla\Session\SessionEvents;
diff --git a/libraries/src/Session/MetadataManager.php b/libraries/src/Session/MetadataManager.php
index 7accb7422423c..239962790ce8a 100644
--- a/libraries/src/Session/MetadataManager.php
+++ b/libraries/src/Session/MetadataManager.php
@@ -149,7 +149,7 @@ public function createOrUpdateRecord(SessionInterface $session, User $user)
      */
     public function deletePriorTo($time)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->delete($this->db->quoteName('#__session'))
             ->where($this->db->quoteName('time') . ' < :time')
             ->bind(':time', $time, ParameterType::INTEGER);
@@ -174,7 +174,7 @@ public function deletePriorTo($time)
      */
     private function checkSessionRecordExists(string $sessionId): int
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('session_id'))
             ->from($this->db->quoteName('#__session'))
             ->where($this->db->quoteName('session_id') . ' = :session_id')
@@ -208,7 +208,7 @@ private function checkSessionRecordExists(string $sessionId): int
      */
     private function createSessionRecord(SessionInterface $session, User $user)
     {
-        $query = $this->db->getQuery(true);
+        $query = $this->db->createQuery();
 
         $time = $session->isNew() ? time() : $session->get('session.timer.start');
 
@@ -275,7 +275,7 @@ private function createSessionRecord(SessionInterface $session, User $user)
      */
     private function updateSessionRecord(SessionInterface $session, User $user)
     {
-        $query = $this->db->getQuery(true);
+        $query = $this->db->createQuery();
 
         $time = time();
 
diff --git a/libraries/src/Session/Session.php b/libraries/src/Session/Session.php
index 626f9675b63e9..d9def5b00ff2c 100644
--- a/libraries/src/Session/Session.php
+++ b/libraries/src/Session/Session.php
@@ -150,7 +150,7 @@ public static function getHandlers(): array
      *
      * @since   1.5
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Load the session service from the dependency injection container or via $app->getSession()
      *              Example: Factory::getApplication()->getSession();
      */
@@ -176,7 +176,7 @@ public static function getInstance()
      */
     public function get($name, $default = null)
     {
-        // Handle B/C by checking if a namespace was passed to the method, will be removed at 5.0
+        // Handle B/C by checking if a namespace was passed to the method, will be removed at 7.0
         if (\func_num_args() > 2) {
             $args = \func_get_args();
 
@@ -227,7 +227,7 @@ public function get($name, $default = null)
      */
     public function set($name, $value = null)
     {
-        // Handle B/C by checking if a namespace was passed to the method, will be removed at 5.0
+        // Handle B/C by checking if a namespace was passed to the method, will be removed at 7.0
         if (\func_num_args() > 2) {
             $args = \func_get_args();
 
@@ -256,7 +256,7 @@ public function set($name, $value = null)
      */
     public function has($name)
     {
-        // Handle B/C by checking if a namespace was passed to the method, will be removed at 5.0
+        // Handle B/C by checking if a namespace was passed to the method, will be removed at 7.0
         if (\func_num_args() > 1) {
             $args = \func_get_args();
 
@@ -299,7 +299,7 @@ public function has($name)
      */
     public function clear()
     {
-        // Handle B/C by checking if parameters were passed to this method; if so proxy to the new remove() method, will be removed at 5.0
+        // Handle B/C by checking if parameters were passed to this method; if so proxy to the new remove() method, will be removed at 7.0
         if (\func_num_args() >= 1) {
             $args = \func_get_args();
 
diff --git a/libraries/src/String/PunycodeHelper.php b/libraries/src/String/PunycodeHelper.php
index 0a6344bfebdb3..e58a6c9ad73ae 100644
--- a/libraries/src/String/PunycodeHelper.php
+++ b/libraries/src/String/PunycodeHelper.php
@@ -196,7 +196,7 @@ public static function urlToUTF8($uri)
     public static function emailToPunycode($email)
     {
         if ($email === null) {
-            @trigger_error(\sprintf('Passing null value is deprecated in %s and will throw an exception in 6.0.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(\sprintf('Passing null value is deprecated in %s and will throw an exception in 7.0.', __METHOD__), E_USER_DEPRECATED);
             return '';
         }
 
diff --git a/libraries/src/TUF/DatabaseStorage.php b/libraries/src/TUF/DatabaseStorage.php
index 667767a9ad34b..1267393bcaef5 100644
--- a/libraries/src/TUF/DatabaseStorage.php
+++ b/libraries/src/TUF/DatabaseStorage.php
@@ -11,7 +11,6 @@
 
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Table\TableInterface;
-use Joomla\CMS\Table\Tuf;
 use Tuf\Metadata\StorageBase;
 
 // phpcs:disable PSR1.Files.SideEffects
diff --git a/libraries/src/TUF/TufFetcher.php b/libraries/src/TUF/TufFetcher.php
index 19566c801daff..c8f0b93aee2da 100644
--- a/libraries/src/TUF/TufFetcher.php
+++ b/libraries/src/TUF/TufFetcher.php
@@ -153,7 +153,7 @@ private function rollBackTufMetadata()
     {
         $db = $this->db;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__tuf_metadata'))
             ->set($db->quoteName('snapshot') . ' = NULL')
             ->set($db->quoteName('targets') . ' = NULL')
diff --git a/libraries/src/Table/Asset.php b/libraries/src/Table/Asset.php
index 6862409bff819..8fac6d715e68c 100644
--- a/libraries/src/Table/Asset.php
+++ b/libraries/src/Table/Asset.php
@@ -110,7 +110,7 @@ public function check()
         if ($this->parent_id > 0) {
             // Get the DatabaseQuery object
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('1')
                 ->from($db->quoteName($this->_tbl))
                 ->where($db->quoteName('id') . ' = ' . $this->parent_id);
@@ -155,7 +155,7 @@ public function rebuild($parentId = null, $leftId = 0, $level = 0, $path = null)
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the structure of the recursive query.
         if (!isset($this->_cache['rebuild.sql'])) {
diff --git a/libraries/src/Table/Category.php b/libraries/src/Table/Category.php
index 902bfb25088d8..21cd86ec80480 100644
--- a/libraries/src/Table/Category.php
+++ b/libraries/src/Table/Category.php
@@ -17,7 +17,6 @@
 use Joomla\CMS\Tag\TaggableTableTrait;
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
-use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
 use Joomla\Event\DispatcherInterface;
@@ -32,7 +31,7 @@
  *
  * @since  1.5
  */
-class Category extends Nested implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface
+class Category extends Nested implements TaggableTableInterface, CurrentUserInterface
 {
     use TaggableTableTrait;
     use CurrentUserTrait;
@@ -56,7 +55,7 @@ class Category extends Nested implements VersionableTableInterface, TaggableTabl
     public function __construct(DatabaseInterface $db, ?DispatcherInterface $dispatcher = null)
     {
         /**
-         * @deprecated  4.0 will be removed in 6.0
+         * @deprecated  4.0 will be removed in 7.0
          *              This format was used by tags and versioning before 4.0 before
          *              the introduction of the getTypeAlias function.
          */
@@ -112,7 +111,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
 
         if ($this->parent_id > 1) {
             // Build the query to get the asset id for the parent category.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('asset_id'))
                 ->from($db->quoteName('#__categories'))
                 ->where($db->quoteName('id') . ' = :parentId')
@@ -127,7 +126,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
         } elseif ($assetId === null) {
             // This is a category that needs to parent with the extension.
             // Build the query to get the asset id for the parent category.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__assets'))
                 ->where($db->quoteName('name') . ' = :extension')
diff --git a/libraries/src/Table/Content.php b/libraries/src/Table/Content.php
index 943d291214ef9..908fc492419e3 100644
--- a/libraries/src/Table/Content.php
+++ b/libraries/src/Table/Content.php
@@ -17,7 +17,6 @@
 use Joomla\CMS\Tag\TaggableTableTrait;
 use Joomla\CMS\User\CurrentUserInterface;
 use Joomla\CMS\User\CurrentUserTrait;
-use Joomla\CMS\Versioning\VersionableTableInterface;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\ParameterType;
 use Joomla\Event\DispatcherInterface;
@@ -33,7 +32,7 @@
  *
  * @since  1.5
  */
-class Content extends Table implements VersionableTableInterface, TaggableTableInterface, CurrentUserInterface
+class Content extends Table implements TaggableTableInterface, CurrentUserInterface
 {
     use TaggableTableTrait;
     use CurrentUserTrait;
@@ -112,7 +111,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
 
             // Build the query to get the asset id for the parent category.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('asset_id'))
                 ->from($db->quoteName('#__categories'))
                 ->where($db->quoteName('id') . ' = :catid')
diff --git a/libraries/src/Table/ContentHistory.php b/libraries/src/Table/ContentHistory.php
index a042eb947df1d..a419a3a9f464a 100644
--- a/libraries/src/Table/ContentHistory.php
+++ b/libraries/src/Table/ContentHistory.php
@@ -169,7 +169,7 @@ public function getHashMatch()
         $db       = $this->getDatabase();
         $itemId   = $this->item_id;
         $sha1Hash = $this->sha1_hash;
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
         $query->select('*')
             ->from($db->quoteName('#__history'))
             ->where($db->quoteName('item_id') . ' = :item_id')
@@ -199,7 +199,7 @@ public function deleteOldVersions($maxVersions)
         // Get the list of version_id values we want to save
         $db        = $this->getDatabase();
         $itemId    = $this->item_id;
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
         $query->select($db->quoteName('version_id'))
             ->from($db->quoteName('#__history'))
             ->where($db->quoteName('item_id') . ' = :item_id')
@@ -214,7 +214,7 @@ public function deleteOldVersions($maxVersions)
         // Don't process delete query unless we have at least the maximum allowed versions
         if (\count($idsToSave) === (int) $maxVersions) {
             // Delete any rows not in our list and and not flagged to keep forever.
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query->delete($db->quoteName('#__history'))
                 ->where($db->quoteName('item_id') . ' = :item_id')
                 ->whereNotIn($db->quoteName('version_id'), $idsToSave)
diff --git a/libraries/src/Table/ContentType.php b/libraries/src/Table/ContentType.php
index 6e5ef821c81bd..7ec7f84ad5f2c 100644
--- a/libraries/src/Table/ContentType.php
+++ b/libraries/src/Table/ContentType.php
@@ -118,7 +118,7 @@ public function fieldmapExpand($assoc = true)
     public function getTypeId($typeAlias)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select($db->quoteName('type_id'))
             ->from($db->quoteName($this->_tbl))
             ->where($db->quoteName('type_alias') . ' = :type_alias')
@@ -144,14 +144,25 @@ public function getContentTable()
 
         if (\is_object($tableInfo) && isset($tableInfo->special)) {
             if (\is_object($tableInfo->special) && isset($tableInfo->special->type, $tableInfo->special->prefix)) {
-                $class = $tableInfo->special->class ?? 'Joomla\\CMS\\Table\\Table';
+                if (isset($tableInfo->special->class)) {
+                    $class = $tableInfo->special->class;
 
-                if (!class_implements($class, 'Joomla\\CMS\\Table\\TableInterface')) {
+                    if (!class_implements($class, 'Joomla\\CMS\\Table\\TableInterface')) {
+                        // This isn't an instance of TableInterface. Stop.
+                        throw new \RuntimeException('Class must be an instance of Joomla\\CMS\\Table\\TableInterface');
+                    }
+
+                    return $class::getInstance($tableInfo->special->type, $tableInfo->special->prefix);
+                }
+
+                $class = rtrim($tableInfo->special->prefix, '\\') . '\\' . $tableInfo->special->type;
+
+                if (!class_implements($class, TableInterface::class)) {
                     // This isn't an instance of TableInterface. Stop.
                     throw new \RuntimeException('Class must be an instance of Joomla\\CMS\\Table\\TableInterface');
                 }
 
-                $result = $class::getInstance($tableInfo->special->type, $tableInfo->special->prefix);
+                $result = new $class($this->getDbo());
             }
         }
 
diff --git a/libraries/src/Table/CoreContent.php b/libraries/src/Table/CoreContent.php
index a7142e9a50139..c4d01abbe2e9c 100644
--- a/libraries/src/Table/CoreContent.php
+++ b/libraries/src/Table/CoreContent.php
@@ -178,7 +178,7 @@ public function deleteByContentId($contentItemId = null, $typeAlias = null)
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select($db->quoteName('core_content_id'))
             ->from($db->quoteName('#__ucm_content'))
             ->where(
@@ -264,7 +264,7 @@ protected function storeUcmBase($updateNulls = true, $isNew = false)
     {
         // Store the ucm_base row
         $db         = $this->getDatabase();
-        $query      = $db->getQuery(true);
+        $query      = $db->createQuery();
         $languageId = ContentHelper::getLanguageId($this->core_language);
 
         // Selecting "all languages" doesn't give a language id - we can't store a blank string in non mysql databases, so save 0 (the default value)
diff --git a/libraries/src/Table/Extension.php b/libraries/src/Table/Extension.php
index b4fdf9889e382..eec6be3bb2ae1 100644
--- a/libraries/src/Table/Extension.php
+++ b/libraries/src/Table/Extension.php
@@ -105,7 +105,7 @@ public function find($options = [])
     {
         // Get the DatabaseQuery object
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         foreach ($options as $col => $val) {
             $query->where($col . ' = ' . $db->quote($val));
diff --git a/libraries/src/Table/Menu.php b/libraries/src/Table/Menu.php
index 6306e5286f1d7..86cb44fa3e22e 100644
--- a/libraries/src/Table/Menu.php
+++ b/libraries/src/Table/Menu.php
@@ -215,7 +215,7 @@ public function store($updateNulls = true)
                 } elseif ($this->language === '*' && $this->id != 0) {
                     // When editing an item with All language check if there are more menu items with the same alias in any language.
                     $id    = (int) $this->id;
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select('id')
                         ->from($db->quoteName('#__menu'))
                         ->where($db->quoteName('parent_id') . ' = 1')
diff --git a/libraries/src/Table/MenuType.php b/libraries/src/Table/MenuType.php
index 7a7a36caffd93..f57c196b99eda 100644
--- a/libraries/src/Table/MenuType.php
+++ b/libraries/src/Table/MenuType.php
@@ -78,7 +78,7 @@ public function check()
 
         // Check for unique menutype.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(id)')
             ->from($db->quoteName('#__menu_types'))
             ->where($db->quoteName('menutype') . ' = :menutype')
@@ -121,7 +121,7 @@ public function store($updateNulls = false)
             $table->load($this->id);
 
             // Verify that no items are checked out
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__menu'))
                 ->where($db->quoteName('menutype') . ' = :menutype')
@@ -214,7 +214,7 @@ public function delete($pk = null)
             $table->load($pk);
 
             // Verify that no items are checked out
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__menu'))
                 ->where($db->quoteName('menutype') . ' = :menutype')
@@ -313,7 +313,7 @@ protected function _getAssetTitle()
     protected function _getAssetParentId(?Table $table = null, $id = null)
     {
         $assetId = null;
-        $asset   = Table::getInstance('asset');
+        $asset   = new Asset($this->getDbo());
 
         if ($asset->loadByName('com_menus')) {
             $assetId = $asset->id;
diff --git a/libraries/src/Table/Module.php b/libraries/src/Table/Module.php
index 86c0021f99048..1a801b60711f3 100644
--- a/libraries/src/Table/Module.php
+++ b/libraries/src/Table/Module.php
@@ -96,7 +96,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
         if ($assetId === null) {
             // Build the query to get the asset id of the parent component.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__assets'))
                 ->where($db->quoteName('name') . ' = ' . $db->quote('com_modules'));
diff --git a/libraries/src/Table/Nested.php b/libraries/src/Table/Nested.php
index 518e38118c9f2..eadc643cf6344 100644
--- a/libraries/src/Table/Nested.php
+++ b/libraries/src/Table/Nested.php
@@ -149,7 +149,7 @@ public function getPath($pk = null, $diagnostic = false)
 
         // Get the path from the node to the root.
         $select = ($diagnostic) ? 'p.' . $k . ', p.parent_id, p.level, p.lft, p.rgt' : 'p.*';
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->select($select)
             ->from($this->_tbl . ' AS n, ' . $this->_tbl . ' AS p')
             ->where('n.lft BETWEEN p.lft AND p.rgt')
@@ -180,7 +180,7 @@ public function getTree($pk = null, $diagnostic = false)
 
         // Get the node and children as a tree.
         $select = ($diagnostic) ? 'n.' . $k . ', n.parent_id, n.level, n.lft, n.rgt' : 'n.*';
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->select($select)
             ->from($this->_tbl . ' AS n, ' . $this->_tbl . ' AS p')
             ->where('n.lft BETWEEN p.lft AND p.rgt')
@@ -264,7 +264,7 @@ public function move($delta, $where = '')
         $k  = $this->_tbl_key;
         $pk = $this->$k;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($k)
             ->from($this->_tbl)
             ->where('parent_id = ' . $this->parent_id);
@@ -323,7 +323,7 @@ public function moveByReference($referenceId, $position = 'after', $pk = null, $
 
         // Get the ids of child nodes.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($k)
             ->from($this->_tbl)
             ->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt);
@@ -468,7 +468,7 @@ public function moveByReference($referenceId, $position = 'after', $pk = null, $
 
         // Set the correct parent id for the moved node if required.
         if ($node->parent_id != $repositionData->new_parent_id) {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($this->_tbl);
 
             // Update the title and alias fields if they exist for the table.
@@ -577,7 +577,7 @@ public function delete($pk = null, $children = true)
             return false;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Should we delete all children along with the node?
         if ($children) {
@@ -695,7 +695,7 @@ public function check()
             }
 
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('1')
                 ->from($this->_tbl)
                 ->where($this->_tbl_key . ' = ' . $this->parent_id);
@@ -764,7 +764,7 @@ public function store($updateNulls = false)
 
                 if ($this->_location_id == 0) {
                     // Get the last root node as the reference node.
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select($this->_tbl_key . ', parent_id, level, lft, rgt')
                         ->from($this->_tbl)
                         ->where('parent_id = 0')
@@ -797,7 +797,7 @@ public function store($updateNulls = false)
                 }
 
                 // Create space in the tree at the new location for the new node in left ids.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->update($this->_tbl)
                     ->set('lft = lft + 2')
                     ->where($repositionData->left_where);
@@ -904,7 +904,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
         $k = $this->_tbl_key;
 
         $db         = $this->getDatabase();
-        $query      = $db->getQuery(true);
+        $query      = $db->createQuery();
         $table      = $db->quoteName($this->_tbl);
         $published  = $db->quoteName($this->getColumnAlias('published'));
         $checkedOut = $db->quoteName($this->getColumnAlias('checked_out'));
@@ -1049,7 +1049,7 @@ public function orderUp($pk)
         try {
             // Get the primary keys of child nodes.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($this->_tbl_key)
                 ->from($this->_tbl)
                 ->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt);
@@ -1115,7 +1115,7 @@ public function orderDown($pk)
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Get the right sibling node.
         $sibling = $this->_getNode($node->rgt + 1, 'left');
@@ -1181,7 +1181,7 @@ public function getRootId()
 
         // Test for a unique record with parent_id = 0
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($k)
             ->from($this->_tbl)
             ->where('parent_id = 0');
@@ -1259,7 +1259,7 @@ public function rebuild($parentId = null, $leftId = 0, $level = 0, $path = '')
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the structure of the recursive query.
         if (!isset($this->_cache['rebuild.sql'])) {
@@ -1341,7 +1341,7 @@ public function rebuildPath($pk = null)
 
         // Get the aliases for the path from the node to the root node.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('p.alias')
             ->from($this->_tbl . ' AS n, ' . $this->_tbl . ' AS p')
             ->where('n.lft BETWEEN p.lft AND p.rgt')
@@ -1405,7 +1405,7 @@ public function saveorder($idArray = null, $lftArray = null)
     {
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Validate arguments
             if (\is_array($idArray) && \is_array($lftArray) && \count($idArray) == \count($lftArray)) {
@@ -1447,7 +1447,7 @@ public function saveorder($idArray = null, $lftArray = null)
     protected function recursiveUpdatePublishedColumn($pk, $newState = null)
     {
         $db        = $this->getDatabase();
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
         $table     = $db->quoteName($this->_tbl);
         $key       = $db->quoteName($this->_tbl_key);
         $published = $db->quoteName($this->getColumnAlias('published'));
@@ -1552,7 +1552,7 @@ protected function _getNode($id, $key = null)
 
         // Get the node data.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($this->_tbl_key . ', parent_id, level, lft, rgt')
             ->from($this->_tbl)
             ->where($k . ' = ' . (int) $id);
@@ -1682,7 +1682,7 @@ protected function _logtable($showData = true, $showQuery = true)
         }
 
         if ($showData) {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($this->_tbl_key . ', parent_id, lft, rgt, level')
                 ->from($this->_tbl)
                 ->order($this->_tbl_key);
diff --git a/libraries/src/Table/Table.php b/libraries/src/Table/Table.php
index ca973a80b3653..793a9040f7ee1 100644
--- a/libraries/src/Table/Table.php
+++ b/libraries/src/Table/Table.php
@@ -18,7 +18,6 @@
 use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
-use Joomla\Database\DatabaseDriver;
 use Joomla\Database\DatabaseInterface;
 use Joomla\Database\DatabaseQuery;
 use Joomla\Database\Exception\DatabaseNotFoundException;
@@ -88,9 +87,9 @@ abstract class Table extends \stdClass implements TableInterface, DispatcherAwar
     protected $_tbl_keys = [];
 
     /**
-     * DatabaseDriver object.
+     * DatabaseInterface object.
      *
-     * @var    DatabaseDriver
+     * @var    DatabaseInterface
      * @since  1.7.0
      *
      * @deprecated  5.4.0 will be removed in 7.0
@@ -282,9 +281,10 @@ public function getFields($reload = false)
      *
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Use the MvcFactory instead
+     * @deprecated  4.3 will be removed in 7.0
+     *              Use the MvcFactory instead or instantiate the table class directly.
      *              Example: Factory::getApplication()->bootComponent('...')->getMVCFactory()->createTable($name, $prefix, $config);
+     *              $table = new \Joomla\CMS\Table\Content($db);
      */
     public static function getInstance($type, $prefix = 'JTable', $config = [])
     {
@@ -333,7 +333,7 @@ public static function getInstance($type, $prefix = 'JTable', $config = [])
             /*
             * If unable to find the class file in the Table include paths. Return false.
             * The warning JLIB_DATABASE_ERROR_NOT_SUPPORTED_FILE_NOT_FOUND has been removed in 3.6.3.
-            * In 6.0 an Exception (type to be determined) will be thrown.
+            * in 7.0 an Exception (type to be determined) will be thrown.
             * For more info see https://github.com/joomla/joomla-cms/issues/11570
             */
 
@@ -361,7 +361,7 @@ public static function getInstance($type, $prefix = 'JTable', $config = [])
      *
      * @since       1.7.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Should not be used anymore as tables are loaded through the MvcFactory
      */
     public static function addIncludePath($path = null)
@@ -536,9 +536,9 @@ public function getId()
     }
 
     /**
-     * Method to get the DatabaseDriver object.
+     * Method to get the DatabaseInterface object.
      *
-     * @return  DatabaseDriver  The internal database driver object.
+     * @return  DatabaseInterface  The internal database driver object.
      *
      * @since   1.7.0
      *
@@ -552,9 +552,9 @@ public function getDbo()
     }
 
     /**
-     * Method to set the DatabaseDriver object.
+     * Method to set the DatabaseInterface object.
      *
-     * @param   DatabaseDriver  $db  A DatabaseDriver object to be used by the table object.
+     * @param   DatabaseInterface  $db  A DatabaseInterface object to be used by the table object.
      *
      * @return  boolean  True on success.
      *
@@ -564,7 +564,7 @@ public function getDbo()
      *              Use setDatabase() instead
      *              Example: $this->setDatabase($db);
      */
-    public function setDbo(DatabaseDriver $db)
+    public function setDbo(DatabaseInterface $db)
     {
         $this->_db = $db;
 
@@ -813,7 +813,7 @@ public function load($keys = null, $reset = true)
         }
 
         // Initialise the query.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName($this->_tbl));
         $fields = array_keys($this->getProperties());
@@ -991,7 +991,7 @@ public function store($updateNulls = false)
                 // Update the asset_id field in this table.
                 $this->asset_id = (int) $asset->id;
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->update($db->quoteName($this->_tbl))
                     ->set('asset_id = ' . (int) $this->asset_id);
                 $this->appendPrimaryKeys($query);
@@ -1120,7 +1120,7 @@ public function delete($pk = null)
         }
 
         // Delete the row by primary key.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName($this->_tbl));
         $this->appendPrimaryKeys($query, $pk);
 
@@ -1203,7 +1203,7 @@ public function checkOut($userId, $pk = null)
         $time = Factory::getDate()->toSql();
 
         // Check the row out by primary key.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName($this->_tbl))
             ->set($db->quoteName($checkedOutField) . ' = ' . (int) $userId)
             ->set($db->quoteName($checkedOutTimeField) . ' = ' . $db->quote($time));
@@ -1286,7 +1286,7 @@ public function checkIn($pk = null)
         $nullID   = $this->_supportNullValue ? 'NULL' : '0';
 
         // Check the row in by primary key.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName($this->_tbl))
             ->set($db->quoteName($checkedOutField) . ' = ' . $nullID)
             ->set($db->quoteName($checkedOutTimeField) . ' = ' . $nullDate);
@@ -1334,7 +1334,7 @@ public function hasPrimaryKey()
                 $empty = $empty && empty($this->$key);
             }
         } else {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('COUNT(*)')
                 ->from($db->quoteName($this->_tbl));
             $this->appendPrimaryKeys($query);
@@ -1403,7 +1403,7 @@ public function hit($pk = null)
         $hitsField = $this->getColumnAlias('hits');
 
         // Check the row in by primary key.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName($this->_tbl))
             ->set($db->quoteName($hitsField) . ' = (' . $db->quoteName($hitsField) . ' + 1)');
         $this->appendPrimaryKeys($query, $pk);
@@ -1454,7 +1454,7 @@ public function isCheckedOut($with = 0, $against = null)
         // This last check can only be relied on if tracking session metadata
         if (Factory::getApplication()->get('session_metadata', true)) {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('COUNT(userid)')
                 ->from($db->quoteName('#__session'))
                 ->where($db->quoteName('userid') . ' = ' . (int) $against);
@@ -1491,7 +1491,7 @@ public function getNextOrder($where = '')
         }
 
         // Get the largest ordering value for a given where clause.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('MAX(' . $db->quoteName($this->getColumnAlias('ordering')) . ')')
             ->from($db->quoteName($this->_tbl));
 
@@ -1549,11 +1549,11 @@ public function reorder($where = '')
 
         $quotedOrderingField = $db->quoteName($this->getColumnAlias('ordering'));
 
-        $subquery = $db->getQuery(true)
+        $subquery = $db->createQuery()
             ->from($db->quoteName($this->_tbl))
             ->selectRowNumber($quotedOrderingField, 'new_ordering');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName($this->_tbl))
             ->set($quotedOrderingField . ' = sq.new_ordering');
 
@@ -1637,7 +1637,7 @@ public function move($delta, $where = '')
         }
 
         $row   = null;
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the primary key and ordering values from the table.
         $query->select(implode(',', $this->_tbl_keys) . ', ' . $quotedOrderingField)
@@ -1788,7 +1788,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 
         foreach ($pks as $pk) {
             // Update the publishing state for rows with the given primary keys.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName($this->_tbl))
                 ->set($db->quoteName($publishedField) . ' = ' . (int) $state);
 
diff --git a/libraries/src/Table/Tuf.php b/libraries/src/Table/Tuf.php
index 180fca7910625..a451cd974d684 100644
--- a/libraries/src/Table/Tuf.php
+++ b/libraries/src/Table/Tuf.php
@@ -10,6 +10,8 @@
 namespace Joomla\CMS\Table;
 
 // phpcs:disable PSR1.Files.SideEffects
+use Joomla\Database\DatabaseInterface;
+
 \defined('_JEXEC') or die;
 // phpcs:enable PSR1.Files.SideEffects
 
@@ -23,11 +25,11 @@ class Tuf extends Table
     /**
      * Constructor
      *
-     * @param   \Joomla\Database\DatabaseDriver  $db  A database connector object
+     * @param   DatabaseInterface  $db  A database connector object
      *
      * @since   5.1.0
      */
-    public function __construct($db)
+    public function __construct(DatabaseInterface $db)
     {
         parent::__construct('#__tuf_metadata', 'id', $db);
     }
diff --git a/libraries/src/Table/Update.php b/libraries/src/Table/Update.php
index 9c2933c9de9f3..2f23f8225cd3b 100644
--- a/libraries/src/Table/Update.php
+++ b/libraries/src/Table/Update.php
@@ -102,7 +102,7 @@ public function find($options = [])
             $where[] = $col . ' = ' . $db->quote($val);
         }
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName($this->_tbl_key))
             ->from($db->quoteName($this->_tbl))
             ->where(implode(' AND ', $where));
diff --git a/libraries/src/Table/User.php b/libraries/src/Table/User.php
index f3508ceb8fb93..74796b681cb24 100644
--- a/libraries/src/Table/User.php
+++ b/libraries/src/Table/User.php
@@ -98,7 +98,7 @@ public function load($userId = null, $reset = true)
 
         // Load the user data.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('id') . ' = :userid')
@@ -165,7 +165,7 @@ public function bind($array, $ignore = '')
 
             // Get the titles for the user groups.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__usergroups'))
@@ -256,7 +256,7 @@ public function check()
 
         // Check for existing username
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :username')
@@ -356,7 +356,7 @@ public function store($updateNulls = true)
         // Reset groups to the local object.
         $this->groups = $groups;
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Store the group data if the user data was saved.
         if (\is_array($this->groups) && \count($this->groups)) {
@@ -458,7 +458,7 @@ public function delete($userId = null)
 
         // Delete the user.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName($this->_tbl))
             ->where($db->quoteName($this->_tbl_key) . ' = :key')
             ->bind(':key', $key, ParameterType::INTEGER);
@@ -533,7 +533,7 @@ public function setLastVisit($timeStamp = null, $userId = null)
 
         // Update the database row for the user.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName($this->_tbl))
             ->set($db->quoteName('lastvisitDate') . ' = :lastvisitDate')
             ->where($db->quoteName('id') . ' = :id')
diff --git a/libraries/src/Table/Usergroup.php b/libraries/src/Table/Usergroup.php
index e8b5e0b98bae0..27e2a37ef3d3a 100644
--- a/libraries/src/Table/Usergroup.php
+++ b/libraries/src/Table/Usergroup.php
@@ -76,7 +76,7 @@ public function check()
         $parentId = (int) $this->parent_id;
         $title    = trim($this->title);
         $id       = (int) $this->id;
-        $query    = $db->getQuery(true)
+        $query    = $db->createQuery()
             ->select('COUNT(title)')
             ->from($this->_tbl)
             ->where($db->quoteName('title') . ' = :title')
@@ -140,7 +140,7 @@ public function rebuild($parentId = 0, $left = 0)
     {
         // Get the database object
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
         $parentId = (int) $parentId;
 
         // Get all children of this node
@@ -248,7 +248,7 @@ public function delete($oid = null)
         $rgt = (int) $this->rgt;
 
         // Select the usergroup ID and its children
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('c.id'))
             ->from($db->quoteName($this->_tbl, 'c'))
             ->where($db->quoteName('c.lft') . ' >= :lft')
diff --git a/libraries/src/Table/ViewLevel.php b/libraries/src/Table/ViewLevel.php
index 333fa864c3bbe..61fedc9ee7aef 100644
--- a/libraries/src/Table/ViewLevel.php
+++ b/libraries/src/Table/ViewLevel.php
@@ -88,7 +88,7 @@ public function check()
 
         // Check for a duplicate title.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(' . $db->quoteName('title') . ')')
             ->from($db->quoteName('#__viewlevels'))
             ->where($db->quoteName('title') . ' = :title')
diff --git a/libraries/src/Tag/TaggableTableTrait.php b/libraries/src/Tag/TaggableTableTrait.php
index 988f78544db0e..71a07e4e5bba9 100644
--- a/libraries/src/Tag/TaggableTableTrait.php
+++ b/libraries/src/Tag/TaggableTableTrait.php
@@ -28,7 +28,7 @@ trait TaggableTableTrait
      * @var    TagsHelper
      * @since  4.0.0
      * @note   The tags helper property is set to public for backwards compatibility for Joomla 4.0. It will be made a
-     *         protected property in Joomla 6.0
+     *         protected property in Joomla 7.0
      */
     public $tagsHelper;
 
diff --git a/libraries/src/Toolbar/Button/BasicButton.php b/libraries/src/Toolbar/Button/BasicButton.php
index cb04fe3583170..cc590220d28b5 100644
--- a/libraries/src/Toolbar/Button/BasicButton.php
+++ b/libraries/src/Toolbar/Button/BasicButton.php
@@ -40,7 +40,7 @@ class BasicButton extends ToolbarButton
      *
      * @since   3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use render() instead.
      *
      * @throws  \LogicException
diff --git a/libraries/src/Toolbar/Button/ConfirmButton.php b/libraries/src/Toolbar/Button/ConfirmButton.php
index 122a6c24d3bb4..f6cd81de1223a 100644
--- a/libraries/src/Toolbar/Button/ConfirmButton.php
+++ b/libraries/src/Toolbar/Button/ConfirmButton.php
@@ -56,7 +56,7 @@ protected function prepareOptions(array &$options)
      *
      * @since   3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use render() instead.
      */
     public function fetchButton($type = 'Confirm', $msg = '', $name = '', $text = '', $task = '', $list = true, $hideMenu = false)
diff --git a/libraries/src/Toolbar/Button/CustomButton.php b/libraries/src/Toolbar/Button/CustomButton.php
index daee67d557bd2..eea294ce5a32d 100644
--- a/libraries/src/Toolbar/Button/CustomButton.php
+++ b/libraries/src/Toolbar/Button/CustomButton.php
@@ -50,7 +50,7 @@ protected function renderButton(array &$options): string
      *
      * @since   3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use render() instead.
      */
     public function fetchButton($type = 'Custom', $html = '', $id = 'custom')
diff --git a/libraries/src/Toolbar/Button/HelpButton.php b/libraries/src/Toolbar/Button/HelpButton.php
index 61f0026f831d2..ca874c17d2956 100644
--- a/libraries/src/Toolbar/Button/HelpButton.php
+++ b/libraries/src/Toolbar/Button/HelpButton.php
@@ -68,7 +68,7 @@ protected function prepareOptions(array &$options)
      *
      * @since   3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use render() instead.
      */
     public function fetchButton($type = 'Help', $ref = '', $com = false, $override = null, $component = null)
diff --git a/libraries/src/Toolbar/Button/InlinehelpButton.php b/libraries/src/Toolbar/Button/InlinehelpButton.php
index 9177b2bd21509..13bca5c6680a0 100644
--- a/libraries/src/Toolbar/Button/InlinehelpButton.php
+++ b/libraries/src/Toolbar/Button/InlinehelpButton.php
@@ -69,7 +69,7 @@ protected function prepareOptions(array &$options)
      *
      * @since       4.1.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use render() instead.
      */
     public function fetchButton(
diff --git a/libraries/src/Toolbar/Button/LinkButton.php b/libraries/src/Toolbar/Button/LinkButton.php
index 3ee3a87f89578..ae93a5c2b0fd3 100644
--- a/libraries/src/Toolbar/Button/LinkButton.php
+++ b/libraries/src/Toolbar/Button/LinkButton.php
@@ -64,7 +64,7 @@ protected function prepareOptions(array &$options)
      *
      * @since   3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use render() instead.
      */
     public function fetchButton($type = 'Link', $name = 'back', $text = '', $url = null)
diff --git a/libraries/src/Toolbar/Button/PopupButton.php b/libraries/src/Toolbar/Button/PopupButton.php
index a84dd6101fc72..201626b5b22ae 100644
--- a/libraries/src/Toolbar/Button/PopupButton.php
+++ b/libraries/src/Toolbar/Button/PopupButton.php
@@ -150,7 +150,7 @@ protected function renderButton(array &$options): string
         }
 
         @trigger_error(
-            'Use of BS Modal is deprecated in Joomla\CMS\Toolbar\Button\PopupButton, and will be removed in 6.0',
+            'Use of BS Modal is deprecated in Joomla\CMS\Toolbar\Button\PopupButton, and will be removed in 7.0',
             E_USER_DEPRECATED
         );
 
diff --git a/libraries/src/Toolbar/Button/SeparatorButton.php b/libraries/src/Toolbar/Button/SeparatorButton.php
index 4857812fcae21..7e1fd8b39672a 100644
--- a/libraries/src/Toolbar/Button/SeparatorButton.php
+++ b/libraries/src/Toolbar/Button/SeparatorButton.php
@@ -38,7 +38,7 @@ class SeparatorButton extends ToolbarButton
      *
      * @since   3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use render() instead.
      */
     public function fetchButton()
diff --git a/libraries/src/Toolbar/Button/StandardButton.php b/libraries/src/Toolbar/Button/StandardButton.php
index 373dc9982803d..cb884b9567b17 100644
--- a/libraries/src/Toolbar/Button/StandardButton.php
+++ b/libraries/src/Toolbar/Button/StandardButton.php
@@ -67,7 +67,7 @@ protected function prepareOptions(array &$options)
      *
      * @since   3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use render() instead.
      */
     public function fetchButton($type = 'Standard', $name = '', $text = '', $task = '', $list = true, $formId = null)
diff --git a/libraries/src/Toolbar/ContainerAwareToolbarFactory.php b/libraries/src/Toolbar/ContainerAwareToolbarFactory.php
index 99ff06e3ac6c7..5933cd518ebfa 100644
--- a/libraries/src/Toolbar/ContainerAwareToolbarFactory.php
+++ b/libraries/src/Toolbar/ContainerAwareToolbarFactory.php
@@ -102,7 +102,7 @@ private function loadButtonClass(string $type)
         $buttonClasses = [
             'Joomla\\CMS\\Toolbar\\Button\\' . $type . 'Button',
             /**
-             * @deprecated  4.3 will be removed in 6.0
+             * @deprecated  4.3 will be removed in 7.0
              */
             'JToolbarButton' . $type,
         ];
diff --git a/libraries/src/Toolbar/Toolbar.php b/libraries/src/Toolbar/Toolbar.php
index 6e761db08e4ba..329a9297a48cf 100644
--- a/libraries/src/Toolbar/Toolbar.php
+++ b/libraries/src/Toolbar/Toolbar.php
@@ -134,7 +134,7 @@ public function __construct($name = 'toolbar', ?ToolbarFactoryInterface $factory
      *
      * @since       1.5
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use the ToolbarFactoryInterface instead
      *              Example:
      *              Factory::getContainer()->get(ToolbarFactoryInterface::class)->createToolbar($name)
@@ -147,7 +147,7 @@ public static function getInstance($name = 'toolbar')
     {
         $toolbar = Factory::getApplication()->getDocument()->getToolbar($name);
 
-        // @todo b/c remove with Joomla 7.0 or removed in 6.0 with this function
+        // @todo b/c remove with Joomla 7.0 or removed in 7.0 with this function
         if (empty(self::$instances[$name])) {
             self::$instances[$name] = $toolbar;
         }
@@ -198,7 +198,7 @@ public function appendButton($button, ...$args)
 
         @trigger_error(
             \sprintf(
-                '%s::appendButton() should only accept %s instance in Joomla 6.0.',
+                '%s::appendButton() should only accept %s instance in Joomla 7.0.',
                 static::class,
                 ToolbarButton::class
             ),
@@ -275,7 +275,7 @@ public function prependButton($button, ...$args)
 
         @trigger_error(
             \sprintf(
-                '%s::prependButton() should only accept %s instance in Joomla 6.0.',
+                '%s::prependButton() should only accept %s instance in Joomla 7.0.',
                 static::class,
                 ToolbarButton::class
             ),
@@ -402,14 +402,14 @@ public function loadButtonType($type, $new = false)
      *
      * @since       1.5
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              ToolbarButton classes should be autoloaded via namespaces
      */
     public function addButtonPath($path)
     {
         @trigger_error(
             \sprintf(
-                'Registering lookup paths for toolbar buttons is deprecated and will be removed in Joomla 6.0.'
+                'Registering lookup paths for toolbar buttons is deprecated and will be removed in Joomla 7.0.'
                     . ' %1$s objects should be autoloaded or a custom %2$s implementation supporting path lookups provided.',
                 ToolbarButton::class,
                 ToolbarFactoryInterface::class
@@ -439,14 +439,14 @@ public function addButtonPath($path)
      * @return  array
      *
      * @since   4.0.0
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              ToolbarButton buttons should be autoloaded via namespaces
      */
     public function getButtonPath(): array
     {
         @trigger_error(
             \sprintf(
-                'Lookup paths for %s objects is deprecated and will be removed in Joomla 6.0.',
+                'Lookup paths for %s objects is deprecated and will be removed in Joomla 7.0.',
                 ToolbarButton::class
             ),
             E_USER_DEPRECATED
diff --git a/libraries/src/Toolbar/ToolbarButton.php b/libraries/src/Toolbar/ToolbarButton.php
index 7c98b47f4a235..e496ada63bc8b 100644
--- a/libraries/src/Toolbar/ToolbarButton.php
+++ b/libraries/src/Toolbar/ToolbarButton.php
@@ -249,7 +249,7 @@ public function fetchIconClass($identifier)
      *
      * @since   3.0
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use render() instead.
      */
     abstract public function fetchButton();
@@ -450,7 +450,7 @@ public function __call(string $name, array $args)
                     throw new \InvalidArgumentException(
                         \sprintf(
                             '%s::%s() miss first argument.',
-                            \get_called_class(),
+                            static::class,
                             $name
                         )
                     );
@@ -464,7 +464,7 @@ public function __call(string $name, array $args)
             \sprintf(
                 'Method %s() not found in class: %s',
                 $name,
-                \get_called_class()
+                static::class
             )
         );
     }
diff --git a/libraries/src/Toolbar/ToolbarHelper.php b/libraries/src/Toolbar/ToolbarHelper.php
index dd6ce583cbbb1..013457cfaaad1 100644
--- a/libraries/src/Toolbar/ToolbarHelper.php
+++ b/libraries/src/Toolbar/ToolbarHelper.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\FileLayout;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\ContentType;
 use Joomla\CMS\Uri\Uri;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -93,7 +93,7 @@ public static function divider()
      *
      * @param   string  $task        The task to perform (picked up by the switch($task) blocks).
      * @param   string  $icon        The image to display.
-     * @param   string  $iconOver    @deprecated 4.3 will be removed in 6.0
+     * @param   string  $iconOver    @deprecated 4.3 will be removed in 7.0
      * @param   string  $alt         The alt text for the icon image.
      * @param   bool    $listSelect  True if required to check that a standard list item is checked.
      * @param   string  $formId      The id of action form.
@@ -675,8 +675,7 @@ public static function versions($typeAlias, $itemId, $height = 800, $width = 500
         $lang = Factory::getLanguage();
         $lang->load('com_contenthistory', JPATH_ADMINISTRATOR, $lang->getTag(), true);
 
-        /** @var \Joomla\CMS\Table\ContentType $contentTypeTable */
-        $contentTypeTable = Table::getInstance('ContentType', '\\Joomla\\CMS\\Table\\');
+        $contentTypeTable = new ContentType(Factory::getDbo());
         $typeId           = $contentTypeTable->getTypeId($typeAlias);
 
         // Options array for Layout
diff --git a/libraries/src/UCM/UCMBase.php b/libraries/src/UCM/UCMBase.php
index 090e3d7775c68..23195a660c07a 100644
--- a/libraries/src/UCM/UCMBase.php
+++ b/libraries/src/UCM/UCMBase.php
@@ -11,7 +11,6 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
-use Joomla\CMS\Table\Table;
 use Joomla\CMS\Table\TableInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -78,7 +77,7 @@ public function __construct($alias = null, ?UCMType $type = null)
     protected function store($data, ?TableInterface $table = null, $primaryKey = null)
     {
         if (!$table) {
-            $table = Table::getInstance('Ucm');
+            $table = new \Joomla\CMS\Table\Ucm(Factory::getDbo());
         }
 
         $ucmId      = $data['ucm_id'] ?? null;
diff --git a/libraries/src/UCM/UCMContent.php b/libraries/src/UCM/UCMContent.php
index d86b239c324ef..94554e731ae5d 100644
--- a/libraries/src/UCM/UCMContent.php
+++ b/libraries/src/UCM/UCMContent.php
@@ -11,6 +11,7 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Table\CoreContent;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Table\TableInterface;
 use Joomla\Database\ParameterType;
@@ -115,7 +116,7 @@ public function delete($pk, ?UCMType $type = null)
             $pk = explode(',', $pk);
         }
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__ucm_content'))
             ->where($db->quoteName('core_type_id') . ' = :typeId')
             ->whereIn($db->quoteName('core_content_item_id'), $pk)
@@ -190,7 +191,7 @@ public function mapData($original, ?UCMType $type = null)
      */
     protected function store($data, ?TableInterface $table = null, $primaryKey = null)
     {
-        $table = $table ?: Table::getInstance('CoreContent');
+        $table = $table ?: new CoreContent(Factory::getDbo());
 
         $typeId     = $this->getType()->type->type_id;
         $primaryKey = $primaryKey ?: $this->getPrimaryKey($typeId, $data['core_content_item_id']);
@@ -224,7 +225,7 @@ protected function store($data, ?TableInterface $table = null, $primaryKey = nul
     public function getPrimaryKey($typeId, $contentItemId)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('ucm_id'))
             ->from($db->quoteName('#__ucm_base'))
             ->where(
diff --git a/libraries/src/UCM/UCMType.php b/libraries/src/UCM/UCMType.php
index 5c6948711da39..729d169f56184 100644
--- a/libraries/src/UCM/UCMType.php
+++ b/libraries/src/UCM/UCMType.php
@@ -122,7 +122,7 @@ public function getType($pk = null)
             return $this->getTypeByAlias($this->alias);
         }
 
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('ct') . '.*')
             ->from($this->db->quoteName('#__content_types', 'ct'))
             ->where($this->db->quoteName('ct.type_id') . ' = :pk')
@@ -145,7 +145,7 @@ public function getType($pk = null)
      */
     public function getTypeByAlias($typeAlias = null)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('ct') . '.*')
             ->from($this->db->quoteName('#__content_types', 'ct'))
             ->where($this->db->quoteName('ct.type_alias') . ' = :alias')
@@ -168,7 +168,7 @@ public function getTypeByAlias($typeAlias = null)
      */
     public function getTypeByTable($tableName)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('ct') . '.*')
             ->from($this->db->quoteName('#__content_types', 'ct'));
 
@@ -203,7 +203,7 @@ public function getTypeId($alias = null)
             $alias = $this->alias;
         }
 
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('ct.type_id'))
             ->from($this->db->quoteName('#__content_types', 'ct'))
             ->where($this->db->quoteName('ct.type_alias') . ' = :alias')
diff --git a/libraries/src/Updater/Adapter/CollectionAdapter.php b/libraries/src/Updater/Adapter/CollectionAdapter.php
index bcd86b7fe8ad1..806a8c1abdf6b 100644
--- a/libraries/src/Updater/Adapter/CollectionAdapter.php
+++ b/libraries/src/Updater/Adapter/CollectionAdapter.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Update;
 use Joomla\CMS\Updater\UpdateAdapter;
 use Joomla\CMS\Version;
 
@@ -121,7 +121,7 @@ public function _startElement($parser, $name, $attrs = [])
                 }
                 break;
             case 'EXTENSION':
-                $update                 = Table::getInstance('update');
+                $update                 = new Update($this->db);
                 $update->update_site_id = $this->updateSiteId;
 
                 foreach ($this->updatecols as $col) {
diff --git a/libraries/src/Updater/Adapter/ExtensionAdapter.php b/libraries/src/Updater/Adapter/ExtensionAdapter.php
index d77449ad5cc88..3e08b1b83c2d6 100644
--- a/libraries/src/Updater/Adapter/ExtensionAdapter.php
+++ b/libraries/src/Updater/Adapter/ExtensionAdapter.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Update;
 use Joomla\CMS\Updater\UpdateAdapter;
 use Joomla\CMS\Updater\Updater;
 use Joomla\CMS\Version;
@@ -32,6 +32,15 @@ class ExtensionAdapter extends UpdateAdapter
     protected $currentUpdate;
     protected $latest;
 
+    /**
+     * The updates with security fixes
+     *
+     * @var    array
+     *
+     * @since  6.2.0
+     */
+    protected array $security = [];
+
     /**
      * Start element parser callback.
      *
@@ -55,7 +64,7 @@ protected function _startElement($parser, $name, $attrs = [])
 
         switch ($name) {
             case 'UPDATE':
-                $this->currentUpdate                 = Table::getInstance('update');
+                $this->currentUpdate                 = new Update($this->db);
                 $this->currentUpdate->update_site_id = $this->updateSiteId;
                 $this->currentUpdate->detailsurl     = $this->_url;
                 $this->currentUpdate->folder         = '';
@@ -134,7 +143,7 @@ protected function _endElement($parser, $name)
 
                     // Check if DB & version is supported via <supported_databases> tag, assume supported if tag isn't present
                     if (isset($this->currentUpdate->supported_databases)) {
-                        $db           = Factory::getDbo();
+                        $db           = $this->db;
                         $dbType       = strtolower($db->getServerType());
                         $dbVersion    = $db->getVersion();
                         $supportedDbs = $this->currentUpdate->supported_databases;
@@ -219,6 +228,10 @@ protected function _endElement($parser, $name)
                             // We don't have any possible updates yet, assume this is an available update.
                             $this->latest = $this->currentUpdate;
                         }
+
+                        if (isset($this->currentUpdate->security)) {
+                            $this->security[] = $this->currentUpdate;
+                        }
                     }
                 }
                 break;
@@ -263,7 +276,7 @@ protected function _characterData($parser, $data)
      *
      * @param   array  $options  Update options.
      *
-     * @return  array|boolean  Array containing the array of update sites and array of updates. False on failure
+     * @return  array|boolean  Array containing the array of update sites, an array of updates and an array of security updates. False on failure
      *
      * @since   1.7.0
      */
@@ -275,6 +288,14 @@ public function findUpdate($options)
             return false;
         }
 
+        $this->security = [];
+
+        /**
+         * Unset the latest update which might have been found for a previous update site, avoid
+         * strange issue reported at https://github.com/joomla/joomla-cms/issues/46066
+         */
+        unset($this->latest);
+
         if (\array_key_exists('minimum_stability', $options)) {
             $this->minimum_stability = $options['minimum_stability'];
         }
@@ -317,7 +338,7 @@ public function findUpdate($options)
             $updates = [];
         }
 
-        return ['update_sites' => [], 'updates' => $updates];
+        return ['update_sites' => [], 'updates' => $updates, 'security' => $this->security];
     }
 
     /**
diff --git a/libraries/src/Updater/Adapter/TufAdapter.php b/libraries/src/Updater/Adapter/TufAdapter.php
index 2bb8cb4fe4790..717610f9139ca 100644
--- a/libraries/src/Updater/Adapter/TufAdapter.php
+++ b/libraries/src/Updater/Adapter/TufAdapter.php
@@ -15,13 +15,15 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Http\HttpFactory;
-use Joomla\CMS\Table\Table;
 use Joomla\CMS\Table\Tuf as MetadataTable;
+use Joomla\CMS\Table\Update;
 use Joomla\CMS\TUF\TufFetcher;
 use Joomla\CMS\Updater\ConstraintChecker;
 use Joomla\CMS\Updater\UpdateAdapter;
 use Joomla\CMS\Updater\Updater;
+use Joomla\CMS\Version;
+use Joomla\Http\HttpFactory;
+use Joomla\Registry\Registry;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Tuf\Exception\MetadataException;
 
@@ -51,7 +53,7 @@ public function findUpdate($options)
 
         if ($targets) {
             foreach ($targets as $target) {
-                $updateTable                 = Table::getInstance('update');
+                $updateTable                 = new Update($this->db);
                 $updateTable->update_site_id = $options['update_site_id'];
 
                 $updateTable->bind($target);
@@ -80,7 +82,10 @@ public function getUpdateTargets($options)
         $metadataTable = new MetadataTable($this->db);
         $metadataTable->load(['update_site_id' => $options['update_site_id']]);
 
-        $tufFetcher = new TufFetcher($metadataTable, $options['location'], $this->db, (new HttpFactory())->getHttp(), Factory::getApplication());
+        $httpOptions = new Registry();
+        $httpOptions->set('userAgent', (new Version())->getUserAgent('Joomla', true, false));
+
+        $tufFetcher = new TufFetcher($metadataTable, $options['location'], $this->db, (new HttpFactory())->getHttp($httpOptions), Factory::getApplication());
         $metaData   = $tufFetcher->getValidUpdate();
 
         $metaData = json_decode((string) $metaData, true);
diff --git a/libraries/src/Updater/Update.php b/libraries/src/Updater/Update.php
index 151376ba51c71..38ab90715d8d8 100644
--- a/libraries/src/Updater/Update.php
+++ b/libraries/src/Updater/Update.php
@@ -11,7 +11,6 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filter\InputFilter;
-use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Object\LegacyErrorHandlingTrait;
@@ -20,6 +19,7 @@
 use Joomla\CMS\TUF\TufFetcher;
 use Joomla\CMS\Version;
 use Joomla\Database\DatabaseDriver;
+use Joomla\Http\HttpFactory;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -548,11 +548,14 @@ public function _characterData($parser, $data)
      */
     public function loadFromTuf(TufMetadata $metadataTable, string $url, $minimumStability = Updater::STABILITY_STABLE, $channel = null)
     {
+        $options = new Registry();
+        $options->set('userAgent', (new Version())->getUserAgent('Joomla', true, false));
+
         $tufFetcher = new TufFetcher(
             $metadataTable,
             $url,
             Factory::getContainer()->get(DatabaseDriver::class),
-            (new HttpFactory())->getHttp(),
+            (new HttpFactory())->getHttp($options),
             Factory::getApplication(),
         );
 
@@ -658,7 +661,7 @@ public function loadFromXml($url, $minimumStability = Updater::STABILITY_STABLE,
         $httpOption->set('userAgent', $version->getUserAgent('Joomla', true, false));
 
         try {
-            $http     = HttpFactory::getHttp($httpOption);
+            $http     = (new HttpFactory())->getHttp($httpOption);
             $response = $http->get($url);
         } catch (\RuntimeException) {
             $response = null;
diff --git a/libraries/src/Updater/UpdateAdapter.php b/libraries/src/Updater/UpdateAdapter.php
index b48542f72d465..6b061aa0ead09 100644
--- a/libraries/src/Updater/UpdateAdapter.php
+++ b/libraries/src/Updater/UpdateAdapter.php
@@ -9,15 +9,16 @@
 
 namespace Joomla\CMS\Updater;
 
-use Joomla\CMS\Adapter\AdapterInstance;
 use Joomla\CMS\Event\Installer\BeforeUpdateSiteDownloadEvent;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Version;
+use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
+use Joomla\Http\HttpFactory;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -29,8 +30,18 @@
  *
  * @since  1.7.0
  */
-abstract class UpdateAdapter extends AdapterInstance
+abstract class UpdateAdapter
 {
+    use LegacyPropertyManagementTrait;
+
+    /**
+     * Parent
+     *
+     * @var    Updater
+     * @since  1.6
+     */
+    protected $parent = null;
+
     /**
      * Resource handle for the XML Parser
      *
@@ -61,7 +72,7 @@ abstract class UpdateAdapter extends AdapterInstance
      * @var    array
      * @since  3.0.0
      */
-    protected $updatecols = ['NAME', 'ELEMENT', 'TYPE', 'FOLDER', 'CLIENT', 'VERSION', 'DESCRIPTION', 'INFOURL', 'CHANGELOGURL', 'EXTRA_QUERY'];
+    protected $updatecols = ['NAME', 'ELEMENT', 'TYPE', 'FOLDER', 'CLIENT', 'VERSION', 'DESCRIPTION', 'INFOURL', 'CHANGELOGURL', 'EXTRA_QUERY', 'SECURITY'];
 
     /**
      * Should we try appending a .xml extension to the update site's URL?
@@ -99,6 +110,37 @@ abstract class UpdateAdapter extends AdapterInstance
      */
     protected $minimum_stability = Updater::STABILITY_STABLE;
 
+    /**
+     * Database
+     *
+     * @var    DatabaseDriver
+     * @since  1.6
+     */
+    protected $db = null;
+
+    /**
+     * Constructor
+     *
+     * @param   Updater         $parent   Parent object
+     * @param   DatabaseDriver  $db       Database object
+     * @param   array           $options  Configuration Options
+     *
+     * @since   1.6
+     */
+    public function __construct(Updater $parent, DatabaseDriver $db, array $options = [])
+    {
+        $this->parent = $parent;
+
+        foreach ($options as $key => $value) {
+            if (property_exists($this, $key)) {
+                $this->$key = $value;
+            }
+        }
+
+        // Pull in the global dbo in case something happened to it.
+        $this->db = $db ?: Factory::getDbo();
+    }
+
     /**
      * Gets the reference to the current direct parent
      *
@@ -154,8 +196,8 @@ protected function toggleUpdateSite($updateSiteId, $enabled = true)
             return;
         }
 
-        $db    = $this->parent->getDbo();
-        $query = $db->getQuery(true)
+        $db    = $this->db;
+        $query = $db->createQuery()
             ->update($db->quoteName('#__update_sites'))
             ->set($db->quoteName('enabled') . ' = :enabled')
             ->where($db->quoteName('update_site_id') . ' = :id')
@@ -185,8 +227,8 @@ protected function getUpdateSiteName($updateSiteId)
             return '';
         }
 
-        $db    = $this->parent->getDbo();
-        $query = $db->getQuery(true)
+        $db    = $this->db;
+        $query = $db->createQuery()
             ->select($db->quoteName('name'))
             ->from($db->quoteName('#__update_sites'))
             ->where($db->quoteName('update_site_id') . ' = :id')
@@ -209,7 +251,7 @@ protected function getUpdateSiteName($updateSiteId)
      *
      * @param   array  $options  The update options, see findUpdate() in children classes
      *
-     * @return  \Joomla\CMS\Http\Response|bool  False if we can't connect to the site, HTTP Response object otherwise
+     * @return  \Joomla\Http\Response|bool  False if we can't connect to the site, HTTP Response object otherwise
      *
      * @throws  \Exception
      */
@@ -261,7 +303,7 @@ protected function getUpdateSiteResponse($options = [])
 
         // Http transport throws an exception when there's no response or an invalid HTTP status code returned.
         try {
-            $http     = HttpFactory::getHttp($httpOption);
+            $http     = (new HttpFactory())->getHttp($httpOption);
             $response = $http->get($newUrl, $headers, 20);
         } catch (\Throwable) {
             $response = null;
diff --git a/libraries/src/Updater/Updater.php b/libraries/src/Updater/Updater.php
index 2b6574b2ede48..19519127eefa7 100644
--- a/libraries/src/Updater/Updater.php
+++ b/libraries/src/Updater/Updater.php
@@ -9,9 +9,14 @@
 
 namespace Joomla\CMS\Updater;
 
-use Joomla\CMS\Adapter\Adapter;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Object\LegacyPropertyManagementTrait;
+use Joomla\CMS\Table\Extension;
+use Joomla\CMS\Table\Update as UpdateTable;
+use Joomla\Database\DatabaseAwareInterface;
+use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
+use Joomla\DI\ContainerAwareInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -22,8 +27,11 @@
  *
  * @since  1.7.0
  */
-class Updater extends Adapter
+class Updater implements DatabaseAwareInterface
 {
+    use DatabaseAwareTrait;
+    use LegacyPropertyManagementTrait;
+
     /**
      * Development snapshots, nightly builds, pre-release versions and so on
      *
@@ -72,6 +80,30 @@ class Updater extends Adapter
      */
     protected static $instance;
 
+    /**
+     * Array of installer adapters
+     *
+     * @var    string[]|UpdateAdapter[]
+     * @since  6.0.0
+     */
+    private $adapters = [];
+
+    /**
+     * Adapter Class Prefix
+     *
+     * @var    string
+     * @since  6.0.0
+     */
+    private $classprefix = '\\Joomla\\CMS\\Updater\\Adapter';
+
+    /**
+     * Base Path for the installer adapters
+     *
+     * @var    string
+     * @since  6.0.0
+     */
+    private $adapterfolder;
+
     /**
      * Constructor
      *
@@ -83,7 +115,9 @@ class Updater extends Adapter
      */
     public function __construct($basepath = __DIR__, $classprefix = '\\Joomla\\CMS\\Updater\\Adapter', $adapterfolder = 'Adapter')
     {
-        parent::__construct($basepath, $classprefix, $adapterfolder);
+        $this->adapterfolder = $basepath . '/' . $adapterfolder;
+        $this->classprefix   = $classprefix;
+        $this->loadAdapters();
     }
 
     /**
@@ -98,6 +132,7 @@ public static function getInstance()
     {
         if (!isset(self::$instance)) {
             self::$instance = new static();
+            self::$instance->setDatabase(Factory::getDbo());
         }
 
         return self::$instance;
@@ -153,8 +188,8 @@ public function findUpdates($eid = 0, $cacheTimeout = 0, $minimumStability = sel
             }
 
             // Make sure there is no update left over in the database.
-            $db    = $this->getDbo();
-            $query = $db->getQuery(true)
+            $db    = $this->getDatabase();
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__updates'))
                 ->where($db->quoteName('update_site_id') . ' = :id')
                 ->bind(':id', $result['update_site_id'], ParameterType::INTEGER);
@@ -222,8 +257,8 @@ public function getAvailableUpdates(int $eid, string $minimumStability = self::S
      */
     private function getUpdateSites($eid = 0)
     {
-        $db    = $this->getDbo();
-        $query = $db->getQuery(true);
+        $db    = $this->getDatabase();
+        $query = $db->createQuery();
 
         $query->select(
             [
@@ -278,19 +313,17 @@ private function getUpdateObjectsForSite($updateSite, $minimumStability = self::
     {
         $retVal = [];
 
-        $this->setAdapter($updateSite['type']);
-
-        if (!isset($this->_adapters[$updateSite['type']])) {
+        try {
+            // Get the update information from the remote update XML document
+            /** @var UpdateAdapter $adapter */
+            $adapter = $this->getAdapter($updateSite['type']);
+        } catch (\InvalidArgumentException $e) {
             // Ignore update sites requiring adapters we don't have installed
             return $retVal;
         }
 
         $updateSite['minimum_stability'] = $minimumStability;
-
-        // Get the update information from the remote update XML document
-        /** @var UpdateAdapter $adapter */
-        $adapter       = $this->_adapters[$updateSite['type']];
-        $update_result = $adapter->findUpdate($updateSite);
+        $update_result                   = $adapter->findUpdate($updateSite);
 
         // Version comparison operator.
         $operator = $includeCurrent ? 'ge' : 'gt';
@@ -323,11 +356,8 @@ private function getUpdateObjectsForSite($updateSite, $minimumStability = self::
                 foreach ($update_result['updates'] as $current_update) {
                     $current_update->extra_query = $updateSite['extra_query'];
 
-                    /** @var \Joomla\CMS\Table\Update $update */
-                    $update = Table::getInstance('update');
-
-                    /** @var \Joomla\CMS\Table\Extension $extension */
-                    $extension = Table::getInstance('extension');
+                    $update    = new UpdateTable($this->getDatabase());
+                    $extension = new Extension($this->getDatabase());
 
                     $uid = $update
                         ->find(
@@ -358,6 +388,7 @@ private function getUpdateObjectsForSite($updateSite, $minimumStability = self::
 
                             if (version_compare($current_update->version, $data['version'], $operator) == 1) {
                                 $current_update->extension_id = $eid;
+                                $current_update->security     = $this->findHighestSeverity($data['version'], $current_update, $update_result['security'] ?? []);
                                 $retVal[]                     = $current_update;
                             }
                         } else {
@@ -376,6 +407,17 @@ private function getUpdateObjectsForSite($updateSite, $minimumStability = self::
                         // If there is an update, check that the version is newer then replaces
                         if (version_compare($current_update->version, $update->version, $operator) == 1) {
                             $retVal[] = $current_update;
+                            if (!$eid) {
+                                continue;
+                            }
+
+                            $extension->load($eid);
+                            $data = json_decode($extension->manifest_cache ?? '', true);
+                            if (empty($data['version'])) {
+                                continue;
+                            }
+
+                            $current_update->security = $this->findHighestSeverity($data['version'], $current_update, $update_result['security'] ?? []);
                         }
                     }
                 }
@@ -385,6 +427,31 @@ private function getUpdateObjectsForSite($updateSite, $minimumStability = self::
         return $retVal;
     }
 
+    /**
+     * Searches for the highest severity in security updates since the installed version.
+     *
+     * @param   string       $installedVersion  The installed version
+     * @param   UpdateTable  $update            The latest compatible update
+     * @param   array        $securityUpdates   The found security updates
+     *
+     * @return  int|null
+     *
+     * @since   6.2.0
+     */
+    private function findHighestSeverity(string $installedVersion, UpdateTable $update, array $securityUpdates): ?int
+    {
+        $securityLevel = (int) $update->security;
+
+        /** @var \Joomla\CMS\Table\Update $securityUpdate */
+        foreach ($securityUpdates as $securityUpdate) {
+            if (version_compare($securityUpdate->version, $installedVersion, '>') && $securityLevel < (int) $securityUpdate->security) {
+                $securityLevel = (int) $securityUpdate->security;
+            }
+        }
+
+        return $securityLevel;
+    }
+
     /**
      * Returns the IDs of the update sites with cached updates
      *
@@ -397,15 +464,15 @@ private function getUpdateObjectsForSite($updateSite, $minimumStability = self::
      */
     private function getSitesWithUpdates($timestamp = 0)
     {
-        $db        = $this->getDbo();
+        $db        = $this->getDatabase();
         $timestamp = (int) $timestamp;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('update_site_id'))
             ->from($db->quoteName('#__updates'));
 
         if ($timestamp) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select($db->quoteName('update_site_id'))
                 ->from($db->quoteName('#__update_sites'))
                 ->where(
@@ -441,10 +508,10 @@ private function getSitesWithUpdates($timestamp = 0)
     private function updateLastCheckTimestamp($updateSiteId)
     {
         $timestamp    = time();
-        $db           = $this->getDbo();
+        $db           = $this->getDatabase();
         $updateSiteId = (int) $updateSiteId;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__update_sites'))
             ->set($db->quoteName('last_check_timestamp') . ' = :timestamp')
             ->where($db->quoteName('update_site_id') . ' = :id')
@@ -453,4 +520,148 @@ private function updateLastCheckTimestamp($updateSiteId)
         $db->setQuery($query);
         $db->execute();
     }
+
+    /**
+     * Discover all adapters in the adapterfolder path
+     *
+     * @return  void
+     *
+     * @since  6.0.0
+     */
+    protected function loadAdapters()
+    {
+        $files    = new \DirectoryIterator($this->adapterfolder);
+
+        // Process the core adapters
+        foreach ($files as $file) {
+            $fileName = $file->getFilename();
+
+            // Only load php files.
+            if (!$file->isFile() || $file->getExtension() !== 'php') {
+                continue;
+            }
+
+            // Derive the class name from the filename.
+            $name  = str_ireplace('.php', '', trim($fileName));
+            $name  = str_ireplace('adapter', '', trim($name));
+            $class = rtrim($this->classprefix, '\\') . '\\' . ucfirst($name) . 'Adapter';
+
+            if (!class_exists($class)) {
+                // Not namespaced
+                $class = $this->classprefix . ucfirst($name);
+            }
+
+            // Core adapters should autoload based on classname, keep this fallback just in case
+            if (!class_exists($class)) {
+                // Try to load the adapter object
+                \JLoader::register($class, $this->adapterfolder . '/' . $fileName);
+
+                if (!class_exists($class)) {
+                    // Skip to next one
+                    continue;
+                }
+            }
+
+            $this->adapters[strtolower($name)] = $class;
+        }
+    }
+
+    /**
+     * Gets a list of available update adapters.
+     *
+     * @param   array  $options  An array of options to inject into the adapter
+     * @param   array  $custom   Array of custom update adapters
+     *
+     * @return  string[]  An array of the class names of available install adapters.
+     *
+     * @since   3.4
+     */
+    public function getAdapters($options = [], array $custom = [])
+    {
+        if (\count($custom)) {
+            foreach ($custom as $adapter) {
+                // Setup the class name
+                // @todo - Can we abstract this to not depend on the Joomla class namespace without PHP namespaces?
+                $class = $this->classprefix . ucfirst(trim($adapter));
+
+                // If the class doesn't exist we have nothing left to do but look at the next type. We did our best.
+                if (!class_exists($class)) {
+                    continue;
+                }
+
+                $this->adapters[$adapter] = $class;
+            }
+        }
+
+        return array_keys($this->adapters);
+    }
+
+    /**
+     * Get an update adapter instance
+     *
+     * @param   string  $name     Adapter name
+     * @param   array   $options  Adapter options
+     *
+     * @return  UpdateAdapter
+     *
+     * @throws  \InvalidArgumentException
+     * @since   6.0.0
+     */
+    public function getAdapter($name, $options = [])
+    {
+        $name = strtolower($name);
+
+        if (!isset($this->adapters[$name])) {
+            throw new \InvalidArgumentException(\sprintf('The %s update adapter does not exist.', $name));
+        }
+
+        if (\is_string($this->adapters[$name])) {
+            $class = $this->adapters[$name];
+
+            // Ensure the adapter type is part of the options array
+            $options['type'] = $name;
+
+            // Check for a possible service from the container otherwise manually instantiate the class
+            if (Factory::getContainer()->has($class)) {
+                return Factory::getContainer()->get($class);
+            }
+
+            $adapter = new $class($this, $this->getDatabase(), $options);
+
+            if ($adapter instanceof ContainerAwareInterface) {
+                $adapter->setContainer(Factory::getContainer());
+            }
+
+            $this->adapters[$name] = $adapter;
+        }
+
+        return $this->adapters[$name];
+    }
+
+    /**
+     * Set an adapter by name
+     *
+     * @param   string                $name     Adapter name
+     * @param   UpdateAdapter|string  $adapter  Adapter object or class name
+     *
+     * @return  boolean  True if successful
+     *
+     * @since   6.0.0
+     */
+    public function setAdapter($name, $adapter)
+    {
+        if (\is_object($adapter)) {
+            $this->adapters[$name] = $adapter;
+
+            return true;
+        }
+
+        if (class_exists($adapter)) {
+            $this->adapters[$name] = $adapter;
+
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/libraries/src/User/CurrentUserTrait.php b/libraries/src/User/CurrentUserTrait.php
index bafe46e0a3e81..430a189de4351 100644
--- a/libraries/src/User/CurrentUserTrait.php
+++ b/libraries/src/User/CurrentUserTrait.php
@@ -32,7 +32,7 @@ trait CurrentUserTrait
 
     /**
      * Returns the current user, if none is set the identity of the global app
-     * is returned. This will change in 6.0 and an empty user will be returned.
+     * is returned. This will change in 7.0 and an empty user will be returned.
      *
      * @return  User
      *
@@ -42,7 +42,7 @@ protected function getCurrentUser(): User
     {
         if (!$this->currentUser) {
             @trigger_error(
-                \sprintf('User must be set in %s. This will not be caught anymore in 6.0', __METHOD__),
+                \sprintf('User must be set in %s. This will not be caught anymore in 7.0', __METHOD__),
                 E_USER_DEPRECATED
             );
             $this->currentUser = Factory::getApplication()->getIdentity() ?: Factory::getUser();
diff --git a/libraries/src/User/User.php b/libraries/src/User/User.php
index f7273e6334c4b..cef076750124b 100644
--- a/libraries/src/User/User.php
+++ b/libraries/src/User/User.php
@@ -10,6 +10,7 @@
 namespace Joomla\CMS\User;
 
 use Joomla\CMS\Access\Access;
+use Joomla\CMS\Application\ConsoleApplication;
 use Joomla\CMS\Event\User\AfterDeleteEvent;
 use Joomla\CMS\Event\User\AfterSaveEvent;
 use Joomla\CMS\Event\User\BeforeDeleteEvent;
@@ -291,7 +292,7 @@ public function __construct($identifier = 0)
      * @return  User  The User object.
      *
      * @since       1.7.0
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Load the user service from the dependency injection container or via $app->getIdentity()
      *              Example: Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($id)
      */
@@ -429,7 +430,7 @@ public function getAuthorisedCategories($component, $action)
         // @todo: Modify the way permissions are stored in the db to allow for faster implementation and better scaling
         $db = Factory::getDbo();
 
-        $subQuery = $db->getQuery(true)
+        $subQuery = $db->createQuery()
             ->select($db->quoteName(['id', 'asset_id']))
             ->from($db->quoteName('#__categories'))
             ->where(
@@ -439,7 +440,7 @@ public function getAuthorisedCategories($component, $action)
                 ]
             );
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['c.id', 'a.name']))
             ->from('(' . $subQuery . ') AS ' . $db->quoteName('c'))
             ->join('INNER', $db->quoteName('#__assets', 'a'), $db->quoteName('c.asset_id') . ' = ' . $db->quoteName('a.id'))
@@ -542,7 +543,7 @@ public function setLastVisit($timestamp = null)
      */
     public function getTimezone()
     {
-        $timezone = $this->getParam('timezone', Factory::getApplication()->get('offset', 'GMT'));
+        $timezone = $this->getParam('timezone', Factory::getApplication()->get('offset', 'UTC'));
 
         return new \DateTimeZone($timezone);
     }
@@ -582,18 +583,16 @@ public static function getTable($type = null, $prefix = '\\Joomla\\CMS\\Table\\'
 
         // Set the default tabletype;
         if (!isset($tabletype)) {
-            $tabletype['name']   = 'user';
-            $tabletype['prefix'] = '\\Joomla\\CMS\\Table\\';
+            $tabletype = \Joomla\CMS\Table\User::class;
         }
 
         // Set a custom table type is defined
         if (isset($type)) {
-            $tabletype['name']   = $type;
-            $tabletype['prefix'] = $prefix;
+            $tabletype = rtrim($prefix, '\\') . '\\' . $type;
         }
 
         // Create the user table object
-        return Table::getInstance($tabletype['name'], $tabletype['prefix']);
+        return new $tabletype(Factory::getDbo());
     }
 
     /**
@@ -747,15 +746,8 @@ public function save($updateOnly = false)
                 $iAmRehashingSuperadmin = true;
             }
 
-            // Check if we are using a CLI application
-            $isCli = false;
-
-            if (Factory::getApplication()->isCli()) {
-                $isCli = true;
-            }
-
             // We are only worried about edits to this account if I am not a Super Admin.
-            if (!$iAmSuperAdmin && !$iAmRehashingSuperadmin && !$isCli) {
+            if (!$iAmSuperAdmin && !$iAmRehashingSuperadmin && !Factory::getApplication() instanceof ConsoleApplication) {
                 // I am not a Super Admin, and this one is, so fail.
                 if (!$isNew && Access::check($this->id, 'core.admin')) {
                     throw new \RuntimeException('User not Super Administrator');
diff --git a/libraries/src/User/UserFactory.php b/libraries/src/User/UserFactory.php
index 5669d560f3e38..7f00469884d70 100644
--- a/libraries/src/User/UserFactory.php
+++ b/libraries/src/User/UserFactory.php
@@ -65,7 +65,7 @@ public function loadUserById(int $id): User
     public function loadUserByUsername(string $username): User
     {
         // Initialise some variables
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('id'))
             ->from($this->db->quoteName('#__users'))
             ->where($this->db->quoteName('username') . ' = :username')
diff --git a/libraries/src/User/UserHelper.php b/libraries/src/User/UserHelper.php
index c505dec007d5e..a7a7ed765c286 100644
--- a/libraries/src/User/UserHelper.php
+++ b/libraries/src/User/UserHelper.php
@@ -17,16 +17,17 @@
 use Joomla\CMS\Authentication\Password\CheckIfRehashNeededHandlerInterface;
 use Joomla\CMS\Authentication\Password\MD5Handler;
 use Joomla\CMS\Authentication\Password\PHPassHandler;
-use Joomla\CMS\Crypt\Crypt;
+use Joomla\CMS\Event\Model\PrepareDataEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Session\SessionManager;
 use Joomla\CMS\Uri\Uri;
+use Joomla\Crypt\Crypt;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -61,7 +62,7 @@ abstract class UserHelper
      * @var    integer
      * @since  4.0.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use UserHelper::HASH_ARGON2I instead
      */
     public const HASH_ARGON2I_BC = 2;
@@ -84,7 +85,7 @@ abstract class UserHelper
      * @var    integer
      * @since  4.0.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use UserHelper::HASH_ARGON2ID instead
      */
     public const HASH_ARGON2ID_BC = 3;
@@ -103,7 +104,7 @@ abstract class UserHelper
      * @var    integer
      * @since  4.0.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Use UserHelper::HASH_BCRYPT instead
      */
     public const HASH_BCRYPT_BC = 1;
@@ -114,7 +115,7 @@ abstract class UserHelper
      * @var    string
      * @since  4.0.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Support for MD5 hashed passwords will be removed use any of the other hashing methods
      */
     public const HASH_MD5 = 'md5';
@@ -125,7 +126,7 @@ abstract class UserHelper
      * @var    string
      * @since  4.0.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Support for PHPass hashed passwords will be removed use any of the other hashing methods
      */
     public const HASH_PHPASS = 'phpass';
@@ -171,7 +172,7 @@ public static function addUserToGroup($userId, $groupId)
         if (!\in_array($groupId, $user->groups)) {
             // Check whether the group exists.
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__usergroups'))
                 ->where($db->quoteName('id') . ' = :groupId')
@@ -197,7 +198,7 @@ public static function addUserToGroup($userId, $groupId)
         $temp         = User::getInstance($userId);
         $temp->groups = $user->groups;
 
-        if (Factory::getSession()->getId()) {
+        if (Factory::getApplication()->getSession()->getId()) {
             // Set the group data for the user object in the session.
             $temp = Factory::getUser();
 
@@ -287,7 +288,7 @@ public static function setUserGroups($userId, $groups)
 
         // Get the titles for the user groups.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'title']))
             ->from($db->quoteName('#__usergroups'))
             ->whereIn($db->quoteName('id'), $user->groups);
@@ -306,7 +307,7 @@ public static function setUserGroups($userId, $groups)
         $temp         = Factory::getUser((int) $userId);
         $temp->groups = $user->groups;
 
-        if (Factory::getSession()->getId()) {
+        if (Factory::getApplication()->getSession()->getId()) {
             // Set the group data for the user object in the session.
             $temp = Factory::getUser();
 
@@ -337,11 +338,17 @@ public static function getProfile($userId = 0)
         // Get the dispatcher and load the user's plugins.
         PluginHelper::importPlugin('user');
 
-        $data     = new CMSObject();
+        $data     = new \stdClass();
         $data->id = $userId;
 
         // Trigger the data preparation event.
-        Factory::getApplication()->triggerEvent('onContentPrepareData', ['com_users.profile', &$data]);
+        Factory::getContainer()->get(DispatcherInterface::class)->dispatch(
+            'onContentPrepareData',
+            new PrepareDataEvent('onContentPrepareData', [
+                'context' => 'com_users.profile',
+                'data'    => $data,
+            ])
+        );
 
         return $data;
     }
@@ -360,7 +367,7 @@ public static function activateUser($activation)
         $db       = Factory::getDbo();
 
         // Let's get the id of the user we want to activate
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('activation') . ' = :activation')
@@ -405,7 +412,7 @@ public static function getUserId($username)
     {
         // Initialise some variables
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :username')
@@ -593,8 +600,10 @@ public static function checkSuperUserInUsers(array $userIds)
      */
     public static function destroyUserSessions($userId, $keepCurrent = false, $clientId = null)
     {
+        $app = Factory::getApplication();
+
         // Destroy all sessions for the user account if able
-        if (!Factory::getApplication()->get('session_metadata', true)) {
+        if (!$app->get('session_metadata', true)) {
             return false;
         }
 
@@ -603,7 +612,7 @@ public static function destroyUserSessions($userId, $keepCurrent = false, $clien
         try {
             $userId = (int) $userId;
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('session_id'))
                 ->from($db->quoteName('#__session'))
                 ->where($db->quoteName('userid') . ' = :userid')
@@ -630,7 +639,7 @@ public static function destroyUserSessions($userId, $keepCurrent = false, $clien
 
         // If true, removes the current session id from the purge list
         if ($keepCurrent) {
-            $sessionIds = array_diff($sessionIds, [Factory::getSession()->getId()]);
+            $sessionIds = array_diff($sessionIds, [$app->getSession()->getId()]);
         }
 
         // If there aren't any active sessions then there's nothing to do here
@@ -644,7 +653,7 @@ public static function destroyUserSessions($userId, $keepCurrent = false, $clien
 
         try {
             $db->setQuery(
-                $db->getQuery(true)
+                $db->createQuery()
                     ->delete($db->quoteName('#__session'))
                     ->whereIn($db->quoteName('session_id'), $sessionIds, ParameterType::LARGE_OBJECT)
             )->execute();
diff --git a/libraries/src/Utility/BufferStreamHandler.php b/libraries/src/Utility/BufferStreamHandler.php
index d0c290c349c85..0bd543be24036 100644
--- a/libraries/src/Utility/BufferStreamHandler.php
+++ b/libraries/src/Utility/BufferStreamHandler.php
@@ -6,7 +6,6 @@
  * @copyright  (C) 2007 Open Source Matters, Inc. <https://www.joomla.org>
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  *
- * Remove phpcs exception with deprecated autoloading BufferStreamHandler::stream_register();
  * @phpcs:disable PSR1.Files.SideEffects
  */
 
@@ -14,13 +13,6 @@
 
 \defined('_JEXEC') or die;
 
-/**
- * @deprecated  3.8 will be removed in 5.0
- *              Workaround for B/C. (removal missed in 4.0, also remove phpcs exception).
- *              If BufferStreamHandler is needed directly call BufferStreamHandler::stream_register();
- */
-BufferStreamHandler::stream_register();
-
 /**
  * Generic Buffer stream handler
  *
@@ -73,7 +65,7 @@ class BufferStreamHandler
     public static function stream_register()
     {
         if (!self::$registered) {
-            stream_wrapper_register('buffer', '\\Joomla\\CMS\\Utility\\BufferStreamHandler');
+            stream_wrapper_register('buffer', BufferStreamHandler::class);
 
             self::$registered = true;
         }
diff --git a/libraries/src/Version.php b/libraries/src/Version.php
index e6b85680897fe..8f4082815e7bd 100644
--- a/libraries/src/Version.php
+++ b/libraries/src/Version.php
@@ -39,7 +39,7 @@ final class Version
      * @var    integer
      * @since  3.8.0
      */
-    public const MAJOR_VERSION = 5;
+    public const MAJOR_VERSION = 6;
 
     /**
      * Minor release version.
@@ -47,7 +47,7 @@ final class Version
      * @var    integer
      * @since  3.8.0
      */
-    public const MINOR_VERSION = 4;
+    public const MINOR_VERSION = 2;
 
     /**
      * Patch release version.
@@ -55,7 +55,7 @@ final class Version
      * @var    integer
      * @since  3.8.0
      */
-    public const PATCH_VERSION = 8;
+    public const PATCH_VERSION = 0;
 
     /**
      * Extra release version info.
@@ -66,7 +66,7 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'rc3-dev';
+    public const EXTRA_VERSION = 'beta2-dev';
 
     /**
      * Development status.
@@ -82,7 +82,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const CODENAME = 'Kutegemea';
+    public const CODENAME = 'Mwezi';
 
     /**
      * Release date.
@@ -90,7 +90,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '15-August-2026';
+    public const RELDATE = '18-August-2026';
 
     /**
      * Release time.
@@ -98,7 +98,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '16:31';
+    public const RELTIME = '18:01';
 
     /**
      * Release timezone.
@@ -106,7 +106,7 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELTZ = 'GMT';
+    public const RELTZ = 'UTC';
 
     /**
      * Copyright Notice.
diff --git a/libraries/src/Versioning/VersionableControllerTrait.php b/libraries/src/Versioning/VersionableControllerTrait.php
index 8e9d8a1e7eeaf..1acf83d697116 100644
--- a/libraries/src/Versioning/VersionableControllerTrait.php
+++ b/libraries/src/Versioning/VersionableControllerTrait.php
@@ -36,9 +36,9 @@ public function loadhistory()
         $table     = $model->getTable();
         $historyId = $this->input->getInt('version_id', null);
 
-        if (!$model->loadhistory($historyId, $table)) {
-            $this->setMessage($model->getError(), 'error');
+        $id = $model->getItemIdFromHistory($historyId);
 
+        if (false === $id) {
             $this->setRedirect(
                 Route::_(
                     'index.php?option=' . $this->option . '&view=' . $this->view_list
@@ -51,17 +51,13 @@ public function loadhistory()
         }
 
         // Determine the name of the primary key for the data.
-        if (empty($key)) {
-            $key = $table->getKeyName();
-        }
-
-        $recordId = $table->$key;
+        $key = $table->getKeyName();
 
         // To avoid data collisions the urlVar may be different from the primary key.
         $urlVar = empty($this->urlVar) ? $key : $this->urlVar;
 
         // Access check.
-        if (!$this->allowEdit([$key => $recordId], $key)) {
+        if (!$this->allowEdit([$key => $id], $key)) {
             $this->setMessage(Text::_('JLIB_APPLICATION_ERROR_EDIT_NOT_PERMITTED'), 'error');
 
             $this->setRedirect(
@@ -79,13 +75,21 @@ public function loadhistory()
         $this->setRedirect(
             Route::_(
                 'index.php?option=' . $this->option . '&view=' . $this->view_item
-                . $this->getRedirectToItemAppend($recordId, $urlVar),
+                . $this->getRedirectToItemAppend($id, $urlVar),
                 false
             )
         );
 
-        if (!$table->check() || !$table->store()) {
-            $this->setMessage($table->getError(), 'error');
+        if (!$model->loadhistory($historyId, $table)) {
+            $this->setMessage($model->getError(), 'error');
+
+            $this->setRedirect(
+                Route::_(
+                    'index.php?option=' . $this->option . '&view=' . $this->view_list
+                    . $this->getRedirectToListAppend(),
+                    false
+                )
+            );
 
             return false;
         }
diff --git a/libraries/src/Versioning/VersionableModelInterface.php b/libraries/src/Versioning/VersionableModelInterface.php
new file mode 100644
index 0000000000000..9d13f6bf765c9
--- /dev/null
+++ b/libraries/src/Versioning/VersionableModelInterface.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\CMS\Versioning;
+
+// phpcs:disable PSR1.Files.SideEffects
+
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Interface for a versionable model.
+ *
+ * @since  6.0.0
+ */
+interface VersionableModelInterface
+{
+    /**
+     * Method to load a row for editing from the version history table.
+     *
+     * @param   integer  $historyId  Key to the version history table.
+     *
+     * @return  boolean  False on failure or error, true otherwise.
+     *
+     * @since   6.0.0
+     */
+    public function loadHistory(int $historyId);
+
+    /**
+     * Method to save the history.
+     *
+     * @param   array   $data     The form data.
+     * @param   string  $context  The model context.
+     *
+     * @return  boolean  True on success, False on error.
+     *
+     * @since   6.0.0
+     */
+    public function saveHistory(array $data, string $context);
+
+    /**
+     * Method to delete the history for an item.
+     *
+     * @param   string   $typeAlias  Typealias of the content type
+     * @param   integer  $id         ID of the content item to delete
+     *
+     * @return  boolean  true on success, otherwise false.
+     *
+     * @since   6.0.0
+     */
+    public function deleteHistory($typeAlias, $id);
+}
diff --git a/libraries/src/Versioning/VersionableModelTrait.php b/libraries/src/Versioning/VersionableModelTrait.php
index 7d15df8364120..4e745fc28c709 100644
--- a/libraries/src/Versioning/VersionableModelTrait.php
+++ b/libraries/src/Versioning/VersionableModelTrait.php
@@ -9,9 +9,15 @@
 
 namespace Joomla\CMS\Versioning;
 
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Date\Date;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Event\AbstractEvent;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\CMS\Table\ContentHistory;
+use Joomla\CMS\Table\ContentType;
+use Joomla\CMS\Workflow\WorkflowServiceInterface;
+use Joomla\Database\ParameterType;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -26,60 +32,129 @@
 trait VersionableModelTrait
 {
     /**
-     * Method to load a row for editing from the version history table.
+     * Fields to be ignored when calculating the hash.
      *
-     * @param   integer  $versionId  Key to the version history table.
-     * @param   Table    $table      Content table object being loaded.
+     * @var    array
+     * @since  6.0.0
+     */
+    protected $ignoreChanges = [
+        'modified_by',
+        'modified_user_id',
+        'modified',
+        'modified_time',
+        'checked_out',
+        'checked_out_time',
+        'tagsHelper',
+        'version',
+        'articletext',
+        'rules',
+        'hits',
+        'path',
+        'newTags',
+    ];
+
+    /**
+     * Fields to be converted to int when calculating the hash.
      *
-     * @return  boolean  False on failure or error, true otherwise.
+     * @var    array
+     * @since  6.0.0
+     */
+    protected $convertToInt = ['publish_up', 'publish_down', 'ordering', 'featured'];
+
+    /**
+     * Method to get the item id from the version history table.
+     *
+     * @param   integer  $historyId  Key to the version history table.
      *
-     * @since   4.0.0
+     * @return  integer  False on failure or error, id otherwise.
+     *
+     * @since   6.0.0
      */
-    public function loadHistory($versionId, Table $table)
+    public function getItemIdFromHistory($historyId)
     {
-        // Only attempt to check the row in if it exists, otherwise do an early exit.
-        if (!$versionId) {
+        $rowArray = $this->getHistoryData($historyId);
+
+        if (false === $rowArray) {
             return false;
         }
 
-        // Get an instance of the row to checkout.
-        $historyTable = Table::getInstance('ContentHistory');
+        $table = $this->getTable();
+        $key   = $table->getKeyName();
 
-        if (!$historyTable->load($versionId)) {
-            $this->setError($historyTable->getError());
+        if (isset($rowArray[$key])) {
+            return $rowArray[$key];
+        }
+
+        return false;
+    }
+
+    /**
+     * Method to get the version data from the version history table.
+     *
+     * @param   integer  $historyId  Key to the version history table.
+     *
+     * @return  mixed    False on failure or error, data otherwise.
+     *
+     * @since   6.0.0
+     */
+    protected function getHistoryData($historyId)
+    {
+        // Get an instance of the row to checkout.
+        $historyTable = new ContentHistory($this->getDatabase());
 
+        if (!$historyTable->load($historyId)) {
             return false;
         }
 
-        $typeAlias = explode('.', $historyTable->item_id);
-        array_pop($typeAlias);
-
         $rowArray = ArrayHelper::fromObject(json_decode($historyTable->version_data));
 
-        $key = $table->getKeyName();
+        return $rowArray;
+    }
 
-        if (implode('.', $typeAlias) != $this->typeAlias) {
-            $this->setError(Text::_('JLIB_APPLICATION_ERROR_HISTORY_ID_MISMATCH'));
+    /**
+     * Method to get a version history table.
+     *
+     * @param   integer  $historyId  Key to the version history table.
+     *
+     * @return  mixed    False on failure or error, table otherwise.
+     *
+     * @since   6.0.0
+     */
+    protected function getHistoryTable($historyId)
+    {
+        if (empty($historyId)) {
+            return false;
+        }
 
-            if (isset($rowArray[$key])) {
-                $table->checkIn($rowArray[$key]);
-            }
+        // Get an instance of the row to checkout.
+        $historyTable = new ContentHistory($this->getDatabase());
 
+        if (!$historyTable->load($historyId)) {
             return false;
         }
 
-        $this->setState('save_date', $historyTable->save_date);
-        $this->setState('version_note', $historyTable->version_note);
+        return $historyTable;
+    }
 
-        /**
-         * Load data from current version before replacing it with data from history to avoid error
-         * if there are some required keys missing in the history data
-         */
+    /**
+     * Method to load a row for editing from the version history table.
+     *
+     * @param   integer  $historyId  Key to the version history table.
+     *
+     * @return  boolean  False on failure or error, true otherwise.
+     *
+     * @since   6.0.0
+     */
+    public function loadHistory(int $historyId)
+    {
+        $rowArray = $this->getHistoryData($historyId);
 
-        if (isset($rowArray[$key])) {
-            $table->load($rowArray[$key]);
+        if (false === $rowArray) {
+            return false;
         }
 
+        $table = $this->getTable();
+
         // We set checked_out to the current user
         if ($table->hasField('checked_out')) {
             $rowArray[$table->getColumnAlias('checked_out')] = $this->getCurrentUser()->id;
@@ -94,6 +169,325 @@ public function loadHistory($versionId, Table $table)
             $rowArray['ordering'] = 0;
         }
 
-        return $table->bind($rowArray);
+        // Fix null note when restoring history
+        if (\array_key_exists('note', $rowArray) && $rowArray['note'] === null) {
+            $rowArray['note'] = '';
+        }
+
+        $historyTable = $this->getHistoryTable($historyId);
+
+        $this->setState('save_date', $historyTable->save_date);
+        $this->setState('version_note', $historyTable->version_note);
+
+        /**
+         * The version history is created prior to Joomla 6.0, so we can only restore item data, not a full
+         * restore like we can do with Joomla 6.0+ version history.
+         */
+        if ($historyTable->is_legacy) {
+            $key = $table->getKeyName();
+
+            /**
+             * Load data from current version before replacing it with data from history to avoid error
+             * if there are some required keys missing in the history data
+             */
+            if (isset($rowArray[$key])) {
+                $table->load($rowArray[$key]);
+            }
+
+            $table->bind($rowArray);
+
+            if (!$table->check() || !$table->store()) {
+                $ret = false;
+            } else {
+                $ret = true;
+            }
+        } else {
+            $ret = $this->save($rowArray);
+        }
+
+        // Mark the restored version as current
+        if ($ret) {
+            $this->markVersionAsCurrent($historyTable->version_id, $historyTable->item_id);
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Utility method to get the hash after removing selected values. This lets us detect changes other than
+     * modified date (which will change on every save).
+     *
+     * @param   mixed        $data   Either an object or an array
+     *
+     * @return  string  SHA1 hash on success. Empty string on failure.
+     *
+     * @since   6.0.0
+     */
+    public function getSha1($data)
+    {
+        $object = \is_object($data) ? $data : ArrayHelper::toObject($data);
+
+        foreach ($this->ignoreChanges as $remove) {
+            if (property_exists($object, $remove)) {
+                unset($object->$remove);
+            }
+        }
+
+        // Convert integers, booleans, and nulls to strings to get a consistent hash value
+        foreach ($object as $name => $value) {
+            if (\is_object($value)) {
+                // Go one level down for JSON column values
+                foreach ($value as $subName => $subValue) {
+                    $object->$subName = \is_int($subValue) || \is_bool($subValue) || $subValue === null ? (string) $subValue : $subValue;
+                }
+            } else {
+                $object->$name = \is_int($value) || \is_bool($value) || $value === null ? (string) $value : $value;
+            }
+        }
+
+        // Work around empty values
+        foreach ($this->convertToInt as $convert) {
+            if (isset($object->$convert)) {
+                $object->$convert = (int) $object->$convert;
+            }
+        }
+
+        if (isset($object->review_time)) {
+            $object->review_time = (int) $object->review_time;
+        }
+
+        return sha1(json_encode($object));
+    }
+
+    /**
+     * Setter for the value
+     *
+     * @param   array  $ignoreChanges
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    public function setIgnoreChanges(array $ignoreChanges): void
+    {
+        $this->ignoreChanges = $ignoreChanges;
+    }
+
+    /**
+     * Setter for the value
+     *
+     * @param   array  $convertToInt
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    public function setConvertToInt(array $convertToInt): void
+    {
+        $this->convertToInt = $convertToInt;
+    }
+
+    /**
+     * Method to save the history.
+     *
+     * @param   array   $data     The form data.
+     * @param   string  $context  The model context.
+     *
+     * @return  boolean  True on success, False on error.
+     *
+     * @since   6.0.0
+     */
+    public function saveHistory(array $data, string $context)
+    {
+        if (!$this->versionHistoryEnabled($context)) {
+            return false;
+        }
+
+        $id = $this->getState($this->getName() . '.id');
+
+        /**
+         * Merge item data and form data so that we write all data to the history. We have to rel
+         * from database to have default data populated for fields which are not passed in $data array,
+         * avoid error such as Column 'created_by_alias' cannot be null" when restore from version history
+         */
+        $table = $this->getTable();
+        $table->load($id);
+        $itemData = ArrayHelper::fromObject($table);
+        $data     = array_merge($data, $itemData);
+
+        $versionNote = '';
+
+        if (\array_key_exists('version_note', $data)) {
+            $versionNote = $data['version_note'];
+            unset($data['version_note']);
+        }
+
+        foreach ($this->ignoreChanges as $ignore) {
+            if (\array_key_exists($ignore, $data)) {
+                unset($data[$ignore]);
+            }
+        }
+
+        return $this->storeHistory($context, $id, ArrayHelper::toObject($data), $versionNote);
+    }
+
+    /**
+     * Method to delete the history for an item.
+     *
+     * @param   string   $typeAlias  Typealias of the component
+     * @param   integer  $id         ID of the content item to delete
+     *
+     * @return  boolean  true on success, otherwise false.
+     *
+     * @since   6.0.0
+     */
+    public function deleteHistory($typeAlias, $id)
+    {
+        $db     = $this->getDatabase();
+        $itemid = $typeAlias . '.' . $id;
+        $query  = $db->createQuery();
+        $query->delete($db->quoteName('#__history'))
+            ->where($db->quoteName('item_id') . ' = :item_id')
+            ->bind(':item_id', $itemid, ParameterType::STRING);
+        $db->setQuery($query);
+
+        return $db->execute();
+    }
+
+    /**
+     * Method to save a version snapshot to the content history table.
+     *
+     * @param   string   $typeAlias  Typealias of the content type
+     * @param   integer  $id         ID of the content item
+     * @param   mixed    $data       Array or object of data that can be
+     *                               en- and decoded into JSON
+     * @param   string   $note       Note for the version to store
+     *
+     * @return  boolean  True on success, otherwise false.
+     *
+     * @since   6.0.0
+     * @throws \Exception
+     */
+    protected function storeHistory(string $typeAlias, int $id, mixed $data, string $note = '')
+    {
+        $typeTable = new ContentType($this->getDatabase());
+        $typeTable->load(['type_alias' => $typeAlias]);
+
+        $historyTable          = new ContentHistory($this->getDatabase());
+        $historyTable->item_id = $typeAlias . '.' . $id;
+
+        [$extension, $type] =  explode('.', $typeAlias);
+
+        // We should allow workflow items interact with the versioning
+        $component = Factory::getApplication()->bootComponent($extension);
+
+        if ($component instanceof WorkflowServiceInterface && $component->isWorkflowActive($typeAlias)) {
+            PluginHelper::importPlugin('workflow');
+
+            // Pre-processing by observers
+            $event = AbstractEvent::create(
+                'onContentVersioningPrepareTable',
+                [
+                    'subject'   => $historyTable,
+                    'extension' => $typeAlias,
+                ]
+            );
+
+            $this->getDispatcher()->dispatch('onContentVersioningPrepareTable', $event);
+        }
+
+        // Fix for null ordering - set to 0 if null
+        if (\is_object($data)) {
+            if (property_exists($data, 'ordering') && $data->ordering === null) {
+                $data->ordering = 0;
+            }
+        } elseif (\is_array($data)) {
+            if (\array_key_exists('ordering', $data) && $data['ordering'] === null) {
+                $data['ordering'] = 0;
+            }
+        }
+
+        $historyTable->version_data = json_encode($data);
+        $historyTable->version_note = $note;
+
+        // Don't save if hash already exists and same version note
+        $historyTable->sha1_hash = $this->getSha1($data);
+
+        $historyRow = $historyTable->getHashMatch();
+
+        if ($historyRow) {
+            if (!$note || ($historyRow->version_note === $note)) {
+                return true;
+            }
+
+            // Update existing row to set version note
+            $historyTable->version_id = $historyRow->version_id;
+        }
+
+        $result = $historyTable->store();
+
+        // Load history_limit config from extension.
+        $context = $type ?? '';
+
+        $maxVersionsContext = ComponentHelper::getParams($extension)->get('history_limit_' . $context, 0);
+        $maxVersions        = ComponentHelper::getParams($extension)->get('history_limit', 0);
+
+        if ($maxVersionsContext) {
+            $historyTable->deleteOldVersions($maxVersionsContext);
+        } elseif ($maxVersions) {
+            $historyTable->deleteOldVersions($maxVersions);
+        }
+
+        // Mark this version as current
+        $this->markVersionAsCurrent($historyTable->version_id, $historyTable->item_id);
+
+        return $result;
+    }
+
+    /**
+     * Method to mark a version as current. When a version is marked as current, all other versions of same
+     * content item will be marked as not current.
+     *
+     * @param   integer  $versionId  The version id to mark as current
+     * @param   string   $itemId     The item id of the content item
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    protected function markVersionAsCurrent(int $versionId, string $itemId): void
+    {
+        $db    = $this->getDatabase();
+        $query = $db->createQuery()
+            ->update($db->quoteName('#__history'))
+            ->set($db->quoteName('is_current') . ' = 0')
+            ->where($db->quoteName('item_id') . ' = :item_id')
+            ->bind(':item_id', $itemId, ParameterType::STRING);
+        $db->setQuery($query);
+        $db->execute();
+
+        $query->clear()
+            ->update($db->quoteName('#__history'))
+            ->set($db->quoteName('is_current') . ' = 1')
+            ->where($db->quoteName('version_id') . ' = :version_id')
+            ->bind(':version_id', $versionId, ParameterType::INTEGER);
+        $db->setQuery($query);
+        $db->execute();
+    }
+
+    /**
+     * Method to check if version history is enabled for a specific context.
+     *
+     * @param   string  $context  The model context.
+     *
+     * @return  boolean  True if version history is enabled, false otherwise.
+     *
+     * @since   6.0.0
+     */
+    protected function versionHistoryEnabled(string $context): bool
+    {
+        [$extension, $type] = explode('.', $context);
+
+        return (bool) ComponentHelper::getParams($extension)->get('save_history', 0);
     }
 }
diff --git a/libraries/src/Versioning/Versioning.php b/libraries/src/Versioning/Versioning.php
index 09af725e628a0..aa971665383a5 100644
--- a/libraries/src/Versioning/Versioning.php
+++ b/libraries/src/Versioning/Versioning.php
@@ -13,7 +13,8 @@
 use Joomla\CMS\Event\AbstractEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\ContentHistory;
+use Joomla\CMS\Table\ContentType;
 use Joomla\CMS\Workflow\WorkflowServiceInterface;
 use Joomla\Database\ParameterType;
 
@@ -25,6 +26,9 @@
  * Handle the versioning of content items
  *
  * @since  4.0.0
+ *
+ * @deprecated  6.0.0  will be removed in 8.0 without direct replacement,
+ *              use the new versioning concept (LINK TO DOCUMENTATION)
  */
 class Versioning
 {
@@ -42,7 +46,7 @@ public static function get($typeAlias, $id)
     {
         $db     = Factory::getDbo();
         $itemid = $typeAlias . '.' . $id;
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $query->select($db->quoteName('h.version_note') . ',' . $db->quoteName('h.save_date') . ',' . $db->quoteName('u.name'))
             ->from($db->quoteName('#__history', 'h'))
             ->leftJoin($db->quoteName('#__users', 'u'), $db->quoteName('u.id') . ' = ' . $db->quoteName('h.editor_user_id'))
@@ -68,7 +72,7 @@ public static function delete($typeAlias, $id)
     {
         $db     = Factory::getDbo();
         $itemid = $typeAlias . '.' . $id;
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $query->delete($db->quoteName('#__history'))
             ->where($db->quoteName('item_id') . ' = :item_id')
             ->bind(':item_id', $itemid, ParameterType::STRING);
@@ -92,10 +96,10 @@ public static function delete($typeAlias, $id)
      */
     public static function store($typeAlias, $id, $data, $note = '')
     {
-        $typeTable = Table::getInstance('ContentType', '\\Joomla\\CMS\\Table\\');
+        $typeTable = new ContentType(Factory::getDbo());
         $typeTable->load(['type_alias' => $typeAlias]);
 
-        $historyTable          = Table::getInstance('ContentHistory', '\\Joomla\\CMS\\Table\\');
+        $historyTable          = new ContentHistory(Factory::getDbo());
         $historyTable->item_id = $typeAlias . '.' . $id;
 
         $aliasParts = explode('.', $typeAlias);
@@ -134,6 +138,8 @@ public static function store($typeAlias, $id, $data, $note = '')
             }
         }
 
+        // Mark this as a legacy version so that it will be restored using legacy way
+        $historyTable->is_legacy    = 1;
         $historyTable->version_data = json_encode($data);
         $historyTable->version_note = $note;
 
diff --git a/libraries/src/WebAuthn/Server.php b/libraries/src/WebAuthn/Server.php
index 195faa4be33d2..0b501d70aa367 100644
--- a/libraries/src/WebAuthn/Server.php
+++ b/libraries/src/WebAuthn/Server.php
@@ -18,6 +18,7 @@
 use Cose\Algorithm\Signature\ECDSA;
 use Cose\Algorithm\Signature\EdDSA;
 use Cose\Algorithm\Signature\RSA;
+use Lcobucci\Clock\SystemClock;
 use ParagonIE\ConstantTime\Base64;
 use ParagonIE\ConstantTime\Base64UrlSafe;
 use Psr\Http\Message\ServerRequestInterface;
@@ -47,7 +48,6 @@
 use Webauthn\PublicKeyCredentialSource;
 use Webauthn\PublicKeyCredentialSourceRepository;
 use Webauthn\PublicKeyCredentialUserEntity;
-use Webauthn\TokenBinding\IgnoreTokenBindingHandler;
 use Webauthn\TokenBinding\TokenBindingHandler;
 
 /**
@@ -101,11 +101,11 @@ final class Server
     /**
      * Token binding handler
      *
-     * @var TokenBindingHandler
+     * @var ?TokenBindingHandler
      * @since 5.0.0
-     * @deprecated 6.0 Will be removed when we upgrade to WebAuthn library 5.0 or later
+     * @deprecated 6.0 Will be removed when we upgrade to WebAuthn library 7.0 or later
      */
-    private TokenBindingHandler $tokenBindingHandler;
+    private ?TokenBindingHandler $tokenBindingHandler;
 
     /**
      * Authentication extension output checker
@@ -140,7 +140,7 @@ final class Server
      *
      * @since 5.0.0
      */
-    public function __construct(PublicKeyCredentialRpEntity $relayingParty, PublicKeyCredentialSourceRepository $publicKeyCredentialSourceRepository, ?MetadataStatementRepository $metadataStatementRepository)
+    public function __construct(PublicKeyCredentialRpEntity $relayingParty, PublicKeyCredentialSourceRepository $publicKeyCredentialSourceRepository, ?MetadataStatementRepository $metadataStatementRepository = null)
     {
         $this->rpEntity = $relayingParty;
 
@@ -160,7 +160,6 @@ public function __construct(PublicKeyCredentialRpEntity $relayingParty, PublicKe
 
         $this->selectedAlgorithms                  = ['RS256', 'RS512', 'PS256', 'PS512', 'ES256', 'ES512', 'Ed25519'];
         $this->publicKeyCredentialSourceRepository = $publicKeyCredentialSourceRepository;
-        $this->tokenBindingHandler                 = new IgnoreTokenBindingHandler();
         $this->extensionOutputCheckerHandler       = new ExtensionOutputCheckerHandler();
         $this->metadataStatementRepository         = $metadataStatementRepository;
     }
@@ -281,7 +280,7 @@ public function generatePublicKeyCredentialRequestOptions(?string $userVerificat
      *
      * @param string $data The data received from the browser
      * @param PublicKeyCredentialCreationOptions $publicKeyCredentialCreationOptions The PK creation options used to request attestation.
-     * @param ServerRequestInterface $serverRequest Abstraction of the request data
+     * @param ServerRequestInterface|string $serverRequest Abstraction of the request data
      *
      * @return PublicKeyCredentialSource
      * @since 5.0.0
@@ -289,7 +288,7 @@ public function generatePublicKeyCredentialRequestOptions(?string $userVerificat
      * @throws \JsonException
      * @throws \Throwable
      */
-    public function loadAndCheckAttestationResponse(string $data, PublicKeyCredentialCreationOptions $publicKeyCredentialCreationOptions, ServerRequestInterface $serverRequest): PublicKeyCredentialSource
+    public function loadAndCheckAttestationResponse(string $data, PublicKeyCredentialCreationOptions $publicKeyCredentialCreationOptions, ServerRequestInterface|string $serverRequest): PublicKeyCredentialSource
     {
         // Remove padding from the response data
         $temp                              = json_decode($data);
@@ -312,7 +311,7 @@ public function loadAndCheckAttestationResponse(string $data, PublicKeyCredentia
         $authenticatorAttestationResponseValidator = new AuthenticatorAttestationResponseValidator(
             $attestationStatementSupportManager,
             $this->publicKeyCredentialSourceRepository,
-            $this->tokenBindingHandler,
+            null,
             $this->extensionOutputCheckerHandler
         );
 
@@ -327,7 +326,6 @@ public function loadAndCheckAttestationResponse(string $data, PublicKeyCredentia
         if (!empty($this->metadataStatementRepository)) {
             $refObj  = new \ReflectionObject($authenticatorAttestationResponseValidator);
             $refProp = $refObj->getProperty('metadataStatementRepository');
-            $refProp->setAccessible(true);
             $refProp->setValue($authenticatorAttestationResponseValidator, $this->metadataStatementRepository);
         }
 
@@ -341,7 +339,7 @@ public function loadAndCheckAttestationResponse(string $data, PublicKeyCredentia
      * @param string $data The data received from the browser
      * @param PublicKeyCredentialRequestOptions $publicKeyCredentialRequestOptions THE PK request options used during authentication
      * @param PublicKeyCredentialUserEntity|null $userEntity The user we are checking against
-     * @param ServerRequestInterface $serverRequest Abstraction of the request data
+     * @param ServerRequestInterface|string $serverRequest Abstraction of the request data
      *
      * @return PublicKeyCredentialSource
      * @since 5.0.0
@@ -349,7 +347,7 @@ public function loadAndCheckAttestationResponse(string $data, PublicKeyCredentia
      * @throws \JsonException
      * @throws \Throwable
      */
-    public function loadAndCheckAssertionResponse(string $data, PublicKeyCredentialRequestOptions $publicKeyCredentialRequestOptions, ?PublicKeyCredentialUserEntity $userEntity, ServerRequestInterface $serverRequest): PublicKeyCredentialSource
+    public function loadAndCheckAssertionResponse(string $data, PublicKeyCredentialRequestOptions $publicKeyCredentialRequestOptions, ?PublicKeyCredentialUserEntity $userEntity, ServerRequestInterface|string $serverRequest): PublicKeyCredentialSource
     {
         /**
          * The library expects $data to be a JSON-encoded array with a 'response' key which is an array of Base64Url-
@@ -418,7 +416,7 @@ private function getAttestationStatementSupportManager(): AttestationStatementSu
         $attestationStatementSupportManager->add(new FidoU2FAttestationStatementSupport());
         $attestationStatementSupportManager->add(new AppleAttestationStatementSupport());
         $attestationStatementSupportManager->add(new AndroidKeyAttestationStatementSupport());
-        $attestationStatementSupportManager->add(new TPMAttestationStatementSupport());
+        $attestationStatementSupportManager->add(new TPMAttestationStatementSupport(new SystemClock(new \DateTimeZone('UTC'))));
         $attestationStatementSupportManager->add(new PackedAttestationStatementSupport($coseAlgorithmManager));
 
         return $attestationStatementSupportManager;
diff --git a/libraries/src/Workflow/Workflow.php b/libraries/src/Workflow/Workflow.php
index 6eb7d8e73475f..809f2c51aaaf5 100644
--- a/libraries/src/Workflow/Workflow.php
+++ b/libraries/src/Workflow/Workflow.php
@@ -9,7 +9,7 @@
 
 namespace Joomla\CMS\Workflow;
 
-use Joomla\CMS\Application\CMSApplication;
+use Joomla\CMS\Application\CMSApplicationInterface;
 use Joomla\CMS\Event\AbstractEvent;
 use Joomla\CMS\Event\Workflow\WorkflowTransitionEvent;
 use Joomla\CMS\Extension\ComponentInterface;
@@ -18,6 +18,7 @@
 use Joomla\CMS\Table\Category;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\ParameterType;
+use Joomla\Event\DispatcherAwareInterface;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
 
@@ -50,7 +51,7 @@ class Workflow
     /**
      * Application Object
      *
-     * @var    CMSApplication
+     * @var    CMSApplicationInterface
      * @since  4.0.0
      */
     protected $app;
@@ -98,26 +99,30 @@ class Workflow
     /**
      * Class constructor
      *
-     * @param   string           $extension  The extension name
-     * @param   ?CMSApplication  $app        Application Object
-     * @param   ?DatabaseDriver  $db         Database Driver Object
+     * @param   string                    $extension  The extension name
+     * @param   ?CMSApplicationInterface  $app        Application Object
+     * @param   ?DatabaseDriver           $db         Database Driver Object
      *
      * @since   4.0.0
      */
-    public function __construct(string $extension, ?CMSApplication $app = null, ?DatabaseDriver $db = null)
+    public function __construct(string $extension, ?CMSApplicationInterface $app = null, ?DatabaseDriver $db = null)
     {
         $this->extension = $extension;
 
         // Initialise default objects if none have been provided
         if ($app === null) {
-            @trigger_error('From 6.0 declaring the app dependency will be mandatory.', E_USER_DEPRECATED);
+            @trigger_error('From 7.0 declaring the app dependency will be mandatory.', E_USER_DEPRECATED);
             $app = Factory::getApplication();
         }
 
+        if (!is_a($app, DispatcherAwareInterface::class)) {
+            trigger_error('The given application object is not Dispatcher aware, which is mandatory.', E_ERROR);
+        }
+
         $this->app = $app;
 
         if ($db === null) {
-            @trigger_error('From 6.0 declaring the database dependency will be mandatory.', E_USER_DEPRECATED);
+            @trigger_error('From 7.0 declaring the database dependency will be mandatory.', E_USER_DEPRECATED);
             $db = Factory::getContainer()->get(DatabaseDriver::class);
         }
 
@@ -199,7 +204,7 @@ public function getDefaultStageByCategory($catId = 0)
 
         // Check if the workflow exists
         if ($workflow_id = (int) $workflow_id) {
-            $query = $this->db->getQuery(true);
+            $query = $this->db->createQuery();
 
             $query->select(
                 [
@@ -233,7 +238,7 @@ public function getDefaultStageByCategory($catId = 0)
         }
 
         // Use default workflow
-        $query  = $this->db->getQuery(true);
+        $query  = $this->db->createQuery();
 
         $query->select(
             [
@@ -285,7 +290,7 @@ public function getValidTransition(array $pks, int $transitionId)
             return null;
         }
 
-        $query = $this->db->getQuery(true);
+        $query = $this->db->createQuery();
 
         $user = $this->app->getIdentity();
 
@@ -382,7 +387,7 @@ public function executeTransition(array $pks, int $transitionId): bool
             AbstractEvent::create(
                 'onWorkflowBeforeTransition',
                 [
-                    'eventClass'     => 'Joomla\CMS\Event\Workflow\WorkflowTransitionEvent',
+                    'eventClass'     => WorkflowTransitionEvent::class,
                     'subject'        => $this,
                     'extension'      => $this->extension,
                     'pks'            => $pks,
@@ -430,7 +435,7 @@ public function executeTransition(array $pks, int $transitionId): bool
     public function createAssociation(int $pk, int $state): bool
     {
         try {
-            $query = $this->db->getQuery(true);
+            $query = $this->db->createQuery();
 
             $query->insert($this->db->quoteName('#__workflow_associations'))
                 ->columns(
@@ -468,7 +473,7 @@ public function updateAssociations(array $pks, int $state): bool
         $pks = ArrayHelper::toInteger($pks);
 
         try {
-            $query = $this->db->getQuery(true);
+            $query = $this->db->createQuery();
 
             $query->update($this->db->quoteName('#__workflow_associations'))
                 ->set($this->db->quoteName('stage_id') . ' = :state')
@@ -499,7 +504,7 @@ public function deleteAssociation(array $pks): bool
         $pks = ArrayHelper::toInteger($pks);
 
         try {
-            $query = $this->db->getQuery(true);
+            $query = $this->db->createQuery();
 
             $query
                 ->delete($this->db->quoteName('#__workflow_associations'))
@@ -526,7 +531,7 @@ public function deleteAssociation(array $pks): bool
      */
     public function getAssociation(int $itemId): ?\stdClass
     {
-        $query = $this->db->getQuery(true);
+        $query = $this->db->createQuery();
 
         $query->select(
             [
diff --git a/libraries/src/Workflow/WorkflowServiceTrait.php b/libraries/src/Workflow/WorkflowServiceTrait.php
index a8e3a662d45b5..a50a0fc2487c8 100644
--- a/libraries/src/Workflow/WorkflowServiceTrait.php
+++ b/libraries/src/Workflow/WorkflowServiceTrait.php
@@ -11,6 +11,7 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Event\AbstractEvent;
+use Joomla\CMS\Event\Workflow\WorkflowFunctionalityUsedEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\WorkflowModelInterface;
@@ -99,7 +100,7 @@ public function isFunctionalityUsed($functionality, $extension): bool
             AbstractEvent::create(
                 'onWorkflowFunctionalityUsed',
                 [
-                    'eventClass'    => 'Joomla\CMS\Event\Workflow\WorkflowFunctionalityUsedEvent',
+                    'eventClass'    => WorkflowFunctionalityUsedEvent::class,
                     'subject'       => $this,
                     'extension'     => $extension,
                     'functionality' => $functionality,
diff --git a/media_source/README.md b/media_source/README.md
new file mode 100644
index 0000000000000..5014feb090de0
--- /dev/null
+++ b/media_source/README.md
@@ -0,0 +1,127 @@
+# CMS Media source
+
+The folder contains source files of CMS client-side resources (Stylesheets, JavaScripts, Images and other assets) needed for extensions to work.
+Each folder is for a specific extension with a few exceptions like `vendor`, `system`.
+
+## Building assets
+
+Before using the assets they must first be built/compiled and placed under `media/` folder.
+
+Following command helps to build, they will call builder associated with each asset:
+- `npm run build -- -a` Build all assets. Will go through all resources and will build each asset.
+- `npm run build -- -n <resource_name>,<resource_name>` Build only specific asset.
+
+Additionally, each builder may provide their own task, that can be executed separately without running the whole rebuild.
+In default configuration the builder uses following tasks:
+- `clear` remove all associated files from `media/`.
+- `copy` copy static files to `media/`
+- `css` process Stylesheets files. Copy or compile to CSS when needed (example for SCSS etc.).
+- `js` process JavaScript files. Copy or compile to JS when needed (example for `.es6.js` and `.vue` etc.).
+- `gzip` prepare compressed version of css,js files.
+
+To execute specific task use `-t` argument:
+- `npm run build -- -a -t <task_name>,<task_name>` Will apply specified task to all asset builders.
+- `npm run build -- -n <resource_name>,<resource_name> -t <task_name>,<task_name>` Will apply specified task to specified asset builders.
+
+Use watchers while developing an extension allows to automatically refresh the assets while editing.
+- `npm run watch -- -n <resource_name>` Will start watching files changes for specific asset.
+
+## Adding new assets
+
+To add new resource follow next steps:
+- Create folder under `media_source/` with name of future asset. Example for `com_example` it will be `media_source/com_example/`.
+- Add Stylesheets, JavaScript and other needed files for the asset.
+- Add the resource name in to `build/build-modules-js/builders-registry.mjs` into the list of `builders` so CLI know it exists.
+- (Optionally) When need extra processing add custom builder into the root of the newly created folder `media_source/com_example/builder.mjs`.
+- Source files of complex Application (for example Vue based script) place under `src/` like `media_source/com_example/src/` and use custom builder to build the Application.
+
+Done. And do not forget to run build.
+
+### Note about JavaScript and Stylesheets
+
+#### Javascript
+
+- Modern JavaScript files must have an extension `.es6.js`.
+  This allows ESLint to check the code style, Joomla is using the Airbnb preset https://github.com/airbnb/javascript.
+  It also instructs Rollup to do the transforms for ES2017. This step creates both normal and minified files.
+  Production code WILL NOT have the `.es6` part for ES2017+ files.
+
+- Legacy JavaScript files must have an extension `.es5.js`.
+  This instructs ESLint to skip checking this file.
+  Also, it instructs the tools to create a minified version (production code WILL NOT have the `.es5` part)
+
+
+#### SCSS
+- SCSS files starting with `_` will not become entry points for SCSS.
+  SCSS files will be transformed to CSS, both normal and minified versions.
+
+### Custom builder
+
+By default, each resource uses `DefaultModuleBuilder` class to build its asset.
+However, each resource may have own `builder.mjs` script with custom logic.
+To use custom builder add `builder.mjs` with custom logic in to the root of the resources' folder.
+
+#### Anatomy of custom builder
+
+Each builder receives the base path (path to `media_source/`) and target path (path to `media/`) as input, also cmd options.
+The builder should provide list of tasks which it is able to run and expose public methods for each task to do so.
+
+**ATTENTION**: While coding the custom builder avoid writing in to folders outside the current asset scope. This could lead to unexpected collisions.
+
+Example builder:
+
+```javascript
+export default class ExampleModuleBuilder
+{
+	tasksBuild = ['clear', 'copy', 'css', 'js'];
+	tasksExtras = ['gzip'];
+
+	constructor(name = '', basePath = '', targetPath = '', options = {}) {
+		if (!name) {
+			throw new Error(`Argument "name" is required for ModuleBuilder.`);
+		}
+
+		if (!basePath || !targetPath) {
+			throw new Error(`Arguments "basePath" and "targetPath"  is required for "${name}" ModuleBuilder.`);
+		}
+
+		this.name = name;
+		this.basePath = path.join(basePath, name);
+		this.targetPath = path.join(targetPath, name);
+		this.options = options;
+	}
+
+	getAllTasks() {
+		return [ ...this.tasksBuild, ...this.tasksExtras ];
+	}
+
+	getBuildTasks() {
+		return this.tasksBuild;
+	}
+
+	// The methods to execute each task
+	async clear() {}
+	async copy() {}
+	async css() {}
+	async js() {}
+	async gzip() {}
+}
+```
+
+The list of tasks is not strict, and depending on the builder needs.
+However, it is required the builder to implement `getBuildTasks()` so the main script knows which tasks need to run while running the complete build.
+Method `getAllTasks()` is optional, needed only when builder have tasks that can be executed from CLI but which does not participate in the complete build.
+
+To simplify the coding it is possible to extend `DefaultModuleBuilder` class.
+
+```javascript
+import DefaultModuleBuilder from '../../build/build-modules-js/builder/default-module-builder.mjs';
+
+export default class ExampleModuleBuilder extends DefaultModuleBuilder {
+	async js() {
+		await super.js();
+
+		// Run custom code
+	}
+}
+```
diff --git a/build/media_source/cache/index.html b/media_source/cache/index.html
similarity index 100%
rename from build/media_source/cache/index.html
rename to media_source/cache/index.html
diff --git a/build/media_source/com_actionlogs/joomla.asset.json b/media_source/com_actionlogs/joomla.asset.json
similarity index 100%
rename from build/media_source/com_actionlogs/joomla.asset.json
rename to media_source/com_actionlogs/joomla.asset.json
diff --git a/build/media_source/com_actionlogs/js/admin-actionlogs-default.es6.js b/media_source/com_actionlogs/js/admin-actionlogs-default.es6.js
similarity index 100%
rename from build/media_source/com_actionlogs/js/admin-actionlogs-default.es6.js
rename to media_source/com_actionlogs/js/admin-actionlogs-default.es6.js
diff --git a/media_source/com_admin/css/admin-help.css b/media_source/com_admin/css/admin-help.css
new file mode 100644
index 0000000000000..4e93135c82138
--- /dev/null
+++ b/media_source/com_admin/css/admin-help.css
@@ -0,0 +1,81 @@
+@charset "UTF-8";
+#help-sidebar {
+  min-width: 18rem;
+}
+
+#help-index.main-nav, #help-index ul {
+  padding-left: 0;
+  background-color: var(--sidebarwrapper-bg);
+  inline-size: 18rem;
+  max-inline-size: 18rem;
+}
+
+#help-index ul .mm-show {
+  background-color: var(--main-nav-ul-bg);
+}
+
+#helpmenu .has-arrow .item-title {
+  margin-inline-end: auto;
+}
+
+#helpmenu .has-arrow:after {
+  display: flex;
+}
+
+.closed #helpmenu li, .closed #helpmenu a:hover {
+  max-inline-size: 18rem;
+}
+
+#help-index.sidebar-wrapper .item > a {
+  align-items: baseline;
+  padding-top: 8px;
+  padding-bottom: 2px;
+}
+
+#help-index.sidebar-wrapper .item-level-1 > a {
+  padding-inline-start: .5rem;
+}
+
+#help-index.sidebar-wrapper .item-level-1 > a:not(.has-arrow) {
+  padding-inline-end: .5rem;
+}
+
+#help-index.sidebar-wrapper .item-level-2 > a {
+  padding-inline-start: 1rem;
+}
+
+#help-index.sidebar-wrapper .item-level-2 > a:not(.has-arrow) {
+  padding-inline-end: .5rem;
+}
+
+#help-index.sidebar-wrapper .item-level-3 > a {
+  padding-inline-start: 1.5rem;
+}
+
+#help-index.sidebar-wrapper .item-level-3 > a:not(.has-arrow) {
+  padding-inline-end: .5rem;
+}
+
+#help-index a.active {
+  background-color: var(--sidebar-item-bg-hvr);
+}
+
+.helpmenu .mm-collapse {
+  display: none;
+}
+
+.helpmenu .mm-collapse.mm-show {
+  display: block;
+}
+
+#help-index .sidebar-wrapper .item a:hover {
+  color: var(--sidebar-item-color-hvr);
+  text-decoration: none;
+  background-color: var(--sidebar-item-bg-hvr);
+}
+
+#help-index h2 {
+  padding: .75rem 0 .25rem .75rem;
+  font-weight: 400;
+  color: var(--sidebar-item-color);
+}
diff --git a/build/media_source/com_admin/joomla.asset.json b/media_source/com_admin/joomla.asset.json
similarity index 78%
rename from build/media_source/com_admin/joomla.asset.json
rename to media_source/com_admin/joomla.asset.json
index 627ed01b2d73f..4ef83ee4e78d1 100644
--- a/build/media_source/com_admin/joomla.asset.json
+++ b/media_source/com_admin/joomla.asset.json
@@ -15,6 +15,11 @@
       "attributes": {
         "type": "module"
       }
+    },
+    {
+      "name": "com_admin.admin-help",
+      "type": "style",
+      "uri": "com_admin/admin-help.min.css"
     }
   ]
 }
diff --git a/media_source/com_admin/js/admin-help.es6.js b/media_source/com_admin/js/admin-help.es6.js
new file mode 100644
index 0000000000000..4113e6c288837
--- /dev/null
+++ b/media_source/com_admin/js/admin-help.es6.js
@@ -0,0 +1,122 @@
+/**
+  * @copyright   (C) 2021 Open Source Matters, Inc. <https://www.joomla.org>
+  * @license     GNU General Public License version 2 or later; see LICENSE.txt
+  */
+
+document.addEventListener('DOMContentLoaded', function (event) {
+  new MetisMenu('#helpmenu', {
+    toggle: true,
+  });
+  const helpIndex = document.getElementById('helpmenu');
+  if (helpIndex) {
+    helpIndex.querySelectorAll('a').forEach((element) => element.addEventListener('click', () => {
+      if (element.classList.contains('has-arrow')) {
+        // 🔸 Action for a link to a folder, where <a class="has-arrow">
+        helpIndex.querySelectorAll('a.has-arrow').forEach((a) => {
+          // Remove 'active' from all collapsed folders.
+          if (element.classList.contains('mm-collapsed')) {
+            element.classList.remove('active');
+          }
+        });
+      } else {
+        // Action for a link to an article.
+        const id = element.dataset.id;
+        if (id) {
+          // First, reset all other links to default state
+          helpIndex.querySelectorAll('a:not(has-arrow)').forEach((a) => {
+            if (a.dataset.id !== id) {
+              a.classList.remove('active');
+              a.removeAttribute('aria-current');
+            } else {
+              element.classList.add('active');
+              a.setAttribute('aria-current', 'page');
+            }
+          });
+          window.scroll(0, 0);
+        }
+        localStorage.setItem('helpIndex.lastClick', id);
+
+        // In narrow screens, close the help menu after selecting an item.
+        const btn = document.querySelector('button[data-bs-target="#help-index"]');
+        const isVisible = !!(btn && btn.offsetParent !== null);
+        if (isVisible) {
+          document.querySelector('nav#help-index').classList.add('collapse');
+          document.querySelector('nav#help-index').classList.remove('show');
+        }
+      }
+    }));
+  }
+
+  // Async restore function
+  function restoreMenu() {
+    let lastClick = localStorage.getItem('helpIndex.lastClick');
+    if (!lastClick) {
+      lastClick = 'start-here';
+    }
+    const selectedLink = helpIndex.querySelector(`a[data-id="${lastClick}"]`);
+    if (!selectedLink) return;
+
+    // Collect parent list items top-down
+    const lists = [];
+    let parentLi = selectedLink.closest('li');
+    while (parentLi && parentLi !== helpIndex) {
+      const parentUl = parentLi.parentElement;
+      const parentLiOfUl = parentUl.closest('li');
+      if (parentLiOfUl) {
+        const li = parentLiOfUl;
+        if (li) lists.unshift(li);
+      }
+      parentLi = parentLiOfUl;
+    }
+
+    // Trigger clicks in sequence
+    for (const li of lists) {
+      li.classList.add('mm-active');
+      li.querySelector('ul').classList.add('mm-show');
+      li.querySelector('a').classList.add('active');
+      li.querySelector('a').setAttribute('aria-expanded', true);
+    }
+
+    // Optional: highlight selected link
+    selectedLink.classList.add('active');
+    selectedLink.setAttribute('aria-current', 'page');
+
+    // Give the submenu a moment to fully render before clicking
+    selectedLink.click();
+  }
+
+  // Run restore after MetisMenu setup delay
+  restoreMenu();
+});
+
+// Define Bootstrap breakpoints (in pixels)
+const breakpoints = {
+  sm: 576,
+  md: 768,
+  lg: 992,
+  xl: 1200,
+  xxl: 1400,
+};
+
+// Collapse the Help menu on small screens (sm) by causing a page reload
+function getCurrentBreakpoint() {
+  const width = window.innerWidth;
+  if (width < breakpoints.md) return 'sm';
+  return 'xxl';
+}
+
+let currentBreakpoint = getCurrentBreakpoint();
+let resizeTimeout;
+
+window.addEventListener('resize', () => {
+  clearTimeout(resizeTimeout);
+
+  resizeTimeout = setTimeout(() => {
+    const newBreakpoint = getCurrentBreakpoint();
+
+    if (newBreakpoint !== currentBreakpoint) {
+      // Breakpoint changed — reload the page
+      location.reload();
+    }
+  }, 300); // delay in ms after resizing stops
+});
diff --git a/build/media_source/com_associations/css/sidebyside.css b/media_source/com_associations/css/sidebyside.css
similarity index 100%
rename from build/media_source/com_associations/css/sidebyside.css
rename to media_source/com_associations/css/sidebyside.css
diff --git a/build/media_source/com_associations/joomla.asset.json b/media_source/com_associations/joomla.asset.json
similarity index 100%
rename from build/media_source/com_associations/joomla.asset.json
rename to media_source/com_associations/joomla.asset.json
diff --git a/build/media_source/com_associations/js/admin-associations-default.es6.js b/media_source/com_associations/js/admin-associations-default.es6.js
similarity index 100%
rename from build/media_source/com_associations/js/admin-associations-default.es6.js
rename to media_source/com_associations/js/admin-associations-default.es6.js
diff --git a/build/media_source/com_associations/js/admin-associations-modal.es6.js b/media_source/com_associations/js/admin-associations-modal.es6.js
similarity index 100%
rename from build/media_source/com_associations/js/admin-associations-modal.es6.js
rename to media_source/com_associations/js/admin-associations-modal.es6.js
diff --git a/build/media_source/com_associations/js/associations-edit.es6.js b/media_source/com_associations/js/associations-edit.es6.js
similarity index 100%
rename from build/media_source/com_associations/js/associations-edit.es6.js
rename to media_source/com_associations/js/associations-edit.es6.js
diff --git a/build/media_source/com_associations/js/sidebyside.es6.js b/media_source/com_associations/js/sidebyside.es6.js
similarity index 99%
rename from build/media_source/com_associations/js/sidebyside.es6.js
rename to media_source/com_associations/js/sidebyside.es6.js
index 506eae310ea92..682bc148e8352 100644
--- a/build/media_source/com_associations/js/sidebyside.es6.js
+++ b/media_source/com_associations/js/sidebyside.es6.js
@@ -134,7 +134,11 @@ document.getElementById('target-association').addEventListener('load', ({ target
   // We need to check if we are not loading a blank iframe.
   if (target.getAttribute('src') !== '') {
     document.getElementById('toolbar-target').classList.remove('hidden');
-    document.getElementById('toolbar-copy').classList.remove('hidden');
+
+    const toolbarCopy = document.getElementById('toolbar-copy');
+    if (toolbarCopy) {
+      toolbarCopy.classList.remove('hidden');
+    }
     document.getElementById('select-change').classList.remove('hidden');
 
     const targetLanguage = target.getAttribute('data-language');
diff --git a/build/media_source/com_banners/joomla.asset.json b/media_source/com_banners/joomla.asset.json
similarity index 100%
rename from build/media_source/com_banners/joomla.asset.json
rename to media_source/com_banners/joomla.asset.json
diff --git a/build/media_source/com_banners/js/admin-banner-edit.es6.js b/media_source/com_banners/js/admin-banner-edit.es6.js
similarity index 100%
rename from build/media_source/com_banners/js/admin-banner-edit.es6.js
rename to media_source/com_banners/js/admin-banner-edit.es6.js
diff --git a/build/media_source/com_cache/joomla.asset.json b/media_source/com_cache/joomla.asset.json
similarity index 100%
rename from build/media_source/com_cache/joomla.asset.json
rename to media_source/com_cache/joomla.asset.json
diff --git a/build/media_source/com_cache/js/admin-cache-default.es6.js b/media_source/com_cache/js/admin-cache-default.es6.js
similarity index 100%
rename from build/media_source/com_cache/js/admin-cache-default.es6.js
rename to media_source/com_cache/js/admin-cache-default.es6.js
diff --git a/build/media_source/com_categories/css/shared-categories-accordion.css b/media_source/com_categories/css/shared-categories-accordion.css
similarity index 100%
rename from build/media_source/com_categories/css/shared-categories-accordion.css
rename to media_source/com_categories/css/shared-categories-accordion.css
diff --git a/build/media_source/com_categories/joomla.asset.json b/media_source/com_categories/joomla.asset.json
similarity index 100%
rename from build/media_source/com_categories/joomla.asset.json
rename to media_source/com_categories/joomla.asset.json
diff --git a/build/media_source/com_categories/js/shared-categories-accordion.es6.js b/media_source/com_categories/js/shared-categories-accordion.es6.js
similarity index 100%
rename from build/media_source/com_categories/js/shared-categories-accordion.es6.js
rename to media_source/com_categories/js/shared-categories-accordion.es6.js
diff --git a/build/media_source/com_config/joomla.asset.json b/media_source/com_config/joomla.asset.json
similarity index 100%
rename from build/media_source/com_config/joomla.asset.json
rename to media_source/com_config/joomla.asset.json
diff --git a/build/media_source/com_config/js/config-default.es6.js b/media_source/com_config/js/config-default.es6.js
similarity index 100%
rename from build/media_source/com_config/js/config-default.es6.js
rename to media_source/com_config/js/config-default.es6.js
diff --git a/build/media_source/com_config/js/config-filters.es6.js b/media_source/com_config/js/config-filters.es6.js
similarity index 100%
rename from build/media_source/com_config/js/config-filters.es6.js
rename to media_source/com_config/js/config-filters.es6.js
diff --git a/build/media_source/com_config/js/modules-default.es6.js b/media_source/com_config/js/modules-default.es6.js
similarity index 100%
rename from build/media_source/com_config/js/modules-default.es6.js
rename to media_source/com_config/js/modules-default.es6.js
diff --git a/build/media_source/com_config/js/templates-default.es6.js b/media_source/com_config/js/templates-default.es6.js
similarity index 100%
rename from build/media_source/com_config/js/templates-default.es6.js
rename to media_source/com_config/js/templates-default.es6.js
diff --git a/build/media_source/com_contact/joomla.asset.json b/media_source/com_contact/joomla.asset.json
similarity index 100%
rename from build/media_source/com_contact/joomla.asset.json
rename to media_source/com_contact/joomla.asset.json
diff --git a/build/media_source/com_contact/js/admin-contacts-modal.es6.js b/media_source/com_contact/js/admin-contacts-modal.es6.js
similarity index 100%
rename from build/media_source/com_contact/js/admin-contacts-modal.es6.js
rename to media_source/com_contact/js/admin-contacts-modal.es6.js
diff --git a/build/media_source/com_contact/js/contacts-list.es6.js b/media_source/com_contact/js/contacts-list.es6.js
similarity index 100%
rename from build/media_source/com_contact/js/contacts-list.es6.js
rename to media_source/com_contact/js/contacts-list.es6.js
diff --git a/build/media_source/com_content/joomla.asset.json b/media_source/com_content/joomla.asset.json
similarity index 100%
rename from build/media_source/com_content/joomla.asset.json
rename to media_source/com_content/joomla.asset.json
diff --git a/build/media_source/com_content/js/admin-article-pagebreak.es6.js b/media_source/com_content/js/admin-article-pagebreak.es6.js
similarity index 100%
rename from build/media_source/com_content/js/admin-article-pagebreak.es6.js
rename to media_source/com_content/js/admin-article-pagebreak.es6.js
diff --git a/build/media_source/com_content/js/admin-article-readmore.es6.js b/media_source/com_content/js/admin-article-readmore.es6.js
similarity index 100%
rename from build/media_source/com_content/js/admin-article-readmore.es6.js
rename to media_source/com_content/js/admin-article-readmore.es6.js
diff --git a/build/media_source/com_content/js/admin-articles-default-batch-footer.es6.js b/media_source/com_content/js/admin-articles-default-batch-footer.es6.js
similarity index 100%
rename from build/media_source/com_content/js/admin-articles-default-batch-footer.es6.js
rename to media_source/com_content/js/admin-articles-default-batch-footer.es6.js
diff --git a/build/media_source/com_content/js/admin-articles-default-stage-footer.es6.js b/media_source/com_content/js/admin-articles-default-stage-footer.es6.js
similarity index 100%
rename from build/media_source/com_content/js/admin-articles-default-stage-footer.es6.js
rename to media_source/com_content/js/admin-articles-default-stage-footer.es6.js
diff --git a/build/media_source/com_content/js/admin-articles-modal.es6.js b/media_source/com_content/js/admin-articles-modal.es6.js
similarity index 100%
rename from build/media_source/com_content/js/admin-articles-modal.es6.js
rename to media_source/com_content/js/admin-articles-modal.es6.js
diff --git a/build/media_source/com_content/js/articles-list.es6.js b/media_source/com_content/js/articles-list.es6.js
similarity index 100%
rename from build/media_source/com_content/js/articles-list.es6.js
rename to media_source/com_content/js/articles-list.es6.js
diff --git a/build/media_source/com_content/js/articles-status.es6.js b/media_source/com_content/js/articles-status.es6.js
similarity index 100%
rename from build/media_source/com_content/js/articles-status.es6.js
rename to media_source/com_content/js/articles-status.es6.js
diff --git a/build/media_source/com_content/js/form-edit.es6.js b/media_source/com_content/js/form-edit.es6.js
similarity index 100%
rename from build/media_source/com_content/js/form-edit.es6.js
rename to media_source/com_content/js/form-edit.es6.js
diff --git a/build/media_source/com_contenthistory/joomla.asset.json b/media_source/com_contenthistory/joomla.asset.json
similarity index 100%
rename from build/media_source/com_contenthistory/joomla.asset.json
rename to media_source/com_contenthistory/joomla.asset.json
diff --git a/build/media_source/com_contenthistory/js/admin-compare-compare.es6.js b/media_source/com_contenthistory/js/admin-compare-compare.es6.js
similarity index 100%
rename from build/media_source/com_contenthistory/js/admin-compare-compare.es6.js
rename to media_source/com_contenthistory/js/admin-compare-compare.es6.js
diff --git a/build/media_source/com_contenthistory/js/admin-history-modal.es6.js b/media_source/com_contenthistory/js/admin-history-modal.es6.js
similarity index 100%
rename from build/media_source/com_contenthistory/js/admin-history-modal.es6.js
rename to media_source/com_contenthistory/js/admin-history-modal.es6.js
diff --git a/build/media_source/com_cpanel/joomla.asset.json b/media_source/com_cpanel/joomla.asset.json
similarity index 100%
rename from build/media_source/com_cpanel/joomla.asset.json
rename to media_source/com_cpanel/joomla.asset.json
diff --git a/build/media_source/com_cpanel/js/admin-cpanel-default.es6.js b/media_source/com_cpanel/js/admin-cpanel-default.es6.js
similarity index 100%
rename from build/media_source/com_cpanel/js/admin-cpanel-default.es6.js
rename to media_source/com_cpanel/js/admin-cpanel-default.es6.js
diff --git a/build/media_source/com_cpanel/js/admin-system-loader.es6.js b/media_source/com_cpanel/js/admin-system-loader.es6.js
similarity index 100%
rename from build/media_source/com_cpanel/js/admin-system-loader.es6.js
rename to media_source/com_cpanel/js/admin-system-loader.es6.js
diff --git a/build/media_source/com_fields/joomla.asset.json b/media_source/com_fields/joomla.asset.json
similarity index 100%
rename from build/media_source/com_fields/joomla.asset.json
rename to media_source/com_fields/joomla.asset.json
diff --git a/build/media_source/com_fields/js/admin-field-changecontext.es6.js b/media_source/com_fields/js/admin-field-changecontext.es6.js
similarity index 100%
rename from build/media_source/com_fields/js/admin-field-changecontext.es6.js
rename to media_source/com_fields/js/admin-field-changecontext.es6.js
diff --git a/build/media_source/com_fields/js/admin-field-edit.es6.js b/media_source/com_fields/js/admin-field-edit.es6.js
similarity index 100%
rename from build/media_source/com_fields/js/admin-field-edit.es6.js
rename to media_source/com_fields/js/admin-field-edit.es6.js
diff --git a/build/media_source/com_fields/js/admin-field-typehaschanged.es6.js b/media_source/com_fields/js/admin-field-typehaschanged.es6.js
similarity index 100%
rename from build/media_source/com_fields/js/admin-field-typehaschanged.es6.js
rename to media_source/com_fields/js/admin-field-typehaschanged.es6.js
diff --git a/build/media_source/com_fields/js/admin-fields-default-batch.es6.js b/media_source/com_fields/js/admin-fields-default-batch.es6.js
similarity index 100%
rename from build/media_source/com_fields/js/admin-fields-default-batch.es6.js
rename to media_source/com_fields/js/admin-fields-default-batch.es6.js
diff --git a/build/media_source/com_fields/js/admin-fields-modal.es6.js b/media_source/com_fields/js/admin-fields-modal.es6.js
similarity index 100%
rename from build/media_source/com_fields/js/admin-fields-modal.es6.js
rename to media_source/com_fields/js/admin-fields-modal.es6.js
diff --git a/build/media_source/com_finder/css/dates.css b/media_source/com_finder/css/dates.css
similarity index 100%
rename from build/media_source/com_finder/css/dates.css
rename to media_source/com_finder/css/dates.css
diff --git a/build/media_source/com_finder/css/finder.css b/media_source/com_finder/css/finder.css
similarity index 100%
rename from build/media_source/com_finder/css/finder.css
rename to media_source/com_finder/css/finder.css
diff --git a/build/media_source/com_finder/css/indexer.css b/media_source/com_finder/css/indexer.css
similarity index 100%
rename from build/media_source/com_finder/css/indexer.css
rename to media_source/com_finder/css/indexer.css
diff --git a/build/media_source/com_finder/joomla.asset.json b/media_source/com_finder/joomla.asset.json
similarity index 100%
rename from build/media_source/com_finder/joomla.asset.json
rename to media_source/com_finder/joomla.asset.json
diff --git a/build/media_source/com_finder/js/debug.es6.js b/media_source/com_finder/js/debug.es6.js
similarity index 100%
rename from build/media_source/com_finder/js/debug.es6.js
rename to media_source/com_finder/js/debug.es6.js
diff --git a/build/media_source/com_finder/js/filters.es6.js b/media_source/com_finder/js/filters.es6.js
similarity index 100%
rename from build/media_source/com_finder/js/filters.es6.js
rename to media_source/com_finder/js/filters.es6.js
diff --git a/build/media_source/com_finder/js/finder-edit.es6.js b/media_source/com_finder/js/finder-edit.es6.js
similarity index 100%
rename from build/media_source/com_finder/js/finder-edit.es6.js
rename to media_source/com_finder/js/finder-edit.es6.js
diff --git a/build/media_source/com_finder/js/finder.es6.js b/media_source/com_finder/js/finder.es6.js
similarity index 100%
rename from build/media_source/com_finder/js/finder.es6.js
rename to media_source/com_finder/js/finder.es6.js
diff --git a/build/media_source/com_finder/js/indexer.es6.js b/media_source/com_finder/js/indexer.es6.js
similarity index 100%
rename from build/media_source/com_finder/js/indexer.es6.js
rename to media_source/com_finder/js/indexer.es6.js
diff --git a/build/media_source/com_finder/js/maps.es6.js b/media_source/com_finder/js/maps.es6.js
similarity index 100%
rename from build/media_source/com_finder/js/maps.es6.js
rename to media_source/com_finder/js/maps.es6.js
diff --git a/media_source/com_guidedtours/images/6_0/cassiopeiacolors.jpg b/media_source/com_guidedtours/images/6_0/cassiopeiacolors.jpg
new file mode 100644
index 0000000000000..ddb7a775e9854
Binary files /dev/null and b/media_source/com_guidedtours/images/6_0/cassiopeiacolors.jpg differ
diff --git a/media_source/com_guidedtours/images/6_1/captcha.jpg b/media_source/com_guidedtours/images/6_1/captcha.jpg
new file mode 100644
index 0000000000000..a2c66ee99671c
Binary files /dev/null and b/media_source/com_guidedtours/images/6_1/captcha.jpg differ
diff --git a/media_source/com_guidedtours/images/6_1/media.jpg b/media_source/com_guidedtours/images/6_1/media.jpg
new file mode 100644
index 0000000000000..f9c1fc5e80dfa
Binary files /dev/null and b/media_source/com_guidedtours/images/6_1/media.jpg differ
diff --git a/media_source/com_guidedtours/images/6_1/workflows.jpg b/media_source/com_guidedtours/images/6_1/workflows.jpg
new file mode 100644
index 0000000000000..1a06462539355
Binary files /dev/null and b/media_source/com_guidedtours/images/6_1/workflows.jpg differ
diff --git a/build/media_source/com_guidedtours/joomla.asset.json b/media_source/com_guidedtours/joomla.asset.json
similarity index 100%
rename from build/media_source/com_guidedtours/joomla.asset.json
rename to media_source/com_guidedtours/joomla.asset.json
diff --git a/build/media_source/com_guidedtours/js/tour-edit.es6.js b/media_source/com_guidedtours/js/tour-edit.es6.js
similarity index 100%
rename from build/media_source/com_guidedtours/js/tour-edit.es6.js
rename to media_source/com_guidedtours/js/tour-edit.es6.js
diff --git a/build/media_source/com_installer/css/installer.css b/media_source/com_installer/css/installer.css
similarity index 100%
rename from build/media_source/com_installer/css/installer.css
rename to media_source/com_installer/css/installer.css
diff --git a/build/media_source/com_installer/joomla.asset.json b/media_source/com_installer/joomla.asset.json
similarity index 100%
rename from build/media_source/com_installer/joomla.asset.json
rename to media_source/com_installer/joomla.asset.json
diff --git a/build/media_source/com_installer/js/changelog.es6.js b/media_source/com_installer/js/changelog.es6.js
similarity index 100%
rename from build/media_source/com_installer/js/changelog.es6.js
rename to media_source/com_installer/js/changelog.es6.js
diff --git a/build/media_source/com_installer/js/installer.es6.js b/media_source/com_installer/js/installer.es6.js
similarity index 100%
rename from build/media_source/com_installer/js/installer.es6.js
rename to media_source/com_installer/js/installer.es6.js
diff --git a/build/media_source/com_joomlaupdate/joomla.asset.json b/media_source/com_joomlaupdate/joomla.asset.json
similarity index 100%
rename from build/media_source/com_joomlaupdate/joomla.asset.json
rename to media_source/com_joomlaupdate/joomla.asset.json
diff --git a/build/media_source/com_joomlaupdate/js/admin-update-default.es6.js b/media_source/com_joomlaupdate/js/admin-update-default.es6.js
similarity index 100%
rename from build/media_source/com_joomlaupdate/js/admin-update-default.es6.js
rename to media_source/com_joomlaupdate/js/admin-update-default.es6.js
diff --git a/build/media_source/com_joomlaupdate/js/default.es6.js b/media_source/com_joomlaupdate/js/default.es6.js
similarity index 100%
rename from build/media_source/com_joomlaupdate/js/default.es6.js
rename to media_source/com_joomlaupdate/js/default.es6.js
diff --git a/build/media_source/com_languages/css/overrider.css b/media_source/com_languages/css/overrider.css
similarity index 100%
rename from build/media_source/com_languages/css/overrider.css
rename to media_source/com_languages/css/overrider.css
diff --git a/build/media_source/com_languages/joomla.asset.json b/media_source/com_languages/joomla.asset.json
similarity index 100%
rename from build/media_source/com_languages/joomla.asset.json
rename to media_source/com_languages/joomla.asset.json
diff --git a/build/media_source/com_languages/js/admin-language-edit-change-flag.es6.js b/media_source/com_languages/js/admin-language-edit-change-flag.es6.js
similarity index 100%
rename from build/media_source/com_languages/js/admin-language-edit-change-flag.es6.js
rename to media_source/com_languages/js/admin-language-edit-change-flag.es6.js
diff --git a/build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js b/media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js
similarity index 100%
rename from build/media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js
rename to media_source/com_languages/js/admin-override-edit-refresh-searchstring.es6.js
diff --git a/build/media_source/com_languages/js/overrider.es6.js b/media_source/com_languages/js/overrider.es6.js
similarity index 100%
rename from build/media_source/com_languages/js/overrider.es6.js
rename to media_source/com_languages/js/overrider.es6.js
diff --git a/build/media_source/com_mails/joomla.asset.json b/media_source/com_mails/joomla.asset.json
similarity index 100%
rename from build/media_source/com_mails/joomla.asset.json
rename to media_source/com_mails/joomla.asset.json
diff --git a/build/media_source/com_mails/js/admin-email-template-edit.es6.js b/media_source/com_mails/js/admin-email-template-edit.es6.js
similarity index 100%
rename from build/media_source/com_mails/js/admin-email-template-edit.es6.js
rename to media_source/com_mails/js/admin-email-template-edit.es6.js
diff --git a/media_source/com_media/builder.mjs b/media_source/com_media/builder.mjs
new file mode 100644
index 0000000000000..216edbdbd6903
--- /dev/null
+++ b/media_source/com_media/builder.mjs
@@ -0,0 +1,97 @@
+/**
+ * Assets Builder
+ */
+import path from 'node:path';
+import fsp from 'node:fs/promises';
+import { rollup } from 'rollup';
+import VuePlugin from 'rollup-plugin-vue';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import replace from '@rollup/plugin-replace';
+import { babel } from '@rollup/plugin-babel';
+import DefaultModuleBuilder from '../../build/build-modules-js/builder/default-module-builder.mjs';
+import { minifyJSContent } from '../../build/build-modules-js/javascript/js-handle.mjs';
+
+export const buildMediaManager = async (basePath, targetPath) => {
+  const srcFile = path.join(basePath, 'src', 'mediamanager.es6.js');
+  const targetFile = path.join(targetPath, 'js', 'media-manager.js');
+  const targetFileMin = path.join(targetPath, 'js', 'media-manager.min.js');
+  const isProduction = process.env.NODE_ENV !== 'DEVELOPMENT';
+
+  return rollup({
+    input: srcFile,
+    plugins: [
+      VuePlugin({
+        target: 'browser',
+        css: false,
+        compileTemplate: true,
+        template: {
+          isProduction,
+        },
+      }),
+      nodeResolve(),
+      commonjs(),
+      replace({
+        'process.env.NODE_ENV': JSON.stringify((process.env.NODE_ENV && process.env.NODE_ENV.toLocaleLowerCase()) || 'production'),
+        __VUE_OPTIONS_API__: true,
+        __VUE_PROD_DEVTOOLS__: !isProduction,
+        preventAssignment: true,
+      }),
+      babel({
+        exclude: 'node_modules/core-js/**',
+        babelHelpers: 'bundled',
+        babelrc: false,
+        presets: [
+          [
+            '@babel/preset-env',
+            {
+              targets: {
+                browsers: [
+                  '> 1%',
+                  'not op_mini all',
+                  /** https://caniuse.com/es6-module */
+                  'chrome >= 61',
+                  'safari >= 11',
+                  'edge >= 16',
+                  'Firefox >= 60',
+                ],
+              },
+              loose: true,
+              bugfixes: false,
+              ignoreBrowserslistConfig: true,
+            },
+          ],
+        ],
+      }),
+    ],
+  }).then((build) => {
+    return build.write({
+      format: 'es',
+      sourcemap: !isProduction ? 'inline' : false,
+      file: targetFile,
+    })
+      .then((value) => (isProduction ? minifyJSContent(value.output[0].code) : value.output[0]))
+      .then((content) => {
+        if (isProduction) {
+          return fsp.writeFile(targetFileMin, content, { encoding: 'utf8', mode: 0o644 });
+        }
+
+        // Copy media-manager.js => media-manager.min.js
+        return fsp.copyFile(targetFile, targetFileMin);
+      }).then(() => {
+        return build.close();
+      });
+  });
+};
+
+export default class MediaModuleBuilder extends DefaultModuleBuilder {
+  /**
+   * Process JavaScript files and Modules
+   * @returns { Promise }
+   */
+  async js() {
+    await super.js();
+
+    return buildMediaManager(this.basePath, this.targetPath);
+  }
+};
diff --git a/build/media_source/com_media/joomla.asset.json b/media_source/com_media/joomla.asset.json
similarity index 100%
rename from build/media_source/com_media/joomla.asset.json
rename to media_source/com_media/joomla.asset.json
diff --git a/build/media_source/com_media/js/edit-images.es6.js b/media_source/com_media/js/edit-images.es6.js
similarity index 100%
rename from build/media_source/com_media/js/edit-images.es6.js
rename to media_source/com_media/js/edit-images.es6.js
diff --git a/build/media_source/com_media/scss/_variables.scss b/media_source/com_media/scss/_variables.scss
similarity index 100%
rename from build/media_source/com_media/scss/_variables.scss
rename to media_source/com_media/scss/_variables.scss
diff --git a/build/media_source/com_media/scss/components/_animations.scss b/media_source/com_media/scss/components/_animations.scss
similarity index 100%
rename from build/media_source/com_media/scss/components/_animations.scss
rename to media_source/com_media/scss/components/_animations.scss
diff --git a/build/media_source/com_media/scss/components/_layout.scss b/media_source/com_media/scss/components/_layout.scss
similarity index 100%
rename from build/media_source/com_media/scss/components/_layout.scss
rename to media_source/com_media/scss/components/_layout.scss
diff --git a/build/media_source/com_media/scss/components/_media-breadcrumb.scss b/media_source/com_media/scss/components/_media-breadcrumb.scss
similarity index 100%
rename from build/media_source/com_media/scss/components/_media-breadcrumb.scss
rename to media_source/com_media/scss/components/_media-breadcrumb.scss
diff --git a/build/media_source/com_media/scss/components/_media-browser.scss b/media_source/com_media/scss/components/_media-browser.scss
similarity index 99%
rename from build/media_source/com_media/scss/components/_media-browser.scss
rename to media_source/com_media/scss/components/_media-browser.scss
index f797126c4398e..f191bf0613317 100644
--- a/build/media_source/com_media/scss/components/_media-browser.scss
+++ b/media_source/com_media/scss/components/_media-browser.scss
@@ -254,6 +254,10 @@
   background-color: hsl(var(--hue), 20%, 97%);
   border: 1px solid hsl(var(--hue), 35%, 95%);
   border-radius: $grid-item-border-radius;
+
+  &.with-thumbnail {
+    padding-bottom: 0;
+  }
 }
 
 .file-icon, .folder-icon {
diff --git a/build/media_source/com_media/scss/components/_media-edit.scss b/media_source/com_media/scss/components/_media-edit.scss
similarity index 100%
rename from build/media_source/com_media/scss/components/_media-edit.scss
rename to media_source/com_media/scss/components/_media-edit.scss
diff --git a/build/media_source/com_media/scss/components/_media-infobar.scss b/media_source/com_media/scss/components/_media-infobar.scss
similarity index 100%
rename from build/media_source/com_media/scss/components/_media-infobar.scss
rename to media_source/com_media/scss/components/_media-infobar.scss
diff --git a/build/media_source/com_media/scss/components/_media-modal.scss b/media_source/com_media/scss/components/_media-modal.scss
similarity index 100%
rename from build/media_source/com_media/scss/components/_media-modal.scss
rename to media_source/com_media/scss/components/_media-modal.scss
diff --git a/build/media_source/com_media/scss/components/_media-toolbar.scss b/media_source/com_media/scss/components/_media-toolbar.scss
similarity index 100%
rename from build/media_source/com_media/scss/components/_media-toolbar.scss
rename to media_source/com_media/scss/components/_media-toolbar.scss
diff --git a/build/media_source/com_media/scss/components/_media-tree.scss b/media_source/com_media/scss/components/_media-tree.scss
similarity index 100%
rename from build/media_source/com_media/scss/components/_media-tree.scss
rename to media_source/com_media/scss/components/_media-tree.scss
diff --git a/build/media_source/com_media/scss/media-manager.scss b/media_source/com_media/scss/media-manager.scss
similarity index 100%
rename from build/media_source/com_media/scss/media-manager.scss
rename to media_source/com_media/scss/media-manager.scss
diff --git a/administrator/components/com_media/resources/scripts/app/Api.es6.js b/media_source/com_media/src/app/Api.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/app/Api.es6.js
rename to media_source/com_media/src/app/Api.es6.js
diff --git a/administrator/components/com_media/resources/scripts/app/Event.es6.js b/media_source/com_media/src/app/Event.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/app/Event.es6.js
rename to media_source/com_media/src/app/Event.es6.js
diff --git a/administrator/components/com_media/resources/scripts/app/Notifications.es6.js b/media_source/com_media/src/app/Notifications.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/app/Notifications.es6.js
rename to media_source/com_media/src/app/Notifications.es6.js
diff --git a/administrator/components/com_media/resources/scripts/app/path.js b/media_source/com_media/src/app/path.js
similarity index 99%
rename from administrator/components/com_media/resources/scripts/app/path.js
rename to media_source/com_media/src/app/path.js
index dbfc45d03f6bf..c6098ebd90d10 100644
--- a/administrator/components/com_media/resources/scripts/app/path.js
+++ b/media_source/com_media/src/app/path.js
@@ -24,4 +24,4 @@ export const dirname = (path) => {
   if (end === -1) return hasRoot ? '/' : '.';
   if (hasRoot && end === 1) return '//';
   return path.slice(0, end);
-}
+};
diff --git a/administrator/components/com_media/resources/scripts/components/app.vue b/media_source/com_media/src/components/app.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/app.vue
rename to media_source/com_media/src/components/app.vue
diff --git a/administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue b/media_source/com_media/src/components/breadcrumb/breadcrumb.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/breadcrumb/breadcrumb.vue
rename to media_source/com_media/src/components/breadcrumb/breadcrumb.vue
diff --git a/administrator/components/com_media/resources/scripts/components/browser/actionItems/actionItemsContainer.vue b/media_source/com_media/src/components/browser/actionItems/actionItemsContainer.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/browser/actionItems/actionItemsContainer.vue
rename to media_source/com_media/src/components/browser/actionItems/actionItemsContainer.vue
diff --git a/administrator/components/com_media/resources/scripts/components/browser/actionItems/delete.vue b/media_source/com_media/src/components/browser/actionItems/delete.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/browser/actionItems/delete.vue
rename to media_source/com_media/src/components/browser/actionItems/delete.vue
diff --git a/administrator/components/com_media/resources/scripts/components/browser/actionItems/download.vue b/media_source/com_media/src/components/browser/actionItems/download.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/browser/actionItems/download.vue
rename to media_source/com_media/src/components/browser/actionItems/download.vue
diff --git a/administrator/components/com_media/resources/scripts/components/browser/actionItems/edit.vue b/media_source/com_media/src/components/browser/actionItems/edit.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/browser/actionItems/edit.vue
rename to media_source/com_media/src/components/browser/actionItems/edit.vue
diff --git a/administrator/components/com_media/resources/scripts/components/browser/actionItems/preview.vue b/media_source/com_media/src/components/browser/actionItems/preview.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/browser/actionItems/preview.vue
rename to media_source/com_media/src/components/browser/actionItems/preview.vue
diff --git a/administrator/components/com_media/resources/scripts/components/browser/actionItems/rename.vue b/media_source/com_media/src/components/browser/actionItems/rename.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/browser/actionItems/rename.vue
rename to media_source/com_media/src/components/browser/actionItems/rename.vue
diff --git a/administrator/components/com_media/resources/scripts/components/browser/actionItems/share.vue b/media_source/com_media/src/components/browser/actionItems/share.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/browser/actionItems/share.vue
rename to media_source/com_media/src/components/browser/actionItems/share.vue
diff --git a/administrator/components/com_media/resources/scripts/components/browser/actionItems/toggle.vue b/media_source/com_media/src/components/browser/actionItems/toggle.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/browser/actionItems/toggle.vue
rename to media_source/com_media/src/components/browser/actionItems/toggle.vue
diff --git a/administrator/components/com_media/resources/scripts/components/browser/browser.vue b/media_source/com_media/src/components/browser/browser.vue
similarity index 98%
rename from administrator/components/com_media/resources/scripts/components/browser/browser.vue
rename to media_source/com_media/src/components/browser/browser.vue
index 1db1e4086bc5e..10aebf2a68f3e 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/browser.vue
+++ b/media_source/com_media/src/components/browser/browser.vue
@@ -200,8 +200,7 @@ export default {
     /* Unselect all browser items */
     unselectAllBrowserItems(event) {
       const clickedDelete = !!((event.target.id !== undefined && event.target.id === 'mediaDelete'));
-      const notClickedBrowserItems = (this.$refs.browserItems
-        && !this.$refs.browserItems.contains(event.target))
+      const notClickedBrowserItems = (this.$refs.browserItems && !this.$refs.browserItems.contains(event.target))
         || event.target === this.$refs.browserItems;
 
       const notClickedInfobar = this.$refs.infobar !== undefined
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/audio.vue b/media_source/com_media/src/components/browser/items/audio.vue
similarity index 61%
rename from administrator/components/com_media/resources/scripts/components/browser/items/audio.vue
rename to media_source/com_media/src/components/browser/items/audio.vue
index cb33bca7d39f4..078ebad9dd1ad 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/audio.vue
+++ b/media_source/com_media/src/components/browser/items/audio.vue
@@ -7,8 +7,23 @@
     @keyup.enter="openPreview()"
   >
     <div class="media-browser-item-preview">
-      <div class="file-background">
-        <div class="file-icon">
+      <div
+        class="file-background"
+        :class="{ 'with-thumbnail': thumbURL }"
+      >
+        <img
+          v-if="thumbURL"
+          class="image-cropped"
+          alt=""
+          :src="thumbURL"
+          :loading="thumbLoading"
+          :width="thumbWidth"
+          :height="thumbHeight"
+        >
+        <div
+          v-if="!thumbURL"
+          class="file-icon"
+        >
           <span class="fas fa-file-audio" />
         </div>
       </div>
@@ -51,6 +66,26 @@ export default {
       showActions: false,
     };
   },
+  computed: {
+    thumbURL() {
+      let path = this.item.thumb_path || '';
+
+      if (path && this.item.modified_date) {
+        path = path + (path.includes('?') ? '&' : '?') + this.item.modified_date;
+      }
+
+      return path;
+    },
+    thumbWidth() {
+      return this.item.thumb_width || null;
+    },
+    thumbHeight() {
+      return this.item.thumb_height || null;
+    },
+    thumbLoading() {
+      return this.item.thumb_width ? 'lazy' : null;
+    },
+  },
   methods: {
     /* Hide actions dropdown */
     hideActions() {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue b/media_source/com_media/src/components/browser/items/directory.vue
similarity index 66%
rename from administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
rename to media_source/com_media/src/components/browser/items/directory.vue
index d665740532b7b..9a20a481f30ca 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/directory.vue
+++ b/media_source/com_media/src/components/browser/items/directory.vue
@@ -9,8 +9,23 @@
       @dblclick.stop.prevent="onPreviewDblClick()"
       @keyup.enter="onPreviewDblClick()"
     >
-      <div class="file-background">
-        <div class="folder-icon">
+      <div
+        class="file-background"
+        :class="{ 'with-thumbnail': thumbURL }"
+      >
+        <img
+          v-if="thumbURL"
+          class="image-cropped"
+          alt=""
+          :src="thumbURL"
+          :loading="thumbLoading"
+          :width="thumbWidth"
+          :height="thumbHeight"
+        >
+        <div
+          v-if="!thumbURL"
+          class="folder-icon"
+        >
           <span class="icon-folder" />
         </div>
       </div>
@@ -47,6 +62,26 @@ export default {
       showActions: false,
     };
   },
+  computed: {
+    thumbURL() {
+      let path = this.item.thumb_path || '';
+
+      if (path && this.item.modified_date) {
+        path = path + (path.includes('?') ? '&' : '?') + this.item.modified_date;
+      }
+
+      return path;
+    },
+    thumbWidth() {
+      return this.item.thumb_width || null;
+    },
+    thumbHeight() {
+      return this.item.thumb_height || null;
+    },
+    thumbLoading() {
+      return this.item.thumb_width ? 'lazy' : null;
+    },
+  },
   methods: {
     /* Handle the on preview double click event */
     onPreviewDblClick() {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/document.vue b/media_source/com_media/src/components/browser/items/document.vue
similarity index 63%
rename from administrator/components/com_media/resources/scripts/components/browser/items/document.vue
rename to media_source/com_media/src/components/browser/items/document.vue
index e8a259f6a6afc..183f58192a3ba 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/document.vue
+++ b/media_source/com_media/src/components/browser/items/document.vue
@@ -5,8 +5,23 @@
     @mouseleave="hideActions()"
   >
     <div class="media-browser-item-preview">
-      <div class="file-background">
-        <div class="file-icon">
+      <div
+        class="file-background"
+        :class="{ 'with-thumbnail': thumbURL }"
+      >
+        <img
+          v-if="thumbURL"
+          class="image-cropped"
+          alt=""
+          :src="thumbURL"
+          :loading="thumbLoading"
+          :width="thumbWidth"
+          :height="thumbHeight"
+        >
+        <div
+          v-if="!thumbURL"
+          class="file-icon"
+        >
           <span class="fas fa-file" />
         </div>
       </div>
@@ -54,6 +69,26 @@ export default {
       showActions: false,
     };
   },
+  computed: {
+    thumbURL() {
+      let path = this.item.thumb_path || '';
+
+      if (path && this.item.modified_date) {
+        path = path + (path.includes('?') ? '&' : '?') + this.item.modified_date;
+      }
+
+      return path;
+    },
+    thumbWidth() {
+      return this.item.thumb_width || null;
+    },
+    thumbHeight() {
+      return this.item.thumb_height || null;
+    },
+    thumbLoading() {
+      return this.item.thumb_width ? 'lazy' : null;
+    },
+  },
   methods: {
     /* Hide actions dropdown */
     hideActions() {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/file.vue b/media_source/com_media/src/components/browser/items/file.vue
similarity index 63%
rename from administrator/components/com_media/resources/scripts/components/browser/items/file.vue
rename to media_source/com_media/src/components/browser/items/file.vue
index 2b816f6e75ade..71a486d0157fe 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/file.vue
+++ b/media_source/com_media/src/components/browser/items/file.vue
@@ -4,8 +4,23 @@
     @mouseleave="hideActions()"
   >
     <div class="media-browser-item-preview">
-      <div class="file-background">
-        <div class="file-icon">
+      <div
+        class="file-background"
+        :class="{ 'with-thumbnail': thumbURL }"
+      >
+        <img
+          v-if="thumbURL"
+          class="image-cropped"
+          alt=""
+          :src="thumbURL"
+          :loading="thumbLoading"
+          :width="thumbWidth"
+          :height="thumbHeight"
+        >
+        <div
+          v-if="!thumbURL"
+          class="file-icon"
+        >
           <span class="icon-file-alt" />
         </div>
       </div>
@@ -53,6 +68,26 @@ export default {
       showActions: false,
     };
   },
+  computed: {
+    thumbURL() {
+      let path = this.item.thumb_path || '';
+
+      if (path && this.item.modified_date) {
+        path = path + (path.includes('?') ? '&' : '?') + this.item.modified_date;
+      }
+
+      return path;
+    },
+    thumbWidth() {
+      return this.item.thumb_width || null;
+    },
+    thumbHeight() {
+      return this.item.thumb_height || null;
+    },
+    thumbLoading() {
+      return this.item.thumb_width ? 'lazy' : null;
+    },
+  },
   methods: {
     /* Hide actions dropdown */
     hideActions() {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue b/media_source/com_media/src/components/browser/items/image.vue
similarity index 87%
rename from administrator/components/com_media/resources/scripts/components/browser/items/image.vue
rename to media_source/com_media/src/components/browser/items/image.vue
index 242d9c8b6de48..de5d027c6f94f 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/image.vue
+++ b/media_source/com_media/src/components/browser/items/image.vue
@@ -12,17 +12,17 @@
     >
       <div class="image-background">
         <img
-          v-if="getURL"
+          v-if="thumbURL"
           class="image-cropped"
-          :src="getURL"
-          :alt="altTag"
-          :loading="loading"
-          :width="width"
-          :height="height"
+          :src="thumbURL"
+          :alt="thumbAlt"
+          :loading="thumbLoading"
+          :width="thumbWidth"
+          :height="thumbHeight"
           @load="setSize"
         >
         <span
-          v-if="!getURL"
+          v-if="!thumbURL"
           class="icon-eye-slash image-placeholder"
           aria-hidden="true"
         />
@@ -71,7 +71,7 @@ export default {
     };
   },
   computed: {
-    getURL() {
+    thumbURL() {
       if (!this.item.thumb_path) {
         return '';
       }
@@ -80,16 +80,16 @@ export default {
         ? `${this.item.thumb_path}?${this.item.modified_date ? new Date(this.item.modified_date).valueOf() : api.mediaVersion}`
         : `${this.item.thumb_path}`;
     },
-    width() {
-      return this.item.width > 0 ? this.item.width : null;
+    thumbWidth() {
+      return this.item.thumb_width || this.item.width || null;
     },
-    height() {
-      return this.item.height > 0 ? this.item.height : null;
+    thumbHeight() {
+      return this.item.thumb_height || this.item.height || null;
     },
-    loading() {
-      return this.item.width > 0 ? 'lazy' : null;
+    thumbLoading() {
+      return this.thumbWidth ? 'lazy' : null;
     },
-    altTag() {
+    thumbAlt() {
       return this.item.name;
     },
   },
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/item.es6.js b/media_source/com_media/src/components/browser/items/item.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/browser/items/item.es6.js
rename to media_source/com_media/src/components/browser/items/item.es6.js
diff --git a/administrator/components/com_media/resources/scripts/components/browser/items/video.vue b/media_source/com_media/src/components/browser/items/video.vue
similarity index 61%
rename from administrator/components/com_media/resources/scripts/components/browser/items/video.vue
rename to media_source/com_media/src/components/browser/items/video.vue
index 9f8fc8c9b7bd4..184bb16f748b2 100644
--- a/administrator/components/com_media/resources/scripts/components/browser/items/video.vue
+++ b/media_source/com_media/src/components/browser/items/video.vue
@@ -5,8 +5,23 @@
     @mouseleave="hideActions()"
   >
     <div class="media-browser-item-preview">
-      <div class="file-background">
-        <div class="file-icon">
+      <div
+        class="file-background"
+        :class="{ 'with-thumbnail': thumbURL }"
+      >
+        <img
+          v-if="thumbURL"
+          class="image-cropped"
+          alt=""
+          :src="thumbURL"
+          :loading="thumbLoading"
+          :width="thumbWidth"
+          :height="thumbHeight"
+        >
+        <div
+          v-if="!thumbURL"
+          class="file-icon"
+        >
           <span class="fas fa-file-video" />
         </div>
       </div>
@@ -49,6 +64,26 @@ export default {
       showActions: false,
     };
   },
+  computed: {
+    thumbURL() {
+      let path = this.item.thumb_path || '';
+
+      if (path && this.item.modified_date) {
+        path = path + (path.includes('?') ? '&' : '?') + this.item.modified_date;
+      }
+
+      return path;
+    },
+    thumbWidth() {
+      return this.item.thumb_width || null;
+    },
+    thumbHeight() {
+      return this.item.thumb_height || null;
+    },
+    thumbLoading() {
+      return this.item.thumb_width ? 'lazy' : null;
+    },
+  },
   methods: {
     /* Hide actions dropdown */
     hideActions() {
diff --git a/administrator/components/com_media/resources/scripts/components/browser/table/row.vue b/media_source/com_media/src/components/browser/table/row.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/browser/table/row.vue
rename to media_source/com_media/src/components/browser/table/row.vue
diff --git a/administrator/components/com_media/resources/scripts/components/browser/table/table.vue b/media_source/com_media/src/components/browser/table/table.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/browser/table/table.vue
rename to media_source/com_media/src/components/browser/table/table.vue
diff --git a/administrator/components/com_media/resources/scripts/components/browser/utils/utils.es6.js b/media_source/com_media/src/components/browser/utils/utils.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/browser/utils/utils.es6.js
rename to media_source/com_media/src/components/browser/utils/utils.es6.js
diff --git a/administrator/components/com_media/resources/scripts/components/infobar/infobar.vue b/media_source/com_media/src/components/infobar/infobar.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/infobar/infobar.vue
rename to media_source/com_media/src/components/infobar/infobar.vue
diff --git a/administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue b/media_source/com_media/src/components/modals/confirm-delete-modal.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/modals/confirm-delete-modal.vue
rename to media_source/com_media/src/components/modals/confirm-delete-modal.vue
diff --git a/administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue b/media_source/com_media/src/components/modals/create-folder-modal.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/modals/create-folder-modal.vue
rename to media_source/com_media/src/components/modals/create-folder-modal.vue
diff --git a/administrator/components/com_media/resources/scripts/components/modals/modal.vue b/media_source/com_media/src/components/modals/modal.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/modals/modal.vue
rename to media_source/com_media/src/components/modals/modal.vue
diff --git a/administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue b/media_source/com_media/src/components/modals/preview-modal.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/modals/preview-modal.vue
rename to media_source/com_media/src/components/modals/preview-modal.vue
diff --git a/administrator/components/com_media/resources/scripts/components/modals/rename-modal.vue b/media_source/com_media/src/components/modals/rename-modal.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/modals/rename-modal.vue
rename to media_source/com_media/src/components/modals/rename-modal.vue
diff --git a/administrator/components/com_media/resources/scripts/components/modals/share-modal.vue b/media_source/com_media/src/components/modals/share-modal.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/modals/share-modal.vue
rename to media_source/com_media/src/components/modals/share-modal.vue
diff --git a/administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue b/media_source/com_media/src/components/toolbar/toolbar.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/toolbar/toolbar.vue
rename to media_source/com_media/src/components/toolbar/toolbar.vue
diff --git a/administrator/components/com_media/resources/scripts/components/tree/disk.vue b/media_source/com_media/src/components/tree/disk.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/tree/disk.vue
rename to media_source/com_media/src/components/tree/disk.vue
diff --git a/administrator/components/com_media/resources/scripts/components/tree/drive.vue b/media_source/com_media/src/components/tree/drive.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/tree/drive.vue
rename to media_source/com_media/src/components/tree/drive.vue
diff --git a/administrator/components/com_media/resources/scripts/components/tree/tree.vue b/media_source/com_media/src/components/tree/tree.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/tree/tree.vue
rename to media_source/com_media/src/components/tree/tree.vue
diff --git a/administrator/components/com_media/resources/scripts/components/upload/upload.vue b/media_source/com_media/src/components/upload/upload.vue
similarity index 100%
rename from administrator/components/com_media/resources/scripts/components/upload/upload.vue
rename to media_source/com_media/src/components/upload/upload.vue
diff --git a/administrator/components/com_media/resources/scripts/mediamanager.es6.js b/media_source/com_media/src/mediamanager.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/mediamanager.es6.js
rename to media_source/com_media/src/mediamanager.es6.js
diff --git a/administrator/components/com_media/resources/scripts/mixins/navigable.es6.js b/media_source/com_media/src/mixins/navigable.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/mixins/navigable.es6.js
rename to media_source/com_media/src/mixins/navigable.es6.js
diff --git a/administrator/components/com_media/resources/scripts/plugins/translate.es6.js b/media_source/com_media/src/plugins/translate.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/plugins/translate.es6.js
rename to media_source/com_media/src/plugins/translate.es6.js
diff --git a/administrator/components/com_media/resources/scripts/store/actions.es6.js b/media_source/com_media/src/store/actions.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/store/actions.es6.js
rename to media_source/com_media/src/store/actions.es6.js
diff --git a/administrator/components/com_media/resources/scripts/store/getters.es6.js b/media_source/com_media/src/store/getters.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/store/getters.es6.js
rename to media_source/com_media/src/store/getters.es6.js
diff --git a/administrator/components/com_media/resources/scripts/store/mutation-types.es6.js b/media_source/com_media/src/store/mutation-types.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/store/mutation-types.es6.js
rename to media_source/com_media/src/store/mutation-types.es6.js
diff --git a/administrator/components/com_media/resources/scripts/store/mutations.es6.js b/media_source/com_media/src/store/mutations.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/store/mutations.es6.js
rename to media_source/com_media/src/store/mutations.es6.js
diff --git a/administrator/components/com_media/resources/scripts/store/plugins/persisted-state.es6.js b/media_source/com_media/src/store/plugins/persisted-state.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/store/plugins/persisted-state.es6.js
rename to media_source/com_media/src/store/plugins/persisted-state.es6.js
diff --git a/administrator/components/com_media/resources/scripts/store/state.es6.js b/media_source/com_media/src/store/state.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/store/state.es6.js
rename to media_source/com_media/src/store/state.es6.js
diff --git a/administrator/components/com_media/resources/scripts/store/store.es6.js b/media_source/com_media/src/store/store.es6.js
similarity index 100%
rename from administrator/components/com_media/resources/scripts/store/store.es6.js
rename to media_source/com_media/src/store/store.es6.js
diff --git a/build/media_source/com_menus/css/admin-item-edit_container.css b/media_source/com_menus/css/admin-item-edit_container.css
similarity index 100%
rename from build/media_source/com_menus/css/admin-item-edit_container.css
rename to media_source/com_menus/css/admin-item-edit_container.css
diff --git a/build/media_source/com_menus/joomla.asset.json b/media_source/com_menus/joomla.asset.json
similarity index 100%
rename from build/media_source/com_menus/joomla.asset.json
rename to media_source/com_menus/joomla.asset.json
diff --git a/build/media_source/com_menus/js/admin-item-edit.es6.js b/media_source/com_menus/js/admin-item-edit.es6.js
similarity index 100%
rename from build/media_source/com_menus/js/admin-item-edit.es6.js
rename to media_source/com_menus/js/admin-item-edit.es6.js
diff --git a/build/media_source/com_menus/js/admin-item-edit_container.es6.js b/media_source/com_menus/js/admin-item-edit_container.es6.js
similarity index 100%
rename from build/media_source/com_menus/js/admin-item-edit_container.es6.js
rename to media_source/com_menus/js/admin-item-edit_container.es6.js
diff --git a/build/media_source/com_menus/js/admin-item-edit_modules.es6.js b/media_source/com_menus/js/admin-item-edit_modules.es6.js
similarity index 100%
rename from build/media_source/com_menus/js/admin-item-edit_modules.es6.js
rename to media_source/com_menus/js/admin-item-edit_modules.es6.js
diff --git a/build/media_source/com_menus/js/admin-item-modal.es6.js b/media_source/com_menus/js/admin-item-modal.es6.js
similarity index 100%
rename from build/media_source/com_menus/js/admin-item-modal.es6.js
rename to media_source/com_menus/js/admin-item-modal.es6.js
diff --git a/build/media_source/com_menus/js/admin-items-modal.es6.js b/media_source/com_menus/js/admin-items-modal.es6.js
similarity index 100%
rename from build/media_source/com_menus/js/admin-items-modal.es6.js
rename to media_source/com_menus/js/admin-items-modal.es6.js
diff --git a/build/media_source/com_menus/js/admin-menus-default.es6.js b/media_source/com_menus/js/admin-menus-default.es6.js
similarity index 100%
rename from build/media_source/com_menus/js/admin-menus-default.es6.js
rename to media_source/com_menus/js/admin-menus-default.es6.js
diff --git a/build/media_source/com_menus/js/default-batch-body.es6.js b/media_source/com_menus/js/default-batch-body.es6.js
similarity index 100%
rename from build/media_source/com_menus/js/default-batch-body.es6.js
rename to media_source/com_menus/js/default-batch-body.es6.js
diff --git a/build/media_source/com_modules/joomla.asset.json b/media_source/com_modules/joomla.asset.json
similarity index 100%
rename from build/media_source/com_modules/joomla.asset.json
rename to media_source/com_modules/joomla.asset.json
diff --git a/build/media_source/com_modules/js/admin-module-edit_assignment.es6.js b/media_source/com_modules/js/admin-module-edit_assignment.es6.js
similarity index 100%
rename from build/media_source/com_modules/js/admin-module-edit_assignment.es6.js
rename to media_source/com_modules/js/admin-module-edit_assignment.es6.js
diff --git a/build/media_source/com_modules/js/admin-module-search.es6.js b/media_source/com_modules/js/admin-module-search.es6.js
similarity index 100%
rename from build/media_source/com_modules/js/admin-module-search.es6.js
rename to media_source/com_modules/js/admin-module-search.es6.js
diff --git a/build/media_source/com_modules/js/admin-modules-modal.es6.js b/media_source/com_modules/js/admin-modules-modal.es6.js
similarity index 100%
rename from build/media_source/com_modules/js/admin-modules-modal.es6.js
rename to media_source/com_modules/js/admin-modules-modal.es6.js
diff --git a/build/media_source/com_modules/js/admin-select-modal.es6.js b/media_source/com_modules/js/admin-select-modal.es6.js
similarity index 100%
rename from build/media_source/com_modules/js/admin-select-modal.es6.js
rename to media_source/com_modules/js/admin-select-modal.es6.js
diff --git a/build/media_source/com_scheduler/css/admin-view-task.css b/media_source/com_scheduler/css/admin-view-task.css
similarity index 100%
rename from build/media_source/com_scheduler/css/admin-view-task.css
rename to media_source/com_scheduler/css/admin-view-task.css
diff --git a/build/media_source/com_scheduler/css/admin-view-tasks.css b/media_source/com_scheduler/css/admin-view-tasks.css
similarity index 100%
rename from build/media_source/com_scheduler/css/admin-view-tasks.css
rename to media_source/com_scheduler/css/admin-view-tasks.css
diff --git a/build/media_source/com_scheduler/joomla.asset.json b/media_source/com_scheduler/joomla.asset.json
similarity index 100%
rename from build/media_source/com_scheduler/joomla.asset.json
rename to media_source/com_scheduler/joomla.asset.json
diff --git a/build/media_source/com_scheduler/js/admin-view-run-test-task.es6.js b/media_source/com_scheduler/js/admin-view-run-test-task.es6.js
similarity index 100%
rename from build/media_source/com_scheduler/js/admin-view-run-test-task.es6.js
rename to media_source/com_scheduler/js/admin-view-run-test-task.es6.js
diff --git a/build/media_source/com_scheduler/js/admin-view-select-task-search.es6.js b/media_source/com_scheduler/js/admin-view-select-task-search.es6.js
similarity index 97%
rename from build/media_source/com_scheduler/js/admin-view-select-task-search.es6.js
rename to media_source/com_scheduler/js/admin-view-select-task-search.es6.js
index feca1b0d70bf4..a40abb12a679e 100644
--- a/build/media_source/com_scheduler/js/admin-view-select-task-search.es6.js
+++ b/media_source/com_scheduler/js/admin-view-select-task-search.es6.js
@@ -67,7 +67,8 @@ if (elSearch && elSearchContainer) {
 
       // If the task title and description don’t match add a class to hide it.
       if (title && !title.toLowerCase().includes(partialSearch.toLowerCase())
-          && description && !description.toLowerCase().includes(partialSearch.toLowerCase())) {
+        && description && !description.toLowerCase().includes(partialSearch.toLowerCase())
+      ) {
         card.classList.add('d-none');
       } else {
         hasSearchResults = true;
diff --git a/build/media_source/com_scheduler/js/scheduler-config.es6.js b/media_source/com_scheduler/js/scheduler-config.es6.js
similarity index 100%
rename from build/media_source/com_scheduler/js/scheduler-config.es6.js
rename to media_source/com_scheduler/js/scheduler-config.es6.js
diff --git a/build/media_source/com_tags/joomla.asset.json b/media_source/com_tags/joomla.asset.json
similarity index 100%
rename from build/media_source/com_tags/joomla.asset.json
rename to media_source/com_tags/joomla.asset.json
diff --git a/build/media_source/com_tags/js/tag-default.es6.js b/media_source/com_tags/js/tag-default.es6.js
similarity index 100%
rename from build/media_source/com_tags/js/tag-default.es6.js
rename to media_source/com_tags/js/tag-default.es6.js
diff --git a/build/media_source/com_tags/js/tag-list.es6.js b/media_source/com_tags/js/tag-list.es6.js
similarity index 100%
rename from build/media_source/com_tags/js/tag-list.es6.js
rename to media_source/com_tags/js/tag-list.es6.js
diff --git a/build/media_source/com_tags/js/tags-default.es6.js b/media_source/com_tags/js/tags-default.es6.js
similarity index 100%
rename from build/media_source/com_tags/js/tags-default.es6.js
rename to media_source/com_tags/js/tags-default.es6.js
diff --git a/build/media_source/com_templates/css/admin-templates-default.css b/media_source/com_templates/css/admin-templates-default.css
similarity index 100%
rename from build/media_source/com_templates/css/admin-templates-default.css
rename to media_source/com_templates/css/admin-templates-default.css
diff --git a/build/media_source/com_templates/joomla.asset.json b/media_source/com_templates/joomla.asset.json
similarity index 100%
rename from build/media_source/com_templates/joomla.asset.json
rename to media_source/com_templates/joomla.asset.json
diff --git a/build/media_source/com_templates/js/admin-template-toggle-assignment.es6.js b/media_source/com_templates/js/admin-template-toggle-assignment.es6.js
similarity index 100%
rename from build/media_source/com_templates/js/admin-template-toggle-assignment.es6.js
rename to media_source/com_templates/js/admin-template-toggle-assignment.es6.js
diff --git a/build/media_source/com_templates/js/admin-template-toggle-switch.es6.js b/media_source/com_templates/js/admin-template-toggle-switch.es6.js
similarity index 100%
rename from build/media_source/com_templates/js/admin-template-toggle-switch.es6.js
rename to media_source/com_templates/js/admin-template-toggle-switch.es6.js
diff --git a/build/media_source/com_templates/js/admin-templates-default.es6.js b/media_source/com_templates/js/admin-templates-default.es6.js
similarity index 100%
rename from build/media_source/com_templates/js/admin-templates-default.es6.js
rename to media_source/com_templates/js/admin-templates-default.es6.js
diff --git a/build/media_source/com_users/images/emergency.svg b/media_source/com_users/images/emergency.svg
similarity index 100%
rename from build/media_source/com_users/images/emergency.svg
rename to media_source/com_users/images/emergency.svg
diff --git a/build/media_source/com_users/joomla.asset.json b/media_source/com_users/joomla.asset.json
similarity index 78%
rename from build/media_source/com_users/joomla.asset.json
rename to media_source/com_users/joomla.asset.json
index 10fc7a97de56a..a89b882c82641 100644
--- a/build/media_source/com_users/joomla.asset.json
+++ b/media_source/com_users/joomla.asset.json
@@ -37,6 +37,17 @@
       "attributes": {
         "type": "module"
       }
+    },
+    {
+      "name": "com_users.activate-user-send-email",
+      "type": "script",
+      "uri": "com_users/activate-user-send-email.min.js",
+      "dependencies": [
+        "core"
+      ],
+      "attributes": {
+        "type": "module"
+      }
     }
   ]
 }
diff --git a/media_source/com_users/js/activate-user-send-email.es6.js b/media_source/com_users/js/activate-user-send-email.es6.js
new file mode 100644
index 0000000000000..79148446af16a
--- /dev/null
+++ b/media_source/com_users/js/activate-user-send-email.es6.js
@@ -0,0 +1,56 @@
+/**
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+if (!Joomla) {
+  throw new Error('Joomla API was not properly initialized');
+}
+
+const button = document.querySelector('.activate-send-mail');
+
+if (button && Object.keys(button.dataset).length !== 0) {
+  button.addEventListener('click', () => {
+    button.querySelector('span').className = 'icon-spinner';
+    button.disabled = true;
+
+    const queryString = Object.keys(button.dataset)
+      .reduce((a, k) => {
+        a.push(`${k}=${encodeURIComponent(button.dataset[k])}`);
+        return a;
+      }, [])
+      .join('&');
+
+    const url = `index.php?${queryString}`;
+
+    Joomla.request({
+      url,
+      method: 'GET',
+      headers: {
+        'X-CSRF-Token': Joomla.getOptions('csrf.token') || '',
+      },
+      onSuccess: (resp) => {
+        let response;
+        try {
+          response = JSON.parse(resp);
+        } catch (error) {
+          button.classList.add('error');
+        }
+
+        button.querySelector('span').className = 'icon-mail';
+        button.disabled = false;
+
+        if (response.messages) {
+          Joomla.renderMessages(response.messages);
+        }
+      },
+      onError: (resp) => {
+        const response = JSON.parse(resp);
+        button.classList.add('error');
+        if (response.messages) {
+          Joomla.renderMessages(response.messages);
+        }
+      },
+    });
+  });
+}
diff --git a/build/media_source/com_users/js/admin-users-groups.es6.js b/media_source/com_users/js/admin-users-groups.es6.js
similarity index 100%
rename from build/media_source/com_users/js/admin-users-groups.es6.js
rename to media_source/com_users/js/admin-users-groups.es6.js
diff --git a/build/media_source/com_users/js/two-factor-focus.es6.js b/media_source/com_users/js/two-factor-focus.es6.js
similarity index 100%
rename from build/media_source/com_users/js/two-factor-focus.es6.js
rename to media_source/com_users/js/two-factor-focus.es6.js
diff --git a/build/media_source/com_users/js/two-factor-list.es6.js b/media_source/com_users/js/two-factor-list.es6.js
similarity index 100%
rename from build/media_source/com_users/js/two-factor-list.es6.js
rename to media_source/com_users/js/two-factor-list.es6.js
diff --git a/media_source/com_workflow/builder.mjs b/media_source/com_workflow/builder.mjs
new file mode 100644
index 0000000000000..6d6775014813d
--- /dev/null
+++ b/media_source/com_workflow/builder.mjs
@@ -0,0 +1,98 @@
+/**
+ * Assets Builder
+ */
+import path from 'node:path';
+import fsp from 'node:fs/promises';
+import { rollup } from 'rollup';
+import VuePlugin from 'rollup-plugin-vue';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import replace from '@rollup/plugin-replace';
+import { babel } from '@rollup/plugin-babel';
+import DefaultModuleBuilder from '../../build/build-modules-js/builder/default-module-builder.mjs';
+import { minifyJSContent } from '../../build/build-modules-js/javascript/js-handle.mjs';
+
+export const buildWorkflowModule = async (basePath, targetPath) => {
+  const srcFile = path.join(basePath, 'src', 'workflowgraph.es6.js');
+  const targetFile = path.join(targetPath, 'js', 'workflow-graph.js');
+  const targetFileMin = path.join(targetPath, 'js', 'workflow-graph.min.js');
+  const isProduction = process.env.NODE_ENV !== 'DEVELOPMENT';
+
+  return rollup({
+    input: srcFile,
+    external: ['joomla.dialog'],
+    plugins: [
+      VuePlugin({
+        target: 'browser',
+        css: false,
+        compileTemplate: true,
+        template: {
+          isProduction,
+        },
+      }),
+      nodeResolve(),
+      commonjs(),
+      replace({
+        'process.env.NODE_ENV': JSON.stringify((process.env.NODE_ENV && process.env.NODE_ENV.toLocaleLowerCase()) || 'production'),
+        __VUE_OPTIONS_API__: true,
+        __VUE_PROD_DEVTOOLS__: !isProduction,
+        preventAssignment: true,
+      }),
+      babel({
+        exclude: 'node_modules/core-js/**',
+        babelHelpers: 'bundled',
+        babelrc: false,
+        presets: [
+          [
+            '@babel/preset-env',
+            {
+              targets: {
+                browsers: [
+                  '> 1%',
+                  'not op_mini all',
+                  /** https://caniuse.com/es6-module */
+                  'chrome >= 61',
+                  'safari >= 11',
+                  'edge >= 16',
+                  'Firefox >= 60',
+                ],
+              },
+              loose: true,
+              bugfixes: false,
+              ignoreBrowserslistConfig: true,
+            },
+          ],
+        ],
+      }),
+    ],
+  }).then((build) => {
+    return build.write({
+      format: 'es',
+      sourcemap: !isProduction ? 'inline' : false,
+      file: targetFile,
+    })
+      .then((value) => (isProduction ? minifyJSContent(value.output[0].code) : value.output[0]))
+      .then((content) => {
+        if (isProduction) {
+          return fsp.writeFile(targetFileMin, content, { encoding: 'utf8', mode: 0o644 });
+        }
+
+        // Copy media-manager.js => media-manager.min.js
+        return fsp.copyFile(targetFile, targetFileMin);
+      }).then(() => {
+        return build.close();
+      });
+  });
+};
+
+export default class WorkflowModuleBuilder extends DefaultModuleBuilder {
+  /**
+   * Process JavaScript files and Modules
+   * @returns { Promise }
+   */
+  async js() {
+    await super.js();
+
+    return buildWorkflowModule(this.basePath, this.targetPath);
+  }
+};
diff --git a/media_source/com_workflow/joomla.asset.json b/media_source/com_workflow/joomla.asset.json
new file mode 100644
index 0000000000000..99b29813026a9
--- /dev/null
+++ b/media_source/com_workflow/joomla.asset.json
@@ -0,0 +1,52 @@
+{
+  "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
+  "name": "com_workflow",
+  "version": "4.0.0",
+  "description": "Joomla CMS",
+  "license": "GPL-2.0-or-later",
+  "assets": [
+    {
+      "name": "com_workflow.admin-items-workflow-buttons",
+      "type": "script",
+      "uri": "com_workflow/admin-items-workflow-buttons.min.js",
+      "dependencies": [
+        "core"
+      ],
+      "attributes": {
+        "type": "module"
+      }
+    },
+    {
+      "name": "com_workflow.workflowgraph",
+      "type": "style",
+      "uri": "com_workflow/workflow-graph.min.css"
+    },
+    {
+      "name": "com_workflow.workflowgraph",
+      "type": "script",
+      "uri": "com_workflow/workflow-graph.min.js",
+      "dependencies": [
+        "core"
+      ],
+      "attributes": {
+        "type": "module"
+      }
+    },
+    {
+      "name" : "com_workflow.workflowgraphclient",
+      "type": "style",
+      "uri": "com_workflow/workflow-graph-client.min.css"
+    },
+    {
+      "name": "com_workflow.workflowgraphclient",
+      "type": "script",
+      "uri": "com_workflow/workflow-graph-client.min.js",
+      "dependencies": [
+        "core"
+      ],
+      "attributes": {
+        "type": "module"
+      }
+    }
+  ]
+}
diff --git a/build/media_source/com_workflow/js/admin-items-workflow-buttons.es6.js b/media_source/com_workflow/js/admin-items-workflow-buttons.es6.js
similarity index 100%
rename from build/media_source/com_workflow/js/admin-items-workflow-buttons.es6.js
rename to media_source/com_workflow/js/admin-items-workflow-buttons.es6.js
diff --git a/media_source/com_workflow/js/workflow-graph-client.es6.js b/media_source/com_workflow/js/workflow-graph-client.es6.js
new file mode 100644
index 0000000000000..0ce13da5018ac
--- /dev/null
+++ b/media_source/com_workflow/js/workflow-graph-client.es6.js
@@ -0,0 +1,618 @@
+/**
+ * @copyright (C) 2026 Open Source Matters
+ * @license  GNU GPL v2 or later; see LICENSE.txt
+ */
+
+Joomla = window.Joomla || {};
+(() => {
+  // --- Constants ---
+  const STAGE_WIDTH = 200;
+  const STAGE_HEIGHT = 100;
+  const MIN_ZOOM = 0.5;
+  const MAX_ZOOM = 2;
+  const ZOOM_SENSITIVITY = 0.1;
+  const CORNER_RADIUS = 10;
+
+  // This central state object holds all data needed for rendering.
+  const state = {
+    workflow: null,
+    stages: [],
+    transitions: [],
+    scale: 1,
+    panX: 0,
+    panY: 0,
+    isDraggingStage: false,
+    highlightedEdge: null,
+  };
+
+  // --- Translation ---
+  const translate = (string) => {
+    return Joomla.Text._(string);
+  };
+
+  const sprintf = (string, ...args) => {
+    const base = Joomla.Text._(string, string);
+    let i = 0;
+    return base.replace(/%((%)|s|d)/g, (m) => {
+      let val = args[i];
+      if (m === '%d') {
+        val = parseFloat(val);
+        if (Number.isNaN(val)) val = 0;
+      }
+      i += 1;
+      return val;
+    });
+  };
+
+  // Get full url for marker to avoid issues with base tags
+  const getMarkerUrl = (id) => {
+    const location = window.location.href.split('#')[0];
+    return `url(${location}#${id})`;
+  };
+
+  function showMessageInModal(message, type) {
+    const messages = {};
+    messages[type] = [Joomla.Text._(message)];
+    Joomla.renderMessages(messages);
+    if (type === 'error') {
+      const dialog = document.querySelector('joomla-dialog');
+      if (dialog) {
+        dialog.close();
+      }
+    }
+  }
+
+  async function makeRequest(url) {
+    try {
+      const paths = Joomla.getOptions('system.paths');
+      const baseUri = `${paths ? `${paths.baseFull}index.php` : window.location.pathname}`;
+      const uri = `${baseUri}?option=com_workflow&extension=com_content&layout=modal&view=graph${url}`;
+      const response = await fetch(uri, { credentials: 'same-origin' });
+      if (!response.ok) {
+        let message = 'COM_WORKFLOW_GRAPH_ERROR_UNKNOWN';
+        if (response.status === 401) message = 'COM_WORKFLOW_GRAPH_ERROR_NOT_AUTHENTICATED';
+        else if (response.status >= 403) message = 'COM_WORKFLOW_GRAPH_ERROR_NO_PERMISSION';
+        else if (response.status != 200) message = sprintf('COM_WORKFLOW_GRAPH_ERROR_REQUEST_FAILED', response.status);
+        throw new Error(message);
+      }
+      const responseData = await response.json();
+      if (responseData.success === false) {
+        throw new Error(responseData.message || 'COM_WORKFLOW_GRAPH_ERROR_API_RETURNED_ERROR');
+      }
+      return responseData;
+    } catch (err) {
+      showMessageInModal(err.message, 'error');
+      return false;
+    }
+  }
+
+  // --- Initial Layout Creation ---
+  function calculateAutoLayout(stages) {
+    const withNoPosition = stages.filter((stage) => !stage.position || isNaN(stage.position.x) || isNaN(stage.position.y));
+    if (withNoPosition.length === 0) return stages;
+
+    const fromAnyStage = stages.find((s) => s.id === 'from_any');
+    const transitionStages = stages.filter((s) => s.id !== 'from_any');
+
+    const gapX = 400;
+    const gapY = 300;
+    const paddingX = 100;
+    const paddingY = 100;
+    const columns = Math.min(4, Math.ceil(Math.sqrt(transitionStages.length) + 1));
+
+    transitionStages.forEach((stage, index) => {
+      if (withNoPosition.some((s) => s.id === stage.id)) {
+        const col = index % columns;
+        const row = Math.floor(index / columns);
+        stage.position = {
+          x: col * gapX + paddingX,
+          y: row * gapY + paddingY,
+        };
+      }
+    });
+
+    if (fromAnyStage && withNoPosition.some((s) => s.id === fromAnyStage.id)) {
+      if (!fromAnyStage.position || isNaN(fromAnyStage.position.x) || isNaN(fromAnyStage.position.y)) {
+        fromAnyStage.position = { x: 600, y: -200 };
+      }
+    }
+    return stages;
+  }
+
+  function buildPathFromPoints(points) {
+    let path = `M ${points[0].x} ${points[0].y - 50}`;
+    for (let i = 1; i < points.length - 1; i++) {
+      const prev = points[i - 1];
+      const curr = points[i];
+      const next = points[i + 1];
+
+      const dx1 = prev.x - curr.x;
+      const dy1 = prev.y - curr.y;
+      const len1 = Math.sqrt(dx1 * dx1 + dy1 * dy1);
+
+      const dx2 = next.x - curr.x;
+      const dy2 = next.y - curr.y;
+      const len2 = Math.sqrt(dx2 * dx2 + dy2 * dy2);
+
+      if (len1 < 1 || len2 < 1) {
+        path += ` L ${curr.x} ${curr.y}`;
+        continue;
+      }
+
+      const r = Math.min(CORNER_RADIUS, len1 / 2, len2 / 2);
+
+      const startX = curr.x + (dx1 / len1) * r;
+      const startY = curr.y + (dy1 / len1) * r;
+
+      const endX = curr.x + (dx2 / len2) * r;
+      const endY = curr.y + (dy2 / len2) * r;
+
+      path += ` L ${startX} ${startY}`;
+      path += ` Q ${curr.x} ${curr.y} ${endX} ${endY}`;
+    }
+    path += ` L ${points[points.length - 1].x} ${points[points.length - 1].y}`;
+    return path;
+  }
+
+  function getVerticalStepPath(sourceX, sourceY, targetX, targetY, midY) {
+    const points = [
+      { x: sourceX, y: sourceY },
+      { x: sourceX, y: midY },
+      { x: targetX, y: midY },
+      { x: targetX, y: targetY },
+    ];
+    return [buildPathFromPoints(points), (sourceX + targetX) / 2, midY];
+  }
+
+  function getHorizontalStepPath(sourceX, sourceY, targetX, targetY, midX) {
+    const startStubY = sourceY + 30;
+    const endStubY = targetY - 30;
+
+    const points = [
+      { x: sourceX, y: sourceY },
+      { x: sourceX, y: startStubY },
+      { x: midX, y: startStubY },
+      { x: midX, y: endStubY },
+      { x: targetX, y: endStubY },
+      { x: targetX, y: targetY },
+    ];
+    return [buildPathFromPoints(points), midX, (startStubY + endStubY) / 2];
+  }
+
+  function generateEdges(transitions, stages) {
+    const stageMap = new Map(stages.map((s) => [s.id, s]));
+    const edgeGroups = {};
+
+    // Undirected Grouping to prevent overlaps on bi-directional edges
+    transitions.forEach((tr) => {
+      const fromId = tr.from_stage_id === -1 ? 'from_any' : tr.from_stage_id;
+      const toId = tr.to_stage_id;
+      const s1 = String(fromId);
+      const s2 = String(toId);
+      const key = s1 < s2 ? `${s1}|${s2}` : `${s2}|${s1}`;
+
+      if (!edgeGroups[key]) edgeGroups[key] = [];
+      edgeGroups[key].push(tr);
+    });
+
+    Object.values(edgeGroups).forEach((group) => group.sort((a, b) => a.id - b.id));
+
+    return transitions.flatMap((tr) => {
+      const fromId = tr.from_stage_id === -1 ? 'from_any' : tr.from_stage_id;
+      const toId = tr.to_stage_id;
+      const fromStage = stageMap.get(fromId);
+      const toStage = stageMap.get(toId);
+
+      if (!(fromStage != null && fromStage.position) || !(toStage != null && toStage.position)) return [];
+
+      const sourceX = fromStage.position.x + STAGE_WIDTH / 2;
+      const sourceY = fromStage.position.y + STAGE_HEIGHT;
+      const targetX = toStage.position.x + STAGE_WIDTH / 2;
+      const targetY = toStage.position.y;
+
+      const s1 = String(fromId);
+      const s2 = String(toId);
+      const groupKey = s1 < s2 ? `${s1}|${s2}` : `${s2}|${s1}`;
+      const group = edgeGroups[groupKey] || [tr];
+      const transitionIndex = group.findIndex((t) => t.id === tr.id);
+
+      let offsetIndex = transitionIndex - (group.length - 1) / 2;
+      const bundleSpacing = 40;
+
+      let pathData, labelX, labelY;
+
+      // Obstruction Check
+      let isVerticalObstructed = false;
+      const distX = Math.abs(sourceX - targetX);
+      const isVerticallyAligned = distX < STAGE_WIDTH;
+
+      if (isVerticallyAligned && targetY > sourceY) {
+        isVerticalObstructed = stages.some((stage) => {
+          if (stage.id === fromId || stage.id === toId) return false;
+          const sTop = stage.position.y;
+          const sBottom = stage.position.y + STAGE_HEIGHT;
+          const isBetweenY = (sTop > sourceY && sBottom < targetY);
+          const sLeft = stage.position.x;
+          const sRight = stage.position.x + STAGE_WIDTH;
+          const pathX = sourceX;
+          const isBlockingX = (pathX > sLeft - 20 && pathX < sRight + 20);
+          return isBetweenY && isBlockingX;
+        });
+      }
+
+      const isStacked = (targetY > (sourceY + 50)) && !isVerticalObstructed && distX > 40;
+
+      if (isStacked) {
+        let midY = (sourceY + targetY) / 2;
+        midY += offsetIndex * bundleSpacing;
+        [pathData, labelX, labelY] = getVerticalStepPath(sourceX, sourceY, targetX, targetY, midY);
+        labelX += offsetIndex * 60; // Stagger X
+      } else {
+        let midX = (sourceX + targetX) / 2;
+        if (distX < STAGE_WIDTH || isVerticalObstructed) {
+          midX = Math.max(sourceX, targetX) + STAGE_WIDTH / 2 + 60;
+        }
+        midX += offsetIndex * bundleSpacing;
+        [pathData, labelX, labelY] = getHorizontalStepPath(sourceX, sourceY, targetX, targetY, midX);
+        labelY += offsetIndex * 35; // Stagger Y
+      }
+
+      return {
+        id: `transition-${tr.id}`,
+        pathData,
+        label: tr.title,
+        labelPosition: { x: labelX, y: labelY },
+        fromId,
+        toId,
+      };
+    }).filter(Boolean);
+  }
+
+  function renderGraph(modal) {
+    const graph = modal.querySelector('#graph');
+    const stageContainer = modal.querySelector('#stages');
+    const svg = modal.querySelector('#connections');
+    if (!graph || !stageContainer || !svg) return;
+
+    // Render Stages
+    stageContainer.querySelectorAll('[id^="stage-"]').forEach((el) => el.remove());
+    state.stages.forEach((stage) => {
+      let stageEl = document.createElement('div');
+      stageEl.id = `stage-${stage.id}`;
+      stageEl.addEventListener('mousedown', (e) => { if (e.button === 0) handleNodeDrag(e, stage); });
+      const isVirtual = stage.id === 'from_any';
+      stageEl.className = `stage ${stage.default ? 'default' : ''} ${isVirtual ? 'virtual' : ''}`;
+      stageEl.style.left = `${stage.position.x}px`;
+      stageEl.style.top = `${stage.position.y}px`;
+
+      let newHTML = isVirtual
+        ? `<div class="stage-title text-truncate">${stage.title}</div>
+           <div class="d-flex justify-content-between align-items-center mt-2"><div class="badge bg-info rounded-pill p-1"></div></div>`
+        : `<div class="stage-title text-truncate" title="${stage.title}">${stage.title}</div>
+           <div class="d-flex align-items-center gap-2">
+             ${stage.description ? `<div class="stage-description text-truncate small">${stage.description}</div>` : ''}
+           </div>
+           <div class="d-flex justify-content-between align-items-center mt-2">
+             ${typeof stage.published !== 'undefined' ? `<div class="badge ${stage.published == '1' ? 'bg-success' : 'bg-danger'} rounded-pill p-1">${stage.published == '1' ? translate('COM_WORKFLOW_GRAPH_ENABLED') : translate('COM_WORKFLOW_GRAPH_DISABLED')}</div>` : ''}
+             ${stage.default ? `<div class="badge bg-warning rounded-pill p-1">${translate('COM_WORKFLOW_GRAPH_DEFAULT')}</div>` : ''}
+           </div>`;
+
+      stageEl.innerHTML = newHTML;
+      stageContainer.appendChild(stageEl);
+    });
+
+    // --- Setting up path SVG layers ---
+    let pathsLayer = svg.querySelector('g.layers-paths');
+    let labelsLayer = svg.querySelector('g.layers-labels');
+
+    if (!pathsLayer) {
+      pathsLayer = document.createElementNS('http://www.w3.org/2000/svg', 'g');
+      pathsLayer.classList.add('layers-paths');
+      svg.appendChild(pathsLayer);
+    }
+    if (!labelsLayer) {
+      labelsLayer = document.createElementNS('http://www.w3.org/2000/svg', 'g');
+      labelsLayer.classList.add('layers-labels');
+      svg.appendChild(labelsLayer);
+    } else {
+      svg.appendChild(labelsLayer); // Ensure it is last (top)
+    }
+
+    const edges = generateEdges(state.transitions, state.stages);
+
+    // Cleanup orphans
+    pathsLayer.querySelectorAll('path[data-edge-id]').forEach((el) => {
+      if (!edges.find((e) => e.id === el.dataset.edgeId)) el.remove();
+    });
+    labelsLayer.querySelectorAll('foreignObject[data-edge-id]').forEach((el) => {
+      if (!edges.find((e) => e.id === el.dataset.edgeId)) el.remove();
+    });
+
+    edges.forEach((edge) => {
+      let path = pathsLayer.querySelector(`path[data-edge-id="${edge.id}"]`);
+      if (!path) {
+        path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
+        path.dataset.edgeId = edge.id;
+        path.setAttribute('class', 'transition-path');
+        pathsLayer.appendChild(path);
+      }
+      path.setAttribute('d', edge.pathData);
+      path.classList.toggle('highlighted', state.highlightedEdge === edge.id);
+      path.setAttribute('marker-end', getMarkerUrl('arrowhead'));
+
+      let foreignObject = labelsLayer.querySelector(`foreignObject[data-edge-id="${edge.id}"]`);
+      let labelDiv;
+
+      if (!foreignObject) {
+        foreignObject = document.createElementNS('http://www.w3.org/2000/svg', 'foreignObject');
+        foreignObject.dataset.edgeId = edge.id;
+        foreignObject.style.overflow = 'visible';
+
+        labelDiv = document.createElement('div');
+        labelDiv.className = 'transition-label-content';
+        labelDiv.addEventListener('click', (e) => {
+          e.stopPropagation();
+          state.highlightedEdge = state.highlightedEdge === edge.id ? null : edge.id;
+          renderGraph(modal);
+        });
+        foreignObject.appendChild(labelDiv);
+        labelsLayer.appendChild(foreignObject);
+      } else {
+        labelDiv = foreignObject.querySelector('div');
+      }
+
+      labelDiv.textContent = edge.label;
+      labelDiv.classList.toggle('highlighted', state.highlightedEdge === edge.id);
+      graph.style.transform = `translate(${state.panX}px, ${state.panY}px) scale(${state.scale})`;
+
+      requestAnimationFrame(() => {
+        labelDiv.style.width = 'max-content';
+        const rect = labelDiv.getBoundingClientRect();
+        if (rect.width === 0 && rect.height === 0) return;
+        const measuredWidth = rect.width / state.scale;
+        const measuredHeight = (rect.height / state.scale) || 24;
+
+        foreignObject.setAttribute('width', measuredWidth + 4);
+        foreignObject.setAttribute('height', measuredHeight + 4);
+
+        foreignObject.setAttribute('x', edge.labelPosition.x - (measuredWidth / 2));
+        foreignObject.setAttribute('y', edge.labelPosition.y - (measuredHeight / 2));
+      });
+    });
+
+    // Grid Background
+    const workflowGraph = modal.querySelector('#workflow-graph');
+    if (workflowGraph) {
+      const dotSize = Math.max(0.3, Math.min(1, state.scale));
+      const spacing = 20 * state.scale;
+      workflowGraph.style.backgroundImage = `
+        radial-gradient(circle,
+          color-mix(in srgb, var(--body-color) 80%, transparent) 0px,
+          color-mix(in srgb, var(--body-color) 60%, transparent) ${dotSize}px,
+          transparent ${dotSize * 2}px
+        )
+      `;
+      workflowGraph.style.backgroundSize = `${spacing}px ${spacing}px`;
+      workflowGraph.style.backgroundPosition = `${state.panX}px ${state.panY}px`;
+    }
+  }
+
+  function handleNodeDrag(startEvent, draggedStage) {
+    if (draggedStage.id === 'from_any') return;
+    const stageElement = document.getElementById(`stage-${draggedStage.id}`);
+    state.isDraggingStage = true;
+    const dragStart = {
+      x: startEvent.clientX,
+      y: startEvent.clientY,
+      stageX: draggedStage.position.x,
+      stageY: draggedStage.position.y,
+    };
+    stageElement.classList.add('dragging');
+    const onMouseMove = (moveEvent) => {
+      const newX = dragStart.stageX + (moveEvent.clientX - dragStart.x) / state.scale;
+      const newY = dragStart.stageY + (moveEvent.clientY - dragStart.y) / state.scale;
+      const stageToUpdate = state.stages.find((s) => s.id === draggedStage.id);
+      if (stageToUpdate) {
+        stageToUpdate.position.x = newX;
+        stageToUpdate.position.y = newY;
+      }
+      renderGraph(document.querySelector('#workflow-graph'));
+    };
+    const onMouseUp = () => {
+      document.removeEventListener('mousemove', onMouseMove);
+      document.removeEventListener('mouseup', onMouseUp);
+      stageElement.classList.remove('dragging');
+      state.isDraggingStage = false;
+    };
+    document.addEventListener('mousemove', onMouseMove);
+    document.addEventListener('mouseup', onMouseUp);
+  }
+
+  async function init(modal) {
+    const container = modal.querySelector('#workflow-graph');
+    const graph = modal.querySelector('#graph');
+    if (!container || container.dataset.initialized) return;
+    container.dataset.initialized = 'true';
+
+    const workflowContainer = container.querySelector('#workflow-container');
+    const workflowId = parseInt(workflowContainer.dataset.workflowId, 10);
+    if (!workflowId) return showMessageInModal('COM_WORKFLOW_GRAPH_ERROR_INVALID_ID', 'error');
+
+    // Standard Arrowhead definition (points right, orient=auto handles the rest)
+    modal.querySelector('#connections').innerHTML = `<defs>
+      <marker id="arrowhead" viewBox="0 0 10 10" refX="10" refY="5"
+        markerWidth="6" markerHeight="6" orient="auto">
+        <path d="M 0 0 L 10 5 L 0 10 z" fill="#2071c6" />
+      </marker>
+    </defs>`;
+
+    try {
+      const workflowData = await makeRequest(`&task=graph.getWorkflow&workflow_id=${workflowId}&format=json`);
+      if (!workflowData) return;
+      const stagesData = await makeRequest(`&task=graph.getStages&workflow_id=${workflowId}&format=json`);
+      if (!stagesData) return;
+      const transitionsData = await makeRequest(`&task=graph.getTransitions&workflow_id=${workflowId}&format=json`);
+      if (!transitionsData) return;
+
+      state.workflow = workflowData?.data || {};
+      let stages = stagesData?.data || [];
+      state.transitions = transitionsData?.data || [];
+
+      if (!stages.length) return showMessageInModal('COM_WORKFLOW_GRAPH_ERROR_STAGES_NOT_FOUND', 'error');
+
+      if (state.transitions.some((tr) => tr.from_stage_id === -1) && !stages.some((s) => s.id === 'from_any')) {
+        stages.unshift({ id: 'from_any', title: translate('COM_WORKFLOW_GRAPH_FROM_ANY'), position: null });
+      }
+      state.stages = stages.map((s) => ({ ...s, position: s.position || { x: NaN, y: NaN } }));
+      state.stages = calculateAutoLayout(state.stages);
+
+      // Update UI Counts
+      modal.querySelector('.joomla-dialog-header h3').textContent = state.workflow.title || translate('COM_WORKFLOW_GRAPH_WORKFLOW');
+      const statusBadge = modal.querySelector('#workflow-status-badge');
+      if (statusBadge) {
+        statusBadge.textContent = state.workflow.published == '1' ? translate('COM_WORKFLOW_GRAPH_ENABLED') : translate('COM_WORKFLOW_GRAPH_DISABLED');
+        statusBadge.classList.add(state.workflow.published == '1' ? 'bg-success' : 'bg-warning');
+      }
+      const realStagesCount = state.stages.filter((s) => s.id !== 'from_any').length;
+      const stageCount = modal.querySelector('#workflow-stage-count');
+      if (stageCount) stageCount.textContent = `${realStagesCount} ${realStagesCount === 1 ? translate('COM_WORKFLOW_GRAPH_STAGE') : translate('COM_WORKFLOW_GRAPH_STAGES')}`;
+
+      const transitionCount = modal.querySelector('#workflow-transition-count');
+      if (transitionCount) transitionCount.textContent = `${state.transitions.length} ${state.transitions.length === 1 ? translate('COM_WORKFLOW_GRAPH_TRANSITION') : translate('COM_WORKFLOW_GRAPH_TRANSITIONS')}`;
+      renderGraph(modal);
+      setTimeout(() => fitToScreen(modal), 150);
+    } catch (error) {
+      showMessageInModal(error.message, 'error');
+      return;
+    }
+
+    // Zoom & Pan Logic
+    let isPanning = false, panStart = {};
+    container.addEventListener('mousedown', (e) => {
+      if (e.target.closest('.stage') || e.target.closest('.zoom-controls') || e.button !== 0) return;
+      isPanning = true;
+      panStart = { x: e.clientX - state.panX, y: e.clientY - state.panY };
+      if (graph) graph.classList.add('dragging');
+    });
+    document.addEventListener('mousemove', (e) => {
+      if (!isPanning) return;
+      state.panX = e.clientX - panStart.x;
+      state.panY = e.clientY - panStart.y;
+      renderGraph(modal);
+    });
+    const stopPanning = () => {
+      isPanning = false;
+      if (graph) graph.classList.remove('dragging');
+    };
+    document.addEventListener('mouseup', stopPanning);
+    container.addEventListener('mouseleave', stopPanning);
+    container.addEventListener('wheel', (e) => {
+      e.preventDefault();
+      const rect = container.getBoundingClientRect();
+      const mouseX = e.clientX - rect.left;
+      const mouseY = e.clientY - rect.top;
+      const oldScale = state.scale;
+      const zoomDirection = e.deltaY < 0 ? 1 : -1;
+      state.scale = Math.max(MIN_ZOOM, Math.min(state.scale * (1 + zoomDirection * ZOOM_SENSITIVITY), MAX_ZOOM));
+      const factor = state.scale / oldScale;
+      state.panX = mouseX - (mouseX - state.panX) * factor;
+      state.panY = mouseY - (mouseY - state.panY) * factor;
+      renderGraph(modal);
+    });
+    const zoomControls = container.querySelector('.zoom-controls');
+    zoomControls.querySelector('.zoom-in').addEventListener('click', () => applyZoom(1.2, modal));
+    zoomControls.querySelector('.zoom-out').addEventListener('click', () => applyZoom(1 / 1.2, modal));
+    zoomControls.querySelector('.fit-screen').addEventListener('click', () => fitToScreen(modal));
+
+    function applyZoom(factor, modalContext) {
+      const rect = modalContext.querySelector('#workflow-graph').getBoundingClientRect();
+      const centerX = rect.width / 2;
+      const centerY = rect.height / 2;
+      const oldScale = state.scale;
+      state.scale = Math.max(MIN_ZOOM, Math.min(state.scale * factor, MAX_ZOOM));
+      const scaleRatio = state.scale / oldScale;
+      state.panX = centerX - (centerX - state.panX) * scaleRatio;
+      state.panY = centerY - (centerY - state.panY) * scaleRatio;
+      renderGraph(modalContext);
+    }
+    function fitToScreen(modalContext) {
+      if (!state.stages.length) return;
+      let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
+      state.stages.forEach((s) => {
+        if (s.position) {
+          minX = Math.min(minX, s.position.x);
+          minY = Math.min(minY, s.position.y);
+          maxX = Math.max(maxX, s.position.x + STAGE_WIDTH);
+          maxY = Math.max(maxY, s.position.y + STAGE_HEIGHT);
+        }
+      });
+      if (minX === Infinity) return;
+      const containerRect = modalContext.querySelector('#workflow-graph').getBoundingClientRect();
+      const padding = 50;
+      const w = maxX - minX;
+      const h = maxY - minY;
+      state.scale = Math.max(MIN_ZOOM, Math.min((containerRect.width - padding) / w, (containerRect.height - padding) / h, MAX_ZOOM));
+      state.panX = (containerRect.width - w * state.scale) / 2 - minX * state.scale;
+      state.panY = (containerRect.height - h * state.scale) / 2 - minY * state.scale;
+      renderGraph(modalContext);
+    }
+
+    // --- Keyboard Shortcuts ---
+    document.addEventListener('keydown', (e) => {
+      if (['INPUT', 'TEXTAREA'].includes(document.activeElement.tagName)) return;
+
+      const PAN_STEP = 30; // Pixels to move
+      const ZOOM_STEP = 1.1; // Multiplier
+
+      switch (e.code) {
+        /* ---------- Zoom ---------- */
+        case 'Equal': // + / =
+          applyZoom(ZOOM_STEP, modal);
+          break;
+
+        case 'Minus': // - / _
+          applyZoom(1 / ZOOM_STEP, modal);
+          break;
+
+        /* ---------- Panning ---------- */
+        case 'ArrowLeft':
+        case 'KeyA':
+          state.panX += PAN_STEP;
+          renderGraph(modal);
+          break;
+
+        case 'ArrowRight':
+        case 'KeyD':
+          state.panX -= PAN_STEP;
+          renderGraph(modal);
+          break;
+
+        case 'ArrowUp':
+        case 'KeyW':
+          state.panY += PAN_STEP;
+          renderGraph(modal);
+          break;
+
+        case 'ArrowDown':
+        case 'KeyS':
+          state.panY -= PAN_STEP;
+          renderGraph(modal);
+          break;
+
+        /* ---------- Reset / Fit ---------- */
+        case 'Digit0':
+        case 'KeyF':
+          fitToScreen(modal);
+          break;
+
+        default:
+          break;
+      }
+    });
+  }
+
+  document.addEventListener('joomla-dialog:open', (event) => {
+    const dialog = event.target;
+    if (dialog.querySelector('#workflow-container')) init(dialog);
+  });
+})();
diff --git a/media_source/com_workflow/scss/workflow-graph-client.scss b/media_source/com_workflow/scss/workflow-graph-client.scss
new file mode 100644
index 0000000000000..05e0d3368729d
--- /dev/null
+++ b/media_source/com_workflow/scss/workflow-graph-client.scss
@@ -0,0 +1,242 @@
+/* ================================
+   Workflow Graph Client Styles
+   ================================ */
+/* Color Variables */
+:root {
+  --wf-bg: var(--bg-primary);
+  --wf-bg: var(--bg-primary);
+  --wf-border: var(--border-color);
+  --wf-border-hover: var(--border-color-translucent);
+  --wf-dot-color: var(--body-color);
+  --stage-bg: rgb(var(--primary-rgb));
+  --stage-border: var(--border-color);
+  --stage-text: var(--white);
+  --stage-desc: #ffffffc0 !important;
+  --stage-virtual-bg: #800080;
+  --transition-hover: var(--border-color-hover);
+  --transition-label-bg: #2071c6;
+  --transition-stroke: var(--transition-label-bg);
+  --transition-label-color: var(--white);
+  --transition-highlight: #ff6868;
+  --zoom-btn-bg: transparent;
+  --zoom-btn-hover: var(--border-color);
+  --zoom-btn-color: var(--text-primary);
+  --vf-custom-controls-bgcolor: var(--secondary);
+}
+
+@keyframes dashmove {
+  from {
+    stroke-dashoffset: 0;
+  }
+  to {
+    stroke-dashoffset: -36;
+  }
+}
+
+#workflow-graph {
+  position: relative;
+  width: 100%;
+  height: 80vh;
+  overflow: hidden;
+  cursor: grab;
+  background-image: radial-gradient(circle at 1px 1px, var(--wf-dot-color) 1px, transparent 1px);
+  background-size: 38px 38px;
+  border: 1px solid var(--stage-border);
+  border-radius: 8px;
+}
+
+#workflow-graph:active {
+  cursor: grabbing;
+}
+
+#workflow-container {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+
+#graph {
+  position: relative;
+  width: fit-content;
+  min-width: 100%;
+  min-height: 100%;
+  transition: transform .15s ease-out;
+  transform-origin: 0 0;
+}
+
+#graph.dragging {
+  transition: none;
+}
+
+#stages {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+
+#connections {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1;
+  width: 100%;
+  height: 100%;
+  overflow: visible;
+  pointer-events: none;
+}
+
+/* ================================
+   Stage Styling
+   ================================ */
+.stage {
+  position: absolute;
+  z-index: 10;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  width: 200px;
+  min-height: 80px;
+  padding: 12px 16px;
+  cursor: move;
+  user-select: none;
+  background: var(--stage-bg);
+  border: 1px solid var(--stage-border);
+  border-radius: 6px;
+  box-shadow: 0 4px 10px rgba(0, 0, 0, .6);
+}
+
+.stage:hover {
+  transform: translateY(-1px);
+}
+
+.stage.dragging {
+  z-index: 1000;
+  transform: rotate(1deg) scale(1.02);
+}
+
+.stage.virtual {
+  background: var(--stage-virtual-bg);
+  border-width: 1px;
+}
+
+.stage-title {
+  margin: 0 0 6px;
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 1.3;
+  color: var(--stage-text);
+  word-wrap: break-word;
+}
+
+.stage-description {
+  margin: 0 0 8px;
+  font-size: 12px;
+  line-height: 1.4;
+  color: var(--stage-desc);
+  word-wrap: break-word;
+}
+
+.stage-badge {
+  display: inline-block;
+  align-self: flex-start;
+  padding: 2px 6px;
+  font-size: 10px;
+  font-weight: 500;
+  color: var(--stage-text);
+  text-transform: uppercase;
+  letter-spacing: .5px;
+  background: var(--stage-border);
+  border-radius: 3px;
+}
+
+/* ================================
+   Transition Styling
+   ================================ */
+.transition-path {
+  stroke: var(--transition-stroke);
+  stroke-width: 3px;
+  fill: none;
+  opacity: .8;
+  transition: stroke .2s, stroke-width .2s;
+}
+
+.transition-path:hover {
+  stroke-width: 3px;
+  opacity: 1;
+  stroke: var(--transition-hover);
+  animation-duration: .5s;
+}
+
+.arrow-marker {
+  fill: var(--transition-stroke);
+  transition: fill .2s ease;
+}
+
+.transition-path:hover+.arrow-marker {
+  fill: var(--transition-hover);
+}
+
+.transition-path.highlighted {
+  stroke: var(--transition-highlight);
+  stroke-width: 5px;
+  stroke-dasharray: 12 6;
+  animation: dashmove .5s linear infinite;
+}
+
+.transition-label-content {
+  position: absolute;
+  z-index: 20;
+  min-width: 80px;
+  max-width: 300px;
+  padding: 2px 12px;
+  font-size: 1rem;
+  font-weight: 600;
+  line-height: 1.2;
+  color: var(--transition-label-color);
+  text-align: center;
+  white-space: nowrap;
+  pointer-events: auto;
+  cursor: pointer;
+  user-select: none;
+  background: var(--transition-label-bg) !important;
+  border: 2px solid var(--transition-stroke);
+  border-radius: 6px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, .15);
+  transition: background .2s, border .2s, box-shadow .2s;
+}
+
+.transition-label-content.highlighted {
+  font-weight: 700;
+  border-color: var(--transition-highlight);
+  transition: transform .2s;
+  transform: scale(1.1);
+}
+
+/* ================================
+   Zoom Controls
+   ================================ */
+.zoom-controls {
+  position: absolute;
+  right: 20px;
+  bottom: 20px;
+  z-index: 1000;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  padding: 4px;
+  background: var(--vf-custom-controls-bgcolor);
+  border: 1px solid var(--wf-border);
+  border-radius: 6px;
+  backdrop-filter: blur(4px);
+}
+
+.zoom-btn:hover {
+  background: var(--zoom-btn-hover);
+  transform: scale(1.05);
+}
+
+.zoom-btn:active {
+  transition: transform .5s ease;
+  transform: scale(.95);
+}
diff --git a/media_source/com_workflow/scss/workflow-graph.scss b/media_source/com_workflow/scss/workflow-graph.scss
new file mode 100644
index 0000000000000..68451e8fec1f0
--- /dev/null
+++ b/media_source/com_workflow/scss/workflow-graph.scss
@@ -0,0 +1,220 @@
+/* ================================
+   Workflow Graph Styles
+   ================================ */
+
+/* Color Variables */
+:root {
+  --vf-black: #000;
+  --vf-custom-controls-bgcolor: var(--secondary);
+  --vf-edge-color: #2071c6;
+  --vf-white: #fff;
+  --vf-opacity-less: rgba(0, 0, 0, .1);
+  --vf-opacity-more: rgba(0, 0, 0, .6);
+}
+
+/* ================================
+   Vue Flow Core Components
+   ================================ */
+.vue-flow {
+  position: relative;
+  z-index: 0;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+  direction: ltr;
+}
+
+[dir="rtl"] .vue-flow__node, [dir="rtl"] .edge-label, [dir="rtl"] .vue-flow__panel {
+  direction: rtl;
+}
+
+.vue-flow__container {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.vue-flow__pane.draggable {
+  cursor: grab;
+}
+
+.vue-flow__pane.selection {
+  cursor: pointer;
+}
+
+.vue-flow__pane.dragging {
+  cursor: grabbing;
+}
+
+.vue-flow__transformationpane {
+  z-index: 2;
+  pointer-events: none;
+  transform-origin: 0 0;
+}
+
+.vue-flow__viewport {
+  z-index: 4;
+  overflow: clip;
+}
+
+.vue-flow__nodesselection-rect:focus,
+.vue-flow__nodesselection-rect:focus-visible,
+.vue-flow__edge.selected,
+.vue-flow__edge:focus,
+.vue-flow__edge:focus-visible {
+  outline: none;
+}
+
+.vue-flow .vue-flow__edges {
+  overflow: visible;
+  pointer-events: none;
+}
+
+.vue-flow__edge-path,
+.vue-flow__connection-path {
+  stroke: var(--success);
+  stroke-width: 3;
+  fill: none;
+}
+
+.vue-flow__edge.animated path {
+  stroke-dasharray: 5;
+  animation: dashdraw .5s linear infinite;
+}
+
+.vue-flow__edge.animated path.vue-flow__edge-interaction {
+  stroke-dasharray: none;
+  animation: none;
+}
+
+.vue-flow__edge.inactive {
+  pointer-events: none;
+}
+
+.vue-flow__connection {
+  pointer-events: none;
+}
+
+.vue-flow__connection .animated {
+  stroke-dasharray: 5;
+  animation: dashdraw .5s linear infinite;
+}
+
+.vue-flow__connectionline {
+  z-index: 1001;
+}
+
+.vue-flow__nodes {
+  pointer-events: none;
+  transform-origin: 0 0;
+}
+
+.vue-flow__node {
+  position: absolute;
+  box-sizing: border-box;
+  pointer-events: all;
+  cursor: default;
+  user-select: none;
+  transform-origin: 0 0;
+}
+
+
+.vue-flow__handle.connectable {
+  pointer-events: all;
+  cursor: crosshair;
+}
+
+.vue-flow__panel {
+  position: absolute;
+  z-index: 5;
+  margin: 15px;
+}
+
+.vue-flow__panel.top {
+  top: 0;
+}
+
+.vue-flow__panel.bottom {
+  bottom: 0;
+}
+
+.vue-flow__panel.left {
+  left: 0;
+}
+
+.vue-flow__panel.right {
+  right: 0;
+}
+
+.vue-flow__panel.center {
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+@keyframes dashdraw {
+  from {
+    stroke-dashoffset: 10;
+  }
+}
+
+/* ================================
+   Vue Flow Custom Components
+   ================================ */
+.min-vh-80 {
+  height: 80vh;
+}
+
+.end-20-px {
+  right: 20px !important;
+}
+
+.top-25-px {
+  top: 25px !important;
+}
+
+.z-10 {
+  z-index: 10;
+}
+
+.z-20 {
+  z-index: 20;
+}
+
+.custom-edge {
+  background: var(--vf-edge-color) !important;
+}
+
+.vue-flow__minimap {
+  box-shadow: 0 10px 15px -3px var(--vf-opacity-less);
+}
+
+.custom-controls {
+  right: 10px;
+  bottom: 10px;
+  background: var(--vf-custom-controls-bgcolor);
+}
+
+.vue-flow__minimap.pannable {
+  cursor: grab;
+}
+
+.stage-node .edge-handler {
+  width: 12px !important;
+  height: 12px !important;
+}
+
+.stage-node:hover .vue-flow__handle {
+  opacity: 1;
+}
+
+.vue-flow__node-stage {
+  max-width: 250px !important;
+}
+
+.workflow-browser-actions-list {
+  background-color: var(--vf-black);
+  box-shadow: 0 4px 10px var(--vf-opacity-more);
+}
+
diff --git a/media_source/com_workflow/src/app/Event.es6.js b/media_source/com_workflow/src/app/Event.es6.js
new file mode 100644
index 0000000000000..3fddff6f7f9c2
--- /dev/null
+++ b/media_source/com_workflow/src/app/Event.es6.js
@@ -0,0 +1,45 @@
+/**
+ * Simple Event Bus for cross-module communication
+ * Used to communicate between Joomla buttons and Vue app
+ */
+export default new class EventBus {
+  /**
+   * Internal registry of events
+   * @type {Object<string, Function[]>}
+   */
+  constructor() {
+    this.events = {};
+  }
+
+  /**
+   * Trigger a custom event with optional payload
+   * @param {string} event - Event name
+   * @param {*} [data=null] - Optional payload
+   */
+  fire(event, data = null) {
+    (this.events[event] || []).forEach((fn) => fn(data));
+  }
+
+  /**
+   * Register a callback for an event
+   * @param {string} event - Event name
+   * @param {Function} callback - Function to invoke on event
+   */
+  listen(event, callback) {
+    if (!this.events[event]) {
+      this.events[event] = [];
+    }
+    this.events[event].push(callback);
+  }
+
+  /**
+   * Remove a listener from an event
+   * @param {string} event - Event name
+   * @param {Function} callback - Function to remove
+   */
+  off(event, callback) {
+    if (this.events[event]) {
+      this.events[event] = this.events[event].filter((fn) => fn !== callback);
+    }
+  }
+}();
diff --git a/media_source/com_workflow/src/app/WorkflowGraphApi.es6.js b/media_source/com_workflow/src/app/WorkflowGraphApi.es6.js
new file mode 100644
index 0000000000000..fac87f3ae4dac
--- /dev/null
+++ b/media_source/com_workflow/src/app/WorkflowGraphApi.es6.js
@@ -0,0 +1,194 @@
+import notifications from '../plugins/Notifications.es6.js';
+
+/**
+ * Handles API communication for the workflow graph.
+ */
+class WorkflowGraphApi {
+  /**
+   * Initializes the WorkflowGraphApi instance.
+   *
+   * @throws {TypeError} If required options are missing.
+   */
+  constructor() {
+    const {
+      apiBaseUrl,
+      extension,
+    } = Joomla.getOptions('com_workflow', {});
+
+    if (!apiBaseUrl || !extension) {
+      throw new TypeError(Joomla.Text._('COM_WORKFLOW_GRAPH_API_NOT_SET'));
+    }
+
+    this.baseUrl = apiBaseUrl;
+    this.extension = extension;
+    this.csrfToken = Joomla.getOptions('csrf.token', null);
+
+    if (!this.csrfToken) {
+      throw new TypeError(Joomla.Text._('COM_WORKFLOW_GRAPH_ERROR_CSRF_TOKEN_NOT_SET'));
+    }
+  }
+
+  /**
+   * Makes a request using Joomla.request.
+   *
+   * @param {string} url - The endpoint relative to baseUrl.
+   * @param {Object} [options={}] - Request config (method, data, headers).
+   * @returns {Promise<any>} The parsed response or error.
+   */
+  async makeRequest(url, options = {}) {
+    const headers = options.headers || {};
+    headers['X-Requested-With'] = 'XMLHttpRequest';
+    options.headers = headers;
+    options[this.csrfToken] = 1;
+
+    return new Promise((resolve, reject) => {
+      Joomla.request({
+        url: `${this.baseUrl}${url}&extension=${this.extension}`,
+        ...options,
+        onSuccess: (response) => {
+          const data = JSON.parse(response);
+          resolve(data);
+        },
+        onError: (xhr) => {
+          let message = 'COM_WORKFLOW_GRAPH_ERROR_UNKNOWN';
+          try {
+            const errorData = JSON.parse(xhr.responseText);
+            message = errorData.data || errorData.message || message;
+          } catch (e) {
+            message = xhr.statusText || message;
+          }
+          notifications.error(message);
+          reject(new Error(Joomla.Text._(message)));
+        },
+      });
+    });
+  }
+
+  /**
+   * Fetches workflow data by ID.
+   *
+   * @param {number} id - Workflow ID.
+   * @returns {Promise<Object|null>}
+   */
+  async getWorkflow(id) {
+    return this.makeRequest(`&task=graph.getWorkflow&workflow_id=${id}&format=json`);
+  }
+
+  /**
+   * Fetches stages for a given workflow.
+   *
+   * @param {number} workflowId - Workflow ID.
+   * @returns {Promise<Object[]|null>}
+   */
+  async getStages(workflowId) {
+    return this.makeRequest(`&task=graph.getStages&workflow_id=${workflowId}&format=json`);
+  }
+
+  /**
+   * Fetches transitions for a given workflow.
+   *
+   * @param {number} workflowId - Workflow ID.
+   * @returns {Promise<Object[]|null>}
+   */
+  async getTransitions(workflowId) {
+    return this.makeRequest(`&task=graph.getTransitions&workflow_id=${workflowId}&format=json`);
+  }
+
+  /**
+   * Deletes a stage from a workflow.
+   *
+   * @param {number} id - Stage ID.
+   * @param {number} workflowId - Workflow ID.
+   * @param {boolean} [stageDelete=0] - Optional flag to indicate if the stage should be deleted or just trashed.
+   *
+   * @returns {Promise<boolean>}
+   */
+  async deleteStage(id, workflowId, stageDelete = false) {
+    try {
+      const formData = new FormData();
+      formData.append('cid[]', id);
+      formData.append('workflow_id', workflowId);
+      formData.append('type', 'stage');
+      formData.append(this.csrfToken, '1');
+
+      const response = await this.makeRequest(`&task=${stageDelete ? 'graph.delete' : 'graph.trash'}&workflow_id=${workflowId}&format=json`, {
+        method: 'POST',
+        data: formData,
+      });
+
+      if (response && response.success) {
+        notifications.success(response?.data?.message || response?.message);
+      }
+    } catch (error) {
+      notifications.error(error.message);
+      throw error;
+    }
+  }
+
+  /**
+   * Deletes a transition from a workflow.
+   *
+   * @param {number} id - Transition ID.
+   * @param {number} workflowId - Workflow ID.
+   * @param {boolean} [transitionDelete=false] - Optional flag to indicate if the transition should be deleted or just trashed.
+   *
+   * @returns {Promise<boolean>}
+   */
+  async deleteTransition(id, workflowId, transitionDelete = false) {
+    try {
+      const formData = new FormData();
+      formData.append('cid[]', id);
+      formData.append('workflow_id', workflowId);
+      formData.append('type', 'transition');
+      formData.append(this.csrfToken, '1');
+
+      const response = await this.makeRequest(`&task=${transitionDelete ? 'graph.delete' : 'graph.trash'}&workflow_id=${workflowId}&format=json`, {
+        method: 'POST',
+        data: formData,
+      });
+
+      if (response && response.success) {
+        notifications.success(response?.data?.message || response?.message);
+      }
+    } catch (error) {
+      notifications.error(error.message);
+      throw error;
+    }
+  }
+
+  /**
+   * Updates the position of a stage.
+   *
+   * @param {number} workflowId - Workflow ID.
+   * @param {Object} positions - Position objects {x, y} of updated stages.
+   * @returns {Promise<Object|null>}
+   */
+  async updateStagePosition(workflowId, positions) {
+    try {
+      const formData = new FormData();
+      formData.append('workflow_id', workflowId);
+      formData.append(this.csrfToken, '1');
+
+      if (positions === null || Object.keys(positions).length === 0) {
+        return true;
+      }
+
+      Object.entries(positions).forEach(([id, position]) => {
+        formData.append(`positions[${id}][x]`, position.x);
+        formData.append(`positions[${id}][y]`, position.y);
+      });
+
+      const response = await this.makeRequest('&task=stages.updateStagesPosition&format=json', {
+        method: 'POST',
+        data: formData,
+      });
+
+      return !!(response && response.success);
+    } catch (error) {
+      notifications.error(error.message);
+      throw error;
+    }
+  }
+}
+
+export default new WorkflowGraphApi();
diff --git a/media_source/com_workflow/src/components/App.vue b/media_source/com_workflow/src/components/App.vue
new file mode 100644
index 0000000000000..6afaaf6c97725
--- /dev/null
+++ b/media_source/com_workflow/src/components/App.vue
@@ -0,0 +1,74 @@
+<template>
+  <main
+    id="workflow-app"
+    class="d-flex flex-column flex-grow-1 min-vh-80"
+    aria-labelledby="workflow-main-title"
+  >
+    <header
+      id="workflow-header"
+      class="d-flex flex-column flex-shrink-0"
+    >
+      <WorkflowTitlebar
+        :save-status="saveStatus"
+      />
+    </header>
+
+    <div class="d-flex flex-grow-1 overflow-hidden">
+      <section
+        id="main-canvas"
+        class="flex-grow-1 position-relative"
+        aria-describedby="canvas-description"
+      >
+        <div
+          id="canvas-description"
+          class="visually-hidden"
+        >
+          {{ translate('COM_WORKFLOW_GRAPH_CANVAS_DESCRIPTION') }}
+        </div>
+
+        <WorkflowCanvas
+          ref="canvas"
+          :save-status="saveStatus"
+          :set-save-status="setSaveStatus"
+          @focus-request="handleCanvasFocus"
+        />
+      </section>
+    </div>
+  </main>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useStore } from 'vuex';
+import WorkflowTitlebar from './Titlebar.vue';
+import WorkflowCanvas from './canvas/WorkflowCanvas.vue';
+
+const store = useStore();
+const saveStatus = ref('upToDate');
+function setSaveStatus(val) {
+  saveStatus.value = val;
+}
+const canvas = ref(null);
+
+function handleCanvasFocus() {
+  canvas.value?.focus();
+}
+
+onMounted(() => {
+  const { workflowId: idFromOpts = null } = Joomla.getOptions('com_workflow', {});
+  const idFromURL = parseInt(new URL(window.location.href).searchParams.get('id'), 10);
+  const currentWorkflowId = idFromOpts || idFromURL;
+
+  if (currentWorkflowId !== null && !Number.isNaN(currentWorkflowId)) {
+    store.dispatch('loadWorkflow', currentWorkflowId);
+  } else {
+    throw new Error('COM_WORKFLOW_GRAPH_ERROR_INVALID_ID');
+  }
+});
+</script>
+
+<script>
+export default {
+  name: 'WorkflowGraphApp',
+};
+</script>
diff --git a/media_source/com_workflow/src/components/Titlebar.vue b/media_source/com_workflow/src/components/Titlebar.vue
new file mode 100644
index 0000000000000..df73e832e5c27
--- /dev/null
+++ b/media_source/com_workflow/src/components/Titlebar.vue
@@ -0,0 +1,92 @@
+<template>
+  <section
+    class="d-flex flex-wrap align-items-center justify-content-between"
+    aria-labelledby="workflow-main-title"
+  >
+    <div class="col-md-6 d-flex flex-column">
+      <h1
+        id="workflow-main-title"
+        class="mb-2"
+      >
+        {{ translate(workflow?.title) }}
+      </h1>
+      <dl
+        class="d-flex align-items-center flex-wrap mb-0"
+        aria-label="Workflow Details"
+      >
+        <dt class="visually-hidden">
+          {{ translate('COM_WORKFLOW_GRAPH_STATUS') }}
+        </dt>
+        <dd class="me-3 mb-1 d-flex mb-0">
+          <span
+            class="badge"
+            :class="workflow.published ? 'bg-success' : 'bg-warning'"
+            role="status"
+            :aria-label="`${workflow.published ? translate('COM_WORKFLOW_GRAPH_ENABLED') : translate('COM_WORKFLOW_GRAPH_DISABLED')}`"
+          >
+            {{ workflow.published ? translate('COM_WORKFLOW_GRAPH_ENABLED') : translate('COM_WORKFLOW_GRAPH_DISABLED') }}
+          </span>
+        </dd>
+
+        <dt class="visually-hidden">
+          {{ translate('COM_WORKFLOW_GRAPH_STAGE_COUNT') }}
+        </dt>
+        <dd class="me-3 mb-1 d-flex mb-0">
+          <span>
+            {{ stagesCount }} {{ stagesCount === 1 ? translate('COM_WORKFLOW_GRAPH_STAGE') : translate('COM_WORKFLOW_GRAPH_STAGES') }}
+          </span>
+        </dd>
+
+        <dt class="visually-hidden">
+          {{ translate('COM_WORKFLOW_GRAPH_TRANSITION_COUNT') }}
+        </dt>
+        <dd class="me-3 mb-1 d-flex mb-0">
+          <span>
+            {{ transitionsCount }} {{ transitionsCount === 1 ? translate('COM_WORKFLOW_GRAPH_TRANSITION')
+              : translate('COM_WORKFLOW_GRAPH_TRANSITIONS') }}
+          </span>
+        </dd>
+      </dl>
+    </div>
+
+    <div
+      id="save-status"
+      class="mb-2 fw-bold"
+      role="status"
+      aria-live="polite"
+      :class="{
+        'text-warning': saveStatus?.value === 'unsaved',
+      }"
+      :aria-label="translate(saveStatus?.value === 'unsaved' ? 'COM_WORKFLOW_GRAPH_UNSAVED_CHANGES' : 'COM_WORKFLOW_GRAPH_UP_TO_DATE')"
+    >
+      {{
+        saveStatus.value === 'unsaved'
+          ? translate('COM_WORKFLOW_GRAPH_UNSAVED_CHANGES')
+          : translate('COM_WORKFLOW_GRAPH_UP_TO_DATE')
+      }}
+    </div>
+  </section>
+</template>
+
+<script>
+export default {
+  name: 'WorkflowTitlebar',
+  props: {
+    saveStatus: {
+      type: String,
+      default: 'upToDate',
+    },
+  },
+  computed: {
+    workflow() {
+      return this.$store.getters.workflow || { title: 'COM_WORKFLOW_GRAPH_LOADING', published: false };
+    },
+    stagesCount() {
+      return this.$store.getters.stages?.length || 0;
+    },
+    transitionsCount() {
+      return this.$store.getters.transitions?.length || 0;
+    },
+  },
+};
+</script>
diff --git a/media_source/com_workflow/src/components/canvas/ControlsPanel.vue b/media_source/com_workflow/src/components/canvas/ControlsPanel.vue
new file mode 100644
index 0000000000000..effda279d96d0
--- /dev/null
+++ b/media_source/com_workflow/src/components/canvas/ControlsPanel.vue
@@ -0,0 +1,59 @@
+<template>
+  <Panel
+    :position="panelPosition"
+    role="list"
+    aria-labelledby="controls-panel-title"
+    class="d-flex gap-2 p-2"
+  >
+    <span
+      id="controls-panel-title"
+      class="visually-hidden"
+    >{{ translate('COM_WORKFLOW_GRAPH_CONTROLS') }}</span>
+
+    <button
+      class="toolbar-button btn btn-primary d-flex align-items-center gap-1"
+      :aria-label="translate('COM_WORKFLOW_GRAPH_ADD_STAGE')"
+      :title="`${translate('COM_WORKFLOW_GRAPH_ADD_STAGE')} (Alt+N)`"
+      @click="$emit('add-stage')"
+      @keydown.enter.prevent="$emit('add-stage')"
+      @keydown.space.prevent="$emit('add-stage')"
+    >
+      <span
+        class="icon icon-plus"
+        aria-hidden="true"
+      />
+      {{ translate('COM_WORKFLOW_GRAPH_ADD_STAGE') }}
+    </button>
+
+    <button
+      class="toolbar-button btn btn-info d-flex align-items-center gap-1"
+      :aria-label="translate('COM_WORKFLOW_GRAPH_ADD_TRANSITION')"
+      :title="`${translate('COM_WORKFLOW_GRAPH_ADD_TRANSITION')} (Alt+M)`"
+      @click="$emit('add-transition')"
+      @keydown.enter.prevent="$emit('add-transition')"
+      @keydown.space.prevent="$emit('add-transition')"
+    >
+      <span
+        class="icon icon-plus"
+        aria-hidden="true"
+      />
+      {{ translate('COM_WORKFLOW_GRAPH_ADD_TRANSITION') }}
+    </button>
+  </Panel>
+</template>
+
+<script>
+import { Panel } from '@vue-flow/core';
+import { isRTL } from '../../utils/utils.es6';
+
+export default {
+  name: 'ControlsPanel',
+  components: { Panel },
+  emits: ['add-stage', 'add-transition'],
+  computed: {
+    panelPosition() {
+      return isRTL() ? 'top-right' : 'top-left';
+    },
+  },
+};
+</script>
diff --git a/media_source/com_workflow/src/components/canvas/CustomControls.vue b/media_source/com_workflow/src/components/canvas/CustomControls.vue
new file mode 100644
index 0000000000000..7f64ba6841710
--- /dev/null
+++ b/media_source/com_workflow/src/components/canvas/CustomControls.vue
@@ -0,0 +1,87 @@
+<template>
+  <div
+    ref="controlsContainer"
+    class="custom-controls position-absolute z-10 p-1"
+    role="list"
+    aria-labelledby="canvas-controls-title"
+  >
+    <span
+      id="canvas-controls-title"
+      class="visually-hidden"
+    >{{ translate('COM_WORKFLOW_GRAPH_CANVAS_VIEW_CONTROLS') }}</span>
+
+    <ul class="d-flex flex-column gap-1 list-unstyled mb-0 px-0">
+      <li>
+        <button
+          class="toolbar-button custom-controls-button"
+          :title="translate('COM_WORKFLOW_GRAPH_ZOOM_IN')"
+          @click="zoomIn"
+          @keydown.enter="zoomIn"
+          @keydown.space.prevent="zoomIn"
+        >
+          <span
+            class="icon icon-plus"
+            aria-hidden="true"
+          />
+          <span class="visually-hidden">{{ translate('COM_WORKFLOW_GRAPH_ZOOM_IN') }}</span>
+        </button>
+      </li>
+      <li>
+        <button
+          class="toolbar-button custom-controls-button"
+          :title="translate('COM_WORKFLOW_GRAPH_ZOOM_OUT')"
+          @click="zoomOut"
+          @keydown.enter="zoomOut"
+          @keydown.space.prevent="zoomOut"
+        >
+          <span
+            class="icon icon-minus"
+            aria-hidden="true"
+          />
+          <span class="visually-hidden">{{ translate('COM_WORKFLOW_GRAPH_ZOOM_OUT') }}</span>
+        </button>
+      </li>
+      <li>
+        <button
+          class="toolbar-button custom-controls-button"
+          :title="translate('COM_WORKFLOW_GRAPH_FIT_VIEW')"
+          @click="customFitView"
+          @keydown.enter="customFitView"
+          @keydown.space.prevent="customFitView"
+        >
+          <span
+            class="icon icon-expand"
+            aria-hidden="true"
+          />
+          <span class="visually-hidden">{{ translate('COM_WORKFLOW_GRAPH_FIT_VIEW') }}</span>
+        </button>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+import { ref } from 'vue';
+import { useVueFlow } from '@vue-flow/core';
+
+export default {
+  name: 'CustomControls',
+  setup() {
+    const { zoomIn, zoomOut, fitView } = useVueFlow();
+    function customFitView() {
+      fitView({
+        padding: 0.5,
+        duration: 300,
+      });
+    }
+    const controlsContainer = ref(null);
+
+    return {
+      zoomIn,
+      zoomOut,
+      controlsContainer,
+      customFitView,
+    };
+  },
+};
+</script>
diff --git a/media_source/com_workflow/src/components/canvas/WorkflowCanvas.vue b/media_source/com_workflow/src/components/canvas/WorkflowCanvas.vue
new file mode 100644
index 0000000000000..f40a7c16e4aa1
--- /dev/null
+++ b/media_source/com_workflow/src/components/canvas/WorkflowCanvas.vue
@@ -0,0 +1,572 @@
+<template>
+  <div
+    class="w-100 h-100 position-relative"
+    role="application"
+    aria-label="Workflow Graph"
+  >
+    <VueFlow
+      v-if="!loading && !error"
+      class="workflow-canvas"
+      max-zoom="2.5"
+      min-zoom=".3"
+      :edges="styledEdges"
+      :nodes="positionedNodes"
+      :node-types="nodeTypes"
+      :edge-types="edgeTypes"
+      :nodes-connectable="workflow?.canCreate"
+      :elements-selectable="true"
+      :snap-to-grid="true"
+      :snap-grid="[40, 40]"
+      :disable-keyboard-a11y="true"
+      role="application"
+      :aria-label="translate('COM_WORKFLOW_GRAPH_CANVAS_LABEL')"
+      @connect="handleConnect"
+      @pane-click="clearSelection"
+      @edge-click="selectEdge"
+      @node-drag-stop="handleNodeDragStop"
+    >
+      <Background
+        pattern-color="var(--body-color)"
+        :gap="16"
+        :aria-label="translate('COM_WORKFLOW_GRAPH_BACKGROUND')"
+        :title="translate('COM_WORKFLOW_GRAPH_BACKGROUND')"
+      />
+
+      <!-- Controls Section -->
+      <section
+        id="workflow-controls"
+        aria-label="Canvas Controls"
+        class="workflow-controls-section"
+      >
+        <span class="visually-hidden">{{ translate('COM_WORKFLOW_GRAPH_CONTROLS') }}</span>
+
+        <!-- Minimap Toggle -->
+        <button
+          id="toggle-minimap"
+          class="toolbar-button custom-controls-button position-absolute z-20 ps-2 pe-2"
+          tabindex="0"
+          :style="showMiniMap ? 'bottom: 130px; left: 175px;' : 'bottom: 10px; left: 10px;'"
+          :title="showMiniMap ? translate('COM_WORKFLOW_GRAPH_MINIMAP_HIDE') : translate('COM_WORKFLOW_GRAPH_MINIMAP_SHOW')"
+          :aria-pressed="showMiniMap ? 'true' : 'false'"
+          @click="showMiniMap = !showMiniMap"
+        >
+          <span
+            v-if="showMiniMap"
+            class="fa fa-close"
+            aria-hidden="true"
+          />
+          <span
+            v-else
+            class="icon icon-expand-2"
+            aria-hidden="true"
+          />
+          <span class="visually-hidden">
+            {{ showMiniMap ? translate('COM_WORKFLOW_GRAPH_MINIMAP_HIDE') : translate('COM_WORKFLOW_GRAPH_MINIMAP_SHOW') }}
+          </span>
+        </button>
+
+        <MiniMap
+          v-if="showMiniMap"
+          class="z-10"
+          position="bottom-left"
+          pannable
+          zoomable
+          :aria-label="translate('COM_WORKFLOW_GRAPH_MINIMAP_LABEL')"
+          :node-color="(node) => node.data?.stage?.color || '#0d6efd'"
+          :mask-color="'rgba(255, 255, 255, .6)'"
+        />
+
+        <CustomControls
+          :aria-label="translate('COM_WORKFLOW_GRAPH_CONTROLS')"
+        />
+
+        <ControlsPanel
+          v-if="workflow?.canCreate"
+          class="canvas-controls-panel"
+          @add-stage="addStage"
+          @add-transition="addTransition"
+        />
+      </section>
+
+      <!-- Workflow Content Sections -->
+      <section
+        id="workflow-stages"
+        class="visually-hidden"
+      >
+        <span>({{ positionedNodes.length }} {{ positionedNodes.length === 1 ? translate('COM_WORKFLOW_GRAPH_STAGE') : translate('COM_WORKFLOW_GRAPH_STAGES') }})</span>
+        <ul>
+          <li
+            v-for="node in positionedNodes"
+            :id="`stage-list-${node.id}`"
+            :key="`stage-${node.id}`"
+          >
+            {{ sprintf('COM_WORKFLOW_GRAPH_STAGE_REF', node.data.stage?.title) }} -
+            {{ node.data.stage.published ? sprintf('COM_WORKFLOW_GRAPH_STAGE_STATUS_ENABLED', node.data.stage?.title) : sprintf('COM_WORKFLOW_GRAPH_STAGE_STATUS_DISABLED', node.data.stage?.title) }}.
+            <span v-if="node.data.stage.default">({{ translate('COM_WORKFLOW_GRAPH_STAGE_DEFAULT') }})</span>
+            {{ node.data.stage?.description ? sprintf('COM_WORKFLOW_GRAPH_STAGE_DESCRIPTION', node.data.stage?.description) : '' }}
+          </li>
+        </ul>
+      </section>
+
+      <section
+        id="workflow-transitions"
+        class="visually-hidden"
+      >
+        <span>({{ styledEdges.length }} {{ styledEdges.length === 1 ? translate('COM_WORKFLOW_GRAPH_TRANSITION') : translate('COM_WORKFLOW_GRAPH_TRANSITIONS') }})</span>
+        <ul>
+          <li
+            v-for="edge in styledEdges"
+            :id="`transition-list-${edge.id}`"
+            :key="`transition-${edge.id}`"
+          >
+            {{ sprintf('COM_WORKFLOW_GRAPH_TRANSITION_REF', edge.data.title, stages.find((s) => s.id === parseInt(edge.source, 10))?.title || translate('COM_WORKFLOW_GRAPH_FROM_ANY'), stages.find((s) => s.id === parseInt(edge.target, 10))?.title) }}
+            {{ edge.data.published ? sprintf('COM_WORKFLOW_GRAPH_TRANSITION_STATUS_ENABLED', edge.data.title) : sprintf('COM_WORKFLOW_GRAPH_TRANSITION_STATUS_DISABLED', edge.data.title) }}
+          </li>
+        </ul>
+      </section>
+    </VueFlow>
+
+    <!-- Loading State -->
+    <div
+      v-if="loading"
+      class="d-flex justify-content-center align-items-center h-100"
+      role="status"
+      aria-live="polite"
+    >
+      <div
+        class="spinner-border"
+        role="status"
+      >
+        <span class="visually-hidden">{{ translate('COM_WORKFLOW_GRAPH_LOADING') }}</span>
+      </div>
+      <span class="ms-2">{{ translate('COM_WORKFLOW_GRAPH_LOADING') }}</span>
+    </div>
+
+    <!-- Accessibility Live Region -->
+    <div
+      ref="liveRegion"
+      aria-live="polite"
+      role="status"
+      class="visually-hidden"
+      aria-atomic="true"
+    />
+  </div>
+</template>
+
+<script>
+import {
+  ref, computed, onMounted, onUnmounted, watch,
+} from 'vue';
+import { useStore } from 'vuex';
+import JoomlaDialog from 'joomla.dialog';
+import { VueFlow, useVueFlow } from '@vue-flow/core';
+import { Background } from '@vue-flow/background';
+import { MiniMap } from '@vue-flow/minimap';
+import stageNode from '../nodes/StageNode.vue';
+import CustomEdge from '../edges/CustomEdge.vue';
+import CustomControls from './CustomControls.vue';
+import ControlsPanel from './ControlsPanel.vue';
+import { announce, setupDialogFocusHandlers } from '../../utils/focus-utils.es6.js';
+import { generatePositionedNodes, createSpecialNode } from '../../utils/positioning.es6.js';
+import { generateStyledEdges } from '../../utils/edges.es6.js';
+import { setupGlobalShortcuts } from '../../utils/keyboard-manager.es6.js';
+import { debounce } from '../../utils/utils.es6';
+import AccessibilityFixer from '../../utils/accessibility-fixer.es6.js';
+import notifications from '../../plugins/Notifications.es6.js';
+
+export default {
+  name: 'WorkflowCanvas',
+  components: {
+    VueFlow,
+    Background,
+    MiniMap,
+    CustomControls,
+    ControlsPanel,
+  },
+  props: {
+    nodeTypes: {
+      type: Object,
+      default: () => ({ stage: stageNode }),
+    },
+    edgeTypes: {
+      type: Object,
+      default: () => ({ custom: CustomEdge }),
+    },
+    saveStatus: { type: Object, required: true },
+    setSaveStatus: { type: Function, required: true },
+  },
+  setup(props, { emit }) {
+    const store = useStore();
+    const {
+      fitView, zoomIn, zoomOut, viewport, setViewport, onViewportChange,
+    } = useVueFlow();
+
+    const isTransitionMode = ref(false);
+    const selectedStage = ref(null);
+    const selectedTransition = ref(null);
+    const liveRegion = ref(null);
+    const saveStatus = ref('upToDate');
+    const currentFocusMode = ref('links');
+    const previouslyFocusedElement = ref(null);
+    const accessibilityFixer = ref(null);
+
+    const showMiniMap = ref(true);
+    const workflow = computed(() => store.getters.workflow || {});
+    const stages = computed(() => store.getters.stages || []);
+    const transitions = computed(() => store.getters.transitions || []);
+    const loading = computed(() => store.getters.loading);
+    const error = computed(() => store.getters.error);
+    const workflowId = computed(() => store.getters.workflowId);
+
+    function translate(key) {
+      return Joomla.Text._(key);
+    }
+
+    function sprintf(key, ...args) {
+      const base = Joomla.Text._(key);
+      let i = 0;
+      return base.replace(/%((%)|s|d)/g, (m) => {
+        let val = args[i];
+
+        if (m === '%d') {
+          val = parseFloat(val);
+          if (Number.isNaN(val)) {
+            val = 0;
+          }
+        }
+        i += 1;
+        return val;
+      });
+    }
+
+    function openModal(type, id = null, params = {}) {
+      previouslyFocusedElement.value = document.activeElement;
+      const extension = Joomla.getOptions('com_workflow', {})?.extension || '';
+      const baseUrl = `index.php?option=com_workflow&view=${type}&workflow_id=${workflowId.value}&extension=${extension}&layout=modal&tmpl=component`;
+      const baseUrlwithId = id ? `${baseUrl}&id=${id}` : baseUrl;
+      const extraQuery = Object.entries(params)
+        .map(([key, val]) => `${encodeURIComponent(key)}=${encodeURIComponent(val)}`)
+        .join('&');
+      const src = extraQuery
+        ? `${baseUrlwithId}&${extraQuery}`
+        : baseUrlwithId;
+
+      const textHeader = id
+        ? translate(`COM_WORKFLOW_GRAPH_EDIT_${type.toUpperCase()}`)
+        : translate(`COM_WORKFLOW_GRAPH_ADD_${type.toUpperCase()}`);
+
+      const dialog = new JoomlaDialog({
+        popupType: 'iframe',
+        textHeader,
+        src,
+      });
+
+      const msgListener = (message) => {
+        try {
+          if (message.source === (dialog.getBodyContent().contentWindow || window)) {
+            const type = message.data && message.data.messageType;
+            if (type === 'joomla:content-select') {
+              dialog.close();
+            }
+          }
+        } catch (e) {
+          // Ignore cross-origin errors
+        }
+      };
+      window.addEventListener('message', msgListener);
+
+      dialog.addEventListener('joomla-dialog:close', () => {
+        window.removeEventListener('message', msgListener);
+        dialog.destroy();
+      });
+
+      dialog.show();
+      setupDialogFocusHandlers(previouslyFocusedElement, store);
+    }
+
+    function canEdit(id, type = 'stage') {
+      if (type === 'stage') {
+        const stage = stages.value.find((s) => s.id === parseInt(id, 10));
+        return stage?.permissions?.edit;
+      }
+      if (type === 'transition') {
+        const transition = transitions.value.find((t) => t.id === parseInt(id, 10));
+        return transition?.permissions?.edit;
+      }
+      return false;
+    }
+
+    function canDelete(id, type = 'stage') {
+      if (type === 'stage') {
+        const stage = stages.value.find((s) => s.id === parseInt(id, 10));
+        return stage?.permissions?.delete;
+      }
+      if (type === 'transition') {
+        const transition = transitions.value.find((t) => t.id === parseInt(id, 10));
+        return transition?.permissions?.delete;
+      }
+      return false;
+    }
+
+    function selectStage(id) {
+      isTransitionMode.value = false;
+      selectedStage.value = parseInt(id, 10);
+      selectedTransition.value = null;
+      announce(liveRegion.value, sprintf('COM_WORKFLOW_GRAPH_STAGE_SELECTED', stages?.value?.find((s) => s.id === parseInt(id, 10))?.title || id));
+    }
+
+    function selectTransition(id) {
+      isTransitionMode.value = true;
+      selectedTransition.value = parseInt(id, 10);
+      selectedStage.value = null;
+      announce(liveRegion.value, sprintf('COM_WORKFLOW_GRAPH_TRANSITION_SELECTED', transitions?.value?.find((t) => t.id === parseInt(id, 10))?.title || id));
+    }
+
+    function editStage(id) {
+      if (!canEdit(id, 'stage')) {
+        return;
+      }
+      openModal('stage', id);
+    }
+
+    function editTransition(id) {
+      if (!canEdit(id, 'transition')) {
+        return;
+      }
+      openModal('transition', id);
+    }
+
+    function clearSelection() {
+      selectedStage.value = null;
+      selectedTransition.value = null;
+      isTransitionMode.value = false;
+      announce(liveRegion.value, translate('COM_WORKFLOW_GRAPH_SELECTION_CLEARED'));
+    }
+
+    function deleteStage(id) {
+      if (!canDelete(id, 'stage')) {
+        return;
+      }
+      store.dispatch('deleteStage', { id, workflowId: workflowId.value });
+      selectedStage.value = null;
+    }
+
+    function deleteTransition(id) {
+      if (!canDelete(id, 'transition')) {
+        return;
+      }
+      store.dispatch('deleteTransition', { id, workflowId: workflowId.value });
+      selectedTransition.value = null;
+    }
+
+    function handleDeleteConfirm(type, id) {
+      if (type === 'stage') deleteStage(id.toString());
+      else deleteTransition(id.toString());
+    }
+
+    function showDeleteModal(type, id) {
+      if ((!canDelete(id, 'stage') && type === 'stage') || (!canDelete(id, 'transition') && type === 'transition')) {
+        return;
+      }
+      const title = translate(type === 'stage'
+        ? 'COM_WORKFLOW_GRAPH_TRASH_STAGE'
+        : 'COM_WORKFLOW_GRAPH_TRASH_TRANSITION');
+
+      const message = translate(type === 'stage'
+        ? sprintf('COM_WORKFLOW_GRAPH_TRASH_STAGE_CONFIRM', stages?.value?.find((s) => s.id === parseInt(id, 10))?.title || id)
+        : sprintf('COM_WORKFLOW_GRAPH_TRASH_TRANSITION_CONFIRM', transitions?.value?.find((t) => t.id === parseInt(id, 10))?.title || id));
+
+      JoomlaDialog.confirm(message, title).then((result) => {
+        if (result) {
+          handleDeleteConfirm(type, id);
+        }
+      });
+    }
+
+    function addStage() {
+      if (!workflow?.value?.canCreate) {
+        return;
+      }
+      openModal('stage');
+      announce(liveRegion.value, translate('COM_WORKFLOW_GRAPH_ADD_STAGE_DIALOG_OPENED'));
+    }
+
+    function addTransition() {
+      if (!workflow?.value?.canCreate) {
+        return;
+      }
+      openModal('transition');
+      announce(liveRegion.value, translate('COM_WORKFLOW_GRAPH_ADD_TRANSITION_DIALOG_OPENED'));
+    }
+
+    function handleConnect({ source, target }) {
+      if (!workflow?.value?.canCreate) {
+        return;
+      }
+      if (source && target) {
+        openModal('transition', null, { from_stage_id: source, to_stage_id: target });
+        announce(liveRegion.value, sprintf('COM_WORKFLOW_GRAPH_CREATING_TRANSITION', (stages?.value?.find((s) => s.id === parseInt(source, 10))?.title || source), (stages?.value?.find((s) => s.id === parseInt(target, 10))?.title || target)));
+      }
+    }
+
+    function selectEdge({ edge }) {
+      selectTransition(edge?.id);
+    }
+
+    function updateSaveMessage() {
+      const el = document.getElementById('save-status');
+      if (!el) return;
+      if (saveStatus.value === 'unsaved') {
+        el.classList.add('text-warning');
+        el.textContent = translate('COM_WORKFLOW_GRAPH_UNSAVED_CHANGES');
+      } else {
+        el.classList.remove('text-warning');
+        el.textContent = translate('COM_WORKFLOW_GRAPH_UP_TO_DATE');
+      }
+    }
+
+    const saveNodePosition = debounce(async () => {
+      const response = await store.dispatch('updateStagePositionAjax');
+      if (response) {
+        saveStatus.value = 'upToDate';
+        updateSaveMessage();
+        announce(liveRegion.value, translate('COM_WORKFLOW_GRAPH_STAGE_POSITIONS_UPDATED'));
+      } else {
+        notifications.error(translate('COM_WORKFLOW_GRAPH_ERROR_FAILED_TO_UPDATE_STAGE_POSITIONS'));
+      }
+    }, 3000);
+
+    async function handleNodeDragStop({ node }) {
+      if (!node || !node.id || node.id === 'from_any') return;
+      const position = store.getters.stages.find((s) => s.id === parseInt(node.id, 10))?.position;
+      const nodePosition = node.computedPosition || position || { x: 0, y: 0 };
+      const { x, y } = nodePosition;
+      saveStatus.value = 'unsaved';
+      updateSaveMessage();
+      await store.dispatch('updateStagePosition', { id: node.id, x, y });
+      saveNodePosition();
+    }
+
+    const positionedNodes = computed(() => {
+      const nodes = generatePositionedNodes(stages.value);
+      const special = createSpecialNode('from_any', { x: 600, y: -200 }, 'purple', translate('COM_WORKFLOW_GRAPH_FROM_ANY'), selectStage, false);
+      return [...nodes.map((n) => ({
+        ...n,
+        data: {
+          ...n.data,
+          isSelected: selectedStage.value === parseInt(n.id, 10),
+          onSelect: () => selectStage(n.id),
+          onEscape: () => clearSelection(),
+          onEdit: () => editStage(n.id),
+          onDelete: () => showDeleteModal('stage', n.id),
+        },
+      })), special];
+    });
+
+    const styledEdges = computed(() => generateStyledEdges(transitions.value, {
+      selectedId: selectedTransition.value,
+    }).map((edge) => ({
+      ...edge,
+      data: {
+        ...edge.data,
+        onSelect: () => selectTransition(edge.id),
+        onEscape: () => clearSelection(),
+        onDelete: () => showDeleteModal('transition', edge.id),
+        onEdit: () => editTransition(edge.id),
+      },
+    })));
+    onMounted(() => {
+      // Initialize accessibility fixer
+      accessibilityFixer.value = new AccessibilityFixer();
+      accessibilityFixer.value.init();
+
+      const detach = setupGlobalShortcuts({
+        addStage,
+        addTransition,
+        editItem: () => {
+          if (selectedStage.value) editStage(selectedStage.value);
+          else if (selectedTransition.value) editTransition(selectedTransition.value);
+        },
+        deleteItem: () => {
+          if (selectedStage.value) showDeleteModal('stage', selectedStage.value);
+          else if (selectedTransition.value) showDeleteModal('transition', selectedTransition.value);
+        },
+        clearSelection,
+        zoomIn,
+        zoomOut,
+        fitView,
+        viewport,
+        state: {
+          selectedStage,
+          selectedTransition,
+          isTransitionMode,
+          currentFocusMode,
+          liveRegion: liveRegion.value,
+        },
+        setSaveStatus: (val) => { saveStatus.value = val; },
+        updateSaveMessage,
+        saveNodePosition,
+        store,
+      });
+      onUnmounted(() => {
+        detach();
+        if (accessibilityFixer.value) {
+          accessibilityFixer.value.destroy();
+        }
+      });
+    });
+
+    let isRestoringViewport = false;
+    watch([loading, error], () => {
+      setTimeout(() => {
+        if (loading.value || error.value) return;
+        const { panX, panY, zoom } = store.getters.canvas ?? {};
+
+        if (
+          typeof panX === 'number' && !Number.isNaN(panX)
+          && typeof panY === 'number' && !Number.isNaN(panY)
+          && typeof zoom === 'number' && !Number.isNaN(zoom)
+        ) {
+          isRestoringViewport = true;
+          Promise.resolve()
+            .then(() => setViewport({ x: panX, y: panY, zoom }))
+            .finally(() => {
+              isRestoringViewport = false;
+            });
+        } else {
+          fitView({ padding: 0.4, duration: 300 });
+        }
+      }, 0);
+    }, { immediate: true });
+
+    onViewportChange(({ x, y, zoom }) => {
+      if (isRestoringViewport) {
+        return;
+      }
+
+      if ([x, y, zoom].some((v) => typeof v !== 'number' || Number.isNaN(v))) {
+        return;
+      }
+      store.dispatch('updateCanvasViewport', { panX: x, panY: y, zoom });
+    });
+
+    return {
+      loading,
+      error,
+      showMiniMap,
+      workflow,
+      stages,
+      positionedNodes,
+      styledEdges,
+      liveRegion,
+      handleConnect,
+      selectEdge,
+      handleDeleteConfirm,
+      addStage,
+      addTransition,
+      clearSelection,
+      handleNodeDragStop,
+    };
+  },
+};
+</script>
diff --git a/media_source/com_workflow/src/components/edges/CustomEdge.vue b/media_source/com_workflow/src/components/edges/CustomEdge.vue
new file mode 100644
index 0000000000000..451fc23d1e3e4
--- /dev/null
+++ b/media_source/com_workflow/src/components/edges/CustomEdge.vue
@@ -0,0 +1,307 @@
+<template>
+  <g
+    role="group"
+    :aria-label="sprintf('COM_WORKFLOW_GRAPH_TRANSITION', data?.title, sourceStageTitle, targetStageTitle)"
+  >
+    <path
+      :d="edgePath"
+      fill="none"
+      role="img"
+      :aria-label="sprintf('COM_WORKFLOW_GRAPH_TRANSITION_PATH', data?.title)"
+      :stroke="style?.stroke || '#333'"
+      :stroke-width="style?.strokeWidth || 2"
+      :stroke-dasharray="style?.strokeDasharray"
+      :marker-end="markerEnd"
+    />
+    <EdgeLabelRenderer>
+      <div
+        ref="edgeLabel"
+        class="edge-label position-absolute cursor-pointer"
+        tabindex="0"
+        role="button"
+        :data-edge-id="data?.id"
+        :aria-pressed="data?.isSelected ? 'true' : 'false'"
+        :style="{
+          width: maxWidth + 10 + 'px',
+          height: '30px',
+          transform: 'translate(-50%, -50%)',
+          left: labelX + 'px',
+          top: labelY + 'px',
+          pointerEvents: 'all',
+          zIndex: showActions ? 20 : 10,
+        }"
+        @mouseenter="onNodeEnter"
+        @mouseleave="onNodeLeave"
+        @click="onSelected"
+        @keydown.enter.stop.prevent="openActions"
+        @keydown.space.prevent.stop="openActions"
+        @keydown.esc="closeActions"
+        @keydown.tab="closeActions"
+      >
+        <div
+          v-if="showActions"
+          class="position-absolute top-25-px end-20-px h-100 rounded bg-secondary bg-opacity-75 pe-none"
+          aria-hidden="true"
+        />
+
+        <div class="custom-edge d-flex flex-column border rounded shadow-sm position-absolute">
+          <nav
+            v-if="showActions"
+            :id="`edge-actions-menu-${data?.id}`"
+            ref="actionsMenu"
+            class="workflow-browser-actions-list position-absolute top-25-px end-20-px opacity-100 d-flex flex-column border rounded shadow-sm p-1"
+            role="menu"
+            aria-orientation="vertical"
+            :aria-labelledby="`transition-${data?.id}-menu-button`"
+            @mouseenter="onDropdownEnter"
+          >
+            <span class="visually-hidden">{{ sprintf('COM_WORKFLOW_GRAPH_TRANSITION_ACTIONS', data?.title) }}</span>
+
+            <button
+              v-if="data?.permissions?.edit"
+              ref="editButton"
+              class="btn btn-sm btn-secondary text-start text-white fw-semibold text-truncate"
+              role="menuitem"
+              tabindex="0"
+              :title="translate('COM_WORKFLOW_GRAPH_EDIT_TRANSITION')"
+              @click="handleEdit"
+              @keydown.enter.stop.prevent="handleEdit"
+              @keydown.space.prevent.stop="handleEdit"
+            >
+              <span
+                class="icon icon-pencil-alt me-1"
+                aria-hidden="true"
+              />
+              {{ translate('COM_WORKFLOW_GRAPH_EDIT_TRANSITION') }}
+            </button>
+
+            <button
+              v-if="data?.permissions?.delete"
+              ref="deleteButton"
+              class="btn btn-sm btn-danger text-start mt-1 text-white fw-semibold text-truncate"
+              role="menuitem"
+              tabindex="0"
+              :title="translate('COM_WORKFLOW_GRAPH_TRASH_TRANSITION')"
+              @click="handleDelete"
+              @keydown.enter.stop.prevent="handleDelete"
+              @keydown.space.prevent.stop="handleDelete"
+            >
+              <span
+                class="icon icon-trash me-1"
+                aria-hidden="true"
+              />
+              {{ translate('COM_WORKFLOW_GRAPH_TRASH_TRANSITION') }}
+            </button>
+          </nav>
+
+          <div class="d-flex justify-content-around align-items-center p-1 pe-1 z-1 position-relative">
+            <span
+              class="h4 d-block card-title text-white fw-semibold text-truncate ms-4"
+              :title="translate(data?.title)"
+            >
+              {{ translate(data?.title) }}
+            </span>
+
+            <div class="align-items-center d-flex position-relative">
+              <button
+                :id="`transition-${data?.id}-menu-button`"
+                ref="menuButton"
+                class="btn btn-sm btn-secondary ms-1 px-1 py-0"
+                :class="{ 'invisible': !isHovered && !showActions }"
+                :style="{
+                  transition: 'opacity 0.2s ease',
+                  zIndex: showActions ? 30 : 11,
+                  position: 'relative',
+                }"
+                :title="showActions ? sprintf('COM_WORKFLOW_GRAPH_CLOSE_ACTIONS_MENU', data?.title) : sprintf('COM_WORKFLOW_GRAPH_OPEN_ACTIONS_MENU', data?.title)"
+                aria-haspopup="true"
+                :aria-expanded="showActions"
+                :aria-controls="`edge-actions-menu-${data?.id}`"
+                @click.stop="toggleActions"
+                @keydown.enter.stop="toggleActions"
+                @keydown.space.prevent.stop="toggleActions"
+              >
+                <span
+                  :class="showActions ? 'icon icon-times' : 'icon icon-ellipsis-h'"
+                  aria-hidden="true"
+                />
+                <span class="visually-hidden">
+                  {{ showActions ? sprintf('COM_WORKFLOW_GRAPH_CLOSE_ACTIONS_MENU', data?.title) : sprintf('COM_WORKFLOW_GRAPH_OPEN_ACTIONS_MENU', data?.title) }}
+                </span>
+              </button>
+            </div>
+          </div>
+        </div>
+
+        <!-- Hidden measurer -->
+        <span
+          ref="textMeasurer"
+          class="fw-semibold invisible position-absolute"
+          style="white-space: nowrap; font-size: 1rem; font-family: inherit;"
+          aria-hidden="true"
+        >
+          {{ translate(data?.title) }}
+        </span>
+      </div>
+    </EdgeLabelRenderer>
+  </g>
+</template>
+
+<script>
+import { getSmoothStepPath, EdgeLabelRenderer } from '@vue-flow/core';
+
+export default {
+  name: 'CustomEdge',
+  components: { EdgeLabelRenderer },
+  props: {
+    id: { type: String, default: '' },
+    sourceX: { type: Number, default: 0 },
+    sourceY: { type: Number, default: 0 },
+    targetX: { type: Number, default: 0 },
+    targetY: { type: Number, default: 0 },
+    sourcePosition: { type: String, default: '' },
+    targetPosition: { type: String, default: '' },
+    style: { type: Object, default: () => ({}) },
+    markerEnd: { type: Object, default: () => ({}) },
+    data: { type: Object, default: () => ({}) },
+  },
+  data() {
+    return {
+      showActions: false,
+      isHovered: false,
+      maxWidth: 100,
+      blurTimeout: null,
+      hoverTimeout: null,
+    };
+  },
+  computed: {
+    edgeData() {
+      // Use offsetIndex to curve the edge away from overlapping others
+      const offsetIndex = this.data?.offsetIndex || 0;
+
+      // Calculate perpendicular offset direction
+      const dx = this.targetX - this.sourceX;
+      const dy = this.targetY - this.sourceY;
+      const length = Math.sqrt(dx * dx + dy * dy) || 1;
+
+      // Perpendicular vector
+      const perpX = -dy / length;
+      const perpY = dx / length;
+      const curveMagnitude = 40 * offsetIndex;
+
+      // Control point for Bezier curve
+      const centerX = (this.sourceX + this.targetX) / 2 + perpX * curveMagnitude;
+      const centerY = (this.sourceY + this.targetY) / 2 + perpY * curveMagnitude;
+      return getSmoothStepPath({
+        sourceX: this.sourceX,
+        sourceY: this.sourceY,
+        targetX: this.targetX,
+        targetY: this.targetY,
+        sourcePosition: this.sourcePosition,
+        targetPosition: this.targetPosition,
+        centerX,
+        centerY,
+        borderRadius: 10,
+        offset: 10,
+      });
+    },
+    edgePath() {
+      return this.edgeData[0];
+    },
+    labelX() {
+      return this.edgeData[1] + ((this.data?.isBiDirectional && this.sourceY < this.targetY && this.data?.offsetIndex ? this.data?.offsetIndex : 0) || 0) * this.maxWidth;
+    },
+    labelY() {
+      return this.edgeData[2] + ((this.data?.isBiDirectional && this.sourceY > this.targetY && this.data?.offsetIndex ? this.data?.offsetIndex : 0) || 0) * 75;
+    },
+    sourceStageTitle() {
+      return this.data?.from_stage_title || `JSTAGE ${this.data?.from_stage_id || 'Unknown'}`;
+    },
+    targetStageTitle() {
+      return this.data?.to_stage_title || `JSTAGE ${this.data?.to_stage_id || 'Unknown'}`;
+    },
+    menuItems() {
+      const items = [];
+      if (this.data?.permissions?.edit && this.$refs.editButton) items.push(this.$refs.editButton);
+      if (this.data?.permissions?.delete && this.$refs.deleteButton) items.push(this.$refs.deleteButton);
+      return items;
+    },
+  },
+  watch: {
+    'data.title': {
+      handler: 'updateLabelWidth',
+      immediate: true,
+    },
+  },
+  mounted() {
+    this.updateLabelWidth();
+  },
+  beforeUnmount() {
+    if (this.blurTimeout) clearTimeout(this.blurTimeout);
+    if (this.hoverTimeout) clearTimeout(this.hoverTimeout);
+  },
+  methods: {
+    toggleActions() {
+      this.showActions ? this.closeActions() : this.openActions();
+    },
+    openActions() {
+      this.data?.onSelect?.();
+      this.showActions = true;
+      this.$nextTick(() => {
+        // Focus first available action
+        const firstButton = this.$refs.editButton || this.$refs.deleteButton;
+        if (firstButton) {
+          firstButton.focus();
+        }
+      });
+      document.addEventListener('click', this.closeActions);
+    },
+    closeActions() {
+      if (this.showActions) {
+        document.removeEventListener('click', this.closeActions);
+      }
+      this.data.onEscape?.();
+      clearTimeout(this.hoverTimeout);
+      clearTimeout(this.blurTimeout);
+      this.showActions = false;
+      // Return focus to menu button
+      this.$nextTick(() => {
+        if (this.$refs.menuButton) {
+          this.$refs.menuButton.focus();
+        }
+      });
+    },
+    handleEdit() {
+      this.closeActions();
+      this.data?.onEdit?.();
+    },
+    handleDelete() {
+      this.closeActions();
+      this.data?.onDelete?.();
+    },
+    onNodeEnter() {
+      clearTimeout(this.hoverTimeout);
+      this.isHovered = true;
+    },
+    onNodeLeave() {
+      this.hoverTimeout = setTimeout(() => {
+        if (!this.showActions) this.isHovered = false;
+      }, 100);
+    },
+    onDropdownEnter() {
+      clearTimeout(this.blurTimeout);
+    },
+    onSelected() {
+      return this.data?.onSelect?.();
+    },
+    updateLabelWidth() {
+      this.$nextTick(() => {
+        if (this.$refs.textMeasurer) {
+          const measuredWidth = this.$refs.textMeasurer.offsetWidth;
+          this.maxWidth = Math.min(measuredWidth + 50, 300);
+        }
+      });
+    },
+  },
+};
+</script>
diff --git a/media_source/com_workflow/src/components/nodes/StageNode.vue b/media_source/com_workflow/src/components/nodes/StageNode.vue
new file mode 100644
index 0000000000000..a163eed3357ad
--- /dev/null
+++ b/media_source/com_workflow/src/components/nodes/StageNode.vue
@@ -0,0 +1,285 @@
+<template>
+  <div
+    class="stage-node card border shadow-sm position-relative"
+    tabindex="0"
+    role="button"
+    :style="stageStyle"
+    :data-stage-id="stage?.id"
+    :aria-describedby="`stage-${stage?.id}-description`"
+    @mouseenter="onNodeEnter"
+    @mouseleave="onNodeLeave"
+    @click="onSelected"
+    @keydown.enter.stop.prevent="openActions"
+    @keydown.space.prevent.stop="openActions"
+    @keydown.esc="closeActions"
+    @keydown.tab="closeActions"
+  >
+    <!-- Dropdown Overlay -->
+    <div
+      v-if="showActions"
+      class="position-absolute top-25-px end-20-px h-100 rounded bg-secondary bg-opacity-75 z-2 pe-none"
+      aria-hidden="true"
+    />
+
+    <!-- Actions Dropdown -->
+    <nav
+      v-if="showActions"
+      :id="`stage-actions-menu-${stage?.id}`"
+      ref="actionsMenu"
+      class="workflow-browser-actions-list position-absolute top-25-px end-20-px opacity-100 d-flex flex-column border rounded shadow-sm z-3 p-1"
+      aria-orientation="vertical"
+      :aria-labelledby="`stage-${stage?.id}-menu-button`"
+      @mouseenter="onDropdownEnter"
+    >
+      <span class="visually-hidden">{{ sprintf('COM_WORKFLOW_GRAPH_STAGE_ACTIONS', stage?.title) }}</span>
+
+      <button
+        v-if="stage?.permissions?.edit"
+        ref="editButton"
+        class="btn btn-sm btn-secondary text-start text-white fw-semibold text-truncate"
+        role="menuitem"
+        tabindex="0"
+        :title="translate('COM_WORKFLOW_GRAPH_EDIT_STAGE')"
+        @click="handleEdit"
+        @keydown.enter="handleEdit"
+        @keydown.space="handleEdit"
+      >
+        <span
+          class="icon icon-pencil-alt me-1"
+          aria-hidden="true"
+        />
+        {{ translate('COM_WORKFLOW_GRAPH_EDIT_STAGE') }}
+      </button>
+
+      <button
+        v-if="stage?.permissions?.delete && !stage.default"
+        ref="deleteButton"
+        class="btn btn-sm btn-danger mt-1 text-start text-white fw-semibold text-truncate"
+        role="menuitem"
+        tabindex="0"
+        :title="translate('COM_WORKFLOW_GRAPH_TRASH_STAGE')"
+        @click="handleDelete"
+        @keydown.enter="handleDelete"
+        @keydown.space.prevent.stop="handleDelete"
+      >
+        <span
+          class="icon icon-trash me-1"
+          aria-hidden="true"
+        />
+        {{ translate('COM_WORKFLOW_GRAPH_TRASH_STAGE') }}
+      </button>
+    </nav>
+
+    <!-- Connection Handles -->
+    <div
+      v-if="stage.published"
+      class="stage-handles"
+      aria-hidden="true"
+    >
+      <Handle
+        type="target"
+        class="edge-handler bg-success position-absolute top-0 start-50 translate-middle-x rounded-circle"
+        :class="{ 'invisible': !isHoveredOrFocused || showActions || !isConnecting }"
+        :position="Position.Top"
+        aria-hidden="true"
+      />
+      <Handle
+        type="source"
+        class="edge-handler bg-success position-absolute bottom-0 start-50 translate-middle-x rounded-circle"
+        :class="{ 'invisible': !isHoveredOrFocused || showActions }"
+        :position="Position.Bottom"
+        aria-hidden="true"
+      />
+      <Handle
+        type="target"
+        class="edge-handler bg-success position-absolute top-50 start-0 translate-middle-y rounded-circle"
+        :class="{ 'invisible': !isHoveredOrFocused || showActions ||!isConnecting }"
+        :position="Position.Left"
+        aria-hidden="true"
+      />
+      <Handle
+        type="source"
+        class="edge-handler bg-success position-absolute top-50 end-0 translate-middle-y rounded-circle"
+        :position="Position.Right"
+        :class="{ 'invisible': !isHoveredOrFocused || showActions }"
+        aria-hidden="true"
+      />
+    </div>
+
+    <div class="card-header d-flex justify-content-between align-items-start p-1 pe-0 z-1 position-relative">
+      <div class="flex-fill w-75 me-3">
+        <span
+          class="h3 d-block card-title mb-1 text-white fw-semibold text-truncate"
+          :title="translate(stage?.title)"
+        >
+          {{ translate(stage.title) }}
+        </span>
+        <span
+          :id="`stage-${stage?.id}-description`"
+          class="card-text text-white-50 mb-0 text-truncate d-block"
+          :title="translate(stage?.description ? stage.description : '')"
+        >
+          {{ translate(stage.description ? stage.description : '') }}
+        </span>
+      </div>
+
+      <!-- Actions Button -->
+      <div
+        v-if="!data?.isSpecial"
+        class="stage-card-actions align-items-center d-flex position-relative"
+      >
+        <button
+          :id="`stage-${stage?.id}-menu-button`"
+          ref="menuButton"
+          class="btn btn-sm btn-light px-1 py-0"
+          :class="{ 'invisible': !isHoveredOrFocused && !showActions }"
+          style="transition: opacity 0.2s ease;"
+          :title="showActions ? sprintf('COM_WORKFLOW_GRAPH_CLOSE_ACTIONS_MENU', stage?.title) : sprintf('COM_WORKFLOW_GRAPH_OPEN_ACTIONS_MENU', stage?.title)"
+          aria-haspopup="true"
+          :aria-expanded="showActions"
+          :aria-controls="`stage-actions-menu-${stage?.id}`"
+          @click.stop="toggleActions"
+          @keydown.enter.stop="toggleActions"
+          @keydown.space.prevent.stop="toggleActions"
+        >
+          <span
+            :class="showActions ? 'icon icon-times' : 'icon icon-ellipsis-h'"
+            aria-hidden="true"
+          />
+          <span class="visually-hidden">
+            {{ showActions ? sprintf('COM_WORKFLOW_GRAPH_CLOSE_ACTIONS_MENU', stage?.title) : sprintf('COM_WORKFLOW_GRAPH_OPEN_ACTIONS_MENU', stage?.title) }}
+          </span>
+        </button>
+      </div>
+    </div>
+
+    <!-- Body -->
+    <div class="card-body px-1 py-0 z-1 position-relative">
+      <div class="d-flex justify-content-between align-items-center">
+        <span
+          :class="stage.published ? 'bg-success' : 'bg-danger'"
+          class="badge rounded-pill p-1"
+        >
+          {{ stage.published ? translate('COM_WORKFLOW_GRAPH_ENABLED') : translate('COM_WORKFLOW_GRAPH_DISABLED') }}
+        </span>
+        <span
+          v-if="stage.default"
+          class="badge bg-warning bg-opacity-10 rounded-pill p-1"
+        >
+          {{ translate('COM_WORKFLOW_GRAPH_DEFAULT') }}
+        </span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { Handle, Position, useVueFlow } from '@vue-flow/core';
+
+export default {
+  name: 'StageNode',
+  components: { Handle },
+  props: {
+    data: {
+      type: Object,
+      required: true,
+    },
+  },
+  setup() {
+    const { connectionStartHandle } = useVueFlow();
+    return { connectionStartHandle };
+  },
+  data() {
+    return {
+      showActions: false,
+      isHoveredOrFocused: false,
+      hoverTimeout: null,
+      blurTimeout: null,
+    };
+  },
+  computed: {
+    isConnecting() {
+      return !!this.connectionStartHandle;
+    },
+    Position() {
+      return Position;
+    },
+    stage() {
+      return this.data.stage;
+    },
+    isSelected() {
+      return this.data.isSelected;
+    },
+    stageStyle() {
+      return {
+        borderColor: 'var(--code-color) !important',
+        borderWidth: this.isSelected ? '3px !important' : '0 !important',
+        background: this.data.isSpecial ? 'purple !important' : 'rgb(var(--primary-rgb)) !important',
+        padding: this.isSelected ? '4px !important' : '6px !important',
+      };
+    },
+    onSelected() {
+      return this.data.onSelect?.();
+    },
+    onEscape() {
+      return this.data.onEscape?.();
+    },
+  },
+  methods: {
+    toggleActions() {
+      if (this.showActions) {
+        this.closeActions();
+      } else {
+        this.openActions();
+      }
+    },
+    openActions() {
+      this.data.onSelect?.();
+      this.showActions = true;
+      this.$nextTick(() => {
+        // Focus first available action
+        const firstButton = this.$refs.editButton || this.$refs.deleteButton;
+        if (firstButton) {
+          firstButton.focus();
+        }
+      });
+      document.addEventListener('click', this.closeActions);
+    },
+    closeActions() {
+      if (this.showActions) {
+        document.removeEventListener('click', this.closeActions);
+      }
+      this.data.onEscape?.();
+      clearTimeout(this.hoverTimeout);
+      clearTimeout(this.blurTimeout);
+      this.showActions = false;
+      // Return focus to menu button
+      this.$nextTick(() => {
+        if (this.$refs.menuButton) {
+          this.$refs.menuButton.focus();
+        }
+      });
+    },
+    handleEdit() {
+      this.closeActions();
+      this.data?.onEdit?.();
+    },
+    handleDelete() {
+      this.closeActions();
+      this.data?.onDelete?.();
+    },
+    onNodeEnter() {
+      clearTimeout(this.hoverTimeout);
+      this.isHoveredOrFocused = true;
+    },
+    onNodeLeave() {
+      this.hoverTimeout = setTimeout(() => {
+        if (!this.showActions) this.isHoveredOrFocused = false;
+      }, 100);
+    },
+    onDropdownEnter() {
+      clearTimeout(this.blurTimeout);
+    },
+  },
+};
+</script>
diff --git a/media_source/com_workflow/src/plugins/Notifications.es6.js b/media_source/com_workflow/src/plugins/Notifications.es6.js
new file mode 100644
index 0000000000000..d12b27ee9cc2c
--- /dev/null
+++ b/media_source/com_workflow/src/plugins/Notifications.es6.js
@@ -0,0 +1,54 @@
+/**
+ * Send a notification
+ * @param {String} message
+ * @param {{}} options
+ *
+ */
+function notify(message, options) {
+  let timer;
+  if (options.type === 'message') {
+    timer = 3000;
+  }
+  Joomla.renderMessages(
+    {
+      [options.type]: [Joomla.Text._(message)],
+    },
+    undefined,
+    true,
+    timer,
+  );
+}
+
+const notifications = {
+  /* Send a success notification */
+  success: (message, options) => {
+    notify(message, {
+      type: 'message', // @todo rename it to success
+      dismiss: true,
+      ...options,
+    });
+  },
+
+  /* Send an error notification */
+  error: (message, options) => {
+    notify(message, {
+      type: 'error', // @todo rename it to danger
+      dismiss: true,
+      ...options,
+    });
+  },
+
+  /* Send a general notification */
+  notify: (message, options) => {
+    notify(message, {
+      type: 'message',
+      dismiss: true,
+      ...options,
+    });
+  },
+
+  /* Ask the user a question */
+  ask: (message) => window.confirm(message),
+};
+
+export default notifications;
diff --git a/media_source/com_workflow/src/plugins/translate.es6.js b/media_source/com_workflow/src/plugins/translate.es6.js
new file mode 100644
index 0000000000000..d9382fdaf9fa9
--- /dev/null
+++ b/media_source/com_workflow/src/plugins/translate.es6.js
@@ -0,0 +1,54 @@
+/**
+ * Joomla Translation Plugin Wrapper
+ * Provides global `translate` and `sprintf` methods to all Vue components
+ */
+const Translate = {
+  /**
+   * Translate a Joomla key
+   * Falls back to key if translation is missing
+   * @param {string} key
+   * @returns {string}
+   */
+  translate: (key) => Joomla.Text._(key, key),
+
+  /**
+   * Format string using Joomla `sprintf`
+   * @param {string} string
+   * @param {...*} args
+   * @returns {string}
+   */
+  sprintf: (string, ...args) => {
+    const base = Translate.translate(string);
+    let i = 0;
+    return base.replace(/%((%)|s|d)/g, (m) => {
+      let val = args[i];
+
+      if (m === '%d') {
+        val = parseFloat(val);
+        if (Number.isNaN(val)) {
+          val = 0;
+        }
+      }
+      i += 1;
+      return val;
+    });
+  },
+
+  /**
+   * Vue plugin install method
+   * Adds $translate and $sprintf globally
+   * @param {App} Vue
+   */
+  install: (Vue) => Vue.mixin({
+    methods: {
+      translate(key) {
+        return Translate.translate(key);
+      },
+      sprintf(key, ...args) {
+        return Translate.sprintf(key, ...args);
+      },
+    },
+  }),
+};
+
+export default Translate;
diff --git a/media_source/com_workflow/src/store/actions.es6.js b/media_source/com_workflow/src/store/actions.es6.js
new file mode 100644
index 0000000000000..34d78b9f610f4
--- /dev/null
+++ b/media_source/com_workflow/src/store/actions.es6.js
@@ -0,0 +1,156 @@
+import workflowGraphApi from '../app/WorkflowGraphApi.es6.js';
+import notifications from '../plugins/Notifications.es6';
+
+/**
+ * Vuex Actions for asynchronous operations and workflows
+ * Handles logic and commits to mutations
+ */
+export default {
+  /**
+   * Load a workflow by its ID, including stages and transitions.
+   * @param commit
+   * @param id - The ID of the workflow
+   * @returns {Promise<{workflow: Object, stages: Array, transitions: Array}>}
+   */
+  async loadWorkflow({ commit }, id) {
+    commit('SET_LOADING', true);
+    commit('SET_ERROR', null);
+    try {
+      // Load workflow, stages, and transitions in parallel
+      const [workflowRes, stagesRes, transitionsRes] = await Promise.all([
+        await workflowGraphApi.getWorkflow(id),
+        await workflowGraphApi.getStages(id),
+        await workflowGraphApi.getTransitions(id),
+      ]);
+
+      commit('SET_WORKFLOW_ID', id);
+      commit('SET_WORKFLOW', workflowRes?.data);
+      commit('SET_STAGES', stagesRes?.data);
+      commit('SET_TRANSITIONS', transitionsRes?.data);
+    } catch (error) {
+      notifications.error(error?.response?.data?.message || error?.message || 'COM_WORKFLOW_GRAPH_ERROR_UNKNOWN');
+    } finally {
+      commit('SET_LOADING', false);
+    }
+  },
+
+  /**
+   * Delete a stage from the workflow.
+   * @param commit
+   * @param dispatch
+   * @param state
+   * @param id - The ID of the stage to delete
+   * @param workflowId - The ID of the workflow
+   * @returns {Promise<void>}
+   */
+  async deleteStage({ commit, dispatch, state }, { id, workflowId }) {
+    commit('SET_LOADING', true);
+    commit('SET_ERROR', null);
+
+    try {
+      const transitions = state.transitions.filter(
+        (t) => t.from_stage_id.toString() === id || t.to_stage_id.toString() === id,
+      );
+
+      if (
+        state.stages.length <= 1
+        || state.stages.find((s) => s.id.toString() === id).default
+      ) {
+        notifications.error('COM_WORKFLOW_GRAPH_ERROR_STAGE_DEFAULT_CANT_DELETED');
+        return;
+      }
+
+      if (transitions.length > 0) {
+        notifications.error('COM_WORKFLOW_GRAPH_ERROR_STAGE_HAS_TRANSITIONS');
+        return;
+      }
+
+      const stageDelete = state.stages.find(
+        (s) => s.id.toString() === id,
+      ).published === -1;
+
+      await workflowGraphApi.deleteStage(id, workflowId, stageDelete);
+    } catch (error) {
+      notifications.error(error?.response?.data?.message || error?.message || 'COM_WORKFLOW_GRAPH_TRASH_STAGE_FAILED');
+    } finally {
+      commit('SET_LOADING', false);
+      await dispatch('loadWorkflow', workflowId);
+    }
+  },
+
+  /**
+   * Delete a transition from the workflow.
+   * @param commit
+   * @param dispatch
+   * @param state
+   * @param id - The ID of the transition to delete
+   * @param workflowId - The ID of the workflow
+   * @returns {Promise<void>}
+   */
+  async deleteTransition({ commit, dispatch, state }, { id, workflowId }) {
+    commit('SET_LOADING', true);
+    commit('SET_ERROR', null);
+    try {
+      const transitionDelete = state.transitions.find(
+        (t) => t.id.toString() === id,
+      ).published === -1;
+      await workflowGraphApi.deleteTransition(id, workflowId, transitionDelete);
+    } catch (error) {
+      notifications.error(error?.response?.data?.message || error?.message || 'COM_WORKFLOW_GRAPH_TRASH_TRANSITION_FAILED');
+    } finally {
+      commit('SET_LOADING', false);
+      await dispatch('loadWorkflow', workflowId);
+    }
+  },
+
+  /**
+   * Update the position of a stage in the workflow locally.
+   * @param commit
+   * @param id - The ID of the stage
+   * @param x - The new x position of the stage
+   * @param y - The new y position of the stage
+   */
+  updateStagePosition({ commit }, { id, x, y }) {
+    commit('UPDATE_STAGE_POSITION', { id, x, y });
+  },
+
+  /**
+   * Update the position of a stage in the workflow via API in database.
+   * @param commit
+   * @param state
+   * @returns {Promise<boolean>}
+   */
+  async updateStagePositionAjax({ commit, state }) {
+    const response = await workflowGraphApi.updateStagePosition(
+      state.workflowId,
+      state.stages.reduce((acc, stage) => {
+        if (stage.position) {
+          acc[stage.id] = {
+            x: stage.position.x,
+            y: stage.position.y,
+          };
+        }
+        return acc;
+      }, {}),
+    );
+
+    if (response) {
+      commit('SET_ERROR', null);
+      return true;
+    }
+
+    notifications.error('COM_WORKFLOW_GRAPH_UPDATE_STAGE_POSITION_FAILED');
+    return false;
+  },
+
+  /**
+   * Update the canvas viewport (zoom and pan) for the workflow graph.
+   * @param commit
+   * @param zoom - The zoom level
+   * @param panX - The pan offset on the X axis
+   * @param panY - The pan offset on the Y axis
+   */
+  updateCanvasViewport({ commit }, { zoom, panX, panY }) {
+    commit('SET_CANVAS_VIEWPORT', { zoom, panX, panY });
+  },
+};
diff --git a/media_source/com_workflow/src/store/getters.es6.js b/media_source/com_workflow/src/store/getters.es6.js
new file mode 100644
index 0000000000000..ca46308702942
--- /dev/null
+++ b/media_source/com_workflow/src/store/getters.es6.js
@@ -0,0 +1,13 @@
+/**
+ * Vuex Getters for accessing state in components
+ * Provides reusable computed-like access to store data
+ */
+export default {
+  workflowId: (state) => state.workflowId,
+  workflow: (state) => state.workflow,
+  stages: (state) => state.stages,
+  transitions: (state) => state.transitions,
+  loading: (state) => state.loading,
+  error: (state) => state.error,
+  canvas: (state) => state.canvas,
+};
diff --git a/media_source/com_workflow/src/store/mutations.es6.js b/media_source/com_workflow/src/store/mutations.es6.js
new file mode 100644
index 0000000000000..95618b37da778
--- /dev/null
+++ b/media_source/com_workflow/src/store/mutations.es6.js
@@ -0,0 +1,52 @@
+/**
+ * Vuex Mutations for synchronously modifying workflow state
+ */
+export default {
+  SET_WORKFLOW_ID(state, id) {
+    state.workflowId = id;
+  },
+  SET_WORKFLOW(state, workflow) {
+    state.workflow = workflow;
+  },
+  SET_STAGES(state, stages) {
+    state.stages = stages.map((stage, idx) => ({
+      ...stage,
+      position: {
+        x: typeof stage?.position?.x === 'number' && !Number.isNaN(stage.position.x)
+          ? stage.position.x
+          : 100 + (idx % 4) * 400,
+        y: typeof stage?.position?.y === 'number' && !Number.isNaN(stage.position.y)
+          ? stage.position.y
+          : 100 + Math.floor(idx / 4) * 300,
+      },
+    }));
+  },
+  SET_TRANSITIONS(state, transitions) {
+    state.transitions = transitions;
+  },
+  SET_LOADING(state, loading) {
+    state.loading = loading;
+  },
+  SET_ERROR(state, error) {
+    state.error = error;
+  },
+  UPDATE_STAGE_POSITION(state, { id, x, y }) {
+    state.stages = state.stages.map((stage) => {
+      if (stage.id.toString() === id) {
+        return {
+          ...stage,
+          position: {
+            x,
+            y,
+          },
+        };
+      }
+      return stage;
+    });
+  },
+  SET_CANVAS_VIEWPORT(state, { zoom, panX, panY }) {
+    state.canvas.zoom = zoom;
+    state.canvas.panX = panX;
+    state.canvas.panY = panY;
+  },
+};
diff --git a/media_source/com_workflow/src/store/plugins/persisted-state.es6.js b/media_source/com_workflow/src/store/plugins/persisted-state.es6.js
new file mode 100644
index 0000000000000..29ee02fef5bdb
--- /dev/null
+++ b/media_source/com_workflow/src/store/plugins/persisted-state.es6.js
@@ -0,0 +1,33 @@
+/**
+ * Vuex plugin for persisting selected store data to localStorage
+ * Typically used for preserving UI state across reloads
+ */
+export default function createPersistedState({ key = 'vuex', paths = [] } = {}) {
+  return (store) => {
+    try {
+      const stored = localStorage.getItem(key);
+      if (stored) {
+        const parsed = JSON.parse(stored);
+        paths.forEach((path) => {
+          if (parsed[path] !== undefined) {
+            store.state[path] = parsed[path];
+          }
+        });
+      }
+
+      store.subscribe((mutation, state) => {
+        const partial = {};
+        paths.forEach((path) => {
+          partial[path] = state[path];
+        });
+        localStorage.setItem(key, JSON.stringify(partial));
+      });
+    } catch (err) {
+      if (window.Joomla && window.Joomla.renderMessages) {
+        window.Joomla.renderMessages({
+          error: [err],
+        });
+      }
+    }
+  };
+}
diff --git a/media_source/com_workflow/src/store/state.es6.js b/media_source/com_workflow/src/store/state.es6.js
new file mode 100644
index 0000000000000..1ff85be0a0591
--- /dev/null
+++ b/media_source/com_workflow/src/store/state.es6.js
@@ -0,0 +1,17 @@
+/**
+ * Reactive base state for the workflow graph
+ * Includes workflow ID, workflow, stages, loading, transitions, history, and canvas viewport
+ */
+export default {
+  workflowId: null,
+  workflow: null,
+  stages: [],
+  transitions: [],
+  loading: false,
+  error: null,
+  canvas: {
+    zoom: null,
+    panX: null,
+    panY: null,
+  },
+};
diff --git a/media_source/com_workflow/src/store/store.es6.js b/media_source/com_workflow/src/store/store.es6.js
new file mode 100644
index 0000000000000..0b2b543d9b9a3
--- /dev/null
+++ b/media_source/com_workflow/src/store/store.es6.js
@@ -0,0 +1,23 @@
+import { createStore } from 'vuex';
+import state from './state.es6.js';
+import mutations from './mutations.es6.js';
+import actions from './actions.es6.js';
+import getters from './getters.es6.js';
+import createPersistedState from './plugins/persisted-state.es6';
+
+/**
+ * Vuex Store for Workflow Graph
+ * Handles state, mutations, actions, getters, and persistence of workflow graph data
+ */
+export default createStore({
+  state,
+  mutations,
+  actions,
+  getters,
+  plugins: [
+    createPersistedState({
+      key: 'workflow-graph-state',
+      paths: ['workflowId', 'stages', 'transitions'],
+    }),
+  ],
+});
diff --git a/media_source/com_workflow/src/utils/accessibility-fixer.es6.js b/media_source/com_workflow/src/utils/accessibility-fixer.es6.js
new file mode 100644
index 0000000000000..11e925da0ce81
--- /dev/null
+++ b/media_source/com_workflow/src/utils/accessibility-fixer.es6.js
@@ -0,0 +1,359 @@
+/**
+ * VueFlow Accessibility Fixer
+ * Handles accessibility issues that cannot be fixed with CSS alone
+ */
+
+export class AccessibilityFixer {
+  constructor() {
+    this.observer = null;
+    this.processedElements = new WeakSet();
+  }
+
+  /**
+   * Initialize the accessibility fixer
+   */
+  init() {
+    // Initial fix
+    this.fixVueFlowAccessibility();
+
+    // Set up mutation observer to handle dynamically added elements
+    this.setupMutationObserver();
+
+    // Fix elements when VueFlow updates
+    this.setupVueFlowObserver();
+  }
+
+  /**
+   * Fix all VueFlow accessibility issues
+   */
+  fixVueFlowAccessibility() {
+    // Fix SVG elements
+    this.fixSVGElements();
+
+    // Fix tabbable groups
+    this.fixTabbableGroups();
+
+    // Fix graphics-document elements
+    this.fixGraphicsDocuments();
+
+    // Fix button accessible names
+    this.fixButtonAccessibleNames();
+
+    // Fix duplicate SVG element IDs
+    this.fixDuplicateSVGIds();
+  }
+
+  /**
+   * Hide all SVG elements from screen readers
+   */
+  fixSVGElements() {
+    const svgSelectors = [
+      '.vue-flow svg',
+      '.vue-flow [role="graphics-document"]',
+      '.vue-flow__background svg',
+      '.vue-flow__minimap svg',
+      '.vue-flow__edge svg',
+      '.vue-flow__nodes svg',
+      '.vue-flow__edges svg',
+      'svg[role="graphics-document"]',
+      'g[role="group"] svg',
+      'g[role="group"] [role="graphics-document"]',
+    ];
+
+    svgSelectors.forEach((selector) => {
+      const elements = document.querySelectorAll(selector);
+      elements.forEach((element) => {
+        if (!this.processedElements.has(element)) {
+          this.hideSVGFromScreenReaders(element);
+          this.processedElements.add(element);
+        }
+      });
+    });
+  }
+
+  /**
+   * Hide individual SVG element from screen readers
+   */
+  hideSVGFromScreenReaders(element) {
+    // Only add aria-hidden to elements where it's valid
+    if (!this.isInvalidForAriaHidden(element)) {
+      element.setAttribute('aria-hidden', 'true');
+    }
+
+    // Only set role="presentation" on elements where it's valid
+    if (!this.isInvalidForPresentationRole(element)) {
+      element.setAttribute('role', 'presentation');
+    }
+
+    // Remove ARIA attributes that shouldn't be on decorative elements
+    if (!this.isInvalidForAriaAttributes(element)) {
+      element.removeAttribute('aria-label');
+      element.removeAttribute('aria-labelledby');
+      element.removeAttribute('aria-describedby');
+    }
+
+    // Also hide all children
+    const children = element.querySelectorAll('*');
+    children.forEach((child) => {
+      // Only add aria-hidden to child elements where it's valid
+      if (!this.isInvalidForAriaHidden(child)) {
+        child.setAttribute('aria-hidden', 'true');
+      }
+
+      // Only set role="presentation" on child elements where it's valid
+      if (!this.isInvalidForPresentationRole(child)) {
+        child.setAttribute('role', 'presentation');
+      }
+
+      // Remove ARIA attributes from children where appropriate
+      if (!this.isInvalidForAriaAttributes(child)) {
+        child.removeAttribute('aria-label');
+        child.removeAttribute('aria-labelledby');
+        child.removeAttribute('aria-describedby');
+      }
+    });
+  }
+
+  /**
+   * Check if role="presentation" is invalid for this element
+   */
+  isInvalidForPresentationRole(element) {
+    const invalidTags = ['title', 'desc', 'metadata'];
+    return invalidTags.includes(element.tagName?.toLowerCase());
+  }
+
+  /**
+   * Check if aria-hidden is invalid for this element
+   */
+  isInvalidForAriaHidden(element) {
+    // aria-hidden is invalid on title elements when they have role="none"
+    const tagName = element.tagName?.toLowerCase();
+    if (tagName === 'title' && element.getAttribute('role') === 'none') {
+      return true;
+    }
+    // aria-hidden should not be used on title, desc, metadata elements in general
+    const invalidTags = ['title', 'desc', 'metadata'];
+    return invalidTags.includes(tagName);
+  }
+
+  /**
+   * Check if ARIA attributes should be removed from this element
+   */
+  isInvalidForAriaAttributes(element) {
+    // Don't remove ARIA attributes from elements that might legitimately use them
+    const tagName = element.tagName?.toLowerCase();
+    const protectedTags = ['title', 'desc', 'metadata'];
+    return protectedTags.includes(tagName);
+  }
+
+  /**
+   * Fix tabbable group elements
+   */
+  fixTabbableGroups() {
+    const groups = document.querySelectorAll('.vue-flow [role="group"][tabindex], [role="group"][tabindex]');
+
+    groups.forEach((group) => {
+      if (!this.processedElements.has(group)) {
+        // Remove tabindex from non-interactive groups
+        const hasInteractiveChildren = group.querySelector('button, [role="button"], [role="menuitem"], input, select, textarea, a[href]');
+
+        if (!hasInteractiveChildren) {
+          group.removeAttribute('tabindex');
+          group.style.pointerEvents = 'none';
+        } else {
+          // If it has interactive children, make the group non-focusable but keep children interactive
+          group.removeAttribute('tabindex');
+          group.style.userSelect = 'none';
+          group.style.webkitUserSelect = 'none';
+          group.style.mozUserSelect = 'none';
+        }
+
+        this.processedElements.add(group);
+      }
+    });
+  }
+
+  /**
+   * Fix graphics-document elements
+   */
+  fixGraphicsDocuments() {
+    const graphicsElements = document.querySelectorAll('[role="graphics-document"]');
+
+    graphicsElements.forEach((element) => {
+      if (!this.processedElements.has(element)) {
+        this.hideSVGFromScreenReaders(element);
+        this.processedElements.add(element);
+      }
+    });
+  }
+
+  /**
+   * Fix button accessible names to match visible text
+   */
+  fixButtonAccessibleNames() {
+    const buttons = document.querySelectorAll('.stage-node[role="button"], .edge-label[role="button"]');
+
+    buttons.forEach((button) => {
+      if (!this.processedElements.has(button)) {
+        // Remove any conflicting aria-label that doesn't match visible text
+        const currentLabel = button.getAttribute('aria-label');
+        const visibleText = this.getVisibleText(button);
+
+        if (currentLabel && visibleText && !visibleText.includes(currentLabel) && !currentLabel.includes(visibleText)) {
+          // If aria-label doesn't match visible text, remove it to let the browser use visible text
+          button.removeAttribute('aria-label');
+        }
+
+        this.processedElements.add(button);
+      }
+    });
+  }
+
+  /**
+   * Fix duplicate SVG element IDs
+   */
+  fixDuplicateSVGIds() {
+    const seenIds = new Set();
+    const elementsWithIds = document.querySelectorAll('svg [id], .vue-flow [id]');
+
+    elementsWithIds.forEach((element) => {
+      const id = element.id;
+      if (id && seenIds.has(id)) {
+        // Generate a unique ID
+        const uniqueId = this.generateUniqueId(id, seenIds);
+        element.id = uniqueId;
+        seenIds.add(uniqueId);
+      } else if (id) {
+        seenIds.add(id);
+      }
+    });
+  }
+
+  /**
+   * Generate a unique ID based on the original ID
+   */
+  generateUniqueId(originalId, seenIds) {
+    let counter = 1;
+    let newId = `${originalId}-${counter}`;
+
+    while (seenIds.has(newId)) {
+      counter++;
+      newId = `${originalId}-${counter}`;
+    }
+
+    return newId;
+  }
+
+  /**
+   * Get the main visible text content of an element
+   */
+  getVisibleText(element) {
+    // For stage nodes, get the title
+    const titleElement = element.querySelector('.card-title');
+    if (titleElement) {
+      return titleElement.textContent.trim();
+    }
+
+    // For edge labels, get the header text
+    const headerElement = element.querySelector('header .card-title');
+    if (headerElement) {
+      return headerElement.textContent.trim();
+    }
+
+    // Fallback to any text content
+    return element.textContent.trim().split('\n')[0].trim();
+  }
+
+  /**
+   * Setup mutation observer to handle dynamically added elements
+   */
+  setupMutationObserver() {
+    this.observer = new MutationObserver((mutations) => {
+      let shouldProcess = false;
+
+      mutations.forEach((mutation) => {
+        if (mutation.type === 'childList' && mutation.addedNodes.length > 0) {
+          mutation.addedNodes.forEach((node) => {
+            if (node.nodeType === Node.ELEMENT_NODE) {
+              // Check if the added node is a VueFlow element or contains VueFlow elements
+              if (node.matches && (
+                node.matches('.vue-flow *')
+                || node.matches('svg')
+                || node.matches('[role="graphics-document"]')
+                || node.matches('[role="group"]')
+                || node.querySelector('.vue-flow *, svg, [role="graphics-document"], [role="group"]')
+              )) {
+                shouldProcess = true;
+              }
+            }
+          });
+        }
+      });
+
+      if (shouldProcess) {
+        // Debounce the processing
+        clearTimeout(this.processTimeout);
+        this.processTimeout = setTimeout(() => {
+          this.fixVueFlowAccessibility();
+        }, 100);
+      }
+    });
+
+    this.observer.observe(document.body, {
+      childList: true,
+      subtree: true,
+    });
+  }
+
+  /**
+   * Setup VueFlow-specific observer for when the flow updates
+   */
+  setupVueFlowObserver() {
+    // Also listen for VueFlow specific events if available
+    const vueFlowElement = document.querySelector('.vue-flow');
+    if (vueFlowElement) {
+      // Set up additional observer for VueFlow container changes
+      const vueFlowObserver = new MutationObserver(() => {
+        clearTimeout(this.vueFlowTimeout);
+        this.vueFlowTimeout = setTimeout(() => {
+          this.fixVueFlowAccessibility();
+        }, 200);
+      });
+
+      vueFlowObserver.observe(vueFlowElement, {
+        childList: true,
+        subtree: true,
+        attributes: true,
+        attributeFilter: ['role', 'tabindex', 'aria-label', 'aria-hidden'],
+      });
+    }
+  }
+
+  /**
+   * Cleanup the fixer
+   */
+  destroy() {
+    if (this.observer) {
+      this.observer.disconnect();
+    }
+    clearTimeout(this.processTimeout);
+    clearTimeout(this.vueFlowTimeout);
+  }
+}
+
+// Auto-initialize when DOM is ready
+if (document.readyState === 'loading') {
+  document.addEventListener('DOMContentLoaded', () => {
+    const fixer = new AccessibilityFixer();
+    fixer.init();
+
+    // Make it globally available for cleanup
+    window.workflowAccessibilityFixer = fixer;
+  });
+} else {
+  const fixer = new AccessibilityFixer();
+  fixer.init();
+  window.workflowAccessibilityFixer = fixer;
+}
+
+export default AccessibilityFixer;
diff --git a/media_source/com_workflow/src/utils/edges.es6.js b/media_source/com_workflow/src/utils/edges.es6.js
new file mode 100644
index 0000000000000..e52b2418f98f2
--- /dev/null
+++ b/media_source/com_workflow/src/utils/edges.es6.js
@@ -0,0 +1,80 @@
+import { getEdgeColor } from './utils.es6.js';
+
+/**
+ * Generate styled edges based on transition data.
+ * @param {Array<Object>} transitions - List of transitions.
+ * @param {Object} options - Optional configuration - contains selected transition id.
+ * @returns {Array<Object>} Styled edge definitions.
+ */
+export function generateStyledEdges(transitions, options = {}) {
+  const {
+    selectedId = null,
+  } = options;
+
+  // Group transitions by source-target pair
+  const edgeGroups = {};
+  transitions.forEach((transition) => {
+    const sourceId = transition.from_stage_id === -1 ? 'from_any' : String(transition.from_stage_id);
+    const targetId = String(transition.to_stage_id);
+    const key = `${sourceId}__${targetId}`;
+    if (!edgeGroups[key]) edgeGroups[key] = [];
+    edgeGroups[key].push(transition);
+  });
+
+  // Assign offsetIndex for each edge in a group
+  const edgeOffsetMap = new Map();
+  Object.entries(edgeGroups).forEach(([key, group]) => {
+    group.forEach((transition, idx) => {
+      edgeOffsetMap.set(transition.id, idx - (group.length - 1) / 2);
+    });
+  });
+
+  return transitions.map((transition) => {
+    const sourceId = transition.from_stage_id === -1 ? 'from_any' : String(transition.from_stage_id);
+    const targetId = String(transition.to_stage_id);
+
+    const isSelected = transition.id === selectedId;
+    const isBiDirectional = transitions.some(
+      (t) => t.from_stage_id === transition.to_stage_id && t.to_stage_id === transition.from_stage_id,
+    );
+
+    // Offset index for multiple edges between same source-target
+    let offsetIndex = edgeOffsetMap.get(transition.id) || 0;
+
+    // If bidirectional, add a small extra offset to separate further
+    if (isBiDirectional) {
+      offsetIndex += transition.from_stage_id > transition.to_stage_id ? 1 : -1;
+    }
+
+    const edgeColor = getEdgeColor(transition, isSelected);
+    const strokeWidth = isSelected ? 5 : 3;
+
+    return {
+      id: String(transition.id),
+      source: sourceId,
+      target: targetId,
+      type: 'custom',
+      animated: isSelected,
+      style: {
+        stroke: edgeColor,
+        strokeWidth,
+        strokeDasharray: transition.published ? undefined : '5,5',
+        zIndex: isSelected ? 1000 : 1,
+      },
+      markerEnd: {
+        type: 'arrow',
+        width: 10,
+        height: 10,
+        color: edgeColor,
+      },
+      data: {
+        ...transition,
+        isSelected,
+        isBiDirectional,
+        offsetIndex,
+        onEdit: () => {},
+        onDelete: () => {},
+      },
+    };
+  });
+}
diff --git a/media_source/com_workflow/src/utils/focus-utils.es6.js b/media_source/com_workflow/src/utils/focus-utils.es6.js
new file mode 100644
index 0000000000000..b515459c61013
--- /dev/null
+++ b/media_source/com_workflow/src/utils/focus-utils.es6.js
@@ -0,0 +1,149 @@
+/**
+ * Announce a message via ARIA live region.
+ * @param {HTMLElement} liveRegionElement
+ * @param {string} message
+ */
+export function announce(liveRegionElement, message) {
+  if (!liveRegionElement || !message) return;
+  liveRegionElement.textContent = '';
+  setTimeout(() => {
+    liveRegionElement.textContent = message;
+  }, 10);
+}
+
+/**
+ * Focus a stage node by stageId.
+ * @param {string|number} stageId - The ID of the stage to focus
+ */
+export function focusNode(stageId) {
+  const el = document.querySelector(`.stage-node[data-stage-id='${stageId}']`);
+  if (el) el.focus();
+}
+
+/**
+ * Focus an edge label by transitionId.
+ * @param {string|number} transitionId - The ID of the transition to focus
+ */
+export function focusEdge(transitionId) {
+  const el = document.querySelector(`.edge-label[data-edge-id='${transitionId}']`);
+  if (el) el.focus();
+}
+
+/**
+ * Find and cycle focus among elements with a selector.
+ * @param {string} selector - The selector for the elements to focus
+ * @param {boolean} reverse - Whether to cycle focus in reverse order
+ */
+export function cycleFocus(selector, reverse = false) {
+  const elements = Array.from(document.querySelectorAll(selector));
+  if (!elements.length) return;
+  const currentIndex = elements.indexOf(document.activeElement);
+  let nextIndex;
+  if (reverse) {
+    nextIndex = currentIndex <= 0 ? elements.length - 1 : currentIndex - 1;
+  } else {
+    nextIndex = currentIndex >= elements.length - 1 ? 0 : currentIndex + 1;
+  }
+  elements[nextIndex].focus();
+}
+
+/**
+ * Cycle between defined focus modes (e.g., stages → transitions → toolbar → actions).
+ * @param {string[]} focusModes - Array of focus mode strings.
+ * @param {Ref<string>} currentModeRef - Vue ref holding the current mode.
+ * @param {HTMLElement} liveRegionElement - ARIA live region for screen reader feedback.
+ */
+export function cycleMode(focusModes, currentModeRef, liveRegionElement) {
+  const currentIndex = focusModes.indexOf(currentModeRef.value);
+  const nextIndex = (currentIndex + 1) % focusModes.length;
+  currentModeRef.value = focusModes[nextIndex];
+}
+
+/**
+ * Handle focus and keyboard events for dialog iframes.
+ * This function sets focus to the first input or body of the iframe,
+ * and adds an Escape key listener to close the dialog.
+ *
+ * @param {HTMLIFrameElement} iframe - The iframe element to handle.
+ *
+ */
+function handleDialogIframeLoad(iframe) {
+  try {
+    iframe.focus();
+    const iframeDoc = iframe.contentDocument || iframe.contentWindow.document;
+    if (iframeDoc) {
+      const firstInput = iframeDoc.querySelector('input:not([type="hidden"]), select, textarea');
+      if (firstInput) {
+        firstInput.focus();
+      } else {
+        iframeDoc.body.focus();
+      }
+
+      iframeDoc.addEventListener('keydown', (e) => {
+        if (e.code === 'Escape') {
+          e.preventDefault();
+          const parentDialog = document.querySelector('joomla-dialog dialog[open]');
+          if (parentDialog && parentDialog.close) {
+            parentDialog.close();
+          }
+        }
+      });
+    }
+  } catch (error) {
+    iframe.focus();
+  }
+}
+
+/**
+ * Handle dialog close event.
+ * @param previouslyFocusedElement - The element that was focused before the dialog opened
+ * @param store - The Vuex store instance
+ */
+function handleDialogClose(previouslyFocusedElement, store) {
+  if (previouslyFocusedElement.value) {
+    previouslyFocusedElement.value.focus();
+    previouslyFocusedElement.value = null;
+  }
+  store.dispatch('loadWorkflow', store.getters.workflowId);
+}
+
+/**
+ * Handle Escape keydown event on dialog.
+ * @param e - The keyboard event
+ */
+function handleDialogKeydown(e) {
+  if (e.code === 'Escape') {
+    e.preventDefault();
+    const dialog = e.currentTarget;
+    if (dialog && dialog.close) {
+      dialog.close();
+    }
+  }
+}
+
+/**
+ * Setup focus handlers for dialog iframes.
+ * This function will focus the dialog and handle iframe loading and closing.
+ *
+ * @param {Ref<HTMLElement>} previouslyFocusedElement - Ref to store the previously focused element.
+ * @param {Object} store - Vuex store instance.
+ */
+export function setupDialogFocusHandlers(previouslyFocusedElement, store) {
+  setTimeout(() => {
+    const dialog = document.querySelector('joomla-dialog dialog[open]');
+    if (dialog) {
+      dialog.focus();
+      const iframe = dialog.querySelector('iframe');
+      if (iframe) {
+        iframe.addEventListener('load', () => {
+          handleDialogIframeLoad(iframe);
+        });
+      }
+
+      dialog.addEventListener('close', () => {
+        handleDialogClose(previouslyFocusedElement, store);
+      });
+      dialog.addEventListener('keydown', handleDialogKeydown);
+    }
+  }, 100);
+}
diff --git a/media_source/com_workflow/src/utils/keyboard-manager.es6.js b/media_source/com_workflow/src/utils/keyboard-manager.es6.js
new file mode 100644
index 0000000000000..c75b898087c9a
--- /dev/null
+++ b/media_source/com_workflow/src/utils/keyboard-manager.es6.js
@@ -0,0 +1,173 @@
+import {
+  announce, cycleFocus, cycleMode,
+} from './focus-utils.es6';
+
+/**
+ * Attach global keyboard listeners for workflow canvas.
+ * @param {Object} options
+ * @param {Function} addStage - Function to add a new stage
+ * @param {Function} addTransition - Function to add a new transition
+ * @param {Function} editItem - Function to edit an item
+ * @param {Function} deleteItem - Function to delete an item
+ * @param {Function} setSaveStatus - Function to set the save status of positions
+ * @param {Function} updateSaveMessage - Function to update the save message
+ * @param {Function} saveNodePosition - Function to save the node position
+ * @param {Function} clearSelection - Function to clear the selection
+ * @param {Function} zoomIn - Function to zoom in
+ * @param {Function} zoomOut - Function to zoom out
+ * @param {Function} fitView - Function to fit the view
+ * @param {Ref<Object>} viewport - Ref to the viewport object
+ * @param {Object} state - { selectedStage, selectedTransition, isTransitionMode, liveRegion }
+ * @param {Object} store - Vuex store instance
+ */
+export function setupGlobalShortcuts({
+  addStage, addTransition, editItem, deleteItem,
+  setSaveStatus, updateSaveMessage, saveNodePosition,
+  clearSelection, zoomIn, zoomOut, fitView,
+  viewport, state, store,
+}) {
+  function handleKey(e) {
+    const iframe = document.querySelector('joomla-dialog dialog[open]');
+    if (iframe) {
+      if (e.code === 'Escape') {
+        e.preventDefault();
+        iframe.close();
+        return;
+      }
+      return;
+    }
+
+    const groupSelectors = {
+      buttons: 'button, button:not([tabindex="-1"])',
+      stages: '.stage-node',
+      transitions: '.edge-label',
+      toolbar: '.toolbar-button',
+      actions: '.action-button',
+      links: 'a[href], a[href]:not([tabindex="-1"])',
+    };
+
+    function moveNode(stageId, direction, fast = false) {
+      const el = document.querySelector(`.stage-node[data-stage-id='${stageId}']`);
+      if (!el || !store) return;
+
+      const moveBy = fast ? 20 : 5;
+
+      const stageIndex = store.getters.stages.findIndex((s) => s.id === parseInt(stageId, 10));
+      if (stageIndex === -1) return;
+      const currentPosition = store.getters.stages[stageIndex].position || { x: 0, y: 0 };
+      if (!currentPosition) return;
+
+      let { x, y } = currentPosition;
+
+      switch (direction) {
+        case 'ArrowUp': y -= moveBy; break;
+        case 'ArrowDown': y += moveBy; break;
+        case 'ArrowLeft': x -= moveBy; break;
+        case 'ArrowRight': x += moveBy; break;
+        default: return;
+      }
+
+      store.dispatch('updateStagePosition', { id: stageId, x, y });
+      setSaveStatus('unsaved');
+      updateSaveMessage();
+      saveNodePosition();
+    }
+
+    switch (true) {
+      /* ---------- Add Stage / Transition ---------- */
+      case e.altKey && e.code === 'KeyN':
+        e.preventDefault();
+        addStage();
+        announce(state.liveRegion, 'Add stage');
+        break;
+
+      case e.altKey && e.code === 'KeyM':
+        e.preventDefault();
+        addTransition();
+        announce(state.liveRegion, 'Add transition');
+        break;
+
+      /* ---------- Edit / Delete ---------- */
+      case e.code === 'KeyE':
+        e.preventDefault();
+        editItem();
+        break;
+
+      case e.code === 'Delete' || e.code === 'Backspace':
+        e.preventDefault();
+        deleteItem();
+        break;
+
+      case e.code === 'Escape':
+        e.preventDefault();
+        clearSelection();
+        break;
+
+      /* ---------- Zoom / View ---------- */
+      case e.code === 'Equal': // + / =
+        e.preventDefault();
+        zoomIn();
+        break;
+
+      case e.code === 'Minus': // - / _
+        e.preventDefault();
+        zoomOut();
+        break;
+
+      case e.code === 'KeyF':
+        e.preventDefault();
+        fitView({ padding: 0.5, duration: 300 });
+        break;
+
+      /* ---------- Focus Mode Cycling ---------- */
+      case e.code === 'Tab': {
+        e.preventDefault();
+        cycleMode(['buttons', 'stages', 'transitions', 'toolbar', 'actions', 'links'], state.currentFocusMode, state.liveRegion);
+        const tabSelector = groupSelectors[state.currentFocusMode.value];
+        if (tabSelector) {
+          const first = document.querySelector(tabSelector);
+          if (first) first.focus();
+        }
+        break;
+      }
+
+      /* ---------- Arrow Navigation ---------- */
+      case ['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'].includes(e.code):
+        e.preventDefault();
+        if (state.selectedStage.value) {
+          if (e.shiftKey) {
+            moveNode(state.selectedStage.value.toString(), e.code, true);
+          } else {
+            const buttonSelector = `.stage-node[data-stage-id='${state.selectedStage.value}'] button[tabindex="0"]`;
+            if (buttonSelector) cycleFocus(buttonSelector, 0);
+          }
+        } else if (state.selectedTransition.value) {
+          const buttonSelector = `.edge-label[data-edge-id='${state.selectedTransition.value}'] button[tabindex="0"]`;
+          if (buttonSelector) cycleFocus(buttonSelector, 0);
+        } else if (e.shiftKey) {
+          const panStep = 20;
+          switch (e.code) {
+            case 'ArrowUp': viewport.value.y += panStep; break;
+            case 'ArrowDown': viewport.value.y -= panStep; break;
+            case 'ArrowLeft': viewport.value.x += panStep; break;
+            case 'ArrowRight': viewport.value.x -= panStep; break;
+            default: break;
+          }
+        } else {
+          const reverse = ['ArrowLeft', 'ArrowUp'].includes(e.code);
+          const selector = groupSelectors[state.currentFocusMode.value];
+          if (selector) cycleFocus(selector, reverse);
+        }
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  document.addEventListener('keydown', handleKey);
+
+  return () => {
+    document.removeEventListener('keydown', handleKey);
+  };
+}
diff --git a/media_source/com_workflow/src/utils/positioning.es6.js b/media_source/com_workflow/src/utils/positioning.es6.js
new file mode 100644
index 0000000000000..9148f8950a454
--- /dev/null
+++ b/media_source/com_workflow/src/utils/positioning.es6.js
@@ -0,0 +1,73 @@
+import { getColorForStage } from './utils.es6.js';
+
+/**
+ * Calculate and return positioned stage nodes in a grid layout.
+ * @param {Array<Object>} stages - Array of stage objects.
+ * @param {Object} options - Grid layout options (gapX, gapY, paddingX, paddingY).
+ * @returns {Array<Object>} Array of positioned node configs.
+ */
+export function generatePositionedNodes(stages, options = {}) {
+  const {
+    gapX = 400,
+    gapY = 300,
+    paddingX = 100,
+    paddingY = 100,
+  } = options;
+
+  const columns = Math.min(4, Math.ceil(Math.sqrt(stages?.length || 0)) + 1);
+
+  return stages.map((stage, index) => {
+    const col = index % columns;
+    const row = Math.floor(index / columns);
+
+    const position = stage?.position || {
+      x: col * gapX + paddingX,
+      y: row * gapY + paddingY,
+    };
+
+    return {
+      id: String(stage.id),
+      type: 'stage',
+      position,
+      data: {
+        stage: {
+          ...stage,
+          color: getColorForStage(stage),
+        },
+        isSelected: false,
+        onSelect: () => {},
+        onEdit: () => {},
+        onDelete: () => {},
+      },
+      draggable: true,
+    };
+  });
+}
+
+/**
+ * Create special static nodes like "from_any" node.
+ * @param {String} id - The ID of the special node
+ * @param {Object} position - The position of the special node
+ * @param {String} color - The color of the special node
+ * @param {String} label - The label of the special node
+ * @param {Function} onSelect - The function to call when the special node is selected
+ * @param {Boolean} draggable - Whether the special node is draggable
+ */
+export function createSpecialNode(id, position, color, label, onSelect = () => {}, draggable = false) {
+  return {
+    id,
+    type: 'stage',
+    position,
+    data: {
+      stage: {
+        id,
+        title: label,
+        published: true,
+        color,
+      },
+      isSpecial: true,
+      onSelect,
+    },
+    draggable,
+  };
+}
diff --git a/media_source/com_workflow/src/utils/utils.es6.js b/media_source/com_workflow/src/utils/utils.es6.js
new file mode 100644
index 0000000000000..33799c4946b6d
--- /dev/null
+++ b/media_source/com_workflow/src/utils/utils.es6.js
@@ -0,0 +1,55 @@
+/**
+ * Utility function to compute color for a stage based on its ID.
+ * Uses a hue offset to ensure color uniqueness.
+ * @param {Object} stage - Stage object with an `id` field.
+ * @returns {string} HSL color string.
+ */
+export function getColorForStage(stage) {
+  return stage?.color || 'rgb(var(--primary-rgb))';
+}
+
+/**
+ * Utility function to compute color for a transition based on its ID.
+ * Uses a different hue offset than stages.
+ * @param {Object} transition - Transition object with an `id` field.
+ * @returns {string} HSL color string.
+ */
+export function getColorForTransition(transition) {
+  const hue = (parseInt(transition?.id, 10) * 199) % 360;
+  return `hsl(${hue}, 70%, 60%)`;
+}
+
+/**
+ * Utility function to determine edge color for a transition.
+ * @param {Object} transition - Transition object.
+ * @param {boolean} isSelected - Whether the edge is currently selected.
+ * @returns {string} Hex or HSL color.
+ */
+export function getEdgeColor(transition, isSelected) {
+  if (isSelected) return getColorForTransition(transition); // Blue for selected
+  if (transition?.published) return '#3B82F6';
+  return (transition.from_stage_id === -1 || transition.to_stage_id === -1) ? '#F97316' : '#10B981';
+}
+
+/**
+ * Utility function to debounce a function call by delay in milliseconds.
+ * Useful for rate-limiting input or UI updates.
+ * @param {Function} func - Function to debounce.
+ * @param {number} delay - Delay in milliseconds.
+ * @returns {Function} Debounced function.
+ */
+export function debounce(func, delay) {
+  let timer;
+  return function debounced(...args) {
+    clearTimeout(timer);
+    timer = setTimeout(() => func.apply(this, args), delay);
+  };
+}
+
+/**
+ * Utility function to check if the document is in right-to-left (RTL) mode.
+ * @returns {boolean} True if RTL, false otherwise.
+ */
+export function isRTL() {
+  return document.dir === 'rtl';
+}
diff --git a/media_source/com_workflow/src/workflowgraph.es6.js b/media_source/com_workflow/src/workflowgraph.es6.js
new file mode 100644
index 0000000000000..805987c532dd6
--- /dev/null
+++ b/media_source/com_workflow/src/workflowgraph.es6.js
@@ -0,0 +1,24 @@
+import { createApp } from 'vue';
+import App from './components/App.vue';
+import EventBus from './app/Event.es6';
+import store from './store/store.es6';
+import translate from './plugins/translate.es6.js';
+import notifications from './plugins/Notifications.es6.js';
+
+// Register WorkflowGraph namespace
+window.WorkflowGraph = window.WorkflowGraph || {};
+// Register the WorkflowGraph event bus
+window.WorkflowGraph.Event = EventBus;
+
+document.addEventListener('DOMContentLoaded', () => {
+  const mountElement = document.getElementById('workflow-graph-root');
+
+  if (mountElement) {
+    const app = createApp(App);
+    app.use(store);
+    app.use(translate);
+    app.mount(mountElement);
+  } else {
+    notifications.error('COM_WORKFLOW_GRAPH_API_NOT_SET');
+  }
+});
diff --git a/build/media_source/com_wrapper/js/iframe-height.es6.js b/media_source/com_wrapper/js/iframe-height.es6.js
similarity index 100%
rename from build/media_source/com_wrapper/js/iframe-height.es6.js
rename to media_source/com_wrapper/js/iframe-height.es6.js
diff --git a/media_source/error-pages/builder.mjs b/media_source/error-pages/builder.mjs
new file mode 100644
index 0000000000000..e79bec51fb485
--- /dev/null
+++ b/media_source/error-pages/builder.mjs
@@ -0,0 +1,175 @@
+/**
+ * Assets Builder
+ */
+import fs from 'node:fs';
+import fsp from 'node:fs/promises';
+import path from 'node:path';
+import Ini from 'ini';
+import buildSettings from '../../build/build-modules-js/settings.json' with { type: 'json' };
+import DefaultModuleBuilder from '../../build/build-modules-js/builder/default-module-builder.mjs';
+import { minifyCSS } from '../../build/build-modules-js/stylesheets/css-handler.mjs';
+import { minifyJSContent } from '../../build/build-modules-js/javascript/js-handle.mjs';
+
+const processIni = async (file, state) => {
+  const languageStrings = Ini.parse(fs.readFileSync(file, { encoding: 'utf8' }));
+
+  // Build the variables into json for the unsupported page
+  if (languageStrings.BUILD_MIN_PHP_ERROR_LANGUAGE) {
+    const name = path.dirname(file).replace(/.+\//, '').replace(/.+\\/, '');
+    state.unsupportedObj = {
+      ...state.unsupportedObj,
+      [name]: {
+        language: Ini.unsafe(languageStrings.BUILD_MIN_PHP_ERROR_LANGUAGE),
+        header: languageStrings.BUILD_MIN_PHP_ERROR_HEADER,
+        text1: languageStrings.BUILD_MIN_PHP_ERROR_TEXT,
+        'help-url-text': languageStrings.BUILD_MIN_PHP_ERROR_URL_TEXT,
+      },
+    };
+  }
+
+  // Build the variables into json for the build incomplete page
+  if (languageStrings.BUILD_INCOMPLETE_LANGUAGE) {
+    const name = path.dirname(file).replace(/.+\//, '').replace(/.+\\/, '');
+    state.incompleteObj = {
+      ...state.incompleteObj,
+      [name]: {
+        language: Ini.unsafe(languageStrings.BUILD_INCOMPLETE_LANGUAGE),
+        header: languageStrings.BUILD_INCOMPLETE_HEADER,
+        text1: languageStrings.BUILD_INCOMPLETE_TEXT,
+        'help-url-text': languageStrings.BUILD_INCOMPLETE_URL_TEXT,
+      },
+    };
+  }
+
+  // Build the variables into json for the fatal error page
+  if (languageStrings.BUILD_FATAL_LANGUAGE) {
+    const name = path.dirname(file).replace(/.+\//, '').replace(/.+\\/, '');
+    state.fatalObj = {
+      ...state.fatalObj,
+      [name]: {
+        language: Ini.unsafe(languageStrings.BUILD_FATAL_LANGUAGE),
+        header: languageStrings.BUILD_FATAL_HEADER,
+        text1: languageStrings.BUILD_FATAL_TEXT,
+        'help-url-text': languageStrings.BUILD_FATAL_URL_TEXT,
+      },
+    };
+  }
+
+  // Build the variables into json for the missing XML error page
+  if (languageStrings.BUILD_NOXML_LANGUAGE) {
+    const name = path.dirname(file).replace(/.+\//, '').replace(/.+\\/, '');
+    state.noxmlObj = {
+      ...state.noxmlObj,
+      [name]: {
+        language: Ini.unsafe(languageStrings.BUILD_NOXML_LANGUAGE),
+        header: languageStrings.BUILD_NOXML_HEADER,
+        text1: languageStrings.BUILD_NOXML_TEXT,
+        'help-url-text': languageStrings.BUILD_NOXML_URL_TEXT,
+      },
+    };
+  }
+};
+
+const processPage = async (name, pageInfo, state, template, css, js) => {
+  const sortedJson = Object.fromEntries(Object.entries(state[`${name}Obj`]).sort());
+  const jsonContent = `window.errorLocale=${JSON.stringify(sortedJson)};`;
+  const rootPath = process.cwd();
+
+  template = template.replace('{{jsonContents}}', jsonContent);
+  template = template.replace('{{Title}}', pageInfo.title);
+  template = template.replace('{{Header}}', pageInfo.header);
+  template = template.replace('{{Description}}', pageInfo.text);
+  template = template.replace('{{Link}}', pageInfo.link);
+  template = template.replace('{{LinkText}}', pageInfo.linkText);
+
+  if (css) {
+    template = template.replace('{{cssContents}}', css);
+  }
+
+  if (js) {
+    template = template.replace('{{jsContents}}', js);
+  }
+
+  const promises = [];
+  pageInfo.destFile.forEach((file) => {
+    const fullPath = path.join(rootPath, file);
+    const folder = path.dirname(fullPath);
+
+    if (!fs.existsSync(folder)) {
+      fs.mkdirSync(folder, { recursive: true, mode: 0o755 });
+    }
+
+    promises.push(fsp.writeFile(fullPath, template, { encoding: 'utf8', mode: 0o644 }));
+  });
+
+  return Promise.all(promises);
+};
+
+/**
+ * Will produce as many .html files as defined in settings.json
+ * Expects three files:
+ *     build/warning_page/template.css
+ *     build/warning_page/template.html
+ *     build/warning_page/template.js
+ *
+ * And also specific strings in the languages in the installation folder!
+ * Also, the base strings are held in build/build-modules-js/settings.json
+ */
+const createErrorPages = async (options, basePath) => {
+  const srcPath = path.join(basePath, 'warning_page');
+  const langsPath = 'installation/language';
+  const state = {
+    incompleteObj: {},
+    unsupportedObj: {},
+    fatalObj: {},
+    noxmlObj: {},
+  };
+
+  // Lookup and parse language files
+  const iniFilesProcess = [];
+  fs.readdirSync(langsPath, { recursive: true, withFileTypes: true }).forEach((file) => {
+    if (file.isDirectory() || file.name.endsWith('langmetadata.xml')) {
+      return;
+    }
+    const iniFile = path.join(file.parentPath, file.name);
+
+    iniFilesProcess.push(processIni(iniFile, state).catch((error) => {
+      throw new Error(`Parsing INI file failed for "${iniFile}".`, { cause: error });
+    }));
+  });
+
+  await Promise.all(iniFilesProcess);
+
+  // Load template files
+  const initTemplate = fs.readFileSync(path.join(srcPath, 'template.html'), { encoding: 'utf8' });
+  let cssContent = fs.readFileSync(path.join(srcPath, 'template.css'), { encoding: 'utf8' });
+  let jsContent = fs.readFileSync(path.join(srcPath, 'template.js'), { encoding: 'utf8' });
+
+  cssContent = await minifyCSS(cssContent);
+  jsContent = await minifyJSContent(jsContent);
+
+  // Lookup and build the pages
+  const processPages = [];
+  Object.keys(options.settings.errorPages).forEach((name) => {
+    const pageInfo = options.settings.errorPages[name];
+
+    processPages.push(processPage(name, pageInfo, state, initTemplate, cssContent, jsContent).catch((error) => {
+      throw new Error(`Failed to build page "${name}".`, { cause: error });
+    }));
+  });
+
+  return Promise.all(processPages);
+};
+
+export default class ErrorPagesModuleBuilder extends DefaultModuleBuilder {
+  tasksBuild = ['build'];
+  tasksExtras = [];
+
+  /**
+   * Create the pages
+   * @returns { Promise }
+   */
+  async build() {
+    return createErrorPages(buildSettings, this.basePath);
+  }
+};
diff --git a/build/warning_page/template.css b/media_source/error-pages/warning_page/template.css
similarity index 78%
rename from build/warning_page/template.css
rename to media_source/error-pages/warning_page/template.css
index d3561b3ad8e5f..d90f23fe73c7c 100644
--- a/build/warning_page/template.css
+++ b/media_source/error-pages/warning_page/template.css
@@ -1,15 +1,10 @@
 html {
-  background: #ee2a00;
-  background: -moz-radial-gradient(center, ellipse cover, rgba(241, 241, 241, 1) 0, rgb(238, 42, 0) 100%);
-  background: -webkit-radial-gradient(center, ellipse cover, rgba(241, 241, 241, 1) 0, rgb(238, 42, 0) 100%);
-  background: radial-gradient(ellipse at center, rgba(241, 241, 241, 1) 0, rgb(238, 42, 0) 100%);
-  background-repeat: no-repeat;
-  background-attachment: fixed;
+  background: #ee2a00 radial-gradient(ellipse at center, rgba(241, 241, 241, 1) 0, rgb(238, 42, 0) 100%) no-repeat fixed;
 }
 
 body {
-  margin: 0;
   padding: 0;
+  margin: 0;
   font: 14px / 18px sans-serif;
   color: #555;
   background-color: transparent;
@@ -35,35 +30,35 @@ p a {
 }
 
 .container {
+  position: relative;
   display: flex;
   flex-direction: column;
-  justify-content: center;
   align-items: center;
-  position: relative;
-  margin: 0 auto;
+  justify-content: center;
   width: 100%;
   height: 100vh;
+  margin: 0 auto;
   overflow: hidden;
 }
 
 .alert-main {
-  display: block;
   position: relative;
-  background: #fff;
-  border: 1px solid rgba(0,0,0,0.1);
-  border-radius: 5px;
+  display: block;
   padding: 20px 60px;
   margin: 0 20px;
-  box-shadow: 0 0 10px rgba(0,0,0,0.05);
+  background: #fff;
+  border: 1px solid rgba(0,0,0,.1);
+  border-radius: 5px;
+  box-shadow: 0 0 10px rgba(0,0,0,.05);
 }
 
 svg {
   position: absolute;
-  bottom: -120px;
   right: -70px;
+  bottom: -120px;
+  z-index: -1;
   width: 400px;
   transform: rotate(10deg);
-  z-index: -1;
 }
 
 h1, p {
@@ -91,27 +86,27 @@ p, label {
 
 p a {
   font-weight: bold;
-  color: #1C3D5C;
+  color: #1c3d5c;
 }
 
 .link-help {
   padding: .4rem .85rem;
   font-size: 1rem;
   font-weight: normal;
-  border-radius: .25rem;
   text-decoration: none;
   background-color: #f5f5f5;
-  border: 1px solid rgba(0,0,0,0.1);
+  border: 1px solid rgba(0,0,0,.1);
+  border-radius: .25rem;
 }
 .link-help:hover {
-  background-color: #eee;
   text-decoration: none;
+  background-color: #eee;
 }
 
 .footer {
   margin: 8px 20px;
-  text-align: left;
   font-size: 11px;
+  text-align: left;
 }
 
 .footer ul {
@@ -125,20 +120,20 @@ p a {
 }
 
 .footer li, .footer a {
-  color: #1C3D5C;
+  color: #1c3d5c;
 }
 
 .footer a:hover {
-  color: #59B0FF;
+  color: #59b0ff;
 }
 
 .links {
   display: block;
-  text-align: center;
   margin-top: 4rem;
-  margin-left: auto;
   margin-right: auto;
+  margin-left: auto;
   font-size: 1rem;
+  text-align: center;
 }
 .links li {
   display: inline-block;
diff --git a/build/warning_page/template.html b/media_source/error-pages/warning_page/template.html
similarity index 100%
rename from build/warning_page/template.html
rename to media_source/error-pages/warning_page/template.html
diff --git a/build/warning_page/template.js b/media_source/error-pages/warning_page/template.js
similarity index 88%
rename from build/warning_page/template.js
rename to media_source/error-pages/warning_page/template.js
index bb0dd15b89e42..198a22aadc716 100644
--- a/build/warning_page/template.js
+++ b/media_source/error-pages/warning_page/template.js
@@ -1,6 +1,6 @@
 var errorLocale = window.errorLocale || null;
 
-(function(document, errorLocale) {
+(function (document, errorLocale) {
   'use strict';
 
   if (errorLocale) {
@@ -9,9 +9,9 @@ var errorLocale = window.errorLocale || null;
     var helpLink = document.getElementById('linkHelp');
 
     // Create links for all the languages
-    Object.keys(errorLocale).forEach(function(key) {
+    Object.keys(errorLocale).forEach(function (key) {
       var sel = document.getElementById('translatedLanguagesSelect'),
-          opt = document.createElement('option');
+        opt = document.createElement('option');
       opt.text = errorLocale[key].language;
       opt.value = key;
 
@@ -19,7 +19,7 @@ var errorLocale = window.errorLocale || null;
         opt.setAttribute('selected', 'selected');
       }
 
-      document.getElementById('translatedLanguagesSelect').addEventListener('change', function(e) {
+      document.getElementById('translatedLanguagesSelect').addEventListener('change', function (e) {
         var ref = e.target.value;
 
         if (!ref) {
@@ -40,11 +40,11 @@ var errorLocale = window.errorLocale || null;
         }
       });
 
-      sel.appendChild(opt)
+      sel.appendChild(opt);
     });
 
     // Select language based on Browser's language
-    Object.keys(errorLocale).forEach(function(key) {
+    Object.keys(errorLocale).forEach(function (key) {
       if (navigator.language === key) {
         // Remove the selected property
         document.querySelector('#translatedLanguagesSelect option[value="en-GB"]').removeAttribute('selected');
diff --git a/build/media_source/index.html b/media_source/index.html
similarity index 100%
rename from build/media_source/index.html
rename to media_source/index.html
diff --git a/media_source/installation/template/builder.mjs b/media_source/installation/template/builder.mjs
new file mode 100644
index 0000000000000..0364570237862
--- /dev/null
+++ b/media_source/installation/template/builder.mjs
@@ -0,0 +1,49 @@
+/**
+ * Assets Builder
+ */
+import path from 'node:path';
+import fsp from 'node:fs/promises';
+import fs from 'node:fs';
+
+import DefaultModuleBuilder from '../../../build/build-modules-js/builder/default-module-builder.mjs';
+
+export default class InstallationTmplModuleBuilder extends DefaultModuleBuilder {
+  /**
+   * Class constructor.
+   *
+   * @param { string } name        The folder (builder) name. Relative to media/.
+   * @param { string } basePath    Base path to the media source, without builder name.
+   * @param { string } targetPath  Path to the media target, without builder name.
+   * @param { object } options     Options object, from cmd or etc.
+   */
+  constructor(name = '', basePath = '', targetPath = '', options = {}) {
+    super(name, basePath, targetPath, options);
+
+    // Update target, because it is outside /media folder
+    this.targetPath = path.join(path.dirname(targetPath), name);
+  }
+
+  /**
+   * Remove files on target location
+   * @returns { Promise }
+   */
+  async clear() {
+    if (!fs.existsSync(this.targetPath)) {
+      return;
+    }
+    const promises = [];
+
+    // Do not remove all, since the target contain PHP files also
+    ['css', 'js', 'images', 'scss'].forEach((dir) => {
+      const fullPath = path.join(this.targetPath, dir);
+
+      if (!fs.existsSync(fullPath)) {
+        return;
+      }
+
+      promises.push(fsp.rm(fullPath, { recursive: true }));
+    });
+
+    return Promise.all(promises);
+  }
+};
diff --git a/installation/template/images/Joomla-brandmark-monochrome-white-RGB.svg b/media_source/installation/template/images/Joomla-brandmark-monochrome-white-RGB.svg
similarity index 100%
rename from installation/template/images/Joomla-brandmark-monochrome-white-RGB.svg
rename to media_source/installation/template/images/Joomla-brandmark-monochrome-white-RGB.svg
diff --git a/installation/template/images/Joomla-logo-monochrome-horizontal-white.svg b/media_source/installation/template/images/Joomla-logo-monochrome-horizontal-white.svg
similarity index 100%
rename from installation/template/images/Joomla-logo-monochrome-horizontal-white.svg
rename to media_source/installation/template/images/Joomla-logo-monochrome-horizontal-white.svg
diff --git a/installation/template/images/joomla-pattern.svg b/media_source/installation/template/images/joomla-pattern.svg
similarity index 100%
rename from installation/template/images/joomla-pattern.svg
rename to media_source/installation/template/images/joomla-pattern.svg
diff --git a/installation/template/images/joomla.png b/media_source/installation/template/images/joomla.png
similarity index 100%
rename from installation/template/images/joomla.png
rename to media_source/installation/template/images/joomla.png
diff --git a/installation/template/images/logo-blue.svg b/media_source/installation/template/images/logo-blue.svg
similarity index 100%
rename from installation/template/images/logo-blue.svg
rename to media_source/installation/template/images/logo-blue.svg
diff --git a/installation/template/images/logo-joomla-blue.svg b/media_source/installation/template/images/logo-joomla-blue.svg
similarity index 100%
rename from installation/template/images/logo-joomla-blue.svg
rename to media_source/installation/template/images/logo-joomla-blue.svg
diff --git a/installation/template/images/logo.svg b/media_source/installation/template/images/logo.svg
similarity index 100%
rename from installation/template/images/logo.svg
rename to media_source/installation/template/images/logo.svg
diff --git a/installation/template/images/select-bg-dark.svg b/media_source/installation/template/images/select-bg-dark.svg
similarity index 100%
rename from installation/template/images/select-bg-dark.svg
rename to media_source/installation/template/images/select-bg-dark.svg
diff --git a/build/media_source/templates/administrator/atum/images/select-bg-rtl-dark.svg b/media_source/installation/template/images/select-bg-rtl-dark.svg
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/select-bg-rtl-dark.svg
rename to media_source/installation/template/images/select-bg-rtl-dark.svg
diff --git a/build/media_source/system/images/select-bg-rtl.svg b/media_source/installation/template/images/select-bg-rtl.svg
similarity index 100%
rename from build/media_source/system/images/select-bg-rtl.svg
rename to media_source/installation/template/images/select-bg-rtl.svg
diff --git a/build/media_source/system/images/select-bg.svg b/media_source/installation/template/images/select-bg.svg
similarity index 100%
rename from build/media_source/system/images/select-bg.svg
rename to media_source/installation/template/images/select-bg.svg
diff --git a/media_source/installation/template/js/remove.js b/media_source/installation/template/js/remove.js
new file mode 100644
index 0000000000000..9193841cdfdcd
--- /dev/null
+++ b/media_source/installation/template/js/remove.js
@@ -0,0 +1,223 @@
+/**
+ * @package     Joomla.Installation
+ * @copyright   (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+// Init on dom content loaded event
+var url = Joomla.getOptions('system.installation').url ? Joomla.getOptions('system.installation').url.replace(/&amp;/g, '&') : 'index.php';
+
+if (document.getElementById('installAddFeatures')) {
+  document.getElementById('installAddFeatures').addEventListener('click', function (e) {
+    e.preventDefault();
+    document.getElementById('installLanguages').classList.add('active');
+    document.getElementById('automatedUpdates')?.classList?.remove('active');
+    document.getElementById('installCongrat').classList.remove('active');
+    document.getElementById('installFinal').classList.remove('active');
+    document.getElementById('installRecommended').classList.remove('active');
+  });
+}
+
+if (document.getElementById('skipLanguages')) {
+  document.getElementById('skipLanguages').addEventListener('click', function (e) {
+    e.preventDefault();
+    document.getElementById('automatedUpdates')?.classList?.add('active');
+    document.getElementById('installCongrat').classList.add('active');
+    document.getElementById('installFinal').classList.add('active');
+    document.getElementById('installRecommended').classList.add('active');
+    document.getElementById('installLanguages').classList.remove('active');
+
+    if (document.getElementById('installFinal')) {
+      document.getElementById('installFinal').focus();
+    }
+  });
+}
+
+if (document.getElementById('removeInstallationFolder')) {
+  document.getElementById('removeInstallationFolder')
+    .addEventListener('click', function (e) {
+      e.preventDefault();
+      let confirm = window.confirm(Joomla.Text._('INSTL_REMOVE_INST_FOLDER').replace('%s', 'installation'));
+      if (confirm) {
+        Joomla.deleteJoomlaInstallationDirectory();
+      }
+    });
+}
+
+if (document.getElementById('automatedUpdatesDisableButton')) {
+  document.getElementById('automatedUpdatesDisableButton')
+    .addEventListener('click', function (e) {
+      e.preventDefault();
+      let confirm = window.confirm(Joomla.Text._('INSTL_DISABLE_AUTOUPDATE'));
+      if (confirm) {
+        Joomla.disableAutomatedUpdates();
+      }
+    });
+}
+
+const completeInstallationOptions = document.querySelectorAll('.complete-installation');
+
+completeInstallationOptions.forEach(function (item) {
+  item.addEventListener('click', function (e) {
+    // In development mode we show the user a pretty button to allow them to choose whether to delete the installation
+    // directory or not. In this case or when the installation folder has been deleted or might be partly deleted,
+    // the buttons just redirect to the admin or site.
+    // In stable release we always try to delete the folder at the first click. Maximum extermination!
+    if ('development' in item.dataset || 'installremoved' in item.dataset) {
+      window.location.href = item.dataset.href;
+    } else {
+      Joomla.deleteJoomlaInstallationDirectory(item.dataset.href);
+    }
+
+    return false;
+  });
+});
+
+Joomla.disableAutomatedUpdates = function () {
+  Joomla.request({
+    method: 'POST',
+    url: Joomla.installationBaseUrl + '?task=installation.disableAutomatedUpdates&format=json',
+    perform: true,
+    token: true,
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    onSuccess: function (response) {
+      const successresponse = JSON.parse(response);
+      if (successresponse.error === true) {
+        if (successresponse.messages) {
+          Joomla.renderMessages(successresponse.messages);
+          Joomla.loadOptions({ 'csrf.token': successresponse.token });
+        } else {
+          // Stuff went wrong. No error messages. Just panic bail!
+          Joomla.renderMessages({ error: ['Unknown error disabling the automated updates.'] });
+        }
+      } else {
+        const automatedUpdates = document.getElementById('automatedUpdates');
+        automatedUpdates.parentNode.removeChild(automatedUpdates);
+      }
+    },
+    onError: function (xhr) {
+      Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr));
+    },
+  });
+};
+
+Joomla.deleteJoomlaInstallationDirectory = function (redirectUrl) {
+  Joomla.request({
+    method: 'POST',
+    url: Joomla.installationBaseUrl + '?task=installation.removeFolder&format=json',
+    perform: true,
+    token: true,
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    onSuccess: function (response) {
+      // If the installation folder has been deleted at least partly, i.e. also
+      // in case of a failure, we cannot use it anymore.
+      // Therefore set a marker in the admin and site buttons so they still work
+      // and disable buttons which will not work anymore.
+      completeInstallationOptions.forEach(function (item) {
+        item.dataset.installremoved = 'true';
+      });
+      if (document.getElementById('installAddFeatures')) {
+        document.getElementById('installAddFeatures').disabled = true;
+      }
+      if (document.getElementById('automatedUpdatesDisableButton')) {
+        document.getElementById('automatedUpdatesDisableButton').disabled = true;
+      }
+      if (document.getElementById('removeInstallationFolder')) {
+        document.getElementById('removeInstallationFolder').disabled = true;
+      }
+      const successresponse = JSON.parse(response);
+      if (successresponse.error === true) {
+        if (successresponse.messages) {
+          Joomla.renderMessages(successresponse.messages);
+          Joomla.loadOptions({ 'csrf.token': successresponse.token });
+        } else {
+          // Stuff went wrong. No error messages. Just panic bail!
+          Joomla.renderMessages({ error: ['Unknown error deleting the installation folder.'] });
+        }
+      } else {
+        const customInstallation = document.getElementById('customInstallation');
+        customInstallation.parentNode.removeChild(customInstallation);
+
+        const automatedUpdates = document.getElementById('automatedUpdates');
+
+        // This will only exist if it has not been removed with a previous step
+        if (automatedUpdates) {
+          automatedUpdates.parentNode.removeChild(automatedUpdates);
+        }
+
+        const removeInstallationTab = document.getElementById('removeInstallationTab');
+
+        // This will only exist in debug mode
+        if (removeInstallationTab) {
+          removeInstallationTab.parentNode.removeChild(removeInstallationTab);
+        }
+
+        if (redirectUrl) {
+          window.location.href = redirectUrl;
+        }
+      }
+    },
+    onError: function (xhr) {
+      Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr));
+    },
+  });
+};
+
+if (document.getElementById('installLanguagesButton')) {
+  document.getElementById('installLanguagesButton').addEventListener('click', function (e) {
+    e.preventDefault();
+    var form = document.getElementById('languagesForm');
+    if (form) {
+      Joomla.removeMessages();
+      document.body.appendChild(document.createElement('joomla-core-loader'));
+
+      // Install the extra languages
+      try {
+        Joomla.install(['languages'], form, true);
+      } catch (err) {
+        const loader = document.querySelector('joomla-core-loader');
+        if (loader) {
+          loader.remove();
+        }
+      }
+    }
+  });
+}
+
+if (document.getElementById('defaultLanguagesButton')) {
+  document.getElementById('defaultLanguagesButton')
+    .addEventListener('click', (e) => {
+      let frontendlang = 'en-GB';
+      if (document.querySelector('input[name="frontendlang"]:checked')) {
+        frontendlang = document.querySelector('input[name="frontendlang"]:checked').value;
+      }
+
+      let administratorlang = 'en-GB';
+      if (document.querySelector('input[name="administratorlang"]:checked')) {
+        administratorlang = document.querySelector('input[name="administratorlang"]:checked').value;
+      }
+
+      e.preventDefault();
+
+      Joomla.request({
+        method: 'POST',
+        url: `${Joomla.installationBaseUrl}?view=setup&frontendlang=${frontendlang}&administratorlang=${administratorlang}&task=language.setdefault&format=json`,
+        perform: true,
+        token: true,
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        onSuccess(response) {
+          const successresponse = JSON.parse(response);
+          if (successresponse.messages) {
+            Joomla.renderMessages(successresponse.messages, '#system-message-container');
+          }
+          Joomla.loadOptions({ 'csrf.token': successresponse.token });
+        },
+        onError(xhr) {
+          Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr));
+        },
+      });
+
+      if (document.getElementById('header')) {
+        document.getElementById('header').scrollIntoView();
+      }
+    });
+}
diff --git a/installation/template/js/setup.js b/media_source/installation/template/js/setup.js
similarity index 67%
rename from installation/template/js/setup.js
rename to media_source/installation/template/js/setup.js
index e52141385bdd4..73ef5af756a11 100644
--- a/installation/template/js/setup.js
+++ b/media_source/installation/template/js/setup.js
@@ -9,7 +9,7 @@
  *
  * @return {Boolean}
  */
-Joomla.setlanguage = function(form) {
+Joomla.setlanguage = function (form) {
   var data = Joomla.serialiseForm(form);
   Joomla.removeMessages();
   document.body.appendChild(document.createElement('joomla-core-loader'));
@@ -19,7 +19,7 @@ Joomla.setlanguage = function(form) {
     method: 'POST',
     data: data,
     perform: true,
-    onSuccess: function(response, xhr){
+    onSuccess: function (response, xhr) {
       response = JSON.parse(response);
       Joomla.replaceTokens(response.token);
       var loaderElement = document.querySelector('joomla-core-loader');
@@ -30,13 +30,13 @@ Joomla.setlanguage = function(form) {
 
       if (response.error) {
         loaderElement.parentNode.removeChild(loaderElement);
-        Joomla.renderMessages({'error': [response.message]});
+        Joomla.renderMessages({ error: [response.message] });
       } else {
         loaderElement.parentNode.removeChild(loaderElement);
         Joomla.goToPage(response.data.view, true);
       }
     },
-    onError:   function(xhr){
+    onError: function (xhr) {
       var loaderElement = document.querySelector('joomla-core-loader');
       loaderElement.parentNode.removeChild(loaderElement);
       try {
@@ -44,36 +44,43 @@ Joomla.setlanguage = function(form) {
         Joomla.replaceTokens(r.token);
         alert(r.message);
       } catch (e) {}
-    }
+    },
   });
 
   return false;
 };
 
-Joomla.checkInputs = function() {
+Joomla.checkInputs = function () {
   document.getElementById('jform_admin_password2').value = document.getElementById('jform_admin_password').value;
 
-  var inputs = [].slice.call(document.querySelectorAll('input[type="password"], input[type="text"], input[type="email"], select')),
-    state = true;
-  inputs.forEach(function(item) {
-    if (!item.valid) state = false;
-  });
   document.getElementById('progress-text').classList.remove('error');
   document.getElementById('progress-text').setAttribute('role', 'status');
   document.getElementById('progress-text').innerText = Joomla.Text._('INSTL_IN_PROGRESS');
   document.getElementById('progressbar').setAttribute('value', 0);
 
-  // Reveal everything
-  document.getElementById('installStep1').classList.add('active');
-  document.getElementById('installStep2').classList.add('active');
-  document.getElementById('installStep3').classList.add('active');
+  var fields = ['#jform_site_name', '#jform_admin_user', '#jform_admin_email', '#jform_admin_password', '#jform_db_type', '#jform_db_host', '#jform_db_user', '#jform_db_name'];
 
-  if (Joomla.checkFormField(['#jform_site_name', '#jform_admin_user', '#jform_admin_email', '#jform_admin_password', '#jform_db_type', '#jform_db_host', '#jform_db_user', '#jform_db_name'])) {
+  if (Joomla.checkFormField(fields)) {
     Joomla.checkDbCredentials();
+
+    return;
+  }
+
+  // Reveal only the step holding the first invalid field
+  var invalid = fields.map(function (field) {
+    return document.querySelector(field);
+  }).filter(function (el) {
+    return el && el.classList.contains('invalid');
+  })[0];
+
+  if (invalid) {
+    document.getElementById('installStep3').classList.remove('active');
+    invalid.closest('.j-install-step').classList.add('active');
+    invalid.focus();
   }
 };
 
-Joomla.checkDbCredentials = function() {
+Joomla.checkDbCredentials = function () {
   const progress = document.getElementById('progressbar');
   const progress_text = document.getElementById('progress-text');
   var form = document.getElementById('adminForm'),
@@ -90,12 +97,12 @@ Joomla.checkDbCredentials = function() {
   progress_text.innerText = Joomla.Text._('INSTL_IN_PROGRESS');
 
   Joomla.request({
-    method: "POST",
-    url : Joomla.installationBaseUrl + '?task=installation.dbcheck&format=json',
+    method: 'POST',
+    url: Joomla.installationBaseUrl + '?task=installation.dbcheck&format=json',
     data: data,
     perform: true,
-    headers: {'Content-Type': 'application/x-www-form-urlencoded'},
-    onSuccess: function(response, xhr){
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    onSuccess: function (response, xhr) {
       try {
         response = JSON.parse(response);
       } catch (e) {
@@ -104,7 +111,7 @@ Joomla.checkDbCredentials = function() {
         progress_text.innerText = response;
         console.error('Error in DB Check Endpoint');
         console.error(response);
-        Joomla.renderMessages({'error': [Joomla.Text._('INSTL_DATABASE_RESPONSE_ERROR')]});
+        Joomla.renderMessages({ error: [Joomla.Text._('INSTL_DATABASE_RESPONSE_ERROR')] });
 
         return false;
       }
@@ -116,8 +123,6 @@ Joomla.checkDbCredentials = function() {
       Joomla.replaceTokens(response.token);
 
       if (response.error) {
-        document.getElementById('installStep1').classList.add('active');
-        document.getElementById('installStep2').classList.add('active');
         document.getElementById('installStep3').classList.add('active');
         document.getElementById('installStep4').classList.remove('active');
         progress_text.innerText = Joomla.Text._('INSTL');
@@ -129,25 +134,36 @@ Joomla.checkDbCredentials = function() {
         Joomla.install(['create', 'populate1', 'populate2', 'populate3', 'custom1', 'custom2', 'config'], form);
       }
     },
-    onError:   function(xhr){
-      Joomla.renderMessages([['', Joomla.Text._('JLIB_DATABASE_ERROR_DATABASE_CONNECT', 'A Database error occurred.')]]);
-      progress_text.setAttribute('role', 'alert');
-      progress_text.classList.add('error');
-      progress_text.innerText = response.message;
-      //Install.goToPage('summary');
+    onError: function (xhr) {
+      var response = {};
 
       try {
-        var r = JSON.parse(xhr.responseText);
-        Joomla.replaceTokens(r.token);
-        alert(r.message);
+        response = JSON.parse(xhr.responseText);
       } catch (e) {
+        // Not a JSON response, the generic AJAX error is used below
       }
-    }
+
+      if (response.token) {
+        Joomla.replaceTokens(response.token);
+      }
+
+      if (response.message) {
+        Joomla.renderMessages({ error: [response.message] });
+      } else {
+        Joomla.renderMessages(Joomla.ajaxErrorsMessages(xhr));
+      }
+
+      progress_text.setAttribute('role', 'alert');
+      progress_text.classList.add('error');
+      progress_text.innerText = response.message || Joomla.Text._('INSTL');
+
+      document.getElementById('installStep3').classList.add('active');
+      document.getElementById('installStep4').classList.remove('active');
+    },
   });
 };
 
-
-(function() {
+(function () {
   // Merge options from the session storage
   if (sessionStorage && sessionStorage.getItem('installation-data')) {
     Joomla.extend(this.options, sessionStorage.getItem('installation-data'));
@@ -164,18 +180,38 @@ Joomla.checkDbCredentials = function() {
     document.getElementById('jform_site_name').focus();
   }
 
-  // Select language
-  var languageEl = document.getElementById('jform_language');
+  // Handle language chooser
+  const languageForm = document.getElementById('languageForm');
+
+  // It's a template(!!!)
+  const languageTemplate = document.getElementById('languageSelect');
+
+  if (languageForm && languageTemplate) {
+    // Check if we have the language field
+    const languageEl = languageTemplate.content.getElementById('jform_language');
 
-  if (languageEl) {
-    languageEl.addEventListener('change', function(e) {
-      var form = document.getElementById('languageForm');
-      Joomla.setlanguage(form)
-    })
+    if (languageEl) {
+      // We use event bubbling to handle the change event
+      languageForm.addEventListener('change', function (e) {
+        if (e.target.id === 'jform_language') {
+          e.target.closest('dialog').close();
+
+          // Set the language
+          Joomla.setlanguage(languageForm);
+        }
+      });
+
+      // Show language name
+      const currentLanguageName = document.getElementById('languageForm-current');
+
+      if (currentLanguageName) {
+        currentLanguageName.innerText = languageEl.options[languageEl.selectedIndex].text;
+      }
+    }
   }
 
   if (document.getElementById('step1')) {
-    document.getElementById('step1').addEventListener('click', function(e) {
+    document.getElementById('step1').addEventListener('click', function (e) {
       e.preventDefault();
       if (Joomla.checkFormField(['#jform_site_name'])) {
         if (document.getElementById('languageForm')) {
@@ -191,11 +227,11 @@ Joomla.checkDbCredentials = function() {
           }
         }
       }
-    })
+    });
   }
 
   if (document.getElementById('step2')) {
-    document.getElementById('step2').addEventListener('click', function(e) {
+    document.getElementById('step2').addEventListener('click', function (e) {
       e.preventDefault();
       if (Joomla.checkFormField(['#jform_admin_user', '#jform_admin_email', '#jform_admin_password'])) {
         if (document.getElementById('installStep3')) {
@@ -213,10 +249,10 @@ Joomla.checkDbCredentials = function() {
       }
     });
 
-    document.getElementById('setupButton').addEventListener('click', function(e) {
+    document.getElementById('setupButton').addEventListener('click', function (e) {
       e.preventDefault();
       e.stopPropagation();
       Joomla.checkInputs();
-    })
+    });
   }
 })();
diff --git a/installation/template/js/template.js b/media_source/installation/template/js/template.js
similarity index 75%
rename from installation/template/js/template.js
rename to media_source/installation/template/js/template.js
index a8caefc4b2934..421f46ffaaca3 100644
--- a/installation/template/js/template.js
+++ b/media_source/installation/template/js/template.js
@@ -3,26 +3,25 @@
  * @copyright   (C) 2017 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
-(function() {
+(function () {
   // Make sure that we have the Joomla object
   Joomla = window.Joomla || {};
   Joomla.installation = Joomla.installation || {};
 
-  Joomla.serialiseForm = function( form ) {
-    var i, l, obj = [], elements = form.querySelectorAll( "input, select, textarea" );
-    for(i = 0, l = elements.length; i < l; i++) {
+  Joomla.serialiseForm = function (form) {
+    var i, l, obj = [], elements = form.querySelectorAll('input, select, textarea');
+    for (i = 0, l = elements.length; i < l; i++) {
       var name = elements[i].name;
       var value = elements[i].value;
-      if(name) {
+      if (name) {
         if (((elements[i].type === 'checkbox' || elements[i].type === 'radio') && elements[i].checked === true) || (elements[i].type !== 'checkbox' && elements[i].type !== 'radio')) {
           obj.push(name.replace('[', '%5B').replace(']', '%5D') + '=' + encodeURIComponent(value));
         }
       }
     }
-    return obj.join("&");
+    return obj.join('&');
   };
 
-
   /**
    * Method to request a different page via AJAX
    *
@@ -31,7 +30,7 @@
    *
    * @return {Boolean}
    */
-  Joomla.goToPage = function(page, fromSubmit) {
+  Joomla.goToPage = function (page, fromSubmit) {
     if (!fromSubmit) {
       Joomla.removeMessages();
       document.body.appendChild(document.createElement('joomla-core-loader'));
@@ -49,17 +48,17 @@
    *
    * @return {Boolean}
    */
-  Joomla.submitform = function(form) {
+  Joomla.submitform = function (form) {
     var data = Joomla.serialiseForm(form);
 
     document.body.appendChild(document.createElement('joomla-core-loader'));
     Joomla.removeMessages();
 
     Joomla.request({
-      type     : "POST",
-      url      : Joomla.baseUrl,
-      data     : data,
-      dataType : 'json',
+      type: 'POST',
+      url: Joomla.baseUrl,
+      data: data,
+      dataType: 'json',
       onSuccess: function (response, xhr) {
         response = JSON.parse(response);
         var spinnerElement = document.querySelector('joomla-core-loader');
@@ -69,7 +68,7 @@
         }
 
         if (response.error) {
-          Joomla.renderMessages({'error': [response.message]});
+          Joomla.renderMessages({ error: [response.message] });
           spinnerElement.parentNode.removeChild(spinnerElement);
         } else {
           spinnerElement.parentNode.removeChild(spinnerElement);
@@ -78,7 +77,7 @@
           }
         }
       },
-      onError  : function (xhr) {
+      onError: function (xhr) {
         var spinnerElement = document.querySelector('joomla-core-loader');
         spinnerElement.parentNode.removeChild(spinnerElement);
         busy = false;
@@ -88,18 +87,16 @@
           alert(r.message);
         } catch (e) {
         }
-      }
+      },
     });
 
     return false;
   };
 
-  Joomla.scrollTo = function (elem, pos)
-  {
+  Joomla.scrollTo = function (elem, pos) {
     var y = elem.scrollTop;
     y += (pos - y) * 0.3;
-    if (Math.abs(y-pos) < 2)
-    {
+    if (Math.abs(y - pos) < 2) {
       elem.scrollTop = pos;
       return;
     }
@@ -107,9 +104,9 @@
     setTimeout(Joomla.scrollTo, 40, elem, pos);
   };
 
-  Joomla.checkFormField = function(fields) {
+  Joomla.checkFormField = function (fields) {
     var state = [];
-    fields.forEach(function(field) {
+    fields.forEach(function (field) {
       state.push(document.formvalidator.validate(document.querySelector(field)));
     });
 
@@ -120,11 +117,11 @@
   };
 
   // Init on dom content loaded event
-  Joomla.makeRandomDbPrefix = function() {
+  Joomla.makeRandomDbPrefix = function () {
     var numbers = '0123456789', letters = 'abcdefghijklmnopqrstuvwxyz', symbols = numbers + letters;
     var prefix = letters[Math.floor(Math.random() * 24)];
 
-    for (var i = 0; i < 4; i++ ) {
+    for (var i = 0; i < 4; i++) {
       prefix += symbols[Math.floor(Math.random() * 34)];
     }
 
@@ -136,28 +133,27 @@
   /**
    * Initializes JavaScript events on each request, required for AJAX
    */
-  Joomla.pageInit = function() {
+  Joomla.pageInit = function () {
     // Attach the validator
-    [].slice.call(document.querySelectorAll('form.form-validate')).forEach(function(form) {
+    [].slice.call(document.querySelectorAll('form.form-validate')).forEach(function (form) {
       document.formvalidator.attachToForm(form);
     });
 
     Joomla.installation = Joomla.installation || {};
 
-    return 'Loaded...'
+    return 'Loaded...';
   };
 
-
   /**
    * Executes the required tasks to complete site installation
    *
    * @param tasks       An array of install tasks to execute
    */
-  Joomla.install = function(tasks, form, fromSubmit) {
+  Joomla.install = function (tasks, form, fromSubmit) {
     const progress = document.getElementById('progressbar');
     const progress_text = document.getElementById('progress-text');
     if (!form) {
-      throw new Error('No form provided')
+      throw new Error('No form provided');
     }
     if (!tasks.length) {
       if (progress_text) {
@@ -171,11 +167,11 @@
     var data = Joomla.serialiseForm(form);
 
     Joomla.request({
-      method: "POST",
-      url : Joomla.baseUrl + '?task=installation.' + task + '&format=json',
+      method: 'POST',
+      url: Joomla.baseUrl + '?task=installation.' + task + '&format=json',
       data: data,
       perform: true,
-      onSuccess: function(response, xhr){
+      onSuccess: function (response, xhr) {
         try {
           response = JSON.parse(response);
         } catch (e) {
@@ -186,33 +182,34 @@
           }
           console.error('Error in ' + task + ' Endpoint');
           console.error(response);
-          Joomla.renderMessages({'error': [Joomla.Text._('INSTL_DATABASE_RESPONSE_ERROR')]});
+          Joomla.renderMessages({ error: [Joomla.Text._('INSTL_DATABASE_RESPONSE_ERROR')] });
 
           return false;
         }
 
         Joomla.replaceTokens(response.token);
 
-        if (response.error === true)
-        {
-          progress_text.setAttribute('role', 'alert');
-          progress_text.classList.add('error');
-          progress_text.innerText = response.message;
+        if (response.error === true) {
+          if (progress_text) {
+            progress_text.setAttribute('role', 'alert');
+            progress_text.classList.add('error');
+            progress_text.innerText = response.message;
+          }
 
           if (response.messages) {
             Joomla.renderMessages(response.messages);
           }
 
           if (response.message) {
-            Joomla.renderMessages({"error": [response.message]});
+            Joomla.renderMessages({ error: [response.message] });
           }
 
           // @todo: Add a delay and red background before removing the progress bar?
-          // Reveal the install steps so the user has a chance to resubmit with the data
-          document.getElementById('installStep1').classList.add('active');
-          document.getElementById('installStep2').classList.add('active');
-          document.getElementById('installStep3').classList.add('active');
-          document.getElementById('installStep4').classList.remove('active');
+          // Reveal the database step so the user has a chance to resubmit with the data
+          if (document.getElementById('installStep3')) {
+            document.getElementById('installStep3').classList.add('active');
+            document.getElementById('installStep4').classList.remove('active');
+          }
 
           return false;
         }
@@ -228,7 +225,7 @@
         }
         Joomla.install(tasks, form, fromSubmit);
       },
-      onError: function(xhr){
+      onError: function (xhr) {
         if (progress_text) {
           progress_text.setAttribute('role', 'alert');
           progress_text.classList.add('error');
@@ -243,12 +240,12 @@
           alert(r.message);
         } catch (e) {
         }
-      }
+      },
     });
   };
 
   /* Load scripts async */
-  document.addEventListener('DOMContentLoaded', function() {
+  document.addEventListener('DOMContentLoaded', function () {
     var page = document.getElementById('installer-view');
 
     // Set the base URL
@@ -258,15 +255,15 @@
     var container = document.getElementById('container-installation');
     if (container) {
       Joomla.installationBaseUrl = container.getAttribute('data-base-url');
-      Joomla.installationBaseUrl += "installation/index.php"
+      Joomla.installationBaseUrl += 'installation/index.php';
     } else {
-      throw new Error('"container-installation" container is missed')
+      throw new Error('"container-installation" container is missed');
     }
 
     if (page && page.getAttribute('data-page-name')) {
-      var script = document.querySelector('script[src*="template.js"]');
+      var script = document.querySelector('script[src*="/template.js"], script[src*="/template.min.js"]');
       el = document.createElement('script');
-      el.src = script.src.replace("template.js", page.getAttribute('data-page-name') + '.js');
+      el.src = script.src.replace('/template.', '/' + page.getAttribute('data-page-name') + '.');
       document.head.appendChild(el);
     }
 
diff --git a/build/media_source/templates/administrator/atum/scss/template-rtl.scss b/media_source/installation/template/scss/template-rtl.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/template-rtl.scss
rename to media_source/installation/template/scss/template-rtl.scss
diff --git a/installation/template/scss/template.scss b/media_source/installation/template/scss/template.scss
similarity index 80%
rename from installation/template/scss/template.scss
rename to media_source/installation/template/scss/template.scss
index 2dd846aa06903..a42198955f357 100644
--- a/installation/template/scss/template.scss
+++ b/media_source/installation/template/scss/template.scss
@@ -3,44 +3,44 @@ $fa-css-prefix: fa;
 $fa-font-path: "../../../media/vendor/fontawesome-free/webfonts";
 
 // Font Awesome
-@import "../../../media/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome";
+@import "../../../../media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome";
 
 // "Font Awesome 6 Free"
-@import "../../../media/vendor/fontawesome-free/scss/fontawesome";
-@import "../../../media/vendor/fontawesome-free/scss/regular";
-@import "../../../media/vendor/fontawesome-free/scss/solid";
-@import "../../../media/vendor/fontawesome-free/scss/brands"; // order of loading is important.
+@import "../../../../media/vendor/fontawesome-free/scss/fontawesome";
+@import "../../../../media/vendor/fontawesome-free/scss/regular";
+@import "../../../../media/vendor/fontawesome-free/scss/solid";
+@import "../../../../media/vendor/fontawesome-free/scss/brands"; // order of loading is important.
 
 // B/C with Font Awesome 5
-@import "../../../media/vendor/fontawesome-free/scss/shims";
+@import "../../../../media/vendor/fontawesome-free/scss/shims";
 
 // B/C for Icomoon
-@import "../../../build/media_source/system/scss/icomoon";
+@import "../../../../media_source/system/scss/icomoon";
 
 // Bootstrap
-@import "../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../media/vendor/bootstrap/scss/functions";
 
 // Variables from the Atum template
-@import "../../../build/media_source/templates/administrator/atum/scss/variables";
-@import "../../../build/media_source/templates/administrator/atum/scss/variables-dark";
+@import "../../../../media_source/templates/administrator/atum/scss/variables";
+@import "../../../../media_source/templates/administrator/atum/scss/variables-dark";
 
 $table-bg: transparent;
 
-@import "../../../media/vendor/bootstrap/scss/variables";
-@import "../../../media/vendor/bootstrap/scss/variables-dark";
-@import "../../../media/vendor/bootstrap/scss/maps";
-@import "../../../media/vendor/bootstrap/scss/mixins";
-@import "../../../media/vendor/bootstrap/scss/utilities";
-@import "../../../media/vendor/bootstrap/scss/bootstrap";
+@import "../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../media/vendor/bootstrap/scss/variables-dark";
+@import "../../../../media/vendor/bootstrap/scss/maps";
+@import "../../../../media/vendor/bootstrap/scss/mixins";
+@import "../../../../media/vendor/bootstrap/scss/utilities";
+@import "../../../../media/vendor/bootstrap/scss/bootstrap";
 
 // Backend Template stuff
-@import "../../../media/templates/administrator/atum/scss/blocks/global";
-@import "../../../media/templates/administrator/atum/scss/blocks/header";
-@import "../../../media/templates/administrator/atum/scss/vendor/bootstrap/custom-forms";
-@import "../../../media/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert";
+@import "../../../../media_source/templates/administrator/atum/scss/blocks/global";
+@import "../../../../media_source/templates/administrator/atum/scss/blocks/header";
+@import "../../../../media_source/templates/administrator/atum/scss/vendor/bootstrap/custom-forms";
+@import "../../../../media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert";
 
 // Safari fix
-@import "../../../media/templates/administrator/atum/scss/vendor/bootstrap/reboot";
+@import "../../../../media_source/templates/administrator/atum/scss/vendor/bootstrap/reboot";
 
 // Custom Atum colors
 :root {
@@ -308,8 +308,25 @@ body {
   }
 }
 
-.languageForm {
-  padding: 0 0 30px;
+#languageForm {
+  joomla-dialog {
+    dialog {
+      &::backdrop {
+        background-color: rgba(0, 0, 0, .5);
+      }
+    }
+    .joomla-dialog-header {
+      display: flex;
+      align-items: center;
+      margin-bottom: .5rem;
+      h3 {
+        margin: 0 .5rem;
+      }
+      .buttons-holder {
+        margin-inline-start: auto;
+      };
+    }
+  }
 
   .form-select {
     width: 100%;
diff --git a/build/media_source/layouts/css/chromes/outline.css b/media_source/layouts/css/chromes/outline.css
similarity index 100%
rename from build/media_source/layouts/css/chromes/outline.css
rename to media_source/layouts/css/chromes/outline.css
diff --git a/build/media_source/layouts/js/joomla/form/field/category-change.es6.js b/media_source/layouts/js/joomla/form/field/category-change.es6.js
similarity index 100%
rename from build/media_source/layouts/js/joomla/form/field/category-change.es6.js
rename to media_source/layouts/js/joomla/form/field/category-change.es6.js
diff --git a/build/media_source/layouts/js/joomla/html/batch/batch-copymove.es6.js b/media_source/layouts/js/joomla/html/batch/batch-copymove.es6.js
similarity index 85%
rename from build/media_source/layouts/js/joomla/html/batch/batch-copymove.es6.js
rename to media_source/layouts/js/joomla/html/batch/batch-copymove.es6.js
index 0d668263d7e96..f2ffc1a30a241 100644
--- a/build/media_source/layouts/js/joomla/html/batch/batch-copymove.es6.js
+++ b/media_source/layouts/js/joomla/html/batch/batch-copymove.es6.js
@@ -9,12 +9,14 @@
     const batchMenu = document.getElementById('batch-menu-id');
     const batchPosition = document.getElementById('batch-position-id');
     const batchGroup = document.getElementById('batch-group-id');
+    const batchTagCopyMoveId = document.getElementById('batch-tag-copy-move-id');
     const batchCopyMove = document.getElementById('batch-copy-move');
     let batchSelector;
 
     const onChange = () => {
       if (!batchSelector.value
-          || (batchSelector.value && parseInt(batchSelector.value, 10) === 0)) {
+        || (batchSelector.value && parseInt(batchSelector.value, 10) === 0)
+      ) {
         batchCopyMove.classList.add('hidden');
       } else {
         batchCopyMove.classList.remove('hidden');
@@ -37,11 +39,12 @@
       batchSelector = batchGroup;
     }
 
-    if (batchCopyMove) {
-      batchCopyMove.classList.add('hidden');
+    if (batchTagCopyMoveId) {
+      batchSelector = batchTagCopyMoveId;
     }
 
     if (batchCopyMove) {
+      batchCopyMove.classList.add('hidden');
       batchSelector.addEventListener('change', onChange);
     }
 
diff --git a/media_source/layouts/js/joomla/html/batch/batch-tag-addremove.es6.js b/media_source/layouts/js/joomla/html/batch/batch-tag-addremove.es6.js
new file mode 100644
index 0000000000000..d2f85ce06cede
--- /dev/null
+++ b/media_source/layouts/js/joomla/html/batch/batch-tag-addremove.es6.js
@@ -0,0 +1,43 @@
+/**
+ * @copyright  (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+(() => {
+  const onSelect = () => {
+    const batchTag = document.getElementById('batch-tag-id');
+    const batchTagAddRemove = document.getElementById('batch-tag-addremove');
+    let batchSelector;
+
+    const onChange = () => {
+      if (!batchSelector.value
+        || (batchSelector.value && parseInt(batchSelector.value, 10) === 0)
+      ) {
+        batchTagAddRemove.classList.add('hidden');
+      } else {
+        batchTagAddRemove.classList.remove('hidden');
+      }
+    };
+
+    if (batchTag) {
+      batchSelector = batchTag;
+    }
+
+    if (batchTagAddRemove) {
+      batchTagAddRemove.classList.add('hidden');
+    }
+
+    if (batchTagAddRemove) {
+      batchSelector.addEventListener('change', onChange);
+    }
+
+    // Cleanup
+    document.removeEventListener('DOMContentLoaded', onSelect, true);
+  };
+
+  // Document loaded
+  document.addEventListener('DOMContentLoaded', onSelect, true);
+
+  // Joomla updated
+  document.addEventListener('joomla:updated', onSelect, true);
+})();
diff --git a/build/media_source/legacy/js/toolbar.es5.js b/media_source/legacy/js/toolbar.es5.js
similarity index 98%
rename from build/media_source/legacy/js/toolbar.es5.js
rename to media_source/legacy/js/toolbar.es5.js
index 9ab5b2e00aeb7..45591cfb44643 100644
--- a/build/media_source/legacy/js/toolbar.es5.js
+++ b/media_source/legacy/js/toolbar.es5.js
@@ -21,7 +21,7 @@ Joomla = window.Joomla || {};
    *
    * @since 4.0.0
    *
-   * @deprecated  4.3 will be removed in 6.0
+   * @deprecated  4.3 will be removed in 7.0
    *             Will be removed without replacement. Use browser native call instead
    */
   Joomla.popupWindow = function (mypage, myname, w, h, scroll) {
diff --git a/build/media_source/mailto/images/close-x.png b/media_source/mailto/images/close-x.png
similarity index 100%
rename from build/media_source/mailto/images/close-x.png
rename to media_source/mailto/images/close-x.png
diff --git a/build/media_source/mod_articles/css/mod-articles.css b/media_source/mod_articles/css/mod-articles.css
similarity index 100%
rename from build/media_source/mod_articles/css/mod-articles.css
rename to media_source/mod_articles/css/mod-articles.css
diff --git a/build/media_source/mod_articles_news/css/template-vert.css b/media_source/mod_articles_news/css/template-vert.css
similarity index 100%
rename from build/media_source/mod_articles_news/css/template-vert.css
rename to media_source/mod_articles_news/css/template-vert.css
diff --git a/build/media_source/mod_articles_news/css/template.css b/media_source/mod_articles_news/css/template.css
similarity index 100%
rename from build/media_source/mod_articles_news/css/template.css
rename to media_source/mod_articles_news/css/template.css
diff --git a/build/media_source/mod_languages/css/template.css b/media_source/mod_languages/css/template.css
similarity index 100%
rename from build/media_source/mod_languages/css/template.css
rename to media_source/mod_languages/css/template.css
diff --git a/build/media_source/mod_languages/images/af.gif b/media_source/mod_languages/images/af.gif
similarity index 100%
rename from build/media_source/mod_languages/images/af.gif
rename to media_source/mod_languages/images/af.gif
diff --git a/build/media_source/mod_languages/images/af_za.gif b/media_source/mod_languages/images/af_za.gif
similarity index 100%
rename from build/media_source/mod_languages/images/af_za.gif
rename to media_source/mod_languages/images/af_za.gif
diff --git a/build/media_source/mod_languages/images/al.gif b/media_source/mod_languages/images/al.gif
similarity index 100%
rename from build/media_source/mod_languages/images/al.gif
rename to media_source/mod_languages/images/al.gif
diff --git a/build/media_source/mod_languages/images/ar.gif b/media_source/mod_languages/images/ar.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ar.gif
rename to media_source/mod_languages/images/ar.gif
diff --git a/build/media_source/mod_languages/images/ar_aa.gif b/media_source/mod_languages/images/ar_aa.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ar_aa.gif
rename to media_source/mod_languages/images/ar_aa.gif
diff --git a/build/media_source/mod_languages/images/at.gif b/media_source/mod_languages/images/at.gif
similarity index 100%
rename from build/media_source/mod_languages/images/at.gif
rename to media_source/mod_languages/images/at.gif
diff --git a/build/media_source/mod_languages/images/az.gif b/media_source/mod_languages/images/az.gif
similarity index 100%
rename from build/media_source/mod_languages/images/az.gif
rename to media_source/mod_languages/images/az.gif
diff --git a/build/media_source/mod_languages/images/az_az.gif b/media_source/mod_languages/images/az_az.gif
similarity index 100%
rename from build/media_source/mod_languages/images/az_az.gif
rename to media_source/mod_languages/images/az_az.gif
diff --git a/build/media_source/mod_languages/images/be.gif b/media_source/mod_languages/images/be.gif
similarity index 100%
rename from build/media_source/mod_languages/images/be.gif
rename to media_source/mod_languages/images/be.gif
diff --git a/build/media_source/mod_languages/images/be_by.gif b/media_source/mod_languages/images/be_by.gif
similarity index 100%
rename from build/media_source/mod_languages/images/be_by.gif
rename to media_source/mod_languages/images/be_by.gif
diff --git a/build/media_source/mod_languages/images/belg.gif b/media_source/mod_languages/images/belg.gif
similarity index 100%
rename from build/media_source/mod_languages/images/belg.gif
rename to media_source/mod_languages/images/belg.gif
diff --git a/build/media_source/mod_languages/images/bg.gif b/media_source/mod_languages/images/bg.gif
similarity index 100%
rename from build/media_source/mod_languages/images/bg.gif
rename to media_source/mod_languages/images/bg.gif
diff --git a/build/media_source/mod_languages/images/bg_bg.gif b/media_source/mod_languages/images/bg_bg.gif
similarity index 100%
rename from build/media_source/mod_languages/images/bg_bg.gif
rename to media_source/mod_languages/images/bg_bg.gif
diff --git a/build/media_source/mod_languages/images/bn.gif b/media_source/mod_languages/images/bn.gif
similarity index 100%
rename from build/media_source/mod_languages/images/bn.gif
rename to media_source/mod_languages/images/bn.gif
diff --git a/build/media_source/mod_languages/images/bn_bd.gif b/media_source/mod_languages/images/bn_bd.gif
similarity index 100%
rename from build/media_source/mod_languages/images/bn_bd.gif
rename to media_source/mod_languages/images/bn_bd.gif
diff --git a/build/media_source/mod_languages/images/br.gif b/media_source/mod_languages/images/br.gif
similarity index 100%
rename from build/media_source/mod_languages/images/br.gif
rename to media_source/mod_languages/images/br.gif
diff --git a/build/media_source/mod_languages/images/br_fr.gif b/media_source/mod_languages/images/br_fr.gif
similarity index 100%
rename from build/media_source/mod_languages/images/br_fr.gif
rename to media_source/mod_languages/images/br_fr.gif
diff --git a/build/media_source/mod_languages/images/bs.gif b/media_source/mod_languages/images/bs.gif
similarity index 100%
rename from build/media_source/mod_languages/images/bs.gif
rename to media_source/mod_languages/images/bs.gif
diff --git a/build/media_source/mod_languages/images/bs_ba.gif b/media_source/mod_languages/images/bs_ba.gif
similarity index 100%
rename from build/media_source/mod_languages/images/bs_ba.gif
rename to media_source/mod_languages/images/bs_ba.gif
diff --git a/build/media_source/mod_languages/images/ca.gif b/media_source/mod_languages/images/ca.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ca.gif
rename to media_source/mod_languages/images/ca.gif
diff --git a/build/media_source/mod_languages/images/ca_es.gif b/media_source/mod_languages/images/ca_es.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ca_es.gif
rename to media_source/mod_languages/images/ca_es.gif
diff --git a/build/media_source/mod_languages/images/cbk_iq.gif b/media_source/mod_languages/images/cbk_iq.gif
similarity index 100%
rename from build/media_source/mod_languages/images/cbk_iq.gif
rename to media_source/mod_languages/images/cbk_iq.gif
diff --git a/build/media_source/mod_languages/images/ch.gif b/media_source/mod_languages/images/ch.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ch.gif
rename to media_source/mod_languages/images/ch.gif
diff --git a/build/media_source/mod_languages/images/cs.gif b/media_source/mod_languages/images/cs.gif
similarity index 100%
rename from build/media_source/mod_languages/images/cs.gif
rename to media_source/mod_languages/images/cs.gif
diff --git a/build/media_source/mod_languages/images/cs_cz.gif b/media_source/mod_languages/images/cs_cz.gif
similarity index 100%
rename from build/media_source/mod_languages/images/cs_cz.gif
rename to media_source/mod_languages/images/cs_cz.gif
diff --git a/build/media_source/mod_languages/images/cy.gif b/media_source/mod_languages/images/cy.gif
similarity index 100%
rename from build/media_source/mod_languages/images/cy.gif
rename to media_source/mod_languages/images/cy.gif
diff --git a/build/media_source/mod_languages/images/cy_gb.gif b/media_source/mod_languages/images/cy_gb.gif
similarity index 100%
rename from build/media_source/mod_languages/images/cy_gb.gif
rename to media_source/mod_languages/images/cy_gb.gif
diff --git a/build/media_source/mod_languages/images/cz.gif b/media_source/mod_languages/images/cz.gif
similarity index 100%
rename from build/media_source/mod_languages/images/cz.gif
rename to media_source/mod_languages/images/cz.gif
diff --git a/build/media_source/mod_languages/images/cz_cz.gif b/media_source/mod_languages/images/cz_cz.gif
similarity index 100%
rename from build/media_source/mod_languages/images/cz_cz.gif
rename to media_source/mod_languages/images/cz_cz.gif
diff --git a/build/media_source/mod_languages/images/da.gif b/media_source/mod_languages/images/da.gif
similarity index 100%
rename from build/media_source/mod_languages/images/da.gif
rename to media_source/mod_languages/images/da.gif
diff --git a/build/media_source/mod_languages/images/da_dk.gif b/media_source/mod_languages/images/da_dk.gif
similarity index 100%
rename from build/media_source/mod_languages/images/da_dk.gif
rename to media_source/mod_languages/images/da_dk.gif
diff --git a/build/media_source/mod_languages/images/de.gif b/media_source/mod_languages/images/de.gif
similarity index 100%
rename from build/media_source/mod_languages/images/de.gif
rename to media_source/mod_languages/images/de.gif
diff --git a/build/media_source/mod_languages/images/de_at.gif b/media_source/mod_languages/images/de_at.gif
similarity index 100%
rename from build/media_source/mod_languages/images/de_at.gif
rename to media_source/mod_languages/images/de_at.gif
diff --git a/build/media_source/mod_languages/images/de_ch.gif b/media_source/mod_languages/images/de_ch.gif
similarity index 100%
rename from build/media_source/mod_languages/images/de_ch.gif
rename to media_source/mod_languages/images/de_ch.gif
diff --git a/build/media_source/mod_languages/images/de_de.gif b/media_source/mod_languages/images/de_de.gif
similarity index 100%
rename from build/media_source/mod_languages/images/de_de.gif
rename to media_source/mod_languages/images/de_de.gif
diff --git a/build/media_source/mod_languages/images/de_li.gif b/media_source/mod_languages/images/de_li.gif
similarity index 100%
rename from build/media_source/mod_languages/images/de_li.gif
rename to media_source/mod_languages/images/de_li.gif
diff --git a/build/media_source/mod_languages/images/de_lu.gif b/media_source/mod_languages/images/de_lu.gif
similarity index 100%
rename from build/media_source/mod_languages/images/de_lu.gif
rename to media_source/mod_languages/images/de_lu.gif
diff --git a/build/media_source/mod_languages/images/dk.gif b/media_source/mod_languages/images/dk.gif
similarity index 100%
rename from build/media_source/mod_languages/images/dk.gif
rename to media_source/mod_languages/images/dk.gif
diff --git a/build/media_source/mod_languages/images/dz_bt.gif b/media_source/mod_languages/images/dz_bt.gif
similarity index 100%
rename from build/media_source/mod_languages/images/dz_bt.gif
rename to media_source/mod_languages/images/dz_bt.gif
diff --git a/build/media_source/mod_languages/images/el.gif b/media_source/mod_languages/images/el.gif
similarity index 100%
rename from build/media_source/mod_languages/images/el.gif
rename to media_source/mod_languages/images/el.gif
diff --git a/build/media_source/mod_languages/images/el_gr.gif b/media_source/mod_languages/images/el_gr.gif
similarity index 100%
rename from build/media_source/mod_languages/images/el_gr.gif
rename to media_source/mod_languages/images/el_gr.gif
diff --git a/build/media_source/mod_languages/images/en.gif b/media_source/mod_languages/images/en.gif
similarity index 100%
rename from build/media_source/mod_languages/images/en.gif
rename to media_source/mod_languages/images/en.gif
diff --git a/build/media_source/mod_languages/images/en_au.gif b/media_source/mod_languages/images/en_au.gif
similarity index 100%
rename from build/media_source/mod_languages/images/en_au.gif
rename to media_source/mod_languages/images/en_au.gif
diff --git a/build/media_source/mod_languages/images/en_ca.gif b/media_source/mod_languages/images/en_ca.gif
similarity index 100%
rename from build/media_source/mod_languages/images/en_ca.gif
rename to media_source/mod_languages/images/en_ca.gif
diff --git a/build/media_source/mod_languages/images/en_gb.gif b/media_source/mod_languages/images/en_gb.gif
similarity index 100%
rename from build/media_source/mod_languages/images/en_gb.gif
rename to media_source/mod_languages/images/en_gb.gif
diff --git a/build/media_source/mod_languages/images/en_nz.gif b/media_source/mod_languages/images/en_nz.gif
similarity index 100%
rename from build/media_source/mod_languages/images/en_nz.gif
rename to media_source/mod_languages/images/en_nz.gif
diff --git a/build/media_source/mod_languages/images/en_us.gif b/media_source/mod_languages/images/en_us.gif
similarity index 100%
rename from build/media_source/mod_languages/images/en_us.gif
rename to media_source/mod_languages/images/en_us.gif
diff --git a/build/media_source/mod_languages/images/eo.gif b/media_source/mod_languages/images/eo.gif
similarity index 100%
rename from build/media_source/mod_languages/images/eo.gif
rename to media_source/mod_languages/images/eo.gif
diff --git a/build/media_source/mod_languages/images/eo_xx.gif b/media_source/mod_languages/images/eo_xx.gif
similarity index 100%
rename from build/media_source/mod_languages/images/eo_xx.gif
rename to media_source/mod_languages/images/eo_xx.gif
diff --git a/build/media_source/mod_languages/images/es.gif b/media_source/mod_languages/images/es.gif
similarity index 100%
rename from build/media_source/mod_languages/images/es.gif
rename to media_source/mod_languages/images/es.gif
diff --git a/build/media_source/mod_languages/images/es_co.gif b/media_source/mod_languages/images/es_co.gif
similarity index 100%
rename from build/media_source/mod_languages/images/es_co.gif
rename to media_source/mod_languages/images/es_co.gif
diff --git a/build/media_source/mod_languages/images/es_es.gif b/media_source/mod_languages/images/es_es.gif
similarity index 100%
rename from build/media_source/mod_languages/images/es_es.gif
rename to media_source/mod_languages/images/es_es.gif
diff --git a/build/media_source/mod_languages/images/et.gif b/media_source/mod_languages/images/et.gif
similarity index 100%
rename from build/media_source/mod_languages/images/et.gif
rename to media_source/mod_languages/images/et.gif
diff --git a/build/media_source/mod_languages/images/et_ee.gif b/media_source/mod_languages/images/et_ee.gif
similarity index 100%
rename from build/media_source/mod_languages/images/et_ee.gif
rename to media_source/mod_languages/images/et_ee.gif
diff --git a/build/media_source/mod_languages/images/eu_es.gif b/media_source/mod_languages/images/eu_es.gif
similarity index 100%
rename from build/media_source/mod_languages/images/eu_es.gif
rename to media_source/mod_languages/images/eu_es.gif
diff --git a/build/media_source/mod_languages/images/fa.gif b/media_source/mod_languages/images/fa.gif
similarity index 100%
rename from build/media_source/mod_languages/images/fa.gif
rename to media_source/mod_languages/images/fa.gif
diff --git a/build/media_source/mod_languages/images/fa_ir.gif b/media_source/mod_languages/images/fa_ir.gif
similarity index 100%
rename from build/media_source/mod_languages/images/fa_ir.gif
rename to media_source/mod_languages/images/fa_ir.gif
diff --git a/build/media_source/mod_languages/images/fi.gif b/media_source/mod_languages/images/fi.gif
similarity index 100%
rename from build/media_source/mod_languages/images/fi.gif
rename to media_source/mod_languages/images/fi.gif
diff --git a/build/media_source/mod_languages/images/fi_fi.gif b/media_source/mod_languages/images/fi_fi.gif
similarity index 100%
rename from build/media_source/mod_languages/images/fi_fi.gif
rename to media_source/mod_languages/images/fi_fi.gif
diff --git a/build/media_source/mod_languages/images/fr.gif b/media_source/mod_languages/images/fr.gif
similarity index 100%
rename from build/media_source/mod_languages/images/fr.gif
rename to media_source/mod_languages/images/fr.gif
diff --git a/build/media_source/mod_languages/images/fr_ca.gif b/media_source/mod_languages/images/fr_ca.gif
similarity index 100%
rename from build/media_source/mod_languages/images/fr_ca.gif
rename to media_source/mod_languages/images/fr_ca.gif
diff --git a/build/media_source/mod_languages/images/fr_fr.gif b/media_source/mod_languages/images/fr_fr.gif
similarity index 100%
rename from build/media_source/mod_languages/images/fr_fr.gif
rename to media_source/mod_languages/images/fr_fr.gif
diff --git a/build/media_source/mod_languages/images/ga_ie.gif b/media_source/mod_languages/images/ga_ie.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ga_ie.gif
rename to media_source/mod_languages/images/ga_ie.gif
diff --git a/build/media_source/mod_languages/images/gd.gif b/media_source/mod_languages/images/gd.gif
similarity index 100%
rename from build/media_source/mod_languages/images/gd.gif
rename to media_source/mod_languages/images/gd.gif
diff --git a/build/media_source/mod_languages/images/gd_gb.gif b/media_source/mod_languages/images/gd_gb.gif
similarity index 100%
rename from build/media_source/mod_languages/images/gd_gb.gif
rename to media_source/mod_languages/images/gd_gb.gif
diff --git a/build/media_source/mod_languages/images/gl.gif b/media_source/mod_languages/images/gl.gif
similarity index 100%
rename from build/media_source/mod_languages/images/gl.gif
rename to media_source/mod_languages/images/gl.gif
diff --git a/build/media_source/mod_languages/images/gl_es.gif b/media_source/mod_languages/images/gl_es.gif
similarity index 100%
rename from build/media_source/mod_languages/images/gl_es.gif
rename to media_source/mod_languages/images/gl_es.gif
diff --git a/build/media_source/mod_languages/images/he.gif b/media_source/mod_languages/images/he.gif
similarity index 100%
rename from build/media_source/mod_languages/images/he.gif
rename to media_source/mod_languages/images/he.gif
diff --git a/build/media_source/mod_languages/images/he_il.gif b/media_source/mod_languages/images/he_il.gif
similarity index 100%
rename from build/media_source/mod_languages/images/he_il.gif
rename to media_source/mod_languages/images/he_il.gif
diff --git a/build/media_source/mod_languages/images/hi.gif b/media_source/mod_languages/images/hi.gif
similarity index 100%
rename from build/media_source/mod_languages/images/hi.gif
rename to media_source/mod_languages/images/hi.gif
diff --git a/build/media_source/mod_languages/images/hi_in.gif b/media_source/mod_languages/images/hi_in.gif
similarity index 100%
rename from build/media_source/mod_languages/images/hi_in.gif
rename to media_source/mod_languages/images/hi_in.gif
diff --git a/build/media_source/mod_languages/images/hk.gif b/media_source/mod_languages/images/hk.gif
similarity index 100%
rename from build/media_source/mod_languages/images/hk.gif
rename to media_source/mod_languages/images/hk.gif
diff --git a/build/media_source/mod_languages/images/hk_hk.gif b/media_source/mod_languages/images/hk_hk.gif
similarity index 100%
rename from build/media_source/mod_languages/images/hk_hk.gif
rename to media_source/mod_languages/images/hk_hk.gif
diff --git a/build/media_source/mod_languages/images/hr.gif b/media_source/mod_languages/images/hr.gif
similarity index 100%
rename from build/media_source/mod_languages/images/hr.gif
rename to media_source/mod_languages/images/hr.gif
diff --git a/build/media_source/mod_languages/images/hr_hr.gif b/media_source/mod_languages/images/hr_hr.gif
similarity index 100%
rename from build/media_source/mod_languages/images/hr_hr.gif
rename to media_source/mod_languages/images/hr_hr.gif
diff --git a/build/media_source/mod_languages/images/hu.gif b/media_source/mod_languages/images/hu.gif
similarity index 100%
rename from build/media_source/mod_languages/images/hu.gif
rename to media_source/mod_languages/images/hu.gif
diff --git a/build/media_source/mod_languages/images/hu_hu.gif b/media_source/mod_languages/images/hu_hu.gif
similarity index 100%
rename from build/media_source/mod_languages/images/hu_hu.gif
rename to media_source/mod_languages/images/hu_hu.gif
diff --git a/build/media_source/mod_languages/images/hy.gif b/media_source/mod_languages/images/hy.gif
similarity index 100%
rename from build/media_source/mod_languages/images/hy.gif
rename to media_source/mod_languages/images/hy.gif
diff --git a/build/media_source/mod_languages/images/hy_am.gif b/media_source/mod_languages/images/hy_am.gif
similarity index 100%
rename from build/media_source/mod_languages/images/hy_am.gif
rename to media_source/mod_languages/images/hy_am.gif
diff --git a/build/media_source/mod_languages/images/icon-16-language.png b/media_source/mod_languages/images/icon-16-language.png
similarity index 100%
rename from build/media_source/mod_languages/images/icon-16-language.png
rename to media_source/mod_languages/images/icon-16-language.png
diff --git a/build/media_source/mod_languages/images/id.gif b/media_source/mod_languages/images/id.gif
similarity index 100%
rename from build/media_source/mod_languages/images/id.gif
rename to media_source/mod_languages/images/id.gif
diff --git a/build/media_source/mod_languages/images/id_id.gif b/media_source/mod_languages/images/id_id.gif
similarity index 100%
rename from build/media_source/mod_languages/images/id_id.gif
rename to media_source/mod_languages/images/id_id.gif
diff --git a/build/media_source/mod_languages/images/is.gif b/media_source/mod_languages/images/is.gif
similarity index 100%
rename from build/media_source/mod_languages/images/is.gif
rename to media_source/mod_languages/images/is.gif
diff --git a/build/media_source/mod_languages/images/is_is.gif b/media_source/mod_languages/images/is_is.gif
similarity index 100%
rename from build/media_source/mod_languages/images/is_is.gif
rename to media_source/mod_languages/images/is_is.gif
diff --git a/build/media_source/mod_languages/images/it.gif b/media_source/mod_languages/images/it.gif
similarity index 100%
rename from build/media_source/mod_languages/images/it.gif
rename to media_source/mod_languages/images/it.gif
diff --git a/build/media_source/mod_languages/images/it_it.gif b/media_source/mod_languages/images/it_it.gif
similarity index 100%
rename from build/media_source/mod_languages/images/it_it.gif
rename to media_source/mod_languages/images/it_it.gif
diff --git a/build/media_source/mod_languages/images/ja.gif b/media_source/mod_languages/images/ja.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ja.gif
rename to media_source/mod_languages/images/ja.gif
diff --git a/build/media_source/mod_languages/images/ja_jp.gif b/media_source/mod_languages/images/ja_jp.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ja_jp.gif
rename to media_source/mod_languages/images/ja_jp.gif
diff --git a/build/media_source/mod_languages/images/ka.gif b/media_source/mod_languages/images/ka.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ka.gif
rename to media_source/mod_languages/images/ka.gif
diff --git a/build/media_source/mod_languages/images/ka_ge.gif b/media_source/mod_languages/images/ka_ge.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ka_ge.gif
rename to media_source/mod_languages/images/ka_ge.gif
diff --git a/build/media_source/mod_languages/images/kk_kz.gif b/media_source/mod_languages/images/kk_kz.gif
similarity index 100%
rename from build/media_source/mod_languages/images/kk_kz.gif
rename to media_source/mod_languages/images/kk_kz.gif
diff --git a/build/media_source/mod_languages/images/km.gif b/media_source/mod_languages/images/km.gif
similarity index 100%
rename from build/media_source/mod_languages/images/km.gif
rename to media_source/mod_languages/images/km.gif
diff --git a/build/media_source/mod_languages/images/km_kh.gif b/media_source/mod_languages/images/km_kh.gif
similarity index 100%
rename from build/media_source/mod_languages/images/km_kh.gif
rename to media_source/mod_languages/images/km_kh.gif
diff --git a/build/media_source/mod_languages/images/ko.gif b/media_source/mod_languages/images/ko.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ko.gif
rename to media_source/mod_languages/images/ko.gif
diff --git a/build/media_source/mod_languages/images/ko_kr.gif b/media_source/mod_languages/images/ko_kr.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ko_kr.gif
rename to media_source/mod_languages/images/ko_kr.gif
diff --git a/build/media_source/mod_languages/images/ku.gif b/media_source/mod_languages/images/ku.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ku.gif
rename to media_source/mod_languages/images/ku.gif
diff --git a/build/media_source/mod_languages/images/lo.gif b/media_source/mod_languages/images/lo.gif
similarity index 100%
rename from build/media_source/mod_languages/images/lo.gif
rename to media_source/mod_languages/images/lo.gif
diff --git a/build/media_source/mod_languages/images/lo_la.gif b/media_source/mod_languages/images/lo_la.gif
similarity index 100%
rename from build/media_source/mod_languages/images/lo_la.gif
rename to media_source/mod_languages/images/lo_la.gif
diff --git a/build/media_source/mod_languages/images/lt.gif b/media_source/mod_languages/images/lt.gif
similarity index 100%
rename from build/media_source/mod_languages/images/lt.gif
rename to media_source/mod_languages/images/lt.gif
diff --git a/build/media_source/mod_languages/images/lt_lt.gif b/media_source/mod_languages/images/lt_lt.gif
similarity index 100%
rename from build/media_source/mod_languages/images/lt_lt.gif
rename to media_source/mod_languages/images/lt_lt.gif
diff --git a/build/media_source/mod_languages/images/lv.gif b/media_source/mod_languages/images/lv.gif
similarity index 100%
rename from build/media_source/mod_languages/images/lv.gif
rename to media_source/mod_languages/images/lv.gif
diff --git a/build/media_source/mod_languages/images/lv_lv.gif b/media_source/mod_languages/images/lv_lv.gif
similarity index 100%
rename from build/media_source/mod_languages/images/lv_lv.gif
rename to media_source/mod_languages/images/lv_lv.gif
diff --git a/build/media_source/mod_languages/images/mk.gif b/media_source/mod_languages/images/mk.gif
similarity index 100%
rename from build/media_source/mod_languages/images/mk.gif
rename to media_source/mod_languages/images/mk.gif
diff --git a/build/media_source/mod_languages/images/mk_mk.gif b/media_source/mod_languages/images/mk_mk.gif
similarity index 100%
rename from build/media_source/mod_languages/images/mk_mk.gif
rename to media_source/mod_languages/images/mk_mk.gif
diff --git a/build/media_source/mod_languages/images/mn.gif b/media_source/mod_languages/images/mn.gif
similarity index 100%
rename from build/media_source/mod_languages/images/mn.gif
rename to media_source/mod_languages/images/mn.gif
diff --git a/build/media_source/mod_languages/images/mn_mn.gif b/media_source/mod_languages/images/mn_mn.gif
similarity index 100%
rename from build/media_source/mod_languages/images/mn_mn.gif
rename to media_source/mod_languages/images/mn_mn.gif
diff --git a/build/media_source/mod_languages/images/ms_my.gif b/media_source/mod_languages/images/ms_my.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ms_my.gif
rename to media_source/mod_languages/images/ms_my.gif
diff --git a/build/media_source/mod_languages/images/nb_no.gif b/media_source/mod_languages/images/nb_no.gif
similarity index 100%
rename from build/media_source/mod_languages/images/nb_no.gif
rename to media_source/mod_languages/images/nb_no.gif
diff --git a/build/media_source/mod_languages/images/nl.gif b/media_source/mod_languages/images/nl.gif
similarity index 100%
rename from build/media_source/mod_languages/images/nl.gif
rename to media_source/mod_languages/images/nl.gif
diff --git a/build/media_source/mod_languages/images/nl_be.gif b/media_source/mod_languages/images/nl_be.gif
similarity index 100%
rename from build/media_source/mod_languages/images/nl_be.gif
rename to media_source/mod_languages/images/nl_be.gif
diff --git a/build/media_source/mod_languages/images/nl_nl.gif b/media_source/mod_languages/images/nl_nl.gif
similarity index 100%
rename from build/media_source/mod_languages/images/nl_nl.gif
rename to media_source/mod_languages/images/nl_nl.gif
diff --git a/build/media_source/mod_languages/images/nn_no.gif b/media_source/mod_languages/images/nn_no.gif
similarity index 100%
rename from build/media_source/mod_languages/images/nn_no.gif
rename to media_source/mod_languages/images/nn_no.gif
diff --git a/build/media_source/mod_languages/images/no.gif b/media_source/mod_languages/images/no.gif
similarity index 100%
rename from build/media_source/mod_languages/images/no.gif
rename to media_source/mod_languages/images/no.gif
diff --git a/build/media_source/mod_languages/images/pl.gif b/media_source/mod_languages/images/pl.gif
similarity index 100%
rename from build/media_source/mod_languages/images/pl.gif
rename to media_source/mod_languages/images/pl.gif
diff --git a/build/media_source/mod_languages/images/pl_pl.gif b/media_source/mod_languages/images/pl_pl.gif
similarity index 100%
rename from build/media_source/mod_languages/images/pl_pl.gif
rename to media_source/mod_languages/images/pl_pl.gif
diff --git a/build/media_source/mod_languages/images/prs_af.gif b/media_source/mod_languages/images/prs_af.gif
similarity index 100%
rename from build/media_source/mod_languages/images/prs_af.gif
rename to media_source/mod_languages/images/prs_af.gif
diff --git a/build/media_source/mod_languages/images/ps.gif b/media_source/mod_languages/images/ps.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ps.gif
rename to media_source/mod_languages/images/ps.gif
diff --git a/build/media_source/mod_languages/images/ps_af.gif b/media_source/mod_languages/images/ps_af.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ps_af.gif
rename to media_source/mod_languages/images/ps_af.gif
diff --git a/build/media_source/mod_languages/images/pt.gif b/media_source/mod_languages/images/pt.gif
similarity index 100%
rename from build/media_source/mod_languages/images/pt.gif
rename to media_source/mod_languages/images/pt.gif
diff --git a/build/media_source/mod_languages/images/pt_br.gif b/media_source/mod_languages/images/pt_br.gif
similarity index 100%
rename from build/media_source/mod_languages/images/pt_br.gif
rename to media_source/mod_languages/images/pt_br.gif
diff --git a/build/media_source/mod_languages/images/pt_pt.gif b/media_source/mod_languages/images/pt_pt.gif
similarity index 100%
rename from build/media_source/mod_languages/images/pt_pt.gif
rename to media_source/mod_languages/images/pt_pt.gif
diff --git a/build/media_source/mod_languages/images/ro.gif b/media_source/mod_languages/images/ro.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ro.gif
rename to media_source/mod_languages/images/ro.gif
diff --git a/build/media_source/mod_languages/images/ro_ro.gif b/media_source/mod_languages/images/ro_ro.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ro_ro.gif
rename to media_source/mod_languages/images/ro_ro.gif
diff --git a/build/media_source/mod_languages/images/ru.gif b/media_source/mod_languages/images/ru.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ru.gif
rename to media_source/mod_languages/images/ru.gif
diff --git a/build/media_source/mod_languages/images/ru_ru.gif b/media_source/mod_languages/images/ru_ru.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ru_ru.gif
rename to media_source/mod_languages/images/ru_ru.gif
diff --git a/build/media_source/mod_languages/images/si.gif b/media_source/mod_languages/images/si.gif
similarity index 100%
rename from build/media_source/mod_languages/images/si.gif
rename to media_source/mod_languages/images/si.gif
diff --git a/build/media_source/mod_languages/images/si_lk.gif b/media_source/mod_languages/images/si_lk.gif
similarity index 100%
rename from build/media_source/mod_languages/images/si_lk.gif
rename to media_source/mod_languages/images/si_lk.gif
diff --git a/build/media_source/mod_languages/images/sk.gif b/media_source/mod_languages/images/sk.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sk.gif
rename to media_source/mod_languages/images/sk.gif
diff --git a/build/media_source/mod_languages/images/sk_sk.gif b/media_source/mod_languages/images/sk_sk.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sk_sk.gif
rename to media_source/mod_languages/images/sk_sk.gif
diff --git a/build/media_source/mod_languages/images/sl.gif b/media_source/mod_languages/images/sl.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sl.gif
rename to media_source/mod_languages/images/sl.gif
diff --git a/build/media_source/mod_languages/images/sl_si.gif b/media_source/mod_languages/images/sl_si.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sl_si.gif
rename to media_source/mod_languages/images/sl_si.gif
diff --git a/build/media_source/mod_languages/images/sq_al.gif b/media_source/mod_languages/images/sq_al.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sq_al.gif
rename to media_source/mod_languages/images/sq_al.gif
diff --git a/build/media_source/mod_languages/images/sr.gif b/media_source/mod_languages/images/sr.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sr.gif
rename to media_source/mod_languages/images/sr.gif
diff --git a/build/media_source/mod_languages/images/sr_rs.gif b/media_source/mod_languages/images/sr_rs.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sr_rs.gif
rename to media_source/mod_languages/images/sr_rs.gif
diff --git a/build/media_source/mod_languages/images/sr_yu.gif b/media_source/mod_languages/images/sr_yu.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sr_yu.gif
rename to media_source/mod_languages/images/sr_yu.gif
diff --git a/build/media_source/mod_languages/images/srp_me.gif b/media_source/mod_languages/images/srp_me.gif
similarity index 100%
rename from build/media_source/mod_languages/images/srp_me.gif
rename to media_source/mod_languages/images/srp_me.gif
diff --git a/build/media_source/mod_languages/images/sv.gif b/media_source/mod_languages/images/sv.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sv.gif
rename to media_source/mod_languages/images/sv.gif
diff --git a/build/media_source/mod_languages/images/sv_se.gif b/media_source/mod_languages/images/sv_se.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sv_se.gif
rename to media_source/mod_languages/images/sv_se.gif
diff --git a/build/media_source/mod_languages/images/sw.gif b/media_source/mod_languages/images/sw.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sw.gif
rename to media_source/mod_languages/images/sw.gif
diff --git a/build/media_source/mod_languages/images/sw_ke.gif b/media_source/mod_languages/images/sw_ke.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sw_ke.gif
rename to media_source/mod_languages/images/sw_ke.gif
diff --git a/build/media_source/mod_languages/images/sy.gif b/media_source/mod_languages/images/sy.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sy.gif
rename to media_source/mod_languages/images/sy.gif
diff --git a/build/media_source/mod_languages/images/sy_iq.gif b/media_source/mod_languages/images/sy_iq.gif
similarity index 100%
rename from build/media_source/mod_languages/images/sy_iq.gif
rename to media_source/mod_languages/images/sy_iq.gif
diff --git a/build/media_source/mod_languages/images/ta.gif b/media_source/mod_languages/images/ta.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ta.gif
rename to media_source/mod_languages/images/ta.gif
diff --git a/build/media_source/mod_languages/images/ta_in.gif b/media_source/mod_languages/images/ta_in.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ta_in.gif
rename to media_source/mod_languages/images/ta_in.gif
diff --git a/build/media_source/mod_languages/images/th.gif b/media_source/mod_languages/images/th.gif
similarity index 100%
rename from build/media_source/mod_languages/images/th.gif
rename to media_source/mod_languages/images/th.gif
diff --git a/build/media_source/mod_languages/images/th_th.gif b/media_source/mod_languages/images/th_th.gif
similarity index 100%
rename from build/media_source/mod_languages/images/th_th.gif
rename to media_source/mod_languages/images/th_th.gif
diff --git a/build/media_source/mod_languages/images/tk_tm.gif b/media_source/mod_languages/images/tk_tm.gif
similarity index 100%
rename from build/media_source/mod_languages/images/tk_tm.gif
rename to media_source/mod_languages/images/tk_tm.gif
diff --git a/build/media_source/mod_languages/images/tr.gif b/media_source/mod_languages/images/tr.gif
similarity index 100%
rename from build/media_source/mod_languages/images/tr.gif
rename to media_source/mod_languages/images/tr.gif
diff --git a/build/media_source/mod_languages/images/tr_tr.gif b/media_source/mod_languages/images/tr_tr.gif
similarity index 100%
rename from build/media_source/mod_languages/images/tr_tr.gif
rename to media_source/mod_languages/images/tr_tr.gif
diff --git a/build/media_source/mod_languages/images/tw.gif b/media_source/mod_languages/images/tw.gif
similarity index 100%
rename from build/media_source/mod_languages/images/tw.gif
rename to media_source/mod_languages/images/tw.gif
diff --git a/build/media_source/mod_languages/images/ug_cn.gif b/media_source/mod_languages/images/ug_cn.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ug_cn.gif
rename to media_source/mod_languages/images/ug_cn.gif
diff --git a/build/media_source/mod_languages/images/uk.gif b/media_source/mod_languages/images/uk.gif
similarity index 100%
rename from build/media_source/mod_languages/images/uk.gif
rename to media_source/mod_languages/images/uk.gif
diff --git a/build/media_source/mod_languages/images/uk_ua.gif b/media_source/mod_languages/images/uk_ua.gif
similarity index 100%
rename from build/media_source/mod_languages/images/uk_ua.gif
rename to media_source/mod_languages/images/uk_ua.gif
diff --git a/build/media_source/mod_languages/images/ur.gif b/media_source/mod_languages/images/ur.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ur.gif
rename to media_source/mod_languages/images/ur.gif
diff --git a/build/media_source/mod_languages/images/ur_pk.gif b/media_source/mod_languages/images/ur_pk.gif
similarity index 100%
rename from build/media_source/mod_languages/images/ur_pk.gif
rename to media_source/mod_languages/images/ur_pk.gif
diff --git a/build/media_source/mod_languages/images/us.gif b/media_source/mod_languages/images/us.gif
similarity index 100%
rename from build/media_source/mod_languages/images/us.gif
rename to media_source/mod_languages/images/us.gif
diff --git a/build/media_source/mod_languages/images/uz.gif b/media_source/mod_languages/images/uz.gif
similarity index 100%
rename from build/media_source/mod_languages/images/uz.gif
rename to media_source/mod_languages/images/uz.gif
diff --git a/build/media_source/mod_languages/images/uz_uz.gif b/media_source/mod_languages/images/uz_uz.gif
similarity index 100%
rename from build/media_source/mod_languages/images/uz_uz.gif
rename to media_source/mod_languages/images/uz_uz.gif
diff --git a/build/media_source/mod_languages/images/vi.gif b/media_source/mod_languages/images/vi.gif
similarity index 100%
rename from build/media_source/mod_languages/images/vi.gif
rename to media_source/mod_languages/images/vi.gif
diff --git a/build/media_source/mod_languages/images/vi_vn.gif b/media_source/mod_languages/images/vi_vn.gif
similarity index 100%
rename from build/media_source/mod_languages/images/vi_vn.gif
rename to media_source/mod_languages/images/vi_vn.gif
diff --git a/build/media_source/mod_languages/images/zh.gif b/media_source/mod_languages/images/zh.gif
similarity index 100%
rename from build/media_source/mod_languages/images/zh.gif
rename to media_source/mod_languages/images/zh.gif
diff --git a/build/media_source/mod_languages/images/zh_cn.gif b/media_source/mod_languages/images/zh_cn.gif
similarity index 100%
rename from build/media_source/mod_languages/images/zh_cn.gif
rename to media_source/mod_languages/images/zh_cn.gif
diff --git a/build/media_source/mod_languages/images/zh_tw.gif b/media_source/mod_languages/images/zh_tw.gif
similarity index 100%
rename from build/media_source/mod_languages/images/zh_tw.gif
rename to media_source/mod_languages/images/zh_tw.gif
diff --git a/build/media_source/mod_login/js/admin-login.es6.js b/media_source/mod_login/js/admin-login.es6.js
similarity index 100%
rename from build/media_source/mod_login/js/admin-login.es6.js
rename to media_source/mod_login/js/admin-login.es6.js
diff --git a/media_source/mod_menu/css/mod-menu.css b/media_source/mod_menu/css/mod-menu.css
new file mode 100644
index 0000000000000..d748b8fcd7ebf
--- /dev/null
+++ b/media_source/mod_menu/css/mod-menu.css
@@ -0,0 +1,22 @@
+:where(.mod-menu__toggle-sub) {
+  display: inline-flex;
+  align-items: center;
+  padding: 0;
+  color: currentColor;
+  background-color: transparent;
+  border: none;
+  &[aria-expanded="true"] .icon-chevron-down {
+    transform: rotate(180deg);
+  }
+}
+:where(.mod-menu [class*="icon-"]) {
+  margin-inline-start: .5rem;
+  transition: all .2s, background-color .2s;
+}
+
+:where(.mod-menu__sub[aria-hidden="true"]) {
+  display: none;
+}
+:where(.mod-menu__sub[aria-hidden="false"]) {
+  display: block;
+}
diff --git a/media_source/mod_menu/joomla.asset.json b/media_source/mod_menu/joomla.asset.json
new file mode 100644
index 0000000000000..2314d4d0ad3d8
--- /dev/null
+++ b/media_source/mod_menu/joomla.asset.json
@@ -0,0 +1,44 @@
+{
+  "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
+  "name": "mod_menu",
+  "version": "6.0.0",
+  "description": "Joomla CMS",
+  "license": "GPL-2.0-or-later",
+  "assets": [
+    {
+      "name": "mod_menu.admin-menu",
+      "type": "script",
+      "uri": "mod_menu/admin-menu.min.js",
+      "dependencies": [
+        "core"
+      ],
+      "attributes": {
+        "type": "module"
+      }
+    },
+    {
+      "name": "mod_menu.menu",
+      "type": "script",
+      "uri": "mod_menu/menu.min.js",
+      "dependencies": [
+        "core"
+      ],
+      "attributes": {
+        "type": "module"
+      }
+    },
+    {
+      "name": "mod_menu.menu",
+      "type": "style",
+      "uri": "mod_menu/mod-menu.min.css"
+    },
+    {
+      "name": "mod_menu.menu",
+      "type": "preset",
+      "dependencies": [
+        "mod_menu.menu#style",
+        "mod_menu.menu#script"
+      ]
+    }
+  ]
+}
diff --git a/build/media_source/mod_menu/js/admin-menu.es6.js b/media_source/mod_menu/js/admin-menu.es6.js
similarity index 92%
rename from build/media_source/mod_menu/js/admin-menu.es6.js
rename to media_source/mod_menu/js/admin-menu.es6.js
index 5a2a460f39ac2..4928104d1888a 100644
--- a/build/media_source/mod_menu/js/admin-menu.es6.js
+++ b/media_source/mod_menu/js/admin-menu.es6.js
@@ -102,12 +102,14 @@ if (sidebar && !sidebar.getAttribute('data-hidden')) {
 
         // Auto Expand Levels
         if (!link.parentNode.classList.contains('parent')) {
-          const firstLevel = link.closest('.collapse-level-1');
-          const secondLevel = link.closest('.collapse-level-2');
-          if (firstLevel) firstLevel.parentNode.classList.add('mm-active');
-          if (firstLevel) firstLevel.classList.add('mm-show');
-          if (secondLevel) secondLevel.parentNode.classList.add('mm-active');
-          if (secondLevel) secondLevel.classList.add('mm-show');
+          let tempParent = link.parentNode;
+
+          while (tempParent && !tempParent.classList.contains('metismenu')) {
+            tempParent.parentNode.classList.add('mm-active');
+            tempParent.classList.add('mm-show');
+
+            tempParent = tempParent.parentNode.closest('ul');
+          }
         }
       }
     });
diff --git a/media_source/mod_menu/js/menu.es6.js b/media_source/mod_menu/js/menu.es6.js
new file mode 100644
index 0000000000000..190ecdbe8ae22
--- /dev/null
+++ b/media_source/mod_menu/js/menu.es6.js
@@ -0,0 +1,284 @@
+/**
+ * @copyright  (C) 2019 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+(() => {
+  'use strict';
+
+  /**
+   * Navigation menu
+   *
+   * Example usage:
+   *   // Default behavior (uses menuHoverClass = 'show-menu', dir = 'ltr')
+   *   new Nav(document.querySelector('.nav'));
+   *
+   *   // Override defaults (e.g. custom open-class and RTL support)
+   *   new Nav(document.querySelector('.nav'), {
+   *     menuHoverClass: 'my-open-class',
+   *     dir:            'rtl'
+   *   });
+   *
+   * @param {HTMLElement} nav                                   The root <ul class="nav"> element
+   * @param {Object}      [settings]                            Optional overrides for defaultSettings
+   * @param {string}      [settings.menuHoverClass='show-menu'] CSS class to toggle on open submenus
+   * @param {string}      [settings.dir='ltr']                  Text direction for keyboard nav ('ltr'|'rtl')
+   */
+  class Nav {
+    // Default settings for the Nav class
+    static defaultSettings = {
+      menuHoverClass: 'show-menu',
+      dir: 'ltr',
+      preventSubmenuOpenOnload: 'nav-active-open',
+    };
+
+    constructor(nav, settings = {}) {
+      this.nav = nav;
+
+      // read the HTML dir attribute or computed style, or fall back to defaultSettings.dir
+      const browserDir
+        = document.documentElement.getAttribute('dir') // <html dir="…">
+          || getComputedStyle(document.documentElement).direction // CSS direction
+          || Nav.defaultSettings.dir;
+
+      this.settings = {
+        ...Nav.defaultSettings,
+        ...settings,
+      };
+
+      // merge defaults, browser‐detected dir, and any explicit overrides in `settings`
+      this.settings = {
+        ...Nav.defaultSettings,
+        dir: settings.dir ?? browserDir, // explicit settings.dir wins, otherwise browserDir
+        ...settings, // other overrides (e.g. menuHoverClass)
+      };
+
+      // Unique prefix for this nav instance - needed for the id of submenus and aria-controls
+      this.idPrefix = this.nav?.id ?? `nav-${Math.floor(Math.random() * 100000)}`;
+
+      this.topLevelNodes = this.nav.querySelectorAll(':scope > li');
+
+      this.nav.querySelectorAll('li').forEach((menuItem) => {
+        // only direct submenu(s) of each menu item
+        const levelChildUls = menuItem.querySelectorAll(':scope > ul');
+        const ariaControls = [];
+        levelChildUls.forEach((childUl) => {
+          childUl.setAttribute('aria-hidden', 'true');
+          childUl.classList.remove(this.settings.menuHoverClass);
+          childUl.id = `${this.idPrefix}-submenu${Nav.idCounter}`;
+          Nav.idCounter += 1;
+          ariaControls.push(childUl.id);
+        });
+
+        if (levelChildUls.length > 0) {
+          const togglebtn = menuItem.querySelector(':scope > [aria-expanded]');
+          togglebtn?.setAttribute('aria-controls', ariaControls.join(' '));
+          togglebtn?.setAttribute('aria-expanded', 'false');
+        }
+      });
+
+      nav.addEventListener('keydown', this.onMenuKeyDown.bind(this));
+      nav.addEventListener('click', this.onClick.bind(this));
+
+      if (this.nav.classList.contains(this.settings.preventSubmenuOpenOnload)) {
+        this.toggleAllForCurrentActive();
+      }
+    }
+
+    onMenuKeyDown(event) {
+      const target = event.target.closest('li');
+      if (!target) {
+        return;
+      }
+
+      const subLists = target.querySelectorAll(':scope > ul');
+
+      switch (event.key) {
+        case 'ArrowUp':
+          event.preventDefault();
+          this.tabPrev();
+          break;
+        case 'ArrowLeft':
+          event.preventDefault();
+          if (this.settings.dir === 'rtl') {
+            this.tabNext();
+          } else {
+            this.tabPrev();
+          }
+          break;
+        case 'ArrowDown':
+          event.preventDefault();
+          this.tabNext();
+          break;
+        case 'ArrowRight':
+          event.preventDefault();
+          if (this.settings.dir === 'rtl') {
+            this.tabPrev();
+          } else {
+            this.tabNext();
+          }
+          break;
+        case 'Enter':
+          if (event.target.nodeName === 'SPAN' && event.target.parentNode.nodeName !== 'A' && subLists.length > 0) {
+            event.preventDefault();
+            this.toggleSubMenu(target, subLists, subLists[0]?.getAttribute('aria-hidden') === 'true');
+          }
+          break;
+        case ' ':
+        case 'Spacebar':
+          if (subLists.length > 0) {
+            event.preventDefault();
+            this.toggleSubMenu(target, subLists, subLists[0]?.getAttribute('aria-hidden') === 'true');
+          }
+          break;
+        case 'Escape': {
+          event.preventDefault();
+          const currentTopLevelLi = this.getTopLevelParentLi(event.target);
+          if (!currentTopLevelLi) {
+            break;
+          }
+          const allChildListsFromTopLevelLi = currentTopLevelLi.querySelectorAll(':scope > ul');
+          if (allChildListsFromTopLevelLi.length > 0) {
+            this.toggleSubMenu(currentTopLevelLi, allChildListsFromTopLevelLi, false);
+          }
+          // set focus on the top level li child with tabindex
+          currentTopLevelLi.querySelectorAll(':scope > [tabindex]:not([tabindex="-1"]), a, button').forEach((tabElement) => {
+            if (tabElement.hasAttribute(['aria-expanded'])) {
+              tabElement.focus();
+            }
+          });
+          break;
+        }
+        case 'End': {
+          event.preventDefault();
+          const currentLiList = target.closest('ul')?.querySelectorAll(':scope > li');
+          for (let index = currentLiList.length - 1; index >= 0; index -= 1) {
+            const lastTabbable = currentLiList[index].querySelector(':scope > [tabindex]:not([tabindex="-1"]), a, button');
+            if (lastTabbable) {
+              lastTabbable.focus();
+              return;
+            }
+          }
+          break;
+        }
+        case 'Home': {
+          event.preventDefault();
+          const firstLi = target.closest('ul')?.querySelector(':scope > li:first-child');
+          if (firstLi) {
+            // set focus on first li child with tabindex within current list
+            firstLi.querySelector(':scope > [tabindex]:not([tabindex="-1"]), a, button')?.focus();
+          }
+          break;
+        }
+        default:
+          break;
+      }
+    }
+
+    onClick(event) {
+      if (!event.target?.hasAttribute('aria-expanded') && !event.target?.closest('[aria-expanded')) {
+        return;
+      }
+      if (event.target?.nodeName === 'A') {
+        return;
+      }
+      if (event.target?.nodeName === 'SPAN' && event.target.parentNode.nodeName === 'A') {
+        return;
+      }
+      const target = event.target.closest('li');
+      const subLists = target?.querySelectorAll(':scope > ul');
+      if (subLists && subLists.length > 0) {
+        event.preventDefault();
+        this.toggleSubMenu(target, subLists, subLists[0]?.getAttribute('aria-hidden') === 'true');
+      }
+    }
+
+    toggleSubMenu(target, subLists, open = false) {
+      const closeSubMenuTree = (ulChild) => {
+        ulChild.setAttribute('aria-hidden', 'true');
+        ulChild.classList.remove(this.settings.menuHoverClass);
+        const parentToggle = ulChild.closest('li')?.querySelector(':scope > [aria-expanded]');
+        parentToggle?.setAttribute('aria-expanded', 'false');
+        ulChild.querySelectorAll('ul').forEach((descendantUl) => {
+          descendantUl.setAttribute('aria-hidden', 'true');
+          descendantUl.classList.remove(this.settings.menuHoverClass);
+          descendantUl.closest('li')?.querySelector(':scope > [aria-expanded]')?.setAttribute('aria-expanded', 'false');
+        });
+      };
+
+      if (open) {
+        // close only sibling branches at the same level, keep ancestor branch open
+        const parentUl = target?.closest('ul');
+        const siblingItems = parentUl?.querySelectorAll(':scope > li');
+        siblingItems?.forEach((siblingItem) => {
+          if (siblingItem === target) {
+            return;
+          }
+          siblingItem.querySelectorAll(':scope > ul').forEach((ulChild) => {
+            closeSubMenuTree(ulChild);
+          });
+        });
+      }
+
+      if (open) {
+        subLists.forEach((ulChild) => {
+          ulChild.setAttribute('aria-hidden', 'false');
+          ulChild.classList.add(this.settings.menuHoverClass);
+        });
+      } else {
+        subLists.forEach(closeSubMenuTree);
+      }
+      target.querySelector(':scope > [aria-expanded]')?.setAttribute('aria-expanded', open ? 'true' : 'false');
+    }
+
+    focusTabbable(direction = 1) {
+      const tabbables = Array.from(this.nav.querySelectorAll('[tabindex]:not([tabindex="-1"]), a, button'))
+        .filter((el) => !el.disabled && el.tabIndex >= 0 && el.offsetParent !== null);
+      const currentIndex = tabbables.indexOf(document.activeElement);
+      if (tabbables.length === 0) return;
+      const nextIndex = (currentIndex + direction + tabbables.length) % tabbables.length;
+      tabbables[nextIndex].focus();
+    }
+
+    tabNext() {
+      this.focusTabbable(1);
+    }
+
+    tabPrev() {
+      this.focusTabbable(-1);
+    }
+
+    getTopLevelParentLi(element) {
+      let currentLi = element.closest('li');
+      // this.topLevelNodes is a NodeList of top-level li elements in this nav
+      while (currentLi && !Array.from(this.topLevelNodes).includes(currentLi)) {
+        const parentUl = currentLi.parentElement.closest('ul');
+        currentLi = parentUl ? parentUl.closest('li') : null;
+      }
+      return currentLi; // top-level li or null if not found, or the
+    }
+
+    toggleAllForCurrentActive() {
+      const active = this.nav.querySelector('.current.active');
+      if (active) {
+        let currentLi = active;
+        while (currentLi && !Array.from(this.topLevelNodes).includes(currentLi)) {
+          const parentUl = currentLi.parentElement.closest('ul');
+          currentLi = parentUl ? parentUl.closest('li') : null;
+          if (currentLi) {
+            const subLists = currentLi.querySelectorAll(':scope > ul');
+            this.toggleSubMenu(currentLi, subLists, subLists[0]?.getAttribute('aria-hidden') === 'true');
+          }
+        }
+      }
+    }
+  }
+
+  // static idCounter for unique id generation of submenus
+  Nav.idCounter = 0;
+
+  // Initialize Nav instances for all nav elements on the page
+  document.addEventListener('DOMContentLoaded', () => {
+    document.querySelectorAll('.nav').forEach((nav) => new Nav(nav));
+  });
+})();
diff --git a/build/media_source/mod_quickicon/js/quickicon.es6.js b/media_source/mod_quickicon/js/quickicon.es6.js
similarity index 96%
rename from build/media_source/mod_quickicon/js/quickicon.es6.js
rename to media_source/mod_quickicon/js/quickicon.es6.js
index a071955e23e3b..f8214e197ef0c 100644
--- a/build/media_source/mod_quickicon/js/quickicon.es6.js
+++ b/media_source/mod_quickicon/js/quickicon.es6.js
@@ -22,7 +22,7 @@ document.querySelectorAll('.quickicon').forEach((quickicon) => {
     Joomla.request({
       url: counter.dataset.url,
       method: 'GET',
-      onSuccess: ((resp) => {
+      onSuccess: (resp) => {
         let response;
         try {
           response = JSON.parse(resp);
@@ -53,10 +53,10 @@ document.querySelectorAll('.quickicon').forEach((quickicon) => {
         } else {
           quickicon.classList.add('error');
         }
-      }),
-      onError: (() => {
+      },
+      onError: () => {
         quickicon.classList.add('error');
-      }),
+      },
     });
   }
 });
diff --git a/build/media_source/mod_sampledata/js/sampledata-process.es6.js b/media_source/mod_sampledata/js/sampledata-process.es6.js
similarity index 100%
rename from build/media_source/mod_sampledata/js/sampledata-process.es6.js
rename to media_source/mod_sampledata/js/sampledata-process.es6.js
diff --git a/build/media_source/plg_behaviour_compat/removed.asset.json b/media_source/plg_behaviour_compat6/removed.asset.json
similarity index 50%
rename from build/media_source/plg_behaviour_compat/removed.asset.json
rename to media_source/plg_behaviour_compat6/removed.asset.json
index 2255caad1a967..a437b9ff22664 100644
--- a/build/media_source/plg_behaviour_compat/removed.asset.json
+++ b/media_source/plg_behaviour_compat6/removed.asset.json
@@ -1,15 +1,28 @@
 {
   "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
-  "name": "plg_behaviour_compat",
-  "version": "5.0.0",
+  "name": "plg_behaviour_compat6",
+  "version": "6.0.0",
   "description": "Joomla CMS Removed Assets b/c entries, the entries are only placeholders without functionality.",
   "license": "GPL-2.0-or-later",
   "assets": [
     {
-      "name": "com_scheduler.admin-view-select-task-css",
+      "name": "wcpolyfill",
+      "type": "script",
+      "uri": ""
+    },
+    {
+      "name": "chosen",
       "type": "style",
-      "deprecated": true,
       "uri": ""
+    },
+    {
+      "name": "chosen",
+      "type": "script",
+      "uri": ""
+    },
+    {
+      "name": "chosen",
+      "type": "preset"
     }
   ]
 }
diff --git a/build/media_source/plg_content_vote/css/rating.css b/media_source/plg_content_vote/css/rating.css
similarity index 100%
rename from build/media_source/plg_content_vote/css/rating.css
rename to media_source/plg_content_vote/css/rating.css
diff --git a/build/media_source/plg_content_vote/images/vote-star-half.svg b/media_source/plg_content_vote/images/vote-star-half.svg
similarity index 100%
rename from build/media_source/plg_content_vote/images/vote-star-half.svg
rename to media_source/plg_content_vote/images/vote-star-half.svg
diff --git a/build/media_source/plg_content_vote/images/vote-star.svg b/media_source/plg_content_vote/images/vote-star.svg
similarity index 100%
rename from build/media_source/plg_content_vote/images/vote-star.svg
rename to media_source/plg_content_vote/images/vote-star.svg
diff --git a/build/media_source/plg_editors-xtd_image/js/button-image.es6.js b/media_source/plg_editors-xtd_image/js/button-image.es6.js
similarity index 100%
rename from build/media_source/plg_editors-xtd_image/js/button-image.es6.js
rename to media_source/plg_editors-xtd_image/js/button-image.es6.js
diff --git a/media_source/plg_editors-xtd_image/js/media-filepicker.es6.js b/media_source/plg_editors-xtd_image/js/media-filepicker.es6.js
new file mode 100644
index 0000000000000..92dff70f2f687
--- /dev/null
+++ b/media_source/plg_editors-xtd_image/js/media-filepicker.es6.js
@@ -0,0 +1,135 @@
+/**
+ * @copyright  (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+import JoomlaDialog from 'joomla.dialog';
+
+if (!window.Joomla) {
+  throw new Error('Joomla API is not properly initiated');
+}
+
+const { apiBaseUrl } = Joomla.getOptions('media-picker-api', {});
+if (!apiBaseUrl) {
+  throw new Error('The "media-picker-api" script option is required');
+}
+
+/**
+ * Resolve the real, root-relative URL for the currently selected media file.
+ *
+ * @param {object} item  The selected media file (Joomla.selectedMediaFile)
+ *
+ * @returns {Promise<{url: string, width: number, height: number}|null>}
+ */
+const resolveUrl = (item) => {
+  const url = new URL(apiBaseUrl, window.location.origin);
+  url.searchParams.append('task', 'api.files');
+  url.searchParams.append('url', true);
+  url.searchParams.append('path', item.path);
+  url.searchParams.append('mediatypes', '0,1,2,3');
+  url.searchParams.append(Joomla.getOptions('csrf.token'), 1);
+
+  return fetch(url, {
+    method: 'GET',
+    headers: { 'Content-Type': 'application/json' },
+  })
+    .then((response) => response.json())
+    .then((response) => {
+      if (!response.success || !response.data || !response.data[0] || !response.data[0].url) {
+        return null;
+      }
+
+      const media = response.data[0];
+      const { rootFull } = Joomla.getOptions('system.paths', {});
+      const parts = rootFull ? media.url.split(rootFull) : [media.url];
+      const relativeUrl = parts.length > 1 ? parts[1] : media.url;
+
+      return {
+        url: relativeUrl,
+        width: item.width,
+        height: item.height,
+      };
+    });
+};
+
+/**
+ * Open the Joomla Media Manager and resolve with the selected file's URL.
+ *
+ * Designed to be consumed by TinyMCE's file_picker_callback, but usable by
+ * any editor that needs a plain media URL.
+ *
+ * @param {{filetype?: string}} meta  The TinyMCE file picker meta object
+ *
+ * @returns {Promise<{url: string, alt?: string, width: number, height: number}|null>}
+ */
+Joomla.editorMediaPicker = (meta = {}) => new Promise((resolve) => {
+  // Restrict the media manager to the relevant types (images=0, audios=1, videos=2, documents=3)
+  const mediatypes = meta.filetype === 'image' ? '0' : '1,2';
+
+  Joomla.selectedMediaFile = {};
+
+  // Ensure the promise resolves exactly once, whether the user selects or dismisses
+  let settled = false;
+  const settle = (value) => {
+    if (settled) {
+      return;
+    }
+    settled = true;
+    resolve(value);
+  };
+
+  const dialog = new JoomlaDialog({
+    popupType: 'iframe',
+    src: `index.php?option=com_media&view=media&tmpl=component&mediatypes=${mediatypes}`,
+    textHeader: Joomla.Text._('PLG_IMAGE_BUTTON_IMAGE'),
+    popupButtons: [
+      {
+        label: Joomla.Text._('JSELECT'),
+        className: 'button button-success btn btn-success',
+        location: 'header',
+        onClick: async () => {
+          const item = Joomla.selectedMediaFile;
+          let result = null;
+
+          if (item && item.path && item.type === 'file') {
+            try {
+              result = await resolveUrl(item);
+            } catch (err) {
+              result = null;
+            }
+          }
+
+          settle(result);
+          Joomla.selectedMediaFile = {};
+          dialog.close();
+        },
+      },
+      {
+        label: '',
+        ariaLabel: Joomla.Text._('JCLOSE'),
+        className: 'button-close btn-close',
+        data: { buttonClose: '', dialogClose: '' },
+        location: 'header',
+      },
+    ],
+  });
+
+  // Skip the extra alt/lazy attribute UI injected by joomla-media-select; TinyMCE has its own fields
+  dialog.classList.add('joomla-dialog-media-field');
+
+  dialog.addEventListener('joomla-dialog:close', () => {
+    Joomla.Modal.setCurrent(null);
+    dialog.destroy();
+    Joomla.selectedMediaFile = {};
+
+    // Resolve null when the dialog is dismissed without a selection
+    settle(null);
+  });
+
+  Joomla.Modal.setCurrent(dialog);
+  dialog.show();
+});
+
+Joomla.editorFilePickers = Joomla.editorFilePickers || {};
+Joomla.editorFilePickers.image = Joomla.editorMediaPicker;
+Joomla.editorFilePickers.media = Joomla.editorMediaPicker;
diff --git a/media_source/plg_editors_codemirror/builder.mjs b/media_source/plg_editors_codemirror/builder.mjs
new file mode 100644
index 0000000000000..51f9d372afda4
--- /dev/null
+++ b/media_source/plg_editors_codemirror/builder.mjs
@@ -0,0 +1,122 @@
+/**
+ * Assets Builder
+ */
+
+import path from 'node:path';
+import fsp from 'node:fs/promises';
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import DefaultModuleBuilder from '../../build/build-modules-js/builder/default-module-builder.mjs';
+import { resolvePackageFile, getPackagesUnderScope } from '../../build/build-modules-js/utils/resolve-package.mjs';
+import { handleMJSFile } from '../../build/build-modules-js/javascript/js-handle.mjs';
+
+/**
+ * Update joomla.asset.json for codemirror
+ *
+ * @param { [['module', 'path']] } modules
+ * @param { string[] }externalModules
+ * @param { string } basePath
+ * @param { string } targetPath
+ * @return {Promise<void>}
+ */
+const updateAssetRegistry = async (modules, externalModules, basePath, targetPath) => {
+  const srcPath = path.join(basePath, 'joomla.asset.json');
+  const destPath = path.join(targetPath, 'joomla.asset.json');
+  const require = createRequire(import.meta.url);
+
+  // Get base JSON and update
+  const registry = JSON.parse(fs.readFileSync(srcPath, { encoding: 'utf8' }));
+
+  // Add dependencies to base codemirror asset
+  registry.assets.forEach((asset) => {
+    if (asset.name === 'codemirror' && asset.type === 'script') {
+      asset.dependencies = externalModules;
+    }
+  });
+
+  // Create asset for each module
+  modules.forEach(([module, modulePath]) => {
+    const modulePathJson = resolvePackageFile(path.join(module, 'package.json'));
+    const moduleOptions = require(modulePathJson);
+    const asset = {
+      type: 'script',
+      name: module,
+      uri: modulePath.replace('.js', '.min.js').replace(/\\/g, '/'),
+      importmap: true,
+      version: moduleOptions.version,
+    };
+
+    registry.assets.push(asset);
+  });
+
+  // Write assets registry
+  return fsp.writeFile(destPath, JSON.stringify(registry, null, 2), { encoding: 'utf8', mode: 0o644 });
+};
+
+/**
+ * Copy/Prepare Codemirror modules
+ * @param { string } basePath
+ * @param { string } targetPath
+ * @return {Promise<void>}
+ */
+const compileCodemirror = async (basePath, targetPath) => {
+  const cmModules = getPackagesUnderScope('@codemirror');
+  const lModules = getPackagesUnderScope('@lezer');
+  const externalModules = [...cmModules, ...lModules];
+  const destBasePath = 'media/vendor/codemirror/js';
+  const tasks = [];
+  const modules = [];
+
+  // Collect @codemirror modules
+  cmModules.forEach((module) => {
+    const destFile = `${module.replace('@codemirror/', 'codemirror-')}.js`;
+    const destPath = path.join(destBasePath, destFile);
+
+    modules.push([module, destPath]);
+  });
+
+  // Collect @lezer modules which @codemirror depends on
+  lModules.forEach((module) => {
+    const destFile = `${module.replace('@lezer/', 'lezer-')}.js`;
+    const destPath = path.join(destBasePath, destFile);
+
+    modules.push([module, destPath]);
+  });
+
+  // Copy/Compile the modules
+  modules.forEach(([module, destPath]) => {
+    tasks.push(handleMJSFile(module, destPath));
+  });
+
+  return Promise.all(tasks).then(() => {
+    return updateAssetRegistry(modules, externalModules, basePath, targetPath);
+  });
+};
+
+export default class CodemirrorModuleBuilder extends DefaultModuleBuilder {
+  /**
+   * Remove files associated with the builder
+   * @returns { Promise }
+   */
+  async clear() {
+    await super.clear();
+
+    const vendorPath = 'media/vendor/codemirror/js';
+
+    if (!fs.existsSync(vendorPath)) {
+      return;
+    }
+
+    return fsp.rm(vendorPath, { recursive: true });
+  }
+
+  /**
+   * Process JavaScript files and Modules
+   * @returns { Promise }
+   */
+  async js() {
+    await super.js();
+
+    return compileCodemirror(this.basePath, this.targetPath);
+  }
+};
diff --git a/build/media_source/plg_editors_codemirror/css/codemirror.css b/media_source/plg_editors_codemirror/css/codemirror.css
similarity index 100%
rename from build/media_source/plg_editors_codemirror/css/codemirror.css
rename to media_source/plg_editors_codemirror/css/codemirror.css
diff --git a/build/media_source/plg_editors_codemirror/joomla.asset.json b/media_source/plg_editors_codemirror/joomla.asset.json
similarity index 95%
rename from build/media_source/plg_editors_codemirror/joomla.asset.json
rename to media_source/plg_editors_codemirror/joomla.asset.json
index 7832390700e09..b9c84925429d9 100644
--- a/build/media_source/plg_editors_codemirror/joomla.asset.json
+++ b/media_source/plg_editors_codemirror/joomla.asset.json
@@ -23,8 +23,7 @@
       "dependencies": [
         "core",
         "codemirror",
-        "editors",
-        "wcpolyfill"
+        "editors"
       ],
       "attributes": {
         "type": "module"
diff --git a/build/media_source/plg_editors_codemirror/js/codemirror.es6.js b/media_source/plg_editors_codemirror/js/codemirror.es6.js
similarity index 99%
rename from build/media_source/plg_editors_codemirror/js/codemirror.es6.js
rename to media_source/plg_editors_codemirror/js/codemirror.es6.js
index 1817332519e3e..705dfed3cadd3 100644
--- a/build/media_source/plg_editors_codemirror/js/codemirror.es6.js
+++ b/media_source/plg_editors_codemirror/js/codemirror.es6.js
@@ -24,12 +24,12 @@ import { highlightSelectionMatches, searchKeymap } from '@codemirror/search';
 import { closeBrackets } from '@codemirror/autocomplete';
 import { oneDark } from '@codemirror/theme-one-dark';
 
-const minimalSetup = (() => [
+const minimalSetup = () => [
   highlightSpecialChars(),
   history(),
   drawSelection(),
   syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
-]);
+];
 
 /**
  * Configure and return list of extensions for given options
diff --git a/build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js b/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js
similarity index 100%
rename from build/media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js
rename to media_source/plg_editors_codemirror/js/joomla-editor-codemirror.w-c.es6.js
diff --git a/build/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js b/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js
similarity index 95%
rename from build/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js
rename to media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js
index 680e761571c9f..41417d3b3ba66 100644
--- a/build/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js
+++ b/media_source/plg_editors_none/js/joomla-editor-none.w-c.es6.js
@@ -151,9 +151,10 @@ class JoomlaEditorNone extends HTMLElement {
   childrenChange() {
     // Ensure the first child is an input with a textarea type.
     if (this.firstElementChild
-            && this.firstElementChild.tagName
-            && this.firstElementChild.tagName.toLowerCase() === 'textarea'
-            && this.firstElementChild.getAttribute('id')) {
+      && this.firstElementChild.tagName
+      && this.firstElementChild.tagName.toLowerCase() === 'textarea'
+      && this.firstElementChild.getAttribute('id')
+    ) {
       this.editor = this.firstElementChild;
       this.unregisterEditor();
       this.registerEditor();
diff --git a/media_source/plg_editors_tinymce/builder.mjs b/media_source/plg_editors_tinymce/builder.mjs
new file mode 100644
index 0000000000000..75d81b30fb755
--- /dev/null
+++ b/media_source/plg_editors_tinymce/builder.mjs
@@ -0,0 +1,90 @@
+/**
+ * Assets Builder
+ */
+import { pathToFileURL } from 'node:url';
+import path from 'node:path';
+import fsp from 'node:fs/promises';
+import fs from 'node:fs';
+import DefaultModuleBuilder from '../../build/build-modules-js/builder/default-module-builder.mjs';
+import { resolvePackageFile } from '../../build/build-modules-js/utils/resolve-package.mjs';
+
+export default class TinyMCEModuleBuilder extends DefaultModuleBuilder {
+  /**
+   * Copy files to target location.
+   *
+   * @returns { Promise }
+   */
+  async copy() {
+    await super.copy();
+
+    const rootPath = process.cwd();
+    const modulePathJson = resolvePackageFile(path.join('tinymce', 'package.json'));
+    const moduleLngPathJson = resolvePackageFile(path.join('tinymce-i18n', 'package.json'));
+
+    // This should never happen
+    if (!modulePathJson || !moduleLngPathJson) {
+      throw new Error('Modules source for "tinymce" or for "tinymce-i18n" not found');
+    }
+
+    const tinySrcPath = path.dirname(modulePathJson);
+    const tinyVendorPath = path.join(path.dirname(this.targetPath), 'vendor', 'tinymce');
+    const moduleOptions = await import(pathToFileURL(modulePathJson).href, { with: { type: 'json' } });
+    const version = moduleOptions.default.version;
+    const majorVersion = version.split('.')[0];
+    const tinyLngSrcPath = path.join(path.dirname(moduleLngPathJson), `langs${majorVersion}`);
+
+    // Copy vendor content
+    const promises = [];
+    const filterFunc = (src, dest) => {
+      return path.basename(src) !== 'index.js';
+    };
+
+    [
+      'icons',
+      'plugins',
+      'skins',
+      'themes',
+      'models',
+      'tinymce.js',
+      'tinymce.min.js',
+      'CHANGELOG.md',
+      'license.md',
+    ].forEach((folder) => {
+      promises.push(fsp.cp(
+        path.join(tinySrcPath, folder),
+        path.join(tinyVendorPath, folder),
+        { preserveTimestamps: true, recursive: true, filter: filterFunc },
+      ));
+    });
+
+    // Copy translation files
+    if (fs.existsSync(tinyLngSrcPath)) {
+      promises.push(fsp.cp(
+        tinyLngSrcPath,
+        path.join(tinyVendorPath, 'langs'),
+        { preserveTimestamps: true, recursive: true },
+      ));
+    }
+
+    // Update the XML file for tinyMCE
+    const xmlVersionStr = /(<version>)(.+)(<\/version>)/;
+    const xmlPath = path.join(rootPath, '/plugins/editors/tinymce/tinymce.xml');
+    const xmlPromise = fsp.readFile(xmlPath).then((srcContent) => {
+      const content = srcContent.toString().replace(xmlVersionStr, `$1${version}$3`);
+      return fsp.writeFile(xmlPath, content, { encoding: 'utf8', mode: 0o644 });
+    });
+    promises.push(xmlPromise);
+
+    // Copy Joomla template snippets which is in vendor folder
+    // @TODO: the templates should be under plugin folder for better consistency?
+    const tmplSrcPath = path.join(path.dirname(this.basePath), 'vendor', 'tinymce', 'templates');
+    const tmplTargetPath = path.join(tinyVendorPath, 'templates');
+    promises.push(fsp.cp(
+      tmplSrcPath,
+      tmplTargetPath,
+      { preserveTimestamps: true, recursive: true },
+    ));
+
+    return Promise.all(promises);
+  }
+};
diff --git a/media_source/plg_editors_tinymce/css/linkpicker.css b/media_source/plg_editors_tinymce/css/linkpicker.css
new file mode 100644
index 0000000000000..2e8fd566249e3
--- /dev/null
+++ b/media_source/plg_editors_tinymce/css/linkpicker.css
@@ -0,0 +1,50 @@
+/**
+ * @copyright  (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+.editor-link-picker {
+  display: flex;
+  block-size: 100%;
+  min-block-size: 60vh;
+}
+
+.editor-link-picker-nav {
+  flex: 0 0 220px;
+  overflow: auto;
+  border-inline-end: 1px solid var(--border-color, #dee2e6);
+}
+
+.editor-link-picker-frame {
+  position: relative;
+  flex: 1 1 auto;
+}
+
+.editor-link-picker-frame iframe {
+  inline-size: 100%;
+  block-size: 100%;
+  border: 0;
+}
+
+.editor-link-picker-item {
+  display: flex;
+  gap: .5rem;
+  align-items: center;
+  inline-size: 100%;
+  padding: .5rem .75rem;
+  text-align: start;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+}
+
+/* Translucent grays read on both light and dark backgrounds */
+.editor-link-picker-item:hover,
+.editor-link-picker-item:focus-visible {
+  background: rgba(127, 127, 127, .15);
+}
+
+.editor-link-picker-item.active {
+  font-weight: 600;
+  background: rgba(127, 127, 127, .25);
+}
diff --git a/build/media_source/plg_editors_tinymce/joomla.asset.json b/media_source/plg_editors_tinymce/joomla.asset.json
similarity index 59%
rename from build/media_source/plg_editors_tinymce/joomla.asset.json
rename to media_source/plg_editors_tinymce/joomla.asset.json
index 08c1999f25612..bc73d4e241a5a 100644
--- a/build/media_source/plg_editors_tinymce/joomla.asset.json
+++ b/media_source/plg_editors_tinymce/joomla.asset.json
@@ -49,6 +49,33 @@
         "tinymce"
       ]
     },
+    {
+      "name": "plg_editors_tinymce.jfilepicker",
+      "type": "script",
+      "uri": "plg_editors_tinymce/plugins/filepicker/plugin.min.js",
+      "attributes": {
+        "type": "module"
+      },
+      "dependencies": [
+        "tinymce"
+      ]
+    },
+    {
+      "name": "plg_editors_tinymce.linkpicker",
+      "type": "style",
+      "uri": "plg_editors_tinymce/linkpicker.min.css"
+    },
+    {
+      "name": "plg_editors_tinymce.linkpicker",
+      "type": "script",
+      "uri": "plg_editors_tinymce/linkpicker.min.js",
+      "attributes": {
+        "type": "module"
+      },
+      "dependencies": [
+        "joomla.dialog"
+      ]
+    },
     {
       "name": "plg_editors_tinymce.jtemplate",
       "type": "script",
@@ -70,6 +97,28 @@
       "dependencies": [
         "tinymce"
       ]
+    },
+    {
+      "name": "plg_editors_tinymce.abbr",
+      "type": "script",
+      "uri": "plg_editors_tinymce/plugins/abbr/plugin.min.js",
+      "attributes": {
+        "type": "module"
+      },
+      "dependencies": [
+        "tinymce"
+      ]
+    },
+    {
+      "name": "plg_editors_tinymce.readmore",
+      "type": "script",
+      "uri": "plg_editors_tinymce/plugins/readmore/plugin.min.js",
+      "attributes": {
+        "type": "module"
+      },
+      "dependencies": [
+        "tinymce"
+      ]
     }
   ]
 }
diff --git a/media_source/plg_editors_tinymce/js/linkpicker.es6.js b/media_source/plg_editors_tinymce/js/linkpicker.es6.js
new file mode 100644
index 0000000000000..5e77dd7dacbb0
--- /dev/null
+++ b/media_source/plg_editors_tinymce/js/linkpicker.es6.js
@@ -0,0 +1,253 @@
+/**
+ * @copyright  (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+import JoomlaDialog from 'joomla.dialog';
+
+/**
+ * Build the list of link sources: the registered content providers
+ * (editor-link-providers) plus a built-in Media source (core com_media).
+ *
+ * @returns {Array<{key: string, title: string, icon: string, src: string, select: string}>}
+ */
+const getSources = () => {
+  const providers = Joomla.getOptions('editor-link-providers', {});
+  const sources = Object.keys(providers).map((key) => ({ key, ...providers[key] }));
+
+  // Built-in Media source: link to any file through the Media Manager
+  sources.push({
+    key: 'media',
+    title: Joomla.Text._('PLG_TINY_LINK_MEDIA'),
+    icon: 'pictures',
+    src: 'index.php?option=com_media&view=media&tmpl=component&mediatypes=0,1,2,3',
+    select: 'media',
+  });
+
+  return sources;
+};
+
+/**
+ * Append the CSRF token to a source URL.
+ *
+ * @param {string} src
+ *
+ * @returns {string}
+ */
+const buildSrc = (src) => {
+  let url;
+  if (src.indexOf('http') === 0) {
+    url = new URL(src);
+  } else {
+    // Prepend the app base (Uri::base(true)) so it works in a subfolder install
+    const base = Joomla.getOptions('system.paths', {}).base || '';
+    const path = src.charAt(0) === '/' ? src : `${base}/${src}`;
+    url = new URL(path, window.location.origin);
+  }
+  url.searchParams.set(Joomla.getOptions('csrf.token', ''), '1');
+  return url.toString();
+};
+
+/**
+ * Resolve the root-relative URL for a selected media file via the com_media files API.
+ *
+ * @param {string} path
+ *
+ * @returns {Promise<string|null>}
+ */
+const resolveMediaUrl = (path) => {
+  const base = Joomla.getOptions('system.paths', {}).base || '';
+  const url = new URL(`${base}/index.php?option=com_media&format=json`, window.location.origin);
+  url.searchParams.append('task', 'api.files');
+  url.searchParams.append('url', 'true');
+  url.searchParams.append('path', path);
+  url.searchParams.append('mediatypes', '0,1,2,3');
+  url.searchParams.append(Joomla.getOptions('csrf.token', ''), '1');
+
+  return fetch(url, { headers: { 'Content-Type': 'application/json' } })
+    .then((response) => response.json())
+    .then((response) => {
+      if (!response.success || !response.data || !response.data[0] || !response.data[0].url) {
+        return null;
+      }
+      const { rootFull } = Joomla.getOptions('system.paths', {});
+      const parts = rootFull ? response.data[0].url.split(rootFull) : [response.data[0].url];
+      return parts.length > 1 ? parts[1] : response.data[0].url;
+    });
+};
+
+/**
+ * Open the two-pane link picker (left = sources, right = item iframe) and resolve
+ * with the chosen link URL and default text, or null when dismissed.
+ *
+ * @returns {Promise<{url: string, text: string}|null>}
+ */
+const openLinkPicker = () => new Promise((resolve) => {
+  const sources = getSources();
+
+  if (!sources.length) {
+    resolve(null);
+    return;
+  }
+
+  // Resolve exactly once, whether the user selects or dismisses
+  let settled = false;
+  const settle = (value) => {
+    if (settled) {
+      return;
+    }
+    settled = true;
+    resolve(value);
+  };
+
+  let activeSource;
+  let mediaSelection = null;
+  let dialog;
+  let selectBtnEl;
+
+  // Media source: the manager dispatches onMediaFileSelected to the parent document
+  const onMediaFileSelected = (event) => {
+    mediaSelection = event.detail && event.detail.path ? event.detail : null;
+  };
+
+  // Content sources: the modal posts the selection to the parent window
+  const msgListener = (event) => {
+    if (event.origin !== window.location.origin || !event.data || typeof event.data !== 'object') {
+      return;
+    }
+    if (event.data.messageType === 'joomla:content-select') {
+      settle({ url: event.data.uri, text: event.data.title || '' });
+      dialog.close();
+    } else if (event.data.messageType === 'joomla:cancel') {
+      dialog.close();
+    }
+  };
+
+  // Layout, styled by linkpicker.css
+  const container = document.createElement('div');
+  container.className = 'editor-link-picker';
+
+  const nav = document.createElement('nav');
+  nav.className = 'editor-link-picker-nav';
+
+  const frameWrap = document.createElement('div');
+  frameWrap.className = 'editor-link-picker-frame';
+
+  const iframe = document.createElement('iframe');
+  iframe.title = Joomla.Text._('PLG_TINY_LINK_PICKER_TITLE');
+  frameWrap.appendChild(iframe);
+
+  // Modals skip the template JS, so mirror the parent's effective color scheme onto the
+  // modal document (same-origin) to keep the iframe in sync with dark/light mode.
+  const applyColorScheme = () => {
+    const parentEl = document.documentElement;
+    let scheme = parentEl.dataset.colorScheme;
+    if (!scheme && 'colorSchemeOs' in parentEl.dataset) {
+      scheme = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+    }
+    if (!scheme) {
+      return;
+    }
+    try {
+      const idoc = iframe.contentDocument;
+      if (idoc && idoc.documentElement) {
+        idoc.documentElement.dataset.colorScheme = scheme;
+        idoc.documentElement.dataset.bsTheme = scheme;
+      }
+    } catch (err) {
+      // Cross-origin document — cannot adjust, ignore
+    }
+  };
+  iframe.addEventListener('load', applyColorScheme);
+
+  container.appendChild(nav);
+  container.appendChild(frameWrap);
+
+  const loadSource = (source) => {
+    activeSource = source;
+    mediaSelection = null;
+
+    nav.querySelectorAll('button').forEach((btn) => {
+      btn.classList.toggle('active', btn.dataset.key === source.key);
+    });
+
+    // A confirm button only makes sense for the media source; content selects on row click
+    if (selectBtnEl) {
+      selectBtnEl.hidden = source.select !== 'media';
+    }
+
+    iframe.src = buildSrc(source.src);
+  };
+
+  sources.forEach((source) => {
+    const btn = document.createElement('button');
+    btn.type = 'button';
+    btn.dataset.key = source.key;
+    btn.className = 'editor-link-picker-item';
+    btn.innerHTML = `<span class="icon-${source.icon}" aria-hidden="true"></span><span class="editor-link-picker-item-label"></span>`;
+    btn.querySelector('.editor-link-picker-item-label').textContent = source.title;
+    btn.addEventListener('click', () => loadSource(source));
+    nav.appendChild(btn);
+  });
+
+  const popupButtons = [
+    {
+      label: Joomla.Text._('JSELECT'),
+      className: 'button button-success btn btn-success btn-sm js-link-picker-select',
+      location: 'header',
+      onClick: async () => {
+        if (!activeSource || activeSource.select !== 'media' || !mediaSelection) {
+          return;
+        }
+        const mediaUrl = await resolveMediaUrl(mediaSelection.path);
+        if (mediaUrl) {
+          settle({ url: mediaUrl, text: decodeURIComponent(mediaUrl.split('/').pop()) });
+          dialog.close();
+        }
+      },
+    },
+    {
+      label: '',
+      ariaLabel: Joomla.Text._('JCLOSE'),
+      className: 'button-close btn-close',
+      data: { buttonClose: '', dialogClose: '' },
+      location: 'header',
+    },
+  ];
+
+  // Attach to the DOM so JoomlaDialog can move/restore the inline content safely
+  document.body.appendChild(container);
+
+  dialog = new JoomlaDialog({
+    popupType: 'inline',
+    popupContent: container,
+    textHeader: Joomla.Text._('PLG_TINY_LINK_PICKER_TITLE'),
+    popupButtons,
+  });
+  dialog.classList.add('editor-link-picker-dialog');
+
+  dialog.addEventListener('joomla-dialog:close', () => {
+    window.removeEventListener('message', msgListener);
+    document.removeEventListener('onMediaFileSelected', onMediaFileSelected);
+    delete window.JoomlaExpectingPostMessage;
+    dialog.destroy();
+    if (container.parentElement) {
+      container.remove();
+    }
+    settle(null);
+  });
+
+  // Disable the legacy jSelect* insertion in the content modals; we use postMessage
+  window.JoomlaExpectingPostMessage = true;
+  window.addEventListener('message', msgListener);
+  document.addEventListener('onMediaFileSelected', onMediaFileSelected);
+
+  dialog.show();
+
+  selectBtnEl = dialog.querySelector('.js-link-picker-select');
+  loadSource(sources[0]);
+});
+
+// Register as the 'file' picker (the link dialog) in the shared editor file-picker registry
+Joomla.editorFilePickers = Joomla.editorFilePickers || {};
+Joomla.editorFilePickers.file = openLinkPicker;
diff --git a/media_source/plg_editors_tinymce/js/plugins/abbr/plugin.es6.js b/media_source/plg_editors_tinymce/js/plugins/abbr/plugin.es6.js
new file mode 100644
index 0000000000000..5b1895ffb0e91
--- /dev/null
+++ b/media_source/plg_editors_tinymce/js/plugins/abbr/plugin.es6.js
@@ -0,0 +1,115 @@
+tinymce.PluginManager.add('abbr', function (editor) {
+  function getCurrentAbbr() {
+    const node = editor.selection.getNode();
+    return editor.dom.getParent(node, 'abbr');
+  }
+
+  function openDialog() {
+    const abbr = getCurrentAbbr();
+    const selectedText = abbr
+      ? abbr.innerText
+      : editor.selection.getContent({ format: 'text' });
+
+    if (!selectedText) {
+      editor.notificationManager.open({
+        text: Joomla.Text._('PLG_TINY_ABBREVIATION_WARNING_NO_SELECTION'),
+        type: 'warning',
+      });
+      return;
+    }
+
+    editor.windowManager.open({
+      title: abbr ? Joomla.Text._('PLG_TINY_ABBREVIATION_EDIT') : Joomla.Text._('PLG_TINY_ABBREVIATION_INSERT'),
+
+      initialData: {
+        title: abbr ? abbr.getAttribute('title') || '' : '',
+      },
+
+      body: {
+        type: 'panel',
+        items: [
+          {
+            type: 'input',
+            name: 'title',
+            label: Joomla.Text._('PLG_TINY_ABBREVIATION_DESCRIPTION_LABEL'),
+            placeholder: 'e.g. Web Content Accessibility Guidelines',
+          },
+        ],
+      },
+      buttons: [
+        { type: 'cancel', text: 'Cancel' },
+        {
+          type: 'submit',
+          text: abbr ? 'Update' : 'Insert',
+          primary: true,
+        },
+      ],
+      onSubmit(api) {
+        const data = api.getData();
+
+        if (!data.title) {
+          editor.notificationManager.open({
+            text: Joomla.Text._('PLG_TINY_ABBREVIATION_WARNING_NO_DESCRIPTION'),
+            type: 'warning',
+          });
+          return;
+        }
+
+        if (abbr) {
+          editor.dom.setAttrib(abbr, 'title', data.title);
+        } else {
+          editor.insertContent(
+            `<abbr title="${editor.dom.encode(data.title)}">${editor.dom.encode(selectedText)}</abbr>`,
+          );
+        }
+
+        api.close();
+      },
+    });
+  }
+
+  function removeAbbr() {
+    const abbr = getCurrentAbbr();
+
+    if (!abbr) {
+      editor.notificationManager.open({
+        text: Joomla.Text._('PLG_TINY_ABBREVIATION_WARNING_REMOVE'),
+        type: 'warning',
+      });
+      return;
+    }
+
+    // Replace <abbr> with its inner content
+    const content = abbr.innerHTML;
+    editor.dom.replace(editor.dom.createFragment(content), abbr);
+  }
+
+  /* icons */
+  editor.ui.registry.addIcon('abbr', '<svg height="24" width="24"><path d="M5 8a1 1 0 0 0 2 0V7h1a1 1 0 0 0 0-2H7V4a1 1 0 0 0-2 0v1H4a1 1 0 0 0 0 2h1Zm13-3h-6a1 1 0 0 0 0 2h6a1 1 0 0 1 1 1v9.72l-1.57-1.45a1 1 0 0 0-.68-.27H8a1 1 0 0 1-1-1v-3a1 1 0 0 0-2 0v3a3 3 0 0 0 3 3h8.36l3 2.73A1 1 0 0 0 20 21a1.1 1.1 0 0 0 .4-.08A1 1 0 0 0 21 20V8a3 3 0 0 0-3-3Z"></path></svg>');
+
+  editor.ui.registry.addIcon('abbr_remove', '<svg height="24" width="24"><path d="M19,6H15a1,1,0,0,0,0,2h4a1,1,0,0,1,1,1v9.72l-1.57-1.45a1,1,0,0,0-.68-.27H9a1,1,0,0,1-1-1V15a1,1,0,0,0-2,0v1a3,3,0,0,0,3,3h8.36l3,2.73A1,1,0,0,0,21,22a1.1,1.1,0,0,0,.4-.08A1,1,0,0,0,22,21V9A3,3,0,0,0,19,6Zm-8.46,4.54A5,5,0,1,0,7,12,5,5,0,0,0,10.54,10.54ZM4,7A3,3,0,0,1,7,4a3,3,0,0,1,1.28.3l-4,4A3,3,0,0,1,4,7ZM9.7,5.71A3,3,0,0,1,10,7,3,3,0,0,1,5.72,9.7Z"></path></svg>');
+
+  /* Buttons */
+  editor.ui.registry.addButton('abbr', {
+    title: 'Abbr',
+    icon: 'abbr',
+    tooltip: Joomla.Text._('PLG_TINY_TOOLBAR_BUTTON_ABBREVIATION'),
+    onAction: openDialog,
+  });
+
+  editor.ui.registry.addButton('abbr_remove', {
+    title: 'Remove Abbr',
+    icon: 'abbr_remove',
+    tooltip: Joomla.Text._('PLG_TINY_TOOLBAR_BUTTON_REMOVE_ABBREVIATION'),
+    onAction: removeAbbr,
+  });
+
+  return {
+    getMetadata() {
+      return {
+        name: 'Abbreviation Plugin (Joomla)',
+        url: 'https://www.joomla.org',
+      };
+    },
+  };
+});
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js b/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js
similarity index 100%
rename from build/media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js
rename to media_source/plg_editors_tinymce/js/plugins/dragdrop/plugin.es6.js
diff --git a/media_source/plg_editors_tinymce/js/plugins/filepicker/plugin.es6.js b/media_source/plg_editors_tinymce/js/plugins/filepicker/plugin.es6.js
new file mode 100644
index 0000000000000..4817b523a3832
--- /dev/null
+++ b/media_source/plg_editors_tinymce/js/plugins/filepicker/plugin.es6.js
@@ -0,0 +1,56 @@
+/**
+ * @copyright  (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+/**
+ * Connects the "browse" button of TinyMCE's image, media and link dialogs to Joomla pickers
+ * registered on Joomla.editorFilePickers. The dialog filetypes are 'image', 'media' and 'file'
+ * (the link dialog).
+ *
+ * Register a picker for all editors, keyed by filetype:
+ *   Joomla.editorFilePickers.image = (meta) => Promise<{ url, alt?, text? } | null>;
+ * Override it for a single editor, keyed by the editor id:
+ *   Joomla.editorFilePickers[editorId] = { image: (meta) => ... };
+ *
+ * The resolved url is inserted; the image/media dialogs read { alt }, the link dialog reads
+ * { text }. The browse button is only shown for filetypes this editor can serve (global pickers
+ * plus its own overrides). A file_picker_callback or file_picker_types set by a developer on the
+ * editor options wins over this plugin.
+ */
+window.tinymce.PluginManager.add('jfilepicker', (editor) => {
+  const registry = Joomla.editorFilePickers || {};
+  const types = [...new Set([
+    ...Object.keys(registry).filter((key) => typeof registry[key] === 'function'),
+    ...Object.keys(registry[editor.id] || {}),
+  ])];
+
+  // Nothing registered, or the developer supplied their own picker: do nothing
+  if (!types.length || editor.options.isSet('file_picker_callback')) {
+    return {};
+  }
+
+  if (!editor.options.isSet('file_picker_types')) {
+    editor.options.set('file_picker_types', types.join(' '));
+  }
+
+  editor.options.set('file_picker_callback', (cb, value, meta) => {
+    const pickers = Joomla.editorFilePickers || {};
+    const picker = (pickers[editor.id] || {})[meta.filetype] || pickers[meta.filetype];
+    if (!picker) {
+      return;
+    }
+    picker(meta).then((result) => {
+      if (result && result.url) {
+        cb(result.url, { alt: result.alt || '', text: result.text || '' });
+      }
+    });
+  });
+
+  return {
+    getMetadata: () => ({
+      name: 'Joomla file picker',
+      url: 'https://www.joomla.org/',
+    }),
+  };
+});
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/joomla-highlighter/plugin.es6.js b/media_source/plg_editors_tinymce/js/plugins/joomla-highlighter/plugin.es6.js
similarity index 100%
rename from build/media_source/plg_editors_tinymce/js/plugins/joomla-highlighter/plugin.es6.js
rename to media_source/plg_editors_tinymce/js/plugins/joomla-highlighter/plugin.es6.js
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/jtemplate/plugin.es5.js b/media_source/plg_editors_tinymce/js/plugins/jtemplate/plugin.es5.js
similarity index 100%
rename from build/media_source/plg_editors_tinymce/js/plugins/jtemplate/plugin.es5.js
rename to media_source/plg_editors_tinymce/js/plugins/jtemplate/plugin.es5.js
diff --git a/build/media_source/plg_editors_tinymce/js/plugins/jxtdbuttons/plugin.es6.js b/media_source/plg_editors_tinymce/js/plugins/jxtdbuttons/plugin.es6.js
similarity index 100%
rename from build/media_source/plg_editors_tinymce/js/plugins/jxtdbuttons/plugin.es6.js
rename to media_source/plg_editors_tinymce/js/plugins/jxtdbuttons/plugin.es6.js
diff --git a/media_source/plg_editors_tinymce/js/plugins/readmore/plugin.es6.js b/media_source/plg_editors_tinymce/js/plugins/readmore/plugin.es6.js
new file mode 100644
index 0000000000000..1e65fb83fec91
--- /dev/null
+++ b/media_source/plg_editors_tinymce/js/plugins/readmore/plugin.es6.js
@@ -0,0 +1,61 @@
+/**
+ * @copyright  (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+(function () {
+  'use strict';
+
+  const READMORE_ID = 'system-readmore';
+
+  tinymce.PluginManager.add('readmore', (editor) => {
+    const hasReadMore = () => {
+      return editor.dom.get(READMORE_ID) !== null;
+    };
+
+    const insertReadMore = () => {
+      if (hasReadMore()) {
+        return;
+      }
+
+      editor.insertContent(
+        `<hr id="${READMORE_ID}" />`,
+      );
+    };
+
+    const onSetupEditable = (api) => {
+      const nodeChanged = () => {
+        api.setEnabled(
+          editor.selection.isEditable() && !hasReadMore(),
+        );
+      };
+
+      editor.on('NodeChange', nodeChanged);
+      nodeChanged();
+
+      return () => {
+        editor.off('NodeChange', nodeChanged);
+      };
+    };
+
+    editor.addCommand('mceReadMore', insertReadMore);
+
+    editor.ui.registry.addIcon('readmore', '<svg width="24px" height="24px"><path d="M6.857 9.429V1.714h15.429v7.714h-1.257V2.971H8.171v6.457H6.857Zm15.429 3.886v9.143H6.857v-9.143h1.257v7.714h12.857v-7.714zM12 10.286h2.571V12H12zm-3.886 0h2.571V12H8.114zm7.714 0h2.571V12h-2.571zm3.886 0h2.571V12h-2.571zM1.714 7.486l3.886 3.886-3.886 3.886z"/></svg>');
+
+    editor.ui.registry.addButton('readmore', {
+      title: 'Read More',
+      icon: 'readmore',
+      tooltip: Joomla.Text._('PLG_TINY_TOOLBAR_BUTTON_READMORE'),
+      onAction: insertReadMore,
+      onSetup: onSetupEditable,
+    });
+    return {
+      getMetadata() {
+        return {
+          name: 'Readmore Plugin (Joomla)',
+          url: 'https://www.joomla.org',
+        };
+      },
+    };
+  });
+})();
diff --git a/build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js b/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js
similarity index 98%
rename from build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js
rename to media_source/plg_editors_tinymce/js/tinymce-builder.es6.js
index 40f417c97c2a4..3dd54d3f6b64d 100644
--- a/build/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js
+++ b/media_source/plg_editors_tinymce/js/tinymce-builder.es6.js
@@ -15,6 +15,8 @@ const tinymce = {
   langCode: 'en',
   langStrings: {},
   icons: {
+    abbr: '<svg height="24" width="24"><path d="M5 8a1 1 0 0 0 2 0V7h1a1 1 0 0 0 0-2H7V4a1 1 0 0 0-2 0v1H4a1 1 0 0 0 0 2h1Zm13-3h-6a1 1 0 0 0 0 2h6a1 1 0 0 1 1 1v9.72l-1.57-1.45a1 1 0 0 0-.68-.27H8a1 1 0 0 1-1-1v-3a1 1 0 0 0-2 0v3a3 3 0 0 0 3 3h8.36l3 2.73A1 1 0 0 0 20 21a1.1 1.1 0 0 0 .4-.08A1 1 0 0 0 21 20V8a3 3 0 0 0-3-3Z"></path></svg>',
+    abbr_remove: '<svg height="24" width="24"><path d="M19,6H15a1,1,0,0,0,0,2h4a1,1,0,0,1,1,1v9.72l-1.57-1.45a1,1,0,0,0-.68-.27H9a1,1,0,0,1-1-1V15a1,1,0,0,0-2,0v1a3,3,0,0,0,3,3h8.36l3,2.73A1,1,0,0,0,21,22a1.1,1.1,0,0,0,.4-.08A1,1,0,0,0,22,21V9A3,3,0,0,0,19,6Zm-8.46,4.54A5,5,0,1,0,7,12,5,5,0,0,0,10.54,10.54ZM4,7A3,3,0,0,1,7,4a3,3,0,0,1,1.28.3l-4,4A3,3,0,0,1,4,7ZM9.7,5.71A3,3,0,0,1,10,7,3,3,0,0,1,5.72,9.7Z"></path></svg>',
     'accessibility-check': '<svg width="24" height="24"><path d="M12 2a2 2 0 0 1 2 2 2 2 0 0 1-2 2 2 2 0 0 1-2-2c0-1.1.9-2 2-2zm8 7h-5v12c0 .6-.4 1-1 1a1 1 0 0 1-1-1v-5c0-.6-.4-1-1-1a1 1 0 0 0-1 1v5c0 .6-.4 1-1 1a1 1 0 0 1-1-1V9H4a1 1 0 1 1 0-2h16c.6 0 1 .4 1 1s-.4 1-1 1z" fill-rule="nonzero"/></svg>',
     accordion: '<svg width="24" height="24"><rect x="12" y="7" width="10" height="2" rx="1"/><rect x="12" y="11" width="10" height="2" rx="1"/><rect x="12" y="15" width="6" height="2" rx="1"/><path fill-rule="evenodd" clip-rule="evenodd" d="M2.3 7.3a1 1 0 0 1 1.4 0L6 9.6l2.3-2.3a1 1 0 0 1 1.4 1.4L6 12.4 2.3 8.7a1 1 0 0 1 0-1.4Z"/></svg>',
     'align-center': '<svg width="24" height="24"><path d="M5 5h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 1 1 0-2zm3 4h8c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 1 1 0-2zm0 8h8c.6 0 1 .4 1 1s-.4 1-1 1H8a1 1 0 0 1 0-2zm-3-4h14c.6 0 1 .4 1 1s-.4 1-1 1H5a1 1 0 0 1 0-2z" fill-rule="evenodd"/></svg>',
@@ -109,6 +111,7 @@ const tinymce = {
     preview: '<svg width="24" height="24"><path d="M3.5 12.5c.5.8 1.1 1.6 1.8 2.3 2 2 4.2 3.2 6.7 3.2s4.7-1.2 6.7-3.2a16.2 16.2 0 0 0 2.1-2.8 15.7 15.7 0 0 0-2.1-2.8c-2-2-4.2-3.2-6.7-3.2a9.3 9.3 0 0 0-6.7 3.2A16.2 16.2 0 0 0 3.2 12c0 .2.2.3.3.5zm-2.4-1l.7-1.2L4 7.8C6.2 5.4 8.9 4 12 4c3 0 5.8 1.4 8.1 3.8a18.2 18.2 0 0 1 2.8 3.7v1l-.7 1.2-2.1 2.5c-2.3 2.4-5 3.8-8.1 3.8-3 0-5.8-1.4-8.1-3.8a18.2 18.2 0 0 1-2.8-3.7 1 1 0 0 1 0-1zm12-3.3a2 2 0 1 0 2.7 2.6 4 4 0 1 1-2.6-2.6z" fill-rule="nonzero"/></svg>',
     print: '<svg width="24" height="24"><path d="M18 8H6a3 3 0 0 0-3 3v6h2v3h14v-3h2v-6a3 3 0 0 0-3-3zm-1 10H7v-4h10v4zm.5-5c-.8 0-1.5-.7-1.5-1.5s.7-1.5 1.5-1.5 1.5.7 1.5 1.5-.7 1.5-1.5 1.5zm.5-8H6v2h12V5z" fill-rule="nonzero"/></svg>',
     quote: '<svg width="24" height="24"><path d="M7.5 17h.9c.4 0 .7-.2.9-.6L11 13V8c0-.6-.4-1-1-1H6a1 1 0 0 0-1 1v4c0 .6.4 1 1 1h2l-1.3 2.7a1 1 0 0 0 .8 1.3zm8 0h.9c.4 0 .7-.2.9-.6L19 13V8c0-.6-.4-1-1-1h-4a1 1 0 0 0-1 1v4c0 .6.4 1 1 1h2l-1.3 2.7a1 1 0 0 0 .8 1.3z" fill-rule="nonzero"/></svg>',
+    readmore: '<svg width="24px" height="24px"><path d="M6.857 9.429V1.714h15.429v7.714h-1.257V2.971H8.171v6.457H6.857Zm15.429 3.886v9.143H6.857v-9.143h1.257v7.714h12.857v-7.714zM12 10.286h2.571V12H12zm-3.886 0h2.571V12H8.114zm7.714 0h2.571V12h-2.571zm3.886 0h2.571V12h-2.571zM1.714 7.486l3.886 3.886-3.886 3.886z"/></svg>',
     redo: '<svg width="24" height="24"><path d="M17.6 10H12c-2.8 0-4.4 1.4-4.9 3.5-.4 2 .3 4 1.4 4.6a1 1 0 1 1-1 1.8c-2-1.2-2.9-4.1-2.3-6.8.6-3 3-5.1 6.8-5.1h5.6l-3.3-3.3a1 1 0 1 1 1.4-1.4l5 5a1 1 0 0 1 0 1.4l-5 5a1 1 0 0 1-1.4-1.4l3.3-3.3z" fill-rule="nonzero"/></svg>',
     reload: '<svg width="24" height="24"><g fill-rule="nonzero"><path d="M5 22.1l-1.2-4.7v-.2a1 1 0 0 1 1-1l5 .4a1 1 0 1 1-.2 2l-2.2-.2a7.8 7.8 0 0 0 8.4.2 7.5 7.5 0 0 0 3.5-6.4 1 1 0 1 1 2 0 9.5 9.5 0 0 1-4.5 8 9.9 9.9 0 0 1-10.2 0l.4 1.4a1 1 0 1 1-2 .5zM13.6 7.4c0-.5.5-1 1-.9l2.8.2a8 8 0 0 0-9.5-1 7.5 7.5 0 0 0-3.6 7 1 1 0 0 1-2 0 9.5 9.5 0 0 1 4.5-8.6 10 10 0 0 1 10.9.3l-.3-1a1 1 0 0 1 2-.5l1.1 4.8a1 1 0 0 1-1 1.2l-5-.4a1 1 0 0 1-.9-1z"/></g></svg>',
     'remove-formatting': '<svg width="24" height="24"><path d="M13.2 6a1 1 0 0 1 0 .2l-2.6 10a1 1 0 0 1-1 .8h-.2a.8.8 0 0 1-.8-1l2.6-10H8a1 1 0 1 1 0-2h9a1 1 0 0 1 0 2h-3.8zM5 18h7a1 1 0 0 1 0 2H5a1 1 0 0 1 0-2zm13 1.5L16.5 18 15 19.5a.7.7 0 0 1-1-1l1.5-1.5-1.5-1.5a.7.7 0 0 1 1-1l1.5 1.5 1.5-1.5a.7.7 0 0 1 1 1L17.5 17l1.5 1.5a.7.7 0 0 1-1 1z" fill-rule="evenodd"/></svg>',
@@ -431,7 +434,8 @@ const TinyMCEBuilder = (container, options) => {
   });
 };
 
-const options = Joomla.getOptions ? Joomla.getOptions('plg_editors_tinymce_builder', {})
+const options = Joomla.getOptions
+  ? Joomla.getOptions('plg_editors_tinymce_builder', {})
   : (Joomla.optionsStorage.plg_editors_tinymce_builder || {});
 
 const builder = document.getElementById('joomla-tinymce-builder');
diff --git a/build/media_source/plg_editors_tinymce/js/tinymce.es6.js b/media_source/plg_editors_tinymce/js/tinymce.es6.js
similarity index 97%
rename from build/media_source/plg_editors_tinymce/js/tinymce.es6.js
rename to media_source/plg_editors_tinymce/js/tinymce.es6.js
index b27b624793ced..3f2206f548363 100644
--- a/build/media_source/plg_editors_tinymce/js/tinymce.es6.js
+++ b/media_source/plg_editors_tinymce/js/tinymce.es6.js
@@ -165,8 +165,12 @@ Joomla.JoomlaTinyMCE = {
     if ('colorSchemeOs' in document.documentElement.dataset) {
       const mql = window.matchMedia('(prefers-color-scheme: dark)');
       options.skin = mql.matches ? skinDark : skinLight;
+      if (mql.matches) {
+        options.content_css = options.content_css ? `${options.content_css},dark` : 'dark';
+      }
     } else if (document.documentElement.dataset.colorScheme === 'dark') {
       options.skin = skinDark;
+      options.content_css = options.content_css ? `${options.content_css},dark` : 'dark';
     }
 
     // Ensure tinymce is initialised in readonly mode if the textarea has readonly applied
diff --git a/build/media_source/plg_editors_tinymce/scss/tinymce-builder.scss b/media_source/plg_editors_tinymce/scss/tinymce-builder.scss
similarity index 100%
rename from build/media_source/plg_editors_tinymce/scss/tinymce-builder.scss
rename to media_source/plg_editors_tinymce/scss/tinymce-builder.scss
diff --git a/build/media_source/plg_installer_folderinstaller/js/folderinstaller.es6.js b/media_source/plg_installer_folderinstaller/js/folderinstaller.es6.js
similarity index 100%
rename from build/media_source/plg_installer_folderinstaller/js/folderinstaller.es6.js
rename to media_source/plg_installer_folderinstaller/js/folderinstaller.es6.js
diff --git a/build/media_source/plg_installer_packageinstaller/js/packageinstaller.es6.js b/media_source/plg_installer_packageinstaller/js/packageinstaller.es6.js
similarity index 100%
rename from build/media_source/plg_installer_packageinstaller/js/packageinstaller.es6.js
rename to media_source/plg_installer_packageinstaller/js/packageinstaller.es6.js
diff --git a/build/media_source/plg_installer_urlinstaller/js/urlinstaller.es6.js b/media_source/plg_installer_urlinstaller/js/urlinstaller.es6.js
similarity index 100%
rename from build/media_source/plg_installer_urlinstaller/js/urlinstaller.es6.js
rename to media_source/plg_installer_urlinstaller/js/urlinstaller.es6.js
diff --git a/build/media_source/plg_installer_webinstaller/js/client.es6.js b/media_source/plg_installer_webinstaller/js/client.es6.js
similarity index 100%
rename from build/media_source/plg_installer_webinstaller/js/client.es6.js
rename to media_source/plg_installer_webinstaller/js/client.es6.js
diff --git a/build/media_source/plg_installer_webinstaller/scss/client.scss b/media_source/plg_installer_webinstaller/scss/client.scss
similarity index 94%
rename from build/media_source/plg_installer_webinstaller/scss/client.scss
rename to media_source/plg_installer_webinstaller/scss/client.scss
index bcccf58dd6917..45fca4515ae6c 100644
--- a/build/media_source/plg_installer_webinstaller/scss/client.scss
+++ b/media_source/plg_installer_webinstaller/scss/client.scss
@@ -1,9 +1,9 @@
 // Bootstrap functions
-@import "../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../media/vendor/bootstrap/scss/functions";
 
 // Bootstrap other
-@import "../../../../media/vendor/bootstrap/scss/mixins";
-@import "../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../media/vendor/bootstrap/scss/mixins";
+@import "../../../media/vendor/bootstrap/scss/variables";
 
 // Extension variables
 $extension-types: (
diff --git a/build/media_source/plg_media-action_crop/js/crop.es6.js b/media_source/plg_media-action_crop/js/crop.es6.js
similarity index 81%
rename from build/media_source/plg_media-action_crop/js/crop.es6.js
rename to media_source/plg_media-action_crop/js/crop.es6.js
index ddeb2649181d3..68a9c3be071d6 100644
--- a/build/media_source/plg_media-action_crop/js/crop.es6.js
+++ b/media_source/plg_media-action_crop/js/crop.es6.js
@@ -8,6 +8,23 @@ let formElements;
 let activated = false;
 let instance;
 
+/**
+ * Parse aspect ratio value from string format to number
+ * Accepts either a plain number (e.g. "1") or numerator/denominator format (e.g. "16/9")
+ * @param {string} value - The aspect ratio value
+ * @returns {number} The calculated aspect ratio as a number
+ */
+const parseAspectRatio = (value) => {
+  if (typeof value !== 'string' || !value.trim()) {
+    return NaN;
+  }
+  if (value.includes('/')) {
+    const [numerator, denominator] = value.split('/').map(parseFloat);
+    return isNaN(numerator) || isNaN(denominator) || denominator === 0 ? NaN : numerator / denominator;
+  }
+  return parseFloat(value);
+};
+
 const addListeners = () => {
   formElements.cropX.addEventListener('change', ({ currentTarget }) => {
     instance.setData({ x: parseInt(currentTarget.value, 10) });
@@ -22,7 +39,7 @@ const addListeners = () => {
     instance.setData({ height: parseInt(currentTarget.value, 10) });
   });
   formElements.aspectRatio.addEventListener('change', ({ currentTarget }) => {
-    instance.setAspectRatio(currentTarget.value);
+    instance.setAspectRatio(parseAspectRatio(currentTarget.value));
   });
   activated = true;
 };
@@ -66,7 +83,7 @@ const init = (image) => {
     addListeners();
   }
 
-  instance.setAspectRatio(formElements.cropAspectRatioOption.value);
+  instance.setAspectRatio(parseAspectRatio(formElements.cropAspectRatioOption.value));
 };
 
 // Register the Events
diff --git a/build/media_source/plg_media-action_resize/js/resize.es6.js b/media_source/plg_media-action_resize/js/resize.es6.js
similarity index 100%
rename from build/media_source/plg_media-action_resize/js/resize.es6.js
rename to media_source/plg_media-action_resize/js/resize.es6.js
diff --git a/build/media_source/plg_media-action_rotate/js/rotate.es6.js b/media_source/plg_media-action_rotate/js/rotate.es6.js
similarity index 100%
rename from build/media_source/plg_media-action_rotate/js/rotate.es6.js
rename to media_source/plg_media-action_rotate/js/rotate.es6.js
diff --git a/build/media_source/plg_multifactorauth_email/images/email.svg b/media_source/plg_multifactorauth_email/images/email.svg
similarity index 100%
rename from build/media_source/plg_multifactorauth_email/images/email.svg
rename to media_source/plg_multifactorauth_email/images/email.svg
diff --git a/build/media_source/plg_multifactorauth_fixed/images/fixed.svg b/media_source/plg_multifactorauth_fixed/images/fixed.svg
similarity index 100%
rename from build/media_source/plg_multifactorauth_fixed/images/fixed.svg
rename to media_source/plg_multifactorauth_fixed/images/fixed.svg
diff --git a/build/media_source/plg_multifactorauth_totp/images/totp.svg b/media_source/plg_multifactorauth_totp/images/totp.svg
similarity index 100%
rename from build/media_source/plg_multifactorauth_totp/images/totp.svg
rename to media_source/plg_multifactorauth_totp/images/totp.svg
diff --git a/build/media_source/plg_multifactorauth_totp/joomla.asset.json b/media_source/plg_multifactorauth_totp/joomla.asset.json
similarity index 100%
rename from build/media_source/plg_multifactorauth_totp/joomla.asset.json
rename to media_source/plg_multifactorauth_totp/joomla.asset.json
diff --git a/build/media_source/plg_multifactorauth_totp/js/setup.es6.js b/media_source/plg_multifactorauth_totp/js/setup.es6.js
similarity index 100%
rename from build/media_source/plg_multifactorauth_totp/js/setup.es6.js
rename to media_source/plg_multifactorauth_totp/js/setup.es6.js
diff --git a/build/media_source/plg_multifactorauth_webauthn/images/passkeys.svg b/media_source/plg_multifactorauth_webauthn/images/passkeys.svg
similarity index 100%
rename from build/media_source/plg_multifactorauth_webauthn/images/passkeys.svg
rename to media_source/plg_multifactorauth_webauthn/images/passkeys.svg
diff --git a/build/media_source/plg_multifactorauth_webauthn/images/webauthn.svg b/media_source/plg_multifactorauth_webauthn/images/webauthn.svg
similarity index 100%
rename from build/media_source/plg_multifactorauth_webauthn/images/webauthn.svg
rename to media_source/plg_multifactorauth_webauthn/images/webauthn.svg
diff --git a/build/media_source/plg_multifactorauth_webauthn/joomla.asset.json b/media_source/plg_multifactorauth_webauthn/joomla.asset.json
similarity index 100%
rename from build/media_source/plg_multifactorauth_webauthn/joomla.asset.json
rename to media_source/plg_multifactorauth_webauthn/joomla.asset.json
diff --git a/build/media_source/plg_multifactorauth_webauthn/js/webauthn.es6.js b/media_source/plg_multifactorauth_webauthn/js/webauthn.es6.js
similarity index 96%
rename from build/media_source/plg_multifactorauth_webauthn/js/webauthn.es6.js
rename to media_source/plg_multifactorauth_webauthn/js/webauthn.es6.js
index 3e5c8050c7636..853a35edc7a1e 100644
--- a/build/media_source/plg_multifactorauth_webauthn/js/webauthn.es6.js
+++ b/media_source/plg_multifactorauth_webauthn/js/webauthn.es6.js
@@ -151,9 +151,11 @@
             signature: arrayToBase64String(
               new Uint8Array(data.response.signature),
             ),
-            userHandle: data.response.userHandle ? arrayToBase64String(
-              new Uint8Array(data.response.userHandle),
-            ) : null,
+            userHandle: data.response.userHandle
+              ? arrayToBase64String(
+                  new Uint8Array(data.response.userHandle),
+                )
+              : null,
           },
         };
 
diff --git a/build/media_source/plg_multifactorauth_yubikey/images/yubikey.svg b/media_source/plg_multifactorauth_yubikey/images/yubikey.svg
similarity index 100%
rename from build/media_source/plg_multifactorauth_yubikey/images/yubikey.svg
rename to media_source/plg_multifactorauth_yubikey/images/yubikey.svg
diff --git a/build/media_source/plg_quickicon_autoupdate/js/healthcheck.es6.js b/media_source/plg_quickicon_autoupdate/js/healthcheck.es6.js
similarity index 100%
rename from build/media_source/plg_quickicon_autoupdate/js/healthcheck.es6.js
rename to media_source/plg_quickicon_autoupdate/js/healthcheck.es6.js
diff --git a/build/media_source/plg_quickicon_eos/js/snooze.es6.js b/media_source/plg_quickicon_eos/js/snooze.es6.js
similarity index 100%
rename from build/media_source/plg_quickicon_eos/js/snooze.es6.js
rename to media_source/plg_quickicon_eos/js/snooze.es6.js
diff --git a/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js b/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
similarity index 80%
rename from build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
rename to media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
index c7dc64c1a4d79..84a53a44de846 100644
--- a/build/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
+++ b/media_source/plg_quickicon_extensionupdate/js/extensionupdatecheck.es6.js
@@ -40,7 +40,11 @@
             // No updates
             update('success', Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE'));
           } else {
-            update('danger', Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND').replace('%s', `<span class="badge text-dark bg-light">${updateInfoList.length}</span>`));
+            let text = Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND').replace('%s', `<span class="badge text-dark bg-light">${updateInfoList.length}</span>`);
+            updateInfoList.filter((u) => u.security > 0).forEach((update) =>
+              text += '<div>' + Joomla.Text._('PLG_QUICKICON_EXTENSIONUPDATE_SECURITY_UPDATEFOUND').replace('%s', update.name) + '</div>',
+            );
+            update('danger', text);
           }
         } else {
           // An error occurred
diff --git a/build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js b/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
similarity index 100%
rename from build/media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
rename to media_source/plg_quickicon_joomlaupdate/js/jupdatecheck.es6.js
diff --git a/build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js b/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
similarity index 100%
rename from build/media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
rename to media_source/plg_quickicon_overridecheck/js/overridecheck.es6.js
diff --git a/build/media_source/plg_quickicon_privacycheck/js/privacycheck.es6.js b/media_source/plg_quickicon_privacycheck/js/privacycheck.es6.js
similarity index 100%
rename from build/media_source/plg_quickicon_privacycheck/js/privacycheck.es6.js
rename to media_source/plg_quickicon_privacycheck/js/privacycheck.es6.js
diff --git a/media_source/plg_system_debug/builder.mjs b/media_source/plg_system_debug/builder.mjs
new file mode 100644
index 0000000000000..3019e8448a0be
--- /dev/null
+++ b/media_source/plg_system_debug/builder.mjs
@@ -0,0 +1,96 @@
+/**
+ * Assets Builder
+ */
+import path from 'node:path';
+import fsp from 'node:fs/promises';
+import fs from 'node:fs';
+import DefaultModuleBuilder from '../../build/build-modules-js/builder/default-module-builder.mjs';
+
+export default class PlgDebugModuleBuilder extends DefaultModuleBuilder {
+  /**
+   * Target location for vendor files of the debugbar
+   * @type {string}
+   */
+  vendorLocation = 'vendor/debugbar';
+
+  /**
+   * Remove files
+   * @returns { Promise }
+   */
+  async clear() {
+    await super.clear();
+
+    const pathMedia = path.dirname(this.targetPath);
+    const pathVendor = path.join(pathMedia, this.vendorLocation);
+
+    if (!fs.existsSync(pathVendor)) {
+      return;
+    }
+
+    return fsp.rm(pathVendor, { recursive: true });
+  }
+
+  /**
+   * Copy files to target location.
+   *
+   * @returns { Promise }
+   */
+  async copy() {
+    await super.copy();
+
+    // Copy DebugBar assets to vendor folder
+    const pathSrc = 'libraries/vendor/php-debugbar/php-debugbar/src/DebugBar/Resources';
+    const pathMedia = path.dirname(this.targetPath);
+    const pathVendor = path.join(pathMedia, this.vendorLocation);
+
+    if (!fs.existsSync(pathSrc)) {
+      throw new Error('DebugBar/Resources not found. Make sure you have run "composer install" first.');
+    }
+
+    return fsp.cp(pathSrc, pathVendor, { recursive: true, preserveTimestamps: true }).then(() => {
+      // Remove unused
+      return Promise.all([
+        fsp.rm(path.join(pathVendor, 'vendor/font-awesome'), { recursive: true }),
+        fsp.rm(path.join(pathVendor, 'vendor/jquery'), { recursive: true }),
+      ]);
+    });
+  }
+
+  /**
+   * Process CSS files
+   * @returns { Promise }
+   */
+  async css() {
+    await super.css();
+
+    // Run default css builder for vendor files
+    const pathMedia = path.dirname(this.targetPath);
+    const builder = new DefaultModuleBuilder(
+      this.vendorLocation,
+      pathMedia,
+      pathMedia,
+      this.options,
+    );
+
+    return builder.css();
+  }
+
+  /**
+   * Process JavaScript files and Modules
+   * @returns { Promise }
+   */
+  async js() {
+    await super.js();
+
+    // Run default js builder for vendor files
+    const pathMedia = path.dirname(this.targetPath);
+    const builder = new DefaultModuleBuilder(
+      this.vendorLocation,
+      pathMedia,
+      pathMedia,
+      this.options,
+    );
+
+    return builder.js();
+  }
+};
diff --git a/build/media_source/plg_system_debug/css/debug.css b/media_source/plg_system_debug/css/debug.css
similarity index 100%
rename from build/media_source/plg_system_debug/css/debug.css
rename to media_source/plg_system_debug/css/debug.css
diff --git a/build/media_source/plg_system_debug/js/debug.es6.js b/media_source/plg_system_debug/js/debug.es6.js
similarity index 100%
rename from build/media_source/plg_system_debug/js/debug.es6.js
rename to media_source/plg_system_debug/js/debug.es6.js
diff --git a/build/media_source/plg_system_debug/widgets/info/widget.css b/media_source/plg_system_debug/widgets/info/widget.css
similarity index 100%
rename from build/media_source/plg_system_debug/widgets/info/widget.css
rename to media_source/plg_system_debug/widgets/info/widget.css
diff --git a/build/media_source/plg_system_debug/widgets/info/widget.es5.js b/media_source/plg_system_debug/widgets/info/widget.es5.js
similarity index 100%
rename from build/media_source/plg_system_debug/widgets/info/widget.es5.js
rename to media_source/plg_system_debug/widgets/info/widget.es5.js
diff --git a/build/media_source/plg_system_debug/widgets/languageErrors/widget.css b/media_source/plg_system_debug/widgets/languageErrors/widget.css
similarity index 100%
rename from build/media_source/plg_system_debug/widgets/languageErrors/widget.css
rename to media_source/plg_system_debug/widgets/languageErrors/widget.css
diff --git a/build/media_source/plg_system_debug/widgets/languageErrors/widget.es5.js b/media_source/plg_system_debug/widgets/languageErrors/widget.es5.js
similarity index 100%
rename from build/media_source/plg_system_debug/widgets/languageErrors/widget.es5.js
rename to media_source/plg_system_debug/widgets/languageErrors/widget.es5.js
diff --git a/build/media_source/plg_system_debug/widgets/languageFiles/widget.css b/media_source/plg_system_debug/widgets/languageFiles/widget.css
similarity index 100%
rename from build/media_source/plg_system_debug/widgets/languageFiles/widget.css
rename to media_source/plg_system_debug/widgets/languageFiles/widget.css
diff --git a/build/media_source/plg_system_debug/widgets/languageFiles/widget.es5.js b/media_source/plg_system_debug/widgets/languageFiles/widget.es5.js
similarity index 100%
rename from build/media_source/plg_system_debug/widgets/languageFiles/widget.es5.js
rename to media_source/plg_system_debug/widgets/languageFiles/widget.es5.js
diff --git a/build/media_source/plg_system_debug/widgets/languageStrings/widget.css b/media_source/plg_system_debug/widgets/languageStrings/widget.css
similarity index 100%
rename from build/media_source/plg_system_debug/widgets/languageStrings/widget.css
rename to media_source/plg_system_debug/widgets/languageStrings/widget.css
diff --git a/build/media_source/plg_system_debug/widgets/languageStrings/widget.es5.js b/media_source/plg_system_debug/widgets/languageStrings/widget.es5.js
similarity index 100%
rename from build/media_source/plg_system_debug/widgets/languageStrings/widget.es5.js
rename to media_source/plg_system_debug/widgets/languageStrings/widget.es5.js
diff --git a/build/media_source/plg_system_debug/widgets/sqlqueries/widget.css b/media_source/plg_system_debug/widgets/sqlqueries/widget.css
similarity index 100%
rename from build/media_source/plg_system_debug/widgets/sqlqueries/widget.css
rename to media_source/plg_system_debug/widgets/sqlqueries/widget.css
diff --git a/build/media_source/plg_system_debug/widgets/sqlqueries/widget.es5.js b/media_source/plg_system_debug/widgets/sqlqueries/widget.es5.js
similarity index 100%
rename from build/media_source/plg_system_debug/widgets/sqlqueries/widget.es5.js
rename to media_source/plg_system_debug/widgets/sqlqueries/widget.es5.js
diff --git a/build/media_source/plg_system_guidedtours/joomla.asset.json b/media_source/plg_system_guidedtours/joomla.asset.json
similarity index 100%
rename from build/media_source/plg_system_guidedtours/joomla.asset.json
rename to media_source/plg_system_guidedtours/joomla.asset.json
diff --git a/build/media_source/plg_system_guidedtours/js/guidedtours.es6.js b/media_source/plg_system_guidedtours/js/guidedtours.es6.js
similarity index 99%
rename from build/media_source/plg_system_guidedtours/js/guidedtours.es6.js
rename to media_source/plg_system_guidedtours/js/guidedtours.es6.js
index 9756d2344d03c..b3a18eda01b5a 100644
--- a/build/media_source/plg_system_guidedtours/js/guidedtours.es6.js
+++ b/media_source/plg_system_guidedtours/js/guidedtours.es6.js
@@ -221,7 +221,7 @@ function addStepToTourButton(tour, stepObj, buttons) {
                 (target.hasAttribute('required') || (this.options.params.required || 0))
                 && (
                   (target.tagName.toLowerCase() === 'input' && ['email', 'password', 'search', 'tel', 'text', 'url'].includes(target.type))
-                    || target.tagName.toLowerCase() === 'textarea'
+                  || target.tagName.toLowerCase() === 'textarea'
                 )
               ) {
                 if ((this.options.params.requiredvalue || '') !== '') {
@@ -449,6 +449,10 @@ function addBackButton(buttons, step) {
 }
 
 function startTour(obj) {
+  if (!obj || !obj.steps) {
+    return;
+  }
+
   // We store the tour id to restart on site refresh
   sessionStorage.setItem('tourId', obj.id);
   sessionStorage.setItem('stepCount', String(obj.steps.length));
@@ -673,7 +677,7 @@ document.querySelector('body').addEventListener('click', (event) => {
   // Click button but missing data-id
   if (
     (!event.target.hasAttribute('data-id') || event.target.getAttribute('data-id') <= 0)
-  && (!event.target.hasAttribute('data-gt-uid') || event.target.getAttribute('data-gt-uid') === '')
+    && (!event.target.hasAttribute('data-gt-uid') || event.target.getAttribute('data-gt-uid') === '')
   ) {
     Joomla.renderMessages({ error: [Joomla.Text._('PLG_SYSTEM_GUIDEDTOURS_COULD_NOT_LOAD_THE_TOUR')] });
     return;
diff --git a/build/media_source/plg_system_guidedtours/scss/guidedtours.scss b/media_source/plg_system_guidedtours/scss/guidedtours.scss
similarity index 97%
rename from build/media_source/plg_system_guidedtours/scss/guidedtours.scss
rename to media_source/plg_system_guidedtours/scss/guidedtours.scss
index e4b2bfa87b001..9b276889371de 100644
--- a/build/media_source/plg_system_guidedtours/scss/guidedtours.scss
+++ b/media_source/plg_system_guidedtours/scss/guidedtours.scss
@@ -3,7 +3,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-@import "../../../../node_modules/shepherd.js/dist/css/shepherd";
+@import "../../../node_modules/shepherd.js/dist/css/shepherd";
 
 .shepherd-target.shepherd-enabled {
   z-index: 9998;
diff --git a/build/media_source/plg_system_jooa11y/joomla.asset.json b/media_source/plg_system_jooa11y/joomla.asset.json
similarity index 100%
rename from build/media_source/plg_system_jooa11y/joomla.asset.json
rename to media_source/plg_system_jooa11y/joomla.asset.json
diff --git a/build/media_source/plg_system_jooa11y/js/jooa11y.es6.js b/media_source/plg_system_jooa11y/js/jooa11y.es6.js
similarity index 100%
rename from build/media_source/plg_system_jooa11y/js/jooa11y.es6.js
rename to media_source/plg_system_jooa11y/js/jooa11y.es6.js
diff --git a/build/media_source/plg_system_schedulerunner/joomla.asset.json b/media_source/plg_system_schedulerunner/joomla.asset.json
similarity index 100%
rename from build/media_source/plg_system_schedulerunner/joomla.asset.json
rename to media_source/plg_system_schedulerunner/joomla.asset.json
diff --git a/build/media_source/plg_system_schedulerunner/js/run-schedule.es6.js b/media_source/plg_system_schedulerunner/js/run-schedule.es6.js
similarity index 100%
rename from build/media_source/plg_system_schedulerunner/js/run-schedule.es6.js
rename to media_source/plg_system_schedulerunner/js/run-schedule.es6.js
diff --git a/build/media_source/plg_system_shortcut/js/shortcut.es6.js b/media_source/plg_system_shortcut/js/shortcut.es6.js
similarity index 100%
rename from build/media_source/plg_system_shortcut/js/shortcut.es6.js
rename to media_source/plg_system_shortcut/js/shortcut.es6.js
diff --git a/build/media_source/plg_system_stats/js/stats-message.es6.js b/media_source/plg_system_stats/js/stats-message.es6.js
similarity index 100%
rename from build/media_source/plg_system_stats/js/stats-message.es6.js
rename to media_source/plg_system_stats/js/stats-message.es6.js
diff --git a/build/media_source/plg_system_stats/js/stats.es6.js b/media_source/plg_system_stats/js/stats.es6.js
similarity index 100%
rename from build/media_source/plg_system_stats/js/stats.es6.js
rename to media_source/plg_system_stats/js/stats.es6.js
diff --git a/build/media_source/plg_system_webauthn/images/fido-passkey-black.svg b/media_source/plg_system_webauthn/images/fido-passkey-black.svg
similarity index 100%
rename from build/media_source/plg_system_webauthn/images/fido-passkey-black.svg
rename to media_source/plg_system_webauthn/images/fido-passkey-black.svg
diff --git a/build/media_source/plg_system_webauthn/images/fido.png b/media_source/plg_system_webauthn/images/fido.png
similarity index 100%
rename from build/media_source/plg_system_webauthn/images/fido.png
rename to media_source/plg_system_webauthn/images/fido.png
diff --git a/build/media_source/plg_system_webauthn/images/webauthn.svg b/media_source/plg_system_webauthn/images/webauthn.svg
similarity index 100%
rename from build/media_source/plg_system_webauthn/images/webauthn.svg
rename to media_source/plg_system_webauthn/images/webauthn.svg
diff --git a/build/media_source/plg_system_webauthn/js/login.es6.js b/media_source/plg_system_webauthn/js/login.es6.js
similarity index 97%
rename from build/media_source/plg_system_webauthn/js/login.es6.js
rename to media_source/plg_system_webauthn/js/login.es6.js
index 4bf2c7a7749da..148293d770161 100644
--- a/build/media_source/plg_system_webauthn/js/login.es6.js
+++ b/media_source/plg_system_webauthn/js/login.es6.js
@@ -163,9 +163,11 @@ window.Joomla = window.Joomla || {};
             authenticatorData: arrayToBase64String(new Uint8Array(data.response.authenticatorData)),
             clientDataJSON: arrayToBase64String(new Uint8Array(data.response.clientDataJSON)),
             signature: arrayToBase64String(new Uint8Array(data.response.signature)),
-            userHandle: data.response.userHandle ? arrayToBase64String(
-              new Uint8Array(data.response.userHandle),
-            ) : null,
+            userHandle: data.response.userHandle
+              ? arrayToBase64String(
+                  new Uint8Array(data.response.userHandle),
+                )
+              : null,
           },
         };
 
diff --git a/build/media_source/plg_system_webauthn/js/management.es6.js b/media_source/plg_system_webauthn/js/management.es6.js
similarity index 100%
rename from build/media_source/plg_system_webauthn/js/management.es6.js
rename to media_source/plg_system_webauthn/js/management.es6.js
diff --git a/build/media_source/plg_system_webauthn/scss/button.scss b/media_source/plg_system_webauthn/scss/button.scss
similarity index 100%
rename from build/media_source/plg_system_webauthn/scss/button.scss
rename to media_source/plg_system_webauthn/scss/button.scss
diff --git a/build/media_source/plg_user_token/js/token.es6.js b/media_source/plg_user_token/js/token.es6.js
similarity index 100%
rename from build/media_source/plg_user_token/js/token.es6.js
rename to media_source/plg_user_token/js/token.es6.js
diff --git a/build/media_source/system/css/fields/calendar.css b/media_source/system/css/fields/calendar.css
similarity index 100%
rename from build/media_source/system/css/fields/calendar.css
rename to media_source/system/css/fields/calendar.css
diff --git a/build/media_source/system/css/fields/joomla-media-select.css b/media_source/system/css/fields/joomla-media-select.css
similarity index 100%
rename from build/media_source/system/css/fields/joomla-media-select.css
rename to media_source/system/css/fields/joomla-media-select.css
diff --git a/build/media_source/system/images/ajax-loader.gif b/media_source/system/images/ajax-loader.gif
similarity index 100%
rename from build/media_source/system/images/ajax-loader.gif
rename to media_source/system/images/ajax-loader.gif
diff --git a/build/media_source/system/images/calendar-select-bg-dark-rtl.svg b/media_source/system/images/calendar-select-bg-dark-rtl.svg
similarity index 100%
rename from build/media_source/system/images/calendar-select-bg-dark-rtl.svg
rename to media_source/system/images/calendar-select-bg-dark-rtl.svg
diff --git a/build/media_source/system/images/calendar-select-bg-dark.svg b/media_source/system/images/calendar-select-bg-dark.svg
similarity index 100%
rename from build/media_source/system/images/calendar-select-bg-dark.svg
rename to media_source/system/images/calendar-select-bg-dark.svg
diff --git a/build/media_source/system/images/calendar.png b/media_source/system/images/calendar.png
similarity index 100%
rename from build/media_source/system/images/calendar.png
rename to media_source/system/images/calendar.png
diff --git a/build/media_source/system/images/favicon.ico b/media_source/system/images/favicon.ico
similarity index 100%
rename from build/media_source/system/images/favicon.ico
rename to media_source/system/images/favicon.ico
diff --git a/build/media_source/system/images/joomla-favicon-pinned.svg b/media_source/system/images/joomla-favicon-pinned.svg
similarity index 100%
rename from build/media_source/system/images/joomla-favicon-pinned.svg
rename to media_source/system/images/joomla-favicon-pinned.svg
diff --git a/build/media_source/system/images/joomla-favicon.svg b/media_source/system/images/joomla-favicon.svg
similarity index 100%
rename from build/media_source/system/images/joomla-favicon.svg
rename to media_source/system/images/joomla-favicon.svg
diff --git a/media_source/system/images/joomla-loader.svg b/media_source/system/images/joomla-loader.svg
new file mode 100644
index 0000000000000..2ff736ea468fe
--- /dev/null
+++ b/media_source/system/images/joomla-loader.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150" width="150" height="150">
+	<style>@keyframes joomla-spinner{0%,28%,to{opacity:.30}20%{opacity:1}}.joomla-spinner{animation:joomla-spinner 1.6s infinite cubic-bezier(0,.15,1,.75)}</style>
+	<path d="m27 75.5-2.9-2.9c-8.9-8.9-11.7-21.7-8.3-33C6.9 37.6.2 29.6.2 20.1c0-11.1 9-20 20-20 10 0 18.2 7.3 19.8 16.8 10.8-2.5 22.6.4 31.1 8.8l1.2 1.2-14.9 14.7-1.1-1.2c-4.8-4.8-12.6-4.8-17.4 0-4.8 4.8-4.8 12.6 0 17.4l2.9 2.9 14.8 14.8 15.6 15.6-14.8 14.8-15.6-15.7L27 75.5z" class="joomla-spinner" style="animation-delay:-1.2s" fill="#7ac143" />
+	<path d="m43.5 58.9 15.6-15.6 14.8-14.8 2.9-2.9c8.9-8.9 21.6-11.7 32.8-8.4C111 7.5 119.4 0 129.5 0c11.1 0 20 9 20 20 0 10.2-7.6 18.6-17.4 19.9 3.2 11.2.4 23.8-8.4 32.7l-1.2 1.2L107.7 59l1.1-1.1c4.8-4.8 4.8-12.6 0-17.4-4.8-4.8-12.5-4.8-17.4 0l-2.9 2.9-14.6 14.7-15.6 15.6-14.8-14.8z" class="joomla-spinner" style="animation-delay:-.8s" fill="#f9a541" />
+	<path d="M110.1 133.5c-11.4 3.5-24.2.7-33.2-8.3l-1.1-1.1 14.8-14.8 1.1 1.1c4.8 4.8 12.6 4.8 17.4 0 4.8-4.8 4.8-12.5 0-17.4l-2.9-2.9-14.9-14.6-15.6-15.7L90.5 45l15.6 15.6 14.8 14.8 2.9 2.9c8.5 8.5 11.4 20.5 8.8 31.3 9.7 1.4 17.2 9.7 17.2 19.8 0 11.1-9 20-20 20-9.8.2-17.9-6.7-19.7-15.9z" class="joomla-spinner" style="animation-delay:-.4s" fill="#f44321" />
+	<path d="m104.3 92-15.6 15.6-14.8 14.8-2.9 2.9c-8.5 8.5-20.6 11.4-31.5 8.7-2 8.9-10 15.5-19.5 15.5-11.1 0-20-9-20-20 0-9.5 6.6-17.4 15.4-19.5-2.8-11 .1-23.1 8.7-31.7l1.1-1.1L40 92l-1.1 1.1c-4.8 4.8-4.8 12.6 0 17.4 4.8 4.8 12.6 4.8 17.4 0l2.9-2.9L74 92.8l15.6-15.6L104.3 92z" class="joomla-spinner" fill="#5091cd" />
+</svg>
diff --git a/build/media_source/system/images/select-bg-dark.svg b/media_source/system/images/select-bg-dark.svg
similarity index 100%
rename from build/media_source/system/images/select-bg-dark.svg
rename to media_source/system/images/select-bg-dark.svg
diff --git a/build/media_source/templates/administrator/atum/images/select-bg-rtl.svg b/media_source/system/images/select-bg-rtl.svg
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/select-bg-rtl.svg
rename to media_source/system/images/select-bg-rtl.svg
diff --git a/build/media_source/templates/administrator/atum/images/select-bg.svg b/media_source/system/images/select-bg.svg
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/select-bg.svg
rename to media_source/system/images/select-bg.svg
diff --git a/build/media_source/system/images/template_thumb.svg b/media_source/system/images/template_thumb.svg
similarity index 99%
rename from build/media_source/system/images/template_thumb.svg
rename to media_source/system/images/template_thumb.svg
index 80f936b80b87c..f2e0ebc7a2471 100644
--- a/build/media_source/system/images/template_thumb.svg
+++ b/media_source/system/images/template_thumb.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-	<path d="m20 4.8c.4-.2.6-.4.9-.4.5 0 .8.3.9.5.2.3.9.5 1.2.5.2 0 .5-.7.7-1.3s.2-1.3.1-1.4-.9-.3-1.1-.3c-.1.1-.3.2-.7.2s-.8-.3-1.1-.6c-.5-.5-1.1-.7-1.7-.9s-1.3-.2-1.9-.2c-.9-.1-1.9-.1-2.8.2-.4.1-.7.2-1.1.4-.1.1-.4.2-.5.2-.1.1-.1.2 0 .2s.5-.1.5-.1-.5.2-.5.4c0 .1.1.1.1.1s.3-.1.5-.1c.4 0 1-.2 1.5-.2.6 0 1.2.2 1.8.8.9 1.1.8 2.5.8 2.8-.2 2.1-4.9 14.9-5.1 15.8s-.2 1.4.9 1.7 1.5 0 1.7-.4c.1-.7 3.1-16.5 4.9-17.9zm-3.9-1-16.1 2.5 2.6 16.7 8.6-1.4c-.1-.7 2.2-6.7 2.6-7.8l-4.4.7.6-1.8 3.1-.5.8 1s.2-.5.2-.7l-4.3-5.3c-.2-.3-.2-.7.1-.9l.2-.2c.3-.2.7-.2.9.1l3.8 4.4c.8-2.4 1.5-4.5 1.5-5.2.1-.2.1-.9-.2-1.6zm-12 9.9 2.7-.5-.7 1.8-1.8.3zm5.8-5.1.3.1c.4.1.5.5.4.9l-3 8-1.8 2.4.2-3 3-8c.1-.4.5-.5.9-.4zm10.8-2.8c-.4.4-.9 1.7-1.9 5.5h.1l.3 1.6-.8.1c-.1.5-.2 1-.4 1.6 1.7.9.8 3.1.7 3.1s-.1 0-.1-.1.1-.4-.2-.5c-.2-.1-.6-.2-.9-.4-.3 1.2-.6 2.6-.9 4.1l6.3-1-2.1-14.1z"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+	<path d="m20 4.8c.4-.2.6-.4.9-.4.5 0 .8.3.9.5.2.3.9.5 1.2.5.2 0 .5-.7.7-1.3s.2-1.3.1-1.4-.9-.3-1.1-.3c-.1.1-.3.2-.7.2s-.8-.3-1.1-.6c-.5-.5-1.1-.7-1.7-.9s-1.3-.2-1.9-.2c-.9-.1-1.9-.1-2.8.2-.4.1-.7.2-1.1.4-.1.1-.4.2-.5.2-.1.1-.1.2 0 .2s.5-.1.5-.1-.5.2-.5.4c0 .1.1.1.1.1s.3-.1.5-.1c.4 0 1-.2 1.5-.2.6 0 1.2.2 1.8.8.9 1.1.8 2.5.8 2.8-.2 2.1-4.9 14.9-5.1 15.8s-.2 1.4.9 1.7 1.5 0 1.7-.4c.1-.7 3.1-16.5 4.9-17.9zm-3.9-1-16.1 2.5 2.6 16.7 8.6-1.4c-.1-.7 2.2-6.7 2.6-7.8l-4.4.7.6-1.8 3.1-.5.8 1s.2-.5.2-.7l-4.3-5.3c-.2-.3-.2-.7.1-.9l.2-.2c.3-.2.7-.2.9.1l3.8 4.4c.8-2.4 1.5-4.5 1.5-5.2.1-.2.1-.9-.2-1.6zm-12 9.9 2.7-.5-.7 1.8-1.8.3zm5.8-5.1.3.1c.4.1.5.5.4.9l-3 8-1.8 2.4.2-3 3-8c.1-.4.5-.5.9-.4zm10.8-2.8c-.4.4-.9 1.7-1.9 5.5h.1l.3 1.6-.8.1c-.1.5-.2 1-.4 1.6 1.7.9.8 3.1.7 3.1s-.1 0-.1-.1.1-.4-.2-.5c-.2-.1-.6-.2-.9-.4-.3 1.2-.6 2.6-.9 4.1l6.3-1-2.1-14.1z"/>
+</svg>
diff --git a/build/media_source/system/joomla.asset.json b/media_source/system/joomla.asset.json
similarity index 97%
rename from build/media_source/system/joomla.asset.json
rename to media_source/system/joomla.asset.json
index 726739b2b1b7e..2b728f1534283 100644
--- a/build/media_source/system/joomla.asset.json
+++ b/media_source/system/joomla.asset.json
@@ -299,6 +299,14 @@
         "defer": true
       }
     },
+    {
+      "name": "joomla.batch-tag-addremove",
+      "type": "script",
+      "uri": "layouts/joomla/html/batch/batch-tag-addremove.min.js",
+      "attributes": {
+        "defer": true
+      }
+    },
     {
       "name": "webcomponent.field-fancy-select-legacy",
       "type": "script",
@@ -309,7 +317,7 @@
         "defer": true
       },
       "dependencies": [
-        "wcpolyfill",
+        "core",
         "choicesjs"
       ]
     },
@@ -345,7 +353,7 @@
         "defer": true
       },
       "dependencies": [
-        "wcpolyfill"
+        "core"
       ]
     },
     {
@@ -370,7 +378,7 @@
         "defer": true
       },
       "dependencies": [
-        "wcpolyfill"
+        "core"
       ]
     },
     {
@@ -394,7 +402,7 @@
         "defer": true
       },
       "dependencies": [
-        "wcpolyfill"
+        "core"
       ]
     },
     {
@@ -423,7 +431,7 @@
         "defer": true
       },
       "dependencies": [
-        "wcpolyfill"
+        "core"
       ]
     },
     {
@@ -447,7 +455,7 @@
         "defer": true
       },
       "dependencies": [
-        "wcpolyfill"
+        "core"
       ]
     },
     {
@@ -476,7 +484,7 @@
         "defer": true
       },
       "dependencies": [
-        "wcpolyfill"
+        "core"
       ]
     },
     {
@@ -500,7 +508,7 @@
         "defer": true
       },
       "dependencies": [
-        "wcpolyfill"
+        "core"
       ]
     },
     {
@@ -524,7 +532,7 @@
         "defer": true
       },
       "dependencies": [
-        "wcpolyfill"
+        "core"
       ]
     },
     {
@@ -549,7 +557,7 @@
         "defer": true
       },
       "dependencies": [
-        "wcpolyfill"
+        "core"
       ]
     },
     {
@@ -573,7 +581,7 @@
         "defer": true
       },
       "dependencies": [
-        "wcpolyfill"
+        "core"
       ]
     },
     {
@@ -597,7 +605,7 @@
         "defer": true
       },
       "dependencies": [
-        "wcpolyfill"
+        "core"
       ]
     },
     {
@@ -618,7 +626,6 @@
       "uri": "system/joomla-dialog.min.js",
       "importmap": true,
       "dependencies": [
-        "wcpolyfill",
         "core"
       ]
     },
diff --git a/build/media_source/system/js/core.es6.js b/media_source/system/js/core.es6.js
similarity index 99%
rename from build/media_source/system/js/core.es6.js
rename to media_source/system/js/core.es6.js
index 19d308cf0c101..12ff840623e62 100644
--- a/build/media_source/system/js/core.es6.js
+++ b/media_source/system/js/core.es6.js
@@ -299,7 +299,7 @@ Joomla.Text = {
  *
  * @type {{}}
  *
- * @deprecated   4.0 will be removed in 6.0
+ * @deprecated   4.0 will be removed in 7.0
  *               Example: Joomla.Text._('...');
  *                        Joomla.Text.load(...);
  */
@@ -736,7 +736,8 @@ Joomla.enqueueRequest = (options) => {
  */
 Joomla.sanitizeHtml = (unsafeHtml, allowList, sanitizeFn) => {
   const allowed = (allowList === undefined || allowList === null)
-    ? DefaultAllowlist : { ...DefaultAllowlist, ...allowList };
+    ? DefaultAllowlist
+    : { ...DefaultAllowlist, ...allowList };
   return sanitizeHtml(unsafeHtml, allowed, sanitizeFn);
 };
 
diff --git a/build/media_source/system/js/draggable.es6.js b/media_source/system/js/draggable.es6.js
similarity index 100%
rename from build/media_source/system/js/draggable.es6.js
rename to media_source/system/js/draggable.es6.js
diff --git a/build/media_source/system/js/editors/editor-api.es6.js b/media_source/system/js/editors/editor-api.es6.js
similarity index 100%
rename from build/media_source/system/js/editors/editor-api.es6.js
rename to media_source/system/js/editors/editor-api.es6.js
diff --git a/build/media_source/system/js/editors/editor-decorator.es6.js b/media_source/system/js/editors/editor-decorator.es6.js
similarity index 100%
rename from build/media_source/system/js/editors/editor-decorator.es6.js
rename to media_source/system/js/editors/editor-decorator.es6.js
diff --git a/build/media_source/system/js/editors/editors.es6.js b/media_source/system/js/editors/editors.es6.js
similarity index 100%
rename from build/media_source/system/js/editors/editors.es6.js
rename to media_source/system/js/editors/editors.es6.js
diff --git a/build/media_source/system/js/fields/calendar-locales/date/gregorian/date-helper.es5.js b/media_source/system/js/fields/calendar-locales/date/gregorian/date-helper.es5.js
similarity index 100%
rename from build/media_source/system/js/fields/calendar-locales/date/gregorian/date-helper.es5.js
rename to media_source/system/js/fields/calendar-locales/date/gregorian/date-helper.es5.js
diff --git a/build/media_source/system/js/fields/calendar-locales/date/jalali/date-helper.es5.js b/media_source/system/js/fields/calendar-locales/date/jalali/date-helper.es5.js
similarity index 100%
rename from build/media_source/system/js/fields/calendar-locales/date/jalali/date-helper.es5.js
rename to media_source/system/js/fields/calendar-locales/date/jalali/date-helper.es5.js
diff --git a/build/media_source/system/js/fields/calendar.es5.js b/media_source/system/js/fields/calendar.es5.js
similarity index 100%
rename from build/media_source/system/js/fields/calendar.es5.js
rename to media_source/system/js/fields/calendar.es5.js
diff --git a/build/media_source/system/js/fields/color-field-adv-init.es5.js b/media_source/system/js/fields/color-field-adv-init.es5.js
similarity index 100%
rename from build/media_source/system/js/fields/color-field-adv-init.es5.js
rename to media_source/system/js/fields/color-field-adv-init.es5.js
diff --git a/build/media_source/system/js/fields/joomla-field-color-slider.es6.js b/media_source/system/js/fields/joomla-field-color-slider.es6.js
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-color-slider.es6.js
rename to media_source/system/js/fields/joomla-field-color-slider.es6.js
diff --git a/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js b/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
similarity index 93%
rename from build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
rename to media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
index 8f56728c0455d..6a041d913e935 100644
--- a/build/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
+++ b/media_source/system/js/fields/joomla-field-fancy-select.w-c.es6.js
@@ -111,19 +111,26 @@ window.customElements.define('joomla-field-fancy-select', class extends HTMLElem
 
     this.isDisconnected = false;
 
-    // Add placeholder option for multiple mode,
-    // Because it not supported as parameter by Choices for <select> https://github.com/jshjohnson/Choices#placeholder
-    if (this.select.multiple && this.placeholder) {
-      const option = document.createElement('option');
-      option.setAttribute('placeholder', '');
-      option.textContent = this.placeholder;
-      this.select.appendChild(option);
+    // START Work around for issue https://github.com/joomla/joomla-cms/issues/47507
+    // For single-select fields, if selectedIndex is 0 and no option has a
+    // selected attribute, set it before choices.js init.
+    //
+    // This workaround can be removed when choices.js
+    // handles this state on init.
+    if (!this.select.multiple
+      && this.select.options.length
+      && this.select.selectedIndex === 0
+      && !this.select.querySelector('option[selected]')) {
+      this.select.options[0].selected = true;
+      this.select.options[0].setAttribute('selected', '');
     }
+    // END workaround for issue #47507
 
     // Init Choices
     this.choicesInstance = new Choices(this.select, {
       placeholderValue: this.placeholder,
       searchPlaceholderValue: this.searchPlaceholder,
+      appendGroupInSearch: true,
       removeItemButton: true,
       searchFloor: this.minTermLength,
       searchResultLimit: parseInt(this.select.dataset.maxResults, 10) || 10,
@@ -254,8 +261,10 @@ window.customElements.define('joomla-field-fancy-select', class extends HTMLElem
     // Handle remote search
     if (this.remoteSearch && this.url) {
       // Cache existing
-      this.choicesInstance.config.choices.forEach((choiceItem) => {
-        this.choicesCache[choiceItem.value] = choiceItem.label;
+      this.choicesInstance.passedElement.optionsAsChoices().forEach((choiceItem) => {
+        if (choiceItem.value !== undefined) {
+          this.choicesCache[choiceItem.value] = choiceItem.label;
+        }
       });
 
       const lookupDelay = 300;
diff --git a/build/media_source/system/js/fields/joomla-field-media.w-c.es6.js b/media_source/system/js/fields/joomla-field-media.w-c.es6.js
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-media.w-c.es6.js
rename to media_source/system/js/fields/joomla-field-media.w-c.es6.js
diff --git a/build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js b/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-module-order.w-c.es6.js
rename to media_source/system/js/fields/joomla-field-module-order.w-c.es6.js
diff --git a/build/media_source/system/js/fields/joomla-field-permissions.w-c.es6.js b/media_source/system/js/fields/joomla-field-permissions.w-c.es6.js
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-permissions.w-c.es6.js
rename to media_source/system/js/fields/joomla-field-permissions.w-c.es6.js
diff --git a/build/media_source/system/js/fields/joomla-field-send-test-mail.w-c.es6.js b/media_source/system/js/fields/joomla-field-send-test-mail.w-c.es6.js
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-send-test-mail.w-c.es6.js
rename to media_source/system/js/fields/joomla-field-send-test-mail.w-c.es6.js
diff --git a/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js b/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js
new file mode 100644
index 0000000000000..347a3f696ef83
--- /dev/null
+++ b/media_source/system/js/fields/joomla-field-simple-color.w-c.es6.js
@@ -0,0 +1,192 @@
+/**
+ * @copyright  (C) 2024 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+function getText(translatableText, fallbackText) {
+  const translatedText = typeof Joomla?.Text?._ === 'function' ? Joomla.Text._(translatableText) : '';
+
+  return translatedText !== translatableText ? translatedText : fallbackText;
+}
+
+const texts = {
+  none: ['JNONE', 'None'],
+  close: ['JCLOSE', 'Close'],
+};
+
+const checker = 'url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3ggRDQENU0dyawAAACZJREFUGNNjPHXqDAMSMDY2ROYyMeAFNJVm/Pv3LzL/7Nnzg8VpAKebCGpIIxHBAAAAAElFTkSuQmCC")';
+const template = Object.assign(document.createElement('template'), {
+  innerHTML: `
+    <button type="button" part="opener" aria-expanded="false"></button>
+    <div part="panel">
+      <slot name="colors"></slot>
+      <button type="button" aria-label="Close" part="close">
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512" width="16" height="16" fill="currentColor"><path d="M342.6 150.6c12.5-12.5 12.5-32.8 0-45.3s-32.8-12.5-45.3 0L192 210.7 86.6 105.4c-12.5-12.5-32.8-12.5-45.3 0s-12.5 32.8 0 45.3L146.7 256 41.4 361.4c-12.5 12.5-12.5 32.8 0 45.3s32.8 12.5 45.3 0L192 301.3 297.4 406.6c12.5 12.5 32.8 12.5 45.3 0s12.5-32.8 0-45.3L237.3 256 342.6 150.6z"/></svg>
+      </button>
+    </div>`,
+});
+
+const sheet = new CSSStyleSheet();
+sheet.replaceSync('[part=close] svg { padding-block-start: .2rem; }');
+
+// Expand any short code
+function getColorName(value) {
+  let newValue = value;
+  if (newValue === 'none') return getText(texts.none[0], texts.none[1]);
+  if (value.startsWith('#') && value.length === 4) {
+    const tmpValue = value.split('');
+    newValue = tmpValue[0] + tmpValue[1] + tmpValue[1] + tmpValue[2] + tmpValue[2] + tmpValue[3] + tmpValue[3];
+  }
+
+  return newValue;
+}
+
+class JoomlaFieldSimpleColor extends HTMLElement {
+  static formAssociated = true;
+
+  get value() { return this.getAttribute('value'); }
+
+  set value(value) { this.setAttribute('value', value); }
+
+  constructor() {
+    super();
+
+    this.attachShadow({ mode: 'open' });
+    this.shadowRoot.appendChild(template.content.cloneNode(true));
+    this.shadowRoot.adoptedStyleSheets = [sheet];
+
+    this.internals = null;
+    this.show = this.show.bind(this);
+    this.hide = this.hide.bind(this);
+    this.keys = this.keys.bind(this);
+    this.colorSelect = this.colorSelect.bind(this);
+    this.getActiveElement = this.getActiveElement.bind(this);
+    this.onDocumentClick = this.onDocumentClick.bind(this);
+
+    // Create a dummy div for the validation of the colors
+    this.div = document.createElement('div');
+  }
+
+  connectedCallback() {
+    try {
+      this.internals = this.attachInternals();
+      this.form = this.internals.form;
+    } catch (error) {
+      throw new Error('Unsupported browser');
+    }
+
+    if (this.internals) {
+      this.querySelector('input[type=hidden]')?.remove();
+    }
+
+    if (this.internals && this.internals.labels.length) {
+      this.internals.labels.forEach((label) => label.addEventListener('click', this.show));
+    }
+
+    this.button = this.shadowRoot.querySelector('[part=opener]');
+    this.panel = this.shadowRoot.querySelector('[part=panel]');
+    this.closeButton = this.panel.querySelector('[part=close]');
+    this.panel.style.display = 'none';
+    this.button.style.background = this.value === 'none' ? checker : this.value;
+
+    this.button.addEventListener('click', this.show);
+    this.internals.setFormValue(this.value);
+  }
+
+  // Show the panel
+  show() {
+    let focused;
+    this.slotted = this.shadowRoot.querySelector('slot[name=colors]');
+    this.addEventListener('keydown', this.keys);
+    this.closeButton.addEventListener('click', this.hide);
+    this.closeButton.setAttribute('aria-label', getText(texts.close[0], texts.close[1]));
+    this.slotted.assignedElements().forEach((element) => {
+      if (!this.validateColor(element.value)) {
+        element.remove();
+      }
+
+      element.style.background = element.value === 'none' ? checker : element.value;
+      element.setAttribute('aria-label', getColorName(element.value));
+      element.addEventListener('click', this.colorSelect);
+      if (element.getAttribute('aria-pressed') === 'true') {
+        focused = element;
+      }
+    });
+    this.button.style.display = 'none';
+    this.panel.style.display = 'flex';
+    this.button.setAttribute('aria-expanded', 'true');
+
+    if (focused) {
+      focused.focus();
+    } else {
+      this.closeButton.focus();
+    }
+    document.addEventListener('click', this.onDocumentClick);
+  }
+
+  // Hide the panel
+  hide() {
+    this.removeEventListener('keydown', this.keys);
+    document.removeEventListener('click', this.onDocumentClick);
+    this.button.setAttribute('aria-expanded', 'false');
+    this.panel.style.display = 'none';
+    this.button.style.display = 'block';
+
+    this.slotted.assignedElements().forEach((element) => element.removeEventListener('click', this.colorSelect));
+    this.button.focus();
+  }
+
+  onDocumentClick(e) {
+    if ([...this.internals.labels].includes(e.target)) return;
+    if ((e.target.closest('joomla-field-simple-color') !== this) && this.panel.style.display === 'flex') {
+      this.hide();
+    }
+  }
+
+  colorSelect(event) {
+    const { currentTarget } = event;
+    this.slotted.assignedElements().forEach((element) => element.setAttribute('aria-pressed', element !== currentTarget ? 'false' : 'true'));
+    this.button.style.background = currentTarget.value === 'none' ? checker : currentTarget.value;
+    this.hide();
+    this.internals.setFormValue(currentTarget.value);
+    this.value = currentTarget.value;
+    this.dispatchEvent(new Event('change'));
+  }
+
+  keys(e) {
+    if (e.code === 'Escape') {
+      this.hide();
+    }
+
+    // Trap the focus
+    if (e.code === 'Tab') {
+      const focusableElements = [...this.slotted.assignedElements(), this.closeButton];
+      const focusedIndex = focusableElements.indexOf(this.getActiveElement());
+
+      if (e.shiftKey && (focusedIndex === 0)) {
+        focusableElements[focusableElements.length - 1].focus();
+        e.preventDefault();
+      } else if (!e.shiftKey && focusedIndex === focusableElements.length - 1) {
+        focusableElements[0].focus();
+        e.preventDefault();
+      }
+    }
+  }
+
+  getActiveElement(root = document) {
+    const activeEl = root.activeElement;
+
+    if (!activeEl) {
+      return null;
+    }
+
+    return activeEl.shadowRoot ? this.getActiveElement(activeEl.shadowRoot) : activeEl;
+  }
+
+  validateColor(color) {
+    this.div.style.color = color;
+    return this.div.style.color !== '';
+  }
+}
+
+customElements.define('joomla-field-simple-color', JoomlaFieldSimpleColor);
diff --git a/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js b/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
similarity index 95%
rename from build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
rename to media_source/system/js/fields/joomla-field-subform.w-c.es6.js
index 8f898c130da18..80878570122c7 100644
--- a/build/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
+++ b/media_source/system/js/fields/joomla-field-subform.w-c.es6.js
@@ -393,7 +393,9 @@ class JoomlaFieldSubform extends HTMLElement {
     // Helper method to test whether Handler was clicked
     function getMoveHandler(element) {
       return !element.form // This need to test whether the element is :input
-      && element.matches(that.buttonMove) ? element : element.closest(that.buttonMove);
+        && element.matches(that.buttonMove)
+        ? element
+        : element.closest(that.buttonMove);
     }
 
     // Helper method to move row to selected position
@@ -409,11 +411,27 @@ class JoomlaFieldSubform extends HTMLElement {
         }
       }
 
+      // Find row position before sorting
+      const fromPosition = Array.from(src.parentElement.children)
+        .filter((row) => row.matches(that.repeatableElement)).indexOf(src);
+
       if (isRowBefore) {
         dest.parentNode.insertBefore(src, dest);
       } else {
         dest.parentNode.insertBefore(src, dest.nextSibling);
       }
+
+      // Find final row position, after sorting
+      const toPosition = Array.from(src.parentElement.children)
+        .filter((row) => row.matches(that.repeatableElement)).indexOf(src);
+
+      // Dispatch order-changed event
+      if (fromPosition !== toPosition) {
+        that.dispatchEvent(new CustomEvent('subform-order-changed', {
+          detail: { row: src, fromPosition, toPosition },
+          bubbles: true,
+        }));
+      }
     }
 
     /**
@@ -492,8 +510,8 @@ class JoomlaFieldSubform extends HTMLElement {
     // - "esc" to cancel selection
     this.addEventListener('keydown', (event) => {
       if ((event.code !== KEYCODE.ESC
-          && event.code !== KEYCODE.SPACE
-          && event.code !== KEYCODE.ENTER) || event.target.form
+        && event.code !== KEYCODE.SPACE
+        && event.code !== KEYCODE.ENTER) || event.target.form
         || !event.target.matches(that.repeatableElement)) {
         return;
       }
diff --git a/build/media_source/system/js/fields/joomla-field-user.w-c.es6.js b/media_source/system/js/fields/joomla-field-user.w-c.es6.js
similarity index 100%
rename from build/media_source/system/js/fields/joomla-field-user.w-c.es6.js
rename to media_source/system/js/fields/joomla-field-user.w-c.es6.js
diff --git a/build/media_source/system/js/fields/joomla-media-select.w-c.es6.js b/media_source/system/js/fields/joomla-media-select.w-c.es6.js
similarity index 99%
rename from build/media_source/system/js/fields/joomla-media-select.w-c.es6.js
rename to media_source/system/js/fields/joomla-media-select.w-c.es6.js
index b13936441a23f..eff8eafd16218 100644
--- a/build/media_source/system/js/fields/joomla-media-select.w-c.es6.js
+++ b/media_source/system/js/fields/joomla-media-select.w-c.es6.js
@@ -93,7 +93,8 @@ document.addEventListener('onMediaFileSelected', async (e) => {
  * @returns {boolean}
  */
 const isElement = (o) => (
-  typeof HTMLElement === 'object' ? o instanceof HTMLElement
+  typeof HTMLElement === 'object'
+    ? o instanceof HTMLElement
     : o && typeof o === 'object' && o.nodeType === 1 && typeof o.nodeName === 'string'
 );
 
diff --git a/build/media_source/system/js/fields/modal-content-select-field.es6.js b/media_source/system/js/fields/modal-content-select-field.es6.js
similarity index 99%
rename from build/media_source/system/js/fields/modal-content-select-field.es6.js
rename to media_source/system/js/fields/modal-content-select-field.es6.js
index c7e422625e3c5..0e345606fd476 100644
--- a/build/media_source/system/js/fields/modal-content-select-field.es6.js
+++ b/media_source/system/js/fields/modal-content-select-field.es6.js
@@ -77,10 +77,8 @@ const updateView = (inputValue, container) => {
   const hasValue = !!inputValue.value;
   container.querySelectorAll('[data-show-when-value]').forEach((el) => {
     if (el.dataset.showWhenValue) {
-
       hasValue ? el.removeAttribute('hidden') : el.setAttribute('hidden', '');
     } else {
-
       hasValue ? el.setAttribute('hidden', '') : el.removeAttribute('hidden');
     }
   });
diff --git a/build/media_source/system/js/fields/modal-fields.es5.js b/media_source/system/js/fields/modal-fields.es5.js
similarity index 100%
rename from build/media_source/system/js/fields/modal-fields.es5.js
rename to media_source/system/js/fields/modal-fields.es5.js
diff --git a/build/media_source/system/js/fields/passwordstrength.es6.js b/media_source/system/js/fields/passwordstrength.es6.js
similarity index 97%
rename from build/media_source/system/js/fields/passwordstrength.es6.js
rename to media_source/system/js/fields/passwordstrength.es6.js
index 05320db10299c..d93396407d178 100644
--- a/build/media_source/system/js/fields/passwordstrength.es6.js
+++ b/media_source/system/js/fields/passwordstrength.es6.js
@@ -149,10 +149,9 @@ class PasswordStrength {
       meter.setAttribute('optimum', 100);
       meter.value = initialVal;
 
-      const label = document.createElement('div');
-      label.setAttribute('class', 'text-center');
+      const label = document.createElement('output');
       label.setAttribute('id', `password-${index}`);
-      label.setAttribute('aria-live', 'polite');
+      label.setAttribute('for', field.id);
 
       field.parentNode.insertAdjacentElement('afterEnd', label);
       field.parentNode.insertAdjacentElement('afterEnd', meter);
diff --git a/build/media_source/system/js/fields/passwordview.es6.js b/media_source/system/js/fields/passwordview.es6.js
similarity index 100%
rename from build/media_source/system/js/fields/passwordview.es6.js
rename to media_source/system/js/fields/passwordview.es6.js
diff --git a/build/media_source/system/js/fields/select-colour.es6.js b/media_source/system/js/fields/select-colour.es6.js
similarity index 100%
rename from build/media_source/system/js/fields/select-colour.es6.js
rename to media_source/system/js/fields/select-colour.es6.js
diff --git a/build/media_source/system/js/fields/validate.es6.js b/media_source/system/js/fields/validate.es6.js
similarity index 99%
rename from build/media_source/system/js/fields/validate.es6.js
rename to media_source/system/js/fields/validate.es6.js
index b34b69b279747..0493c84aa8ca0 100644
--- a/build/media_source/system/js/fields/validate.es6.js
+++ b/media_source/system/js/fields/validate.es6.js
@@ -315,7 +315,7 @@ document.formvalidator = new JFormValidator();
 
 /**
  * Expose the classes to the global scope
- * These will be removed in Joomla! 6.0
+ * These will be removed in Joomla! 7.0
  */
 window.JFormValidator = JFormValidator;
 window.punycode = punycode;
diff --git a/build/media_source/system/js/highlight.es6.js b/media_source/system/js/highlight.es6.js
similarity index 100%
rename from build/media_source/system/js/highlight.es6.js
rename to media_source/system/js/highlight.es6.js
diff --git a/build/media_source/system/js/inlinehelp.es6.js b/media_source/system/js/inlinehelp.es6.js
similarity index 100%
rename from build/media_source/system/js/inlinehelp.es6.js
rename to media_source/system/js/inlinehelp.es6.js
diff --git a/build/media_source/system/js/joomla-core-loader.w-c.es6.js b/media_source/system/js/joomla-core-loader.w-c.es6.js
similarity index 100%
rename from build/media_source/system/js/joomla-core-loader.w-c.es6.js
rename to media_source/system/js/joomla-core-loader.w-c.es6.js
diff --git a/build/media_source/system/js/joomla-dialog-autocreate.es6.js b/media_source/system/js/joomla-dialog-autocreate.es6.js
similarity index 100%
rename from build/media_source/system/js/joomla-dialog-autocreate.es6.js
rename to media_source/system/js/joomla-dialog-autocreate.es6.js
diff --git a/build/media_source/system/js/joomla-dialog.w-c.es6.js b/media_source/system/js/joomla-dialog.w-c.es6.js
similarity index 100%
rename from build/media_source/system/js/joomla-dialog.w-c.es6.js
rename to media_source/system/js/joomla-dialog.w-c.es6.js
diff --git a/build/media_source/system/js/joomla-hidden-mail.w-c.es6.js b/media_source/system/js/joomla-hidden-mail.w-c.es6.js
similarity index 100%
rename from build/media_source/system/js/joomla-hidden-mail.w-c.es6.js
rename to media_source/system/js/joomla-hidden-mail.w-c.es6.js
diff --git a/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js b/media_source/system/js/joomla-toolbar-button.w-c.es6.js
similarity index 93%
rename from build/media_source/system/js/joomla-toolbar-button.w-c.es6.js
rename to media_source/system/js/joomla-toolbar-button.w-c.es6.js
index 19b9c06e72b29..7cccf47597994 100644
--- a/build/media_source/system/js/joomla-toolbar-button.w-c.es6.js
+++ b/media_source/system/js/joomla-toolbar-button.w-c.es6.js
@@ -85,12 +85,12 @@ window.customElements.define('joomla-toolbar-button', class extends HTMLElement
     if (this.buttonElement) {
       if (this.disabled) {
         if (this.buttonElement.nodeName === 'BUTTON') {
-          this.buttonElement.disabled = true;
-        } else {
-          this.buttonElement.classList.add('disabled');
+          this.buttonElement.setAttribute('aria-disabled', 'true');
         }
+        this.buttonElement.classList.add('disabled');
       } else if (this.buttonElement.nodeName === 'BUTTON') {
-        this.buttonElement.disabled = false;
+        this.buttonElement.removeAttribute('aria-disabled');
+        this.buttonElement.classList.remove('disabled');
       } else {
         this.buttonElement.classList.remove('disabled');
       }
diff --git a/build/media_source/system/js/keepalive.es6.js b/media_source/system/js/keepalive.es6.js
similarity index 100%
rename from build/media_source/system/js/keepalive.es6.js
rename to media_source/system/js/keepalive.es6.js
diff --git a/build/media_source/system/js/list-view.es6.js b/media_source/system/js/list-view.es6.js
similarity index 100%
rename from build/media_source/system/js/list-view.es6.js
rename to media_source/system/js/list-view.es6.js
diff --git a/build/media_source/system/js/messages.es6.js b/media_source/system/js/messages.es6.js
similarity index 100%
rename from build/media_source/system/js/messages.es6.js
rename to media_source/system/js/messages.es6.js
diff --git a/build/media_source/system/js/modal-content-select.es6.js b/media_source/system/js/modal-content-select.es6.js
similarity index 100%
rename from build/media_source/system/js/modal-content-select.es6.js
rename to media_source/system/js/modal-content-select.es6.js
diff --git a/build/media_source/system/js/multiselect.es6.js b/media_source/system/js/multiselect.es6.js
similarity index 100%
rename from build/media_source/system/js/multiselect.es6.js
rename to media_source/system/js/multiselect.es6.js
diff --git a/build/media_source/system/js/searchtools.es6.js b/media_source/system/js/searchtools.es6.js
similarity index 92%
rename from build/media_source/system/js/searchtools.es6.js
rename to media_source/system/js/searchtools.es6.js
index 32bffd78cd0b0..48c89c17fd787 100644
--- a/build/media_source/system/js/searchtools.es6.js
+++ b/media_source/system/js/searchtools.es6.js
@@ -38,7 +38,12 @@ Joomla = window.Joomla || {};
         elem.value = '';
       });
 
-      form.submit();
+      if (form.requestSubmit) {
+        form.requestSubmit();
+      } else {
+        // Fallback if requestSubmit is not available
+        form.submit();
+      }
     }
   };
 
@@ -89,6 +94,14 @@ Joomla = window.Joomla || {};
 
       // Initialise selectors
       this.theForm = document.querySelector(this.options.formSelector);
+      // Prevent duplicate initialization when joomla:updated fires
+      if (this.theForm && this.theForm.dataset.searchtoolsInitialized) {
+        return;
+      }
+
+      if (this.theForm) {
+        this.theForm.dataset.searchtoolsInitialized = 'true';
+      }
 
       // Filters
       this.filterButton = document.querySelector(`${this.options.formSelector} ${this.options.filterBtnSelector}`);
@@ -179,15 +192,20 @@ Joomla = window.Joomla || {};
       // Do we need to add to mark filter as enabled?
       this.getFilterFields().forEach((i) => {
         const needsFormSubmit = !i.classList.contains(this.options.listSelectAutoSubmit)
-        && i.closest(`joomla-field-fancy-select.${this.options.listSelectAutoSubmit}`);
+          && i.closest(`joomla-field-fancy-select.${this.options.listSelectAutoSubmit}`);
         const needsFormReset = !i.classList.contains(this.options.listSelectAutoReset)
-        && i.closest(`joomla-field-fancy-select.${this.options.listSelectAutoReset}`);
+          && i.closest(`joomla-field-fancy-select.${this.options.listSelectAutoReset}`);
 
         self.checkFilter(i);
         i.addEventListener('change', () => {
           self.checkFilter(i);
           if (i.classList.contains(this.options.listSelectAutoSubmit) || needsFormSubmit) {
-            i.form.submit();
+            if (i.form.requestSubmit) {
+              i.form.requestSubmit();
+            } else {
+              // Fallback if requestSubmit is not available
+              i.form.submit();
+            }
           }
           if (i.classList.contains(this.options.listSelectAutoReset) || needsFormReset) {
             this.clear(i);
@@ -225,7 +243,12 @@ Joomla = window.Joomla || {};
               self.toggleDirection();
             }
 
-            self.theForm.submit();
+            if (self.theForm.requestSubmit) {
+              self.theForm.requestSubmit();
+            } else {
+              // Fallback if requestSubmit is not available
+              self.theForm.submit();
+            }
           }
         });
       });
@@ -263,32 +286,30 @@ Joomla = window.Joomla || {};
         }
 
         i.value = '';
-        self.checkFilter(i);
 
-        if (window.jQuery && window.jQuery.chosen) {
-          window.jQuery(i).trigger('chosen:updated');
+        if (i.hasAttribute('data-alt-value')) {
+          i.setAttribute('data-alt-value', '');
+          i.dispatchEvent(new Event('change', { bubbles: true }));
         }
+        self.checkFilter(i);
       });
 
       if (self.clearListOptions) {
         self.getListFields().forEach((i) => {
           i.value = '';
           self.checkFilter(i);
-
-          if (window.jQuery && window.jQuery.chosen) {
-            window.jQuery(i).trigger('chosen:updated');
-          }
         });
 
         // Special case to limit box to the default config limit
         document.querySelector('#list_limit').value = self.options.defaultLimit;
-
-        if (window.jQuery && window.jQuery.chosen) {
-          window.jQuery('#list_limit').trigger('chosen:updated');
-        }
       }
 
-      self.theForm.submit();
+      if (self.theForm.requestSubmit) {
+        self.theForm.requestSubmit();
+      } else {
+        // Fallback if requestSubmit is not available
+        self.theForm.submit();
+      }
     }
 
     updateFilterCount(count) {
@@ -359,7 +380,6 @@ Joomla = window.Joomla || {};
       }
     }
 
-
     deactiveFilter(element) {
       element.classList.remove('active');
       const chosenId = `#${element.getAttribute('id')}`;
@@ -488,10 +508,6 @@ Joomla = window.Joomla || {};
             }
           }
         });
-
-        if (window.jQuery && window.jQuery.chosen) {
-          window.jQuery(this.orderField).trigger('chosen:updated');
-        }
       }
 
       this.activeOrder = this.orderField.value;
@@ -527,10 +543,6 @@ Joomla = window.Joomla || {};
         }
 
         field.value = newValue;
-        // Trigger the chosen update
-        if (window.jQuery && window.jQuery.chosen) {
-          field.trigger('chosen:updated');
-        }
       }
     }
 
@@ -564,6 +576,9 @@ Joomla = window.Joomla || {};
       sort.parentNode.setAttribute('aria-sort', ariasort);
     }
 
+    // Reinitialize for Joomla Updated event
+    document.addEventListener('joomla:updated', onBoot);
+
     // Cleanup
     document.removeEventListener('DOMContentLoaded', onBoot);
   };
diff --git a/build/media_source/system/js/showon.es6.js b/media_source/system/js/showon.es6.js
similarity index 100%
rename from build/media_source/system/js/showon.es6.js
rename to media_source/system/js/showon.es6.js
diff --git a/build/media_source/system/js/table-columns.es6.js b/media_source/system/js/table-columns.es6.js
similarity index 96%
rename from build/media_source/system/js/table-columns.es6.js
rename to media_source/system/js/table-columns.es6.js
index 9aa237b3bdf26..15a64da8473de 100644
--- a/build/media_source/system/js/table-columns.es6.js
+++ b/media_source/system/js/table-columns.es6.js
@@ -187,9 +187,11 @@ class TableColumns {
 if (window.innerWidth > 992) {
   // Look for dataset name else page-title
   [...document.querySelectorAll('table:not(.columns-order-ignore)')].forEach(($table) => {
-    const tableName = ($table.dataset.name ? $table.dataset.name : document.querySelector('.page-title')?.textContent.trim()
-      .replace(/[^a-z0-9]/gi, '-')
-      .toLowerCase()
+    const tableName = ($table.dataset.name
+      ? $table.dataset.name
+      : document.querySelector('.page-title')?.textContent.trim()
+          .replace(/[^a-z0-9]/gi, '-')
+          .toLowerCase()
     );
 
     // Skip unnamed table
diff --git a/build/media_source/system/js/treeselectmenu.es6.js b/media_source/system/js/treeselectmenu.es6.js
similarity index 100%
rename from build/media_source/system/js/treeselectmenu.es6.js
rename to media_source/system/js/treeselectmenu.es6.js
diff --git a/build/media_source/system/scss/_icomoon.scss b/media_source/system/scss/_icomoon.scss
similarity index 100%
rename from build/media_source/system/scss/_icomoon.scss
rename to media_source/system/scss/_icomoon.scss
diff --git a/build/media_source/system/scss/_jquery-minicolors.scss b/media_source/system/scss/_jquery-minicolors.scss
similarity index 100%
rename from build/media_source/system/scss/_jquery-minicolors.scss
rename to media_source/system/scss/_jquery-minicolors.scss
diff --git a/build/media_source/system/scss/editor.scss b/media_source/system/scss/editor.scss
similarity index 100%
rename from build/media_source/system/scss/editor.scss
rename to media_source/system/scss/editor.scss
diff --git a/build/media_source/system/scss/fields/joomla-field-media.scss b/media_source/system/scss/fields/joomla-field-media.scss
similarity index 100%
rename from build/media_source/system/scss/fields/joomla-field-media.scss
rename to media_source/system/scss/fields/joomla-field-media.scss
diff --git a/build/media_source/system/scss/fields/joomla-field-permissions.scss b/media_source/system/scss/fields/joomla-field-permissions.scss
similarity index 100%
rename from build/media_source/system/scss/fields/joomla-field-permissions.scss
rename to media_source/system/scss/fields/joomla-field-permissions.scss
diff --git a/media_source/system/scss/fields/joomla-field-simple-color.scss b/media_source/system/scss/fields/joomla-field-simple-color.scss
new file mode 100644
index 0000000000000..21ba29cc28c97
--- /dev/null
+++ b/media_source/system/scss/fields/joomla-field-simple-color.scss
@@ -0,0 +1,52 @@
+joomla-field-simple-color {
+  display: block;
+
+  button {
+    width: 2rem;
+    height: 2rem;
+    appearance: none;
+    background: none;
+    border: var(--border-width, 1px) solid var(--input-border-color, #ccc);
+    border-radius: var(--border-radius, .25rem);
+    margin-inline: .5rem;
+    margin-block-end: .24rem;
+  }
+
+  &::part(close) {
+    appearance: none;
+    background: none;
+    border: 0;
+    margin-inline: .5rem;
+    margin-block-end: .2rem;
+  }
+
+  &::part(opener) {
+    width: 2rem;
+    height: 2rem;
+    overflow: hidden;
+    vertical-align: middle;
+    border: var(--border-width, 1px) solid var(--input-border-color, #ccc);
+    border-radius: var(--border-radius, .25rem);
+    appearance: none;
+    margin-block: .7rem;
+  }
+
+  &::part(opener):focus,
+  &::part(opener):hover,
+  button[aria-pressed=true] {
+    border: 2px solid var(--template-link-color, rgba(82 168 236 / .8));
+    box-shadow: 0 0 0 .25rem #2a69b740;
+  }
+
+  &::part(panel) {
+    flex-direction: row;
+    flex-wrap: wrap;
+    float: inline-start;
+    padding: .64rem 0 .4rem;
+    background-color: var(--body-bg, #fff);
+    background-clip: padding-box;
+    border: var(--border-width, 1px) solid var(--input-border-color, #ccc);
+    border-radius: var(--border-radius, .25rem);
+    box-shadow: 0 5px 10px rgba(0 0 0 / .2);
+  }
+}
diff --git a/build/media_source/system/scss/fields/switcher.scss b/media_source/system/scss/fields/switcher.scss
similarity index 100%
rename from build/media_source/system/scss/fields/switcher.scss
rename to media_source/system/scss/fields/switcher.scss
diff --git a/media_source/system/scss/joomla-fontawesome.scss b/media_source/system/scss/joomla-fontawesome.scss
new file mode 100644
index 0000000000000..e16a9631c3fab
--- /dev/null
+++ b/media_source/system/scss/joomla-fontawesome.scss
@@ -0,0 +1,17 @@
+// Override the font path
+$fa-font-path: "../../../media/vendor/fontawesome-free/webfonts" !default;
+$fa-font-display: block !default;
+
+// Font Awesome 6 Free
+@import "../../../media/vendor/fontawesome-free/scss/fontawesome";
+@import "../../../media/vendor/fontawesome-free/scss/regular";
+@import "../../../media/vendor/fontawesome-free/scss/solid";
+
+// Brands must be imported last
+@import "../../../media/vendor/fontawesome-free/scss/brands";
+
+// B/C with Font Awesome 5
+@import "../../../media/vendor/fontawesome-free/scss/shims";
+
+// B/C for Icomoon
+@import "icomoon";
diff --git a/build/media_source/system/scss/joomla-toolbar-button.scss b/media_source/system/scss/joomla-toolbar-button.scss
similarity index 100%
rename from build/media_source/system/scss/joomla-toolbar-button.scss
rename to media_source/system/scss/joomla-toolbar-button.scss
diff --git a/build/media_source/system/scss/system-admin-error.scss b/media_source/system/scss/system-admin-error.scss
similarity index 100%
rename from build/media_source/system/scss/system-admin-error.scss
rename to media_source/system/scss/system-admin-error.scss
diff --git a/build/media_source/system/scss/system-admin-system.scss b/media_source/system/scss/system-admin-system.scss
similarity index 100%
rename from build/media_source/system/scss/system-admin-system.scss
rename to media_source/system/scss/system-admin-system.scss
diff --git a/build/media_source/system/scss/system-site-error.scss b/media_source/system/scss/system-site-error.scss
similarity index 100%
rename from build/media_source/system/scss/system-site-error.scss
rename to media_source/system/scss/system-site-error.scss
diff --git a/build/media_source/system/scss/system-site-error_rtl.scss b/media_source/system/scss/system-site-error_rtl.scss
similarity index 100%
rename from build/media_source/system/scss/system-site-error_rtl.scss
rename to media_source/system/scss/system-site-error_rtl.scss
diff --git a/build/media_source/system/scss/system-site-general.scss b/media_source/system/scss/system-site-general.scss
similarity index 100%
rename from build/media_source/system/scss/system-site-general.scss
rename to media_source/system/scss/system-site-general.scss
diff --git a/build/media_source/system/scss/system-site-offline.scss b/media_source/system/scss/system-site-offline.scss
similarity index 100%
rename from build/media_source/system/scss/system-site-offline.scss
rename to media_source/system/scss/system-site-offline.scss
diff --git a/build/media_source/templates/administrator/atum/images/icons/dashboard.svg b/media_source/templates/administrator/atum/images/icons/dashboard.svg
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/icons/dashboard.svg
rename to media_source/templates/administrator/atum/images/icons/dashboard.svg
diff --git a/build/media_source/templates/administrator/atum/images/joomla-pattern.svg b/media_source/templates/administrator/atum/images/joomla-pattern.svg
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/joomla-pattern.svg
rename to media_source/templates/administrator/atum/images/joomla-pattern.svg
diff --git a/build/media_source/templates/administrator/atum/images/logos/brand-large.svg b/media_source/templates/administrator/atum/images/logos/brand-large.svg
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/logos/brand-large.svg
rename to media_source/templates/administrator/atum/images/logos/brand-large.svg
diff --git a/build/media_source/templates/administrator/atum/images/logos/brand-small.svg b/media_source/templates/administrator/atum/images/logos/brand-small.svg
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/logos/brand-small.svg
rename to media_source/templates/administrator/atum/images/logos/brand-small.svg
diff --git a/build/media_source/templates/administrator/atum/images/logos/login.svg b/media_source/templates/administrator/atum/images/logos/login.svg
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/logos/login.svg
rename to media_source/templates/administrator/atum/images/logos/login.svg
diff --git a/build/media_source/templates/administrator/atum/images/select-bg-active-rtl.svg b/media_source/templates/administrator/atum/images/select-bg-active-rtl.svg
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/select-bg-active-rtl.svg
rename to media_source/templates/administrator/atum/images/select-bg-active-rtl.svg
diff --git a/build/media_source/templates/administrator/atum/images/select-bg-active.svg b/media_source/templates/administrator/atum/images/select-bg-active.svg
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/select-bg-active.svg
rename to media_source/templates/administrator/atum/images/select-bg-active.svg
diff --git a/build/media_source/templates/administrator/atum/images/select-bg-dark.svg b/media_source/templates/administrator/atum/images/select-bg-dark.svg
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/select-bg-dark.svg
rename to media_source/templates/administrator/atum/images/select-bg-dark.svg
diff --git a/installation/template/images/select-bg-rtl-dark.svg b/media_source/templates/administrator/atum/images/select-bg-rtl-dark.svg
similarity index 100%
rename from installation/template/images/select-bg-rtl-dark.svg
rename to media_source/templates/administrator/atum/images/select-bg-rtl-dark.svg
diff --git a/build/media_source/templates/site/cassiopeia/images/select-bg-rtl.svg b/media_source/templates/administrator/atum/images/select-bg-rtl.svg
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/images/select-bg-rtl.svg
rename to media_source/templates/administrator/atum/images/select-bg-rtl.svg
diff --git a/build/media_source/templates/site/cassiopeia/images/select-bg.svg b/media_source/templates/administrator/atum/images/select-bg.svg
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/images/select-bg.svg
rename to media_source/templates/administrator/atum/images/select-bg.svg
diff --git a/build/media_source/templates/administrator/atum/images/template_preview.png b/media_source/templates/administrator/atum/images/template_preview.png
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/template_preview.png
rename to media_source/templates/administrator/atum/images/template_preview.png
diff --git a/build/media_source/templates/administrator/atum/images/template_thumbnail.png b/media_source/templates/administrator/atum/images/template_thumbnail.png
similarity index 100%
rename from build/media_source/templates/administrator/atum/images/template_thumbnail.png
rename to media_source/templates/administrator/atum/images/template_thumbnail.png
diff --git a/build/media_source/templates/administrator/atum/js/template.es6.js b/media_source/templates/administrator/atum/js/template.es6.js
similarity index 100%
rename from build/media_source/templates/administrator/atum/js/template.es6.js
rename to media_source/templates/administrator/atum/js/template.es6.js
diff --git a/build/media_source/templates/administrator/atum/scss/_maps-atum.scss b/media_source/templates/administrator/atum/scss/_maps-atum.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/_maps-atum.scss
rename to media_source/templates/administrator/atum/scss/_maps-atum.scss
diff --git a/build/media_source/templates/administrator/atum/scss/_variables-dark.scss b/media_source/templates/administrator/atum/scss/_variables-dark.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/_variables-dark.scss
rename to media_source/templates/administrator/atum/scss/_variables-dark.scss
diff --git a/build/media_source/templates/administrator/atum/scss/_variables.scss b/media_source/templates/administrator/atum/scss/_variables.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/_variables.scss
rename to media_source/templates/administrator/atum/scss/_variables.scss
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss b/media_source/templates/administrator/atum/scss/blocks/_alerts.scss
similarity index 98%
rename from build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss
rename to media_source/templates/administrator/atum/scss/blocks/_alerts.scss
index 9a49b34c320fb..58f613979b50c 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_alerts.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_alerts.scss
@@ -1,7 +1,7 @@
 // Alerts
 
 .alert-parent {
-  margin-top: 0;
+  margin-block-start: 0;
 }
 
 .alert-heading {
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_calendar.scss b/media_source/templates/administrator/atum/scss/blocks/_calendar.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/blocks/_calendar.scss
rename to media_source/templates/administrator/atum/scss/blocks/_calendar.scss
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_edit.scss b/media_source/templates/administrator/atum/scss/blocks/_edit.scss
similarity index 72%
rename from build/media_source/templates/administrator/atum/scss/blocks/_edit.scss
rename to media_source/templates/administrator/atum/scss/blocks/_edit.scss
index ed148d96f916a..12395696baa67 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_edit.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_edit.scss
@@ -2,13 +2,13 @@
 
 .title-alias {
   .form-control {
-    max-width: 100%;
+    max-inline-size: 100%;
   }
 
   .form-control-feedback {
     position: absolute;
-    right: 1rem;
-    bottom: -1.8rem;
+    inset-inline-end: 1rem;
+    inset-block-end: -1.8rem;
     text-align: right;
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss b/media_source/templates/administrator/atum/scss/blocks/_form.scss
similarity index 71%
rename from build/media_source/templates/administrator/atum/scss/blocks/_form.scss
rename to media_source/templates/administrator/atum/scss/blocks/_form.scss
index 40c4feb4e4d74..aa65e32b7c493 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_form.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_form.scss
@@ -1,7 +1,7 @@
 // Form
 
 .form-control {
-  max-width: $input-max-width;
+  max-inline-size: $input-max-width;
   background: $form-control-bg;
   border: $form-control-border;
 
@@ -61,18 +61,18 @@
   }
 
   .control-label {
-    width: 240px;
+    inline-size: 240px;
     padding: .3rem 1rem .3rem 0;
   }
 
   .controls {
     position: relative;
     flex: 1;
-    min-width: 210px;
-    max-width: 100%;
+    min-inline-size: 210px;
+    max-inline-size: 100%;
 
     + div {
-      width: 100%;
+      inline-size: 100%;
       margin: 5px 0 10px;
     }
   }
@@ -83,36 +83,36 @@
 }
 
 .stack .control-label {
-  width: 100%;
+  inline-size: 100%;
 }
 
 .spacer {
   hr {
-    width: 380px;
+    inline-size: 380px;
   }
 }
 
 td .form-control {
   display: inline-block;
-  width: auto;
+  inline-size: auto;
 }
 
 .checkboxes {
-  padding-top: 5px;
+  padding-block-start: 5px;
 
   .checkbox input {
     position: static;
-    margin-left: 0;
+    margin-inline-start: 0;
   }
 }
 
 .form-check {
-  padding-top: 5px;
-  margin-bottom: 0;
+  padding-block-start: 5px;
+  margin-block-end: 0;
 }
 
 .modal label {
-  width: 100%;
+  inline-size: 100%;
 }
 
 // Validation
@@ -161,23 +161,23 @@ label.valid {
 :hover + [role="tooltip"] {
   position: absolute;
   display: block;
-  max-width: 100%;
+  max-inline-size: 100%;
   overflow-wrap: break-word;
   white-space: normal;
 }
 
 .filter-search-bar__description {
-  top: 100%;
-  bottom: auto;
+  inset-block-start: 100%;
+  inset-block-end: auto;
 }
 
 .container-popup .filter-search-bar__description {
-  top: 100%;
-  bottom: auto;
+  inset-block-start: 100%;
+  inset-block-end: auto;
 }
 
 .input-group > .form-control[readonly] {
-  margin-right: 1px;
+  margin-inline-end: 1px;
 }
 
 .form-group {
@@ -188,7 +188,7 @@ label.valid {
 div.subform-repeatable-group {
   position: relative;
   padding: 32px 32px 16px 28px;
-  margin-top: 20px;
+  margin-block-start: 20px;
   border: $input-border-width solid $input-border-color;
   @include border-radius($border-radius);
 
@@ -202,18 +202,18 @@ div.subform-repeatable-group {
       position: absolute;
 
       &.group-add {
-        right: -1px;
-        bottom: -1px;
+        inset-inline-end: -1px;
+        inset-block-end: -1px;
         border-radius: $border-radius 0 $border-radius 0;
       }
       &.group-remove {
-        top: -1px;
-        right: -1px;
+        inset-block-start: -1px;
+        inset-inline-end: -1px;
         border-radius: 0 $border-radius;
       }
       &.group-move {
-        top: 50%;
-        right: 100%;
+        inset-block-start: 50%;
+        inset-inline-end: 100%;
         padding: 0;
         border-radius: $border-radius 0 0 $border-radius;
         transform: translateY(-50%);
@@ -223,16 +223,16 @@ div.subform-repeatable-group {
         }
       }
       &.group-move-up {
-        top: 50%;
-        right: 100%;
-        margin-top: -45px;
+        inset-block-start: 50%;
+        inset-inline-end: 100%;
+        margin-block-start: -45px;
         border-radius: 0;
         transform: translateY(-50%);
       }
       &.group-move-down {
-        top: 50%;
-        right: 100%;
-        margin-top: 45px;
+        inset-block-start: 50%;
+        inset-inline-end: 100%;
+        margin-block-start: 45px;
         border-radius: 0;
         transform: translateY(-50%);
       }
@@ -240,6 +240,41 @@ div.subform-repeatable-group {
   }
 }
 
+// Subform Grid layout
+.subform-repeatable-grid>.subform-repeatable-group {
+  padding-top: 16px;
+}
+.subform-grid-row {
+  display: flex;
+  flex-flow: row wrap;
+  column-gap: 1rem;
+
+  > .control-group {
+    flex: 1 1 220px;
+    flex-flow: column;
+
+    > .control-label {
+      width: 100%;
+    }
+
+    > .controls {
+      width: 100%;
+      min-width: unset;
+    }
+  }
+
+  // For groupByFieldset="true"
+  > fieldset {
+    flex: 1 1 220px;
+
+    > .control-group {
+      > .control-label {
+        width: 100%;
+      }
+    }
+  }
+}
+
 // Highlight draggable section
 .subform-repeatable-group[draggable="true"] {
   // For non table layout
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss b/media_source/templates/administrator/atum/scss/blocks/_global.scss
similarity index 81%
rename from build/media_source/templates/administrator/atum/scss/blocks/_global.scss
rename to media_source/templates/administrator/atum/scss/blocks/_global.scss
index 5fbd296d9cb7b..acbbb2d629eec 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_global.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_global.scss
@@ -1,7 +1,12 @@
 // Global
+@media screen and (prefers-reduced-motion: no-preference) {
+  @view-transition {
+    navigation: auto;
+  }
+}
 
 html {
-  height: 100%;
+  block-size: 100%;
 
   &.a11y_font {
     font-size: 18px;
@@ -11,7 +16,7 @@ html {
 body {
   display: flex;
   flex-direction: column;
-  min-height: 100%;
+  min-block-size: 100%;
   padding: 0;
   margin: 0;
   text-align: start;
@@ -24,11 +29,11 @@ body {
     filter: grayscale(1);
     &::after {
       position: fixed;
-      top: 0;
-      left: 0;
+      inset-block-start: 0;
+      inset-inline-start: 0;
       z-index: -1;
-      width: 100%;
-      height: 100%;
+      inline-size: 100%;
+      block-size: 100%;
       content: "";
       background: var(--template-bg-dark-5);
     }
@@ -123,14 +128,13 @@ caption {
 
 .container-main,
 .system-debug {
-  padding-bottom: 50px;
+  padding-block-end: 50px;
 }
 
 body .container-main {
   order: 1;
   position: relative;
-  padding-right: 0;
-  padding-left: 0;
+  padding-inline: 0;
   background: var(--main-bg);
 }
 
@@ -141,7 +145,7 @@ body .container-main {
     padding: 0 2rem;
 
     .subhead + & {
-      padding-top: 0;
+      padding-block-start: 0;
     }
   }
 }
@@ -158,7 +162,7 @@ body:not(.contentpane) .main-card {
 
 // Multiple buttons wrapping
 .input-group input {
-  min-width: 220px;
+  min-inline-size: 220px;
 }
 
 // Multilingual associations specific
@@ -168,7 +172,7 @@ body:not(.contentpane) .main-card {
 
 .item-associations li {
   display: inline-block;
-  margin-bottom: 3px;
+  margin-block-end: 3px;
   list-style: none;
 }
 
@@ -225,26 +229,45 @@ a[target="_blank"]::before {
 }
 
 // details
-
 details {
+  --_duration: .2s;
+
   padding: .5rem 1rem;
   margin: 0 0 2rem;
   background: $details-bg;
   border: $details-border;
   border-radius: $border-radius;
 
+  @media (prefers-reduced-motion: no-preference) {
+    interpolate-size: allow-keywords;
+  }
+
+  &::details-content {
+    overflow-y: clip;
+    opacity: 0;
+    block-size: 0;
+    transition: content-visibility var(--_duration) allow-discrete,
+      opacity var(--_duration),
+      block-size var(--_duration);
+  }
+
+  &[open]::details-content {
+    opacity: 1;
+    block-size: auto;
+  }
+
   summary {
     color: var(--template-link-color);
 
     ~ * {
-      margin-top: 1rem;
+      padding-block-start: 1rem;
     }
   }
 }
 
 // meter element
 meter {
-  width: 100%;
+  inline-size: 100%;
 }
 
 // Bootstrap 4 b/c
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_header.scss b/media_source/templates/administrator/atum/scss/blocks/_header.scss
similarity index 90%
rename from build/media_source/templates/administrator/atum/scss/blocks/_header.scss
rename to media_source/templates/administrator/atum/scss/blocks/_header.scss
index 29846e364b3c8..bd9b17abd1fb2 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_header.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_header.scss
@@ -6,7 +6,7 @@
 
   &-inside {
     display: flex;
-    min-height: 54px;
+    min-block-size: 54px;
   }
 
   a {
@@ -21,8 +21,8 @@
     display: flex;
     flex-flow: row nowrap;
     align-items: center;
-    width: $sidebar-width;
-    height: 100%;
+    inline-size: $sidebar-width;
+    block-size: 100%;
     padding: 12px 5px;
     overflow: hidden;
     background-color: $header-logo-bg;
@@ -30,7 +30,7 @@
 
     &.small {
       justify-content: center;
-      width: $sidebar-width-closed;
+      inline-size: $sidebar-width-closed;
       transition: all .3s ease-in-out;
 
       svg,
@@ -42,8 +42,8 @@
 
         &.logo-collapsed {
           display: inline-block;
-          width: 20px;
-          height: 20px;
+          inline-size: 20px;
+          block-size: 20px;
           object-fit: contain;
           object-position: center center;
         }
@@ -52,8 +52,8 @@
 
     svg,
     img {
-      width: 150px;
-      height: 30px;
+      inline-size: 150px;
+      block-size: 30px;
       margin: 0 .35rem;
       object-fit: contain;
       object-position: left center;
@@ -107,7 +107,7 @@
 .header-items {
   align-items: center;
   justify-content: flex-end;
-  width: 50%;
+  inline-size: 50%;
   margin: 15px;
   margin-inline-start: auto;
 
@@ -165,9 +165,9 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 28px;
-    min-width: 28px;
-    height: 28px;
+    inline-size: 28px;
+    min-inline-size: 28px;
+    block-size: 28px;
     margin: 4px;
     color: $white;
     background-color: var(--template-bg-dark);
@@ -215,9 +215,9 @@
 @include media-breakpoint-down(md) {
   .header-items {
     position: fixed;
-    bottom: 0;
+    inset-block-end: 0;
     flex-direction: row-reverse;
-    width: 100%;
+    inline-size: 100%;
     padding: 10px 0;
     margin: 0;
     background: var(--template-bg-dark);
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss b/media_source/templates/administrator/atum/scss/blocks/_icons.scss
similarity index 94%
rename from build/media_source/templates/administrator/atum/scss/blocks/_icons.scss
rename to media_source/templates/administrator/atum/scss/blocks/_icons.scss
index 93895de77afff..9575566e165ee 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_icons.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_icons.scss
@@ -14,8 +14,8 @@
   [class*=" #{$jicon-css-prefix}-"],
   [class^="#{$fa-css-prefix}-"],
   [class*=" #{$fa-css-prefix}-"] {
-    width: 26px;
-    height: 26px;
+    inline-size: 26px;
+    block-size: 26px;
     font-size: 1rem;
     line-height: 22px;
     color: $gray-400;
@@ -47,8 +47,8 @@
   .#{$jicon-css-prefix}-checkedout,
   .#{$jicon-css-prefix}-lock,
   .#{$fa-css-prefix}-lock {
-    width: auto;
-    height: auto;
+    inline-size: auto;
+    block-size: auto;
     font-size: 1.2rem;
     line-height: 1rem;
     color: $icon-checkedout-color; // var(--template-text-dark);
@@ -73,7 +73,7 @@
 
 // WebAuthn
 .plg_system_webauthn_login_button svg {
-  width: 30px;
+  inline-size: 30px;
   margin: 4px;
 }
 
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_iframe.scss b/media_source/templates/administrator/atum/scss/blocks/_iframe.scss
similarity index 72%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_iframe.scss
rename to media_source/templates/administrator/atum/scss/blocks/_iframe.scss
index 8aa02dceeeb6e..6f1e3b5a6b371 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_iframe.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_iframe.scss
@@ -5,5 +5,5 @@ iframe {
 }
 
 .modal iframe {
-  width: 100%;
+  inline-size: 100%;
 }
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss b/media_source/templates/administrator/atum/scss/blocks/_layout.scss
similarity index 81%
rename from build/media_source/templates/administrator/atum/scss/blocks/_layout.scss
rename to media_source/templates/administrator/atum/scss/blocks/_layout.scss
index 31e25f1c57a4b..e873605a4d9be 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_layout.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_layout.scss
@@ -1,14 +1,14 @@
 .options-form {
-  width: 100%;
+  inline-size: 100%;
   padding: 1vw 2vw;
-  margin-bottom: 1rem;
+  margin-block-end: 1rem;
   color: $options-form-color;
   background: $options-form-bg;
   border: $options-form-border;
 
   > legend {
     float: none;
-    width: auto;
+    inline-size: auto;
     padding: 0 1rem;
     font-weight: $font-weight-bold;
     color: $options-form-legend-color;
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_lists.scss b/media_source/templates/administrator/atum/scss/blocks/_lists.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/blocks/_lists.scss
rename to media_source/templates/administrator/atum/scss/blocks/_lists.scss
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_login.scss b/media_source/templates/administrator/atum/scss/blocks/_login.scss
similarity index 83%
rename from build/media_source/templates/administrator/atum/scss/blocks/_login.scss
rename to media_source/templates/administrator/atum/scss/blocks/_login.scss
index fea0fa175e942..1e5912738c057 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_login.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_login.scss
@@ -11,20 +11,20 @@
       flex-wrap: wrap;
       align-items: center;
       justify-content: center;
-      min-height: calc(100vh - 35vh);
+      min-block-size: calc(100vh - 35vh);
     }
 
     #content {
       @include media-breakpoint-down(md) {
-        max-width: 98%;
+        max-inline-size: 98%;
         padding: 0;
       }
     }
   }
 
   .login {
-    width: 100%;
-    max-width: 25rem;
+    inline-size: 100%;
+    max-inline-size: 25rem;
     padding: 30px;
     margin: 1rem;
     color: var(--template-text-dark);
@@ -33,12 +33,12 @@
     box-shadow: $login-box-shadow;
 
     @include media-breakpoint-down(lg) {
-      margin-bottom: 3rem;
+      margin-block-end: 3rem;
     }
 
     img {
-      width: auto;
-      max-height: 4.4rem;
+      inline-size: auto;
+      max-block-size: 4.4rem;
     }
 
     .logo {
@@ -46,8 +46,8 @@
     }
 
     svg.joomla-logo {
-      width: 2.4rem;
-      height: 4.4rem;
+      inline-size: 2.4rem;
+      block-size: 4.4rem;
       background-size: 4.4rem 2.4rem;
 
       path {
@@ -58,7 +58,7 @@
     &-watermark {
       position: absolute;
       z-index: -1;
-      max-width: 500px;
+      max-inline-size: 500px;
       transform: rotate(12deg) translate(40%, 10%);
     }
 
@@ -66,14 +66,14 @@
 
   .form-group {
     position: relative;
-    margin-bottom: 1.85rem;
+    margin-block-end: 1.85rem;
 
     label {
       span {
         font-size: ($font-size-base * .9);
 
         @include media-breakpoint-down(sm) {
-          width: 100%;
+          inline-size: 100%;
         }
       }
     }
@@ -81,14 +81,14 @@
     .form-control-feedback {
       position: absolute;
       inset-inline-end: 0;
-      bottom: -1.5rem;
+      inset-block-end: -1.5rem;
       font-size: ($font-size-base * .75);
       text-align: end;
     }
 
     .form-control-hint {
       position: absolute;
-      top: .1rem;
+      inset-block-start: .1rem;
       inset-inline-end: 0;
       font-size: ($font-size-base * .75);
       text-align: end;
@@ -100,13 +100,14 @@
     box-shadow: $login-focus-box-shadow;
   }
 
-  h1 {
-    margin-bottom: .25rem;
+  .h1 {
+    margin-block-end: .25rem;
     color: $white;
     text-align: center;
   }
 
-  h2 {
+  h2,
+  .h2 {
     font-weight: $font-weight-normal;
     color: var(--template-bg-dark-10);
   }
@@ -120,7 +121,7 @@
 
   .form-control,
   .form-select {
-    max-width: none;
+    max-inline-size: none;
   }
 
   .sidebar-wrapper,
@@ -131,16 +132,16 @@
   .sidebar-wrapper {
     display: flex;
     flex-direction: column;
-    max-width: none;
+    max-inline-size: none;
     background-color: var(--template-sidebar-bg);
 
     @include media-breakpoint-down(md) {
       order: 2;
-      margin-bottom: 3rem;
+      margin-block-end: 3rem;
     }
 
     .main-brand {
-      margin-bottom: auto;
+      margin-block-end: auto;
 
       a {
         font-size: ($font-size-base * .875);
@@ -163,7 +164,7 @@
 
   #sidebar {
     align-self: flex-end;
-    width: 100%;
+    inline-size: 100%;
     font-size: ($font-size-base * .875);
     --body-color: var(--template-text-light);
     color: var(--template-text-light);
@@ -189,7 +190,7 @@
 
     @include media-breakpoint-down(md) {
       position: relative;
-      bottom: 0;
+      inset-block-end: 0;
     }
   }
 
@@ -198,8 +199,8 @@
 
     @include media-breakpoint-down(md) {
       flex: 1 0 100% !important;
-      max-width: 100% !important;
-      min-height: auto;
+      max-inline-size: 100% !important;
+      min-block-size: auto;
     }
   }
 
@@ -233,16 +234,16 @@ label {
 .com_login .sidebar-wrapper .main-brand {
   flex: 1;
   flex-basis: auto;
-  margin-top: 100px;
+  margin-block-start: 100px;
   text-align: center;
 
   @include media-breakpoint-down(md) {
-    margin-top: 10px;
+    margin-block-start: 10px;
   }
 }
 
 .com_login .sidebar-wrapper #sidebar p {
-  margin-bottom: .2rem;
+  margin-block-end: .2rem;
 }
 
 .com_login .sidebar-wrapper .main-brand a,
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss b/media_source/templates/administrator/atum/scss/blocks/_modals.scss
similarity index 87%
rename from build/media_source/templates/administrator/atum/scss/blocks/_modals.scss
rename to media_source/templates/administrator/atum/scss/blocks/_modals.scss
index d95a219033a2a..92607fc7227b6 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_modals.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_modals.scss
@@ -67,8 +67,8 @@
     [class*=" #{$fa-css-prefix}-"],
     span {
       display: inline-block;
-      width: 2.375rem;
-      height: 100%;
+      inline-size: 2.375rem;
+      block-size: 100%;
       margin: 0 16px;
       margin-inline-start: -22px;
       line-height: 2.375rem;
@@ -84,8 +84,8 @@
     [class*=" #{$fa-css-prefix}-"],
     span {
       display: inline-block;
-      width: 2.375rem;
-      height: 100%;
+      inline-size: 2.375rem;
+      block-size: 100%;
       margin: 0 16px;
       margin-inline-start: -22px;
       line-height: 2.375rem;
@@ -118,7 +118,7 @@
 
   &__item {
     display: flex;
-    border-bottom: 1px solid $table-border-color;
+    border-block-end: 1px solid $table-border-color;
 
     @include media-breakpoint-down(md) {
       flex-direction: column;
@@ -127,11 +127,11 @@
 
   &__tag {
     flex: 1 0 180px;
-    max-width: 180px;
+    max-inline-size: 180px;
     padding: 10px 15px;
     text-align: end;
     background: color.adjust($gray-100, $lightness: -2.5%);
-    border-right: 1px solid $table-border-color;
+    border-inline-end: 1px solid $table-border-color;
 
     .badge {
       border-radius: .2rem;
@@ -143,10 +143,10 @@
 
     @include media-breakpoint-down(md) {
       flex: 1 0 auto;
-      max-width: 100%;
+      max-inline-size: 100%;
       text-align: left;
-      border-right: 0;
-      border-bottom: 1px solid $table-border-color;
+      border-inline-end: 0;
+      border-block-end: 1px solid $table-border-color;
     }
   }
 
@@ -155,14 +155,14 @@
 
     ul {
       padding-inline-start: 15px;
-      margin-bottom: 0;
+      margin-block-end: 0;
     }
 
     li {
-      margin-bottom: .15rem;
+      margin-block-end: .15rem;
 
       &:last-of-type {
-        margin-bottom: 0;
+        margin-block-end: 0;
       }
     }
   }
@@ -171,17 +171,17 @@
 // Styling for joomla-dialog element
 joomla-dialog {
   dialog {
-    width: 96vw;
-    max-width: 1700px;
-    height: 96vh;
+    inline-size: 96vw;
+    max-inline-size: 1700px;
+    block-size: 96vh;
     padding: 0;
     border: 1px solid var(--border-color-translucent);
     border-radius: .3rem;
     box-shadow: $modal-joomla-dialog-box-shadow;
 
     @include media-breakpoint-up(xxl) {
-      width: 80vw;
-      height: 80vh;
+      inline-size: 80vw;
+      block-size: 80vh;
     }
 
     // Override display to flex, to scale the content to full height
@@ -192,8 +192,8 @@ joomla-dialog {
 
   &[type="image"] {
     dialog {
-      width: fit-content;
-      height: fit-content;
+      inline-size: fit-content;
+      block-size: fit-content;
     }
   }
 
@@ -204,8 +204,8 @@ joomla-dialog {
   }
 
   iframe.iframe-content {
-    width: 100%;
-    height: 100%;
+    inline-size: 100%;
+    block-size: 100%;
   }
 
   // Extra loading animation for iframe and ajax types
@@ -214,13 +214,14 @@ joomla-dialog {
     &.loading {
       dialog:after {
         position: absolute;
-        top: 50%;
-        left: 50%;
+        inset-block-start: 50%;
+        inset-inline-start: 50%;
         display: block;
-        width: 66px;
-        height: 66px;
+        inline-size: 66px;
+        block-size: 66px;
         content: "";
-        background: url("../../../../system/images/ajax-loader.gif") no-repeat center; // TODO: use svg animation?
+        background: url("../../../../system/images/joomla-loader.svg") no-repeat center;
+        background-size: 66px 66px;
         transform: translate(-50%, -50%);
       }
     }
@@ -255,7 +256,7 @@ joomla-dialog dialog[open] {
   box-sizing: border-box;
   display: flex;
   flex-flow: column;
-  width: 100%;
+  inline-size: 100%;
   background: var(--body-bg);
 
   .buttons-holder {
@@ -276,7 +277,7 @@ joomla-dialog dialog[open] {
   align-items: center;
   justify-content: space-between;
   padding: 1rem;
-  border-bottom: 1px solid var(--border-color);
+  border-block-end: 1px solid var(--border-color);
 
   h3 {
     margin: 0;
@@ -299,8 +300,8 @@ joomla-dialog dialog[open] {
 
   .buttons-holder {
     position: absolute;
-    top: 1rem;
-    right: 1rem;
+    inset-block-start: 1rem;
+    inset-inline-end: 1rem;
   }
 
   // Apply overflow for potentially large content
@@ -323,7 +324,7 @@ joomla-dialog dialog[open] {
 .joomla-dialog-footer {
   position: relative;
   padding: 1rem;
-  border-top: 1px solid var(--border-color);
+  border-block-start: 1px solid var(--border-color);
 
   .buttons-holder button {
     padding-inline: 22px;
@@ -338,9 +339,9 @@ joomla-dialog dialog[open] {
 .joomla-dialog-alert,
 .joomla-dialog-confirm {
   dialog {
-    width: 600px;
-    max-width: 80vw;
-    height: fit-content;
+    inline-size: 600px;
+    max-inline-size: 80vw;
+    block-size: fit-content;
   }
 
   .joomla-dialog-body {
@@ -352,8 +353,8 @@ joomla-dialog dialog[open] {
 .joomla-dialog-content-select-field {
   dialog {
     @include media-breakpoint-up(xxl) {
-      width: 90vw;
-      height: 90vh;
+      inline-size: 90vw;
+      block-size: 90vh;
     }
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss b/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss
similarity index 96%
rename from build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss
rename to media_source/templates/administrator/atum/scss/blocks/_quickicons.scss
index 4392c5e93e328..94a641430fd6b 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss
@@ -45,7 +45,7 @@
       }
 
       .quickicon-icon {
-        margin-top: .5rem;
+        margin-block-start: .5rem;
         margin-inline-start: .2rem;
         color: var(--icon-color);
 
@@ -138,7 +138,7 @@
   }
 
   .quickicon-linkadd {
-    width: 2.5rem;
+    inline-size: 2.5rem;
     font-size: 1.2rem;
     background: $quickicon-linkadd-bg;
     transition: all .25s ease;
@@ -146,10 +146,10 @@
     a {
       align-items: flex-end;
       justify-content: center;
-      width: 100%;
+      inline-size: 100%;
 
       > * {
-        margin-bottom: 10px;
+        margin-block-end: 10px;
         color: $quickicon-linkadd-color;
       }
 
@@ -173,7 +173,7 @@
   .quickicon-single,
   .quickicon-group {
     display: flex;
-    min-height: 6rem;
+    min-block-size: 6rem;
     overflow: hidden;
     border: $quickicon-border;
     border-radius: $quickicon-border-radius;
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_shepard-modals.scss b/media_source/templates/administrator/atum/scss/blocks/_shepard-modals.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/blocks/_shepard-modals.scss
rename to media_source/templates/administrator/atum/scss/blocks/_shepard-modals.scss
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss b/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss
rename to media_source/templates/administrator/atum/scss/blocks/_sidebar-nav.scss
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss b/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss
similarity index 86%
rename from build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss
rename to media_source/templates/administrator/atum/scss/blocks/_sidebar.scss
index 4c34cef06ed42..9326589d15149 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_sidebar.scss
@@ -2,14 +2,14 @@
 
 .sidebar-wrapper {
   z-index: $zindex-sidebar;
-  min-height: calc(100vh - 66px);
+  min-block-size: calc(100vh - 66px);
   overflow: hidden;
   background-color: $sidebarwrapper-bg;
   box-shadow: var(--atum-box-shadow);
 
   .sidebar-sticky {
     position: sticky;
-    top: 0;
+    inset-block-start: 0;
   }
 
   .item {
@@ -36,7 +36,7 @@
       display: flex;
       flex-grow: 1;
       align-items: center;
-      min-height: 40px;
+      min-block-size: 40px;
 
       [class^="#{$jicon-css-prefix}-"],
       [class*=" #{$jicon-css-prefix}-"],
@@ -47,24 +47,23 @@
       }
     }
 
-    &-level-2 > a {
-      padding-inline-start: 3rem;
-    }
-
-    &-level-3 > a {
-      padding-inline-start: 3.75rem;
+    @for $level from 2 through 10 {
+      &-level-#{$level} > a {
+        $pad: 3rem + (($level - 2) * .75rem);
+        padding-inline-start: $pad;
+      }
     }
   }
 
   @include media-breakpoint-up(sm) {
     flex: 1 0 $sidebar-width;
-    max-width: $sidebar-width;
+    max-inline-size: $sidebar-width;
     transition: all .3s ease-in-out;
   }
 
   @include media-breakpoint-down(sm) {
     &.sidebar-menu {
-      top: auto;
+      inset-block-start: auto;
     }
   }
 
@@ -83,12 +82,12 @@
 
 // Sidebar navigation
 .main-nav {
-  width: $sidebar-width;
+  inline-size: $sidebar-width;
   padding: 0;
   font-size: .95rem;
 
   @include media-breakpoint-down(sm) {
-    width: 100%;
+    inline-size: 100%;
   }
 
   // All list items
@@ -100,28 +99,28 @@
         display: inline-flex;
         align-items: center;
         justify-content: center;
-        width: 40px;
-        height: 100%;
+        inline-size: 40px;
+        block-size: 100%;
       }
     }
   }
 
   // 2nd level items
   ul {
-    width: 100%;
+    inline-size: 100%;
     padding: 0;
     background-color: $main-nav-ul-bg; /* main-nav-ul-bg: var(--template-bg-dark-75) */
   }
 
   .divider {
-    height: 1px;
+    block-size: 1px;
     margin: 0 0 0 48px;
     list-style: none;
     background-color: $main-nav-divider-bg; /* main-nav-divider-bg: var(--template-bg-dark-60) */
   }
 
   .menuitem-group {
-    margin-top: .65rem;
+    margin-block-start: .65rem;
     font-size: .75rem;
     padding-inline-start: 3rem;
 
@@ -140,7 +139,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      width: 2rem;
+      inline-size: 2rem;
       font-family: "Font Awesome 6 Free";
       font-weight: 900;
       content: "\f054" #{"/*!rtl:\"\f053\"*/"};
@@ -170,7 +169,7 @@
 
   .mm-collapsing {
     position: relative;
-    height: 0;
+    block-size: 0;
     overflow: hidden;
     transition: all .35s ease;
   }
@@ -186,7 +185,7 @@
 .closed {
   .sidebar-wrapper {
     flex: 1 0 $sidebar-width-closed;
-    max-width: $sidebar-width-closed;
+    max-inline-size: $sidebar-width-closed;
     overflow: visible;
   }
 
@@ -198,12 +197,12 @@
 
   .main-nav,
   .main-nav li {
-    max-width: 3rem;
+    max-inline-size: 3rem;
   }
 
   .main-nav a:hover {
     position: relative;
-    max-width: 3rem;
+    max-inline-size: 3rem;
   }
 
   .main-nav a:hover .sidebar-item-title {
@@ -211,7 +210,7 @@
     inset-inline-start: 100%;
     display: flex;
     align-items: center;
-    height: 100%;
+    block-size: 100%;
     padding: 0 1rem;
     white-space: nowrap;
     pointer-events: none;
@@ -223,7 +222,7 @@
   }
 
   .main-nav > li > ul {
-    height: 0;
+    block-size: 0;
     padding: 0;
     visibility: hidden;
   }
@@ -244,8 +243,8 @@
 
   .toggler-burger {
     position: fixed;
-    right: 0;
-    bottom: 0;
+    inset-inline-end: 0;
+    inset-block-end: 0;
     z-index: $zindex-mobile-toggle;
     padding: 10px 15px;
 
@@ -277,12 +276,12 @@
     &.show,
     &.collapsing {
       position: fixed;
-      bottom: 55px;
+      inset-block-end: 55px;
       z-index: $zindex-mobile-menu;
       display: block;
-      width: 100%;
-      min-height: auto;
-      max-height: calc(100vh - 72px);
+      inline-size: 100%;
+      min-block-size: auto;
+      max-block-size: calc(100vh - 72px);
       overflow-y: auto;
     }
   }
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_switcher.scss b/media_source/templates/administrator/atum/scss/blocks/_switcher.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/blocks/_switcher.scss
rename to media_source/templates/administrator/atum/scss/blocks/_switcher.scss
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss b/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss
similarity index 89%
rename from build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss
rename to media_source/templates/administrator/atum/scss/blocks/_toolbar.scss
index fb0bf3d2f89e5..cbaac9123cf91 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_toolbar.scss
@@ -1,11 +1,10 @@
 .subhead {
   position: sticky;
-  top: 0;
-  right: 0;
-  left: 0;
+  inset-block-start: 0;
+  inset-inline: 0;
   z-index: $zindex-toolbar;
-  width: auto;
-  min-height: 43px;
+  inline-size: auto;
+  min-block-size: 43px;
   padding: 8px 1rem;
   color: var(--atum-subhead-color);
   background: var(--atum-subhead-bg);
@@ -13,8 +12,7 @@
   box-shadow: var(--atum-box-shadow);
 
   .row {
-    margin-right: 0;
-    margin-left: 0;
+    margin-inline: 0;
   }
 
   &.noshadow {
@@ -34,7 +32,7 @@
     .btn > span,
     .dropdown-item > span {
       margin-inline-end: .5rem;
-      width: 1.25em;
+      inline-size: 1.25em;
       text-align: center;
     }
   }
@@ -131,7 +129,7 @@
       align-items: center;
 
       &::after {
-        width: 2.375rem;
+        inline-size: 2.375rem;
         font-family: "Font Awesome 6 Free";
         font-weight: 900;
         content: "\f078";
@@ -172,7 +170,7 @@
   .contentpane & {
     margin: -15px -15px 0;
     background-image: none;
-    border-bottom: 1px solid var(--template-bg-dark-7); // TODO: unified variables for light and dark mode
+    border-block-end: 1px solid var(--template-bg-dark-7); // TODO: unified variables for light and dark mode
   }
 }
 
@@ -183,17 +181,17 @@
   }
 
   #myTab {
-    margin-top: 1rem;
-    margin-bottom: 1.5rem;
+    margin-block-start: 1rem;
+    margin-block-end: 1.5rem;
   }
 
   joomla-tab[view=accordion] ul li {
-    width: 100%;
+    inline-size: 100%;
   }
 
   .toggler-toolbar {
-    top: 0;
-    bottom: auto;
+    inset-block-start: 0;
+    inset-block-end: auto;
     z-index: $zindex-alerts;
     padding: 7px 10px;
     margin: 5px;
@@ -212,20 +210,19 @@
   }
 
   .subhead {
-    padding-right: 0;
-    padding-left: 0;
+    padding-inline: 0;
 
     joomla-toolbar-button,
     .btn-group,
     .btn {
-      width: 100%;
-      margin-left: 0;
+      inline-size: 100%;
+      margin-inline-start: 0;
       text-align: left;
     }
 
     .btn-toolbar > .btn-group,
     .btn-toolbar > joomla-toolbar-button {
-      margin-left: 0;
+      margin-inline-start: 0;
     }
 
     .btn.btn-action::after {
@@ -234,7 +231,7 @@
     }
 
     .dropdown-toggle-split {
-      width: auto;
+      inline-size: auto;
     }
   }
 }
@@ -243,8 +240,8 @@
 @if $enable-dark-mode {
   @include color-mode(dark) {
     .subhead {
-      border-top: 1px solid rgba(255,255,255,.05);
-      border-bottom: 1px solid rgba(255,255,255,.05);
+      border-block-start: 1px solid rgba(255,255,255,.05);
+      border-block-end: 1px solid rgba(255,255,255,.05);
     }
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss b/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss
similarity index 80%
rename from build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss
rename to media_source/templates/administrator/atum/scss/blocks/_treeselect.scss
index d420d9b85f592..2533f858a7ce1 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_treeselect.scss
@@ -2,7 +2,7 @@
 
 .treeselect {
   display: block;
-  padding-left: 0;
+  padding-inline-start: 0;
   list-style: none;
 
   .nav-header {
@@ -18,10 +18,10 @@
 
     &::before {
       position: absolute;
-      top: 14px;
+      inset-block-start: 14px;
       inset-inline-start: ($treeselect-indent - 15px);
-      width: 10px;
-      height: 1px;
+      inline-size: 10px;
+      block-size: 1px;
       margin: auto;
       content: "";
       background-color: var(--treeselect-line-color);
@@ -29,11 +29,11 @@
 
     &::after {
       position: absolute;
-      top: 0;
-      bottom: 0;
+      inset-block-start: 0;
+      inset-block-end: 0;
       inset-inline-start: ($treeselect-indent - 15px);
-      width: 1px;
-      height: 100%;
+      inline-size: 1px;
+      block-size: 100%;
       content: "";
       background-color: var(--treeselect-line-color);
     }
@@ -41,7 +41,7 @@
     &:last-child {
 
       &::after {
-        height: 14px;
+        block-size: 14px;
       }
     }
 
@@ -63,10 +63,11 @@
   .treeselect-toggle {
     display: inline-block;
     padding: 0;
-    margin-right: .1rem;
+    margin-inline-end: .1rem;
     color: var(--template-link-color);
     text-align: center;
     cursor: pointer;
+
     // The chevron class lands on the toggle itself, not on a child element,
     // and the collapsed state is chevron-left under RTL.
     &.#{$jicon-css-prefix}-chevron-right,
@@ -88,21 +89,21 @@
 
     input {
       position: relative;
-      top: 1px;
-      margin-right: .2rem;
+      inset-block-start: 1px;
+      margin-inline-end: .2rem;
     }
 
     label {
-      margin-bottom: 0;
+      margin-block-end: 0;
     }
   }
 
   .dropdown-toggle {
     padding: 0 .5rem .3rem;
-    margin-left: .5rem;
+    margin-inline-start: .5rem;
 
     &::after {
-      margin-left: 0;
+      margin-inline-start: 0;
       font-size: 1rem;
       color: var(--treeselect-dropdown-toggle);
     }
@@ -110,7 +111,7 @@
 }
 
 .treeselect-sub {
-  padding-left: 0;
+  padding-inline-start: 0;
 }
 
 .tree-holder {
@@ -124,11 +125,11 @@
     }
 
     li::before {
-      top: 12px;
+      inset-block-start: 12px;
     }
 
     li:last-child::after {
-      height: 12px;
+      block-size: 12px;
     }
   }
 
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_utilities.scss b/media_source/templates/administrator/atum/scss/blocks/_utilities.scss
similarity index 86%
rename from build/media_source/templates/administrator/atum/scss/blocks/_utilities.scss
rename to media_source/templates/administrator/atum/scss/blocks/_utilities.scss
index 897f75e30db0f..bffae95bc14b4 100644
--- a/build/media_source/templates/administrator/atum/scss/blocks/_utilities.scss
+++ b/media_source/templates/administrator/atum/scss/blocks/_utilities.scss
@@ -6,8 +6,8 @@
 // Keep B/C
 .element-invisible {
   position: absolute;
-  width: 1px;
-  height: 1px;
+  inline-size: 1px;
+  block-size: 1px;
   padding: 0;
   overflow: hidden;
   clip: rect(0, 0, 0, 0);
@@ -133,63 +133,63 @@
 // Sizing
 
 .w-1 {
-  width: 1%;
+  inline-size: 1%;
 }
 
 .w-3 {
-  width: 3%;
+  inline-size: 3%;
 }
 
 .w-5 {
-  width: 5%;
+  inline-size: 5%;
 }
 
 .w-6 {
-  width: 6%;
+  inline-size: 6%;
 }
 
 .w-7 {
-  width: 7%;
+  inline-size: 7%;
 }
 
 .w-10 {
-  width: 10%;
+  inline-size: 10%;
 }
 
 .w-12 {
-  width: 12%;
+  inline-size: 12%;
 }
 
 .w-15 {
-  width: 15%;
+  inline-size: 15%;
 }
 
 .w-20 {
-  width: 20%;
+  inline-size: 20%;
 }
 
 .w-30 {
-  width: 30%;
+  inline-size: 30%;
 }
 
 .w-35 {
-  width: 35%;
+  inline-size: 35%;
 }
 
 .w-40 {
-  width: 40%;
+  inline-size: 40%;
 }
 
 .w-60 {
-  width: 60%;
+  inline-size: 60%;
 }
 
 .w-80 {
-  width: 80%;
+  inline-size: 80%;
 }
 
 .editor-xtd-buttons .btn {
-  margin-bottom: 5px;
+  margin-block-end: 5px;
 }
 
 // Visibility depend from ColorScheme
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_config.scss b/media_source/templates/administrator/atum/scss/pages/_com_config.scss
similarity index 92%
rename from build/media_source/templates/administrator/atum/scss/pages/_com_config.scss
rename to media_source/templates/administrator/atum/scss/pages/_com_config.scss
index 7ba95feea4aef..c3cadaad40d93 100644
--- a/build/media_source/templates/administrator/atum/scss/pages/_com_config.scss
+++ b/media_source/templates/administrator/atum/scss/pages/_com_config.scss
@@ -7,7 +7,7 @@
   }
 
   #page-filters .form-select {
-    width: auto;
+    inline-size: auto;
   }
 
   .tab-description {
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_content.scss b/media_source/templates/administrator/atum/scss/pages/_com_content.scss
similarity index 77%
rename from build/media_source/templates/administrator/atum/scss/pages/_com_content.scss
rename to media_source/templates/administrator/atum/scss/pages/_com_content.scss
index 8a2039b1cb961..6ef489f9a1806 100644
--- a/build/media_source/templates/administrator/atum/scss/pages/_com_content.scss
+++ b/media_source/templates/administrator/atum/scss/pages/_com_content.scss
@@ -1,6 +1,6 @@
 .com_content.layout-edit {
   joomla-field-media .field-media-preview {
-    height: 10.25rem;
+    block-size: 10.25rem;
   }
 
   joomla-tab {
@@ -12,19 +12,19 @@
 
       .form-group {
         flex: 0 0 50%;
-        max-width: 50%;
+        max-inline-size: 50%;
         box-shadow: none;
 
         &:nth-child(1),
         &:nth-child(19) {
           flex: 0 0 100%;
-          max-width: 100%;
+          max-inline-size: 100%;
         }
       }
 
       .field-spacer {
         flex: 0 0 100%;
-        max-width: 100%;
+        max-inline-size: 100%;
       }
     }
   }
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss b/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss
similarity index 87%
rename from build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss
rename to media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss
index 3fd87cff92e84..fb473785e7087 100644
--- a/build/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss
+++ b/media_source/templates/administrator/atum/scss/pages/_com_cpanel.scss
@@ -3,19 +3,19 @@
 .com_cpanel {
 
   .content {
-    margin-top: 2rem;
+    margin-block-start: 2rem;
   }
 
   .card {
     p:last-child {
-      margin-bottom: 0;
+      margin-block-end: 0;
     }
 
     .list-group,
     .table {
       padding: 0;
-      margin-bottom: unset;
-      border-top: 1px solid var(--border-color);
+      margin-block-end: unset;
+      border-block-start: 1px solid var(--border-color);
     }
 
   }
@@ -28,8 +28,7 @@
     }
 
     .btn {
-      margin-top: .25em;
-      margin-bottom: .25em;
+      margin-block: .25em;
     }
   }
 
@@ -37,8 +36,8 @@
     padding: 0;
     overflow: hidden;
     background-color: $card-body-bg;
-    border-bottom-right-radius: $border-radius;
-    border-bottom-left-radius: $border-radius;
+    border-end-end-radius: $border-radius;
+    border-end-start-radius: $border-radius;
   }
 
   .module-actions {
@@ -56,8 +55,8 @@
     flex-direction: column;
     align-items: flex-start;
     justify-content: flex-end;
-    width: 100%;
-    min-height: 130px;
+    inline-size: 100%;
+    min-block-size: 130px;
     padding: 0 1rem;
     font-size: .875rem;
     font-weight: 700;
@@ -90,7 +89,7 @@
 
 .cpanel-modules {
   .list-group {
-    border-top: 1px solid $atum-list-group-border-color;
+    border-block-start: 1px solid $atum-list-group-border-color;
   }
 
   .list-group-item {
@@ -153,7 +152,7 @@
   }
 
   h2 {
-    margin-bottom: 0;
+    margin-block-end: 0;
     font-size: $h4-font-size;
   }
 
@@ -180,7 +179,7 @@
 }
 
 .sample-data__icon {
-  width: 1.3rem;
+  inline-size: 1.3rem;
   text-align: center;
 }
 
@@ -197,8 +196,8 @@
         box-shadow: 0 0 0 1px rgba(255, 255, 255, .1), 1px 1px 2px rgba(0, 0, 0, .1);
 
         .list-group-item:last-child {
-          border-bottom-right-radius: var(--border-radius);
-          border-bottom-left-radius: var(--border-radius);
+          border-end-end-radius: var(--border-radius);
+          border-end-start-radius: var(--border-radius);
         }
 
         .list-group-item {
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_joomlaupdate.scss b/media_source/templates/administrator/atum/scss/pages/_com_joomlaupdate.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/pages/_com_joomlaupdate.scss
rename to media_source/templates/administrator/atum/scss/pages/_com_joomlaupdate.scss
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss b/media_source/templates/administrator/atum/scss/pages/_com_media.scss
similarity index 96%
rename from build/media_source/templates/administrator/atum/scss/pages/_com_media.scss
rename to media_source/templates/administrator/atum/scss/pages/_com_media.scss
index ff3a748686d33..37ec9469feb6f 100644
--- a/build/media_source/templates/administrator/atum/scss/pages/_com_media.scss
+++ b/media_source/templates/administrator/atum/scss/pages/_com_media.scss
@@ -9,7 +9,7 @@
   --com-media-manager-toolbar-icon-color: #{$media-manager-toolbar-icon-color};
 }
 .file-background, .folder-background {
-  padding-bottom: 100%;
+  padding-block-end: 100%;
   background-color: $media-browser-file-bg; //hsl(var(--hue), 20%, 97%);
   border: $media-manager-border; // 1px solid hsl(var(--hue), 35%, 95%);
 }
@@ -26,7 +26,7 @@
 }
 .media-toolbar {
   background-color: $media-toolbar-bg; // var(--com-media-manager-content-bg,#fff);
-  border-bottom: $media-manager-border; // 1px solid var(--template-bg-dark-7);
+  border-block-end: $media-manager-border; // 1px solid var(--template-bg-dark-7);
   border-inline-start: $media-manager-border; // 1px solid var(--template-bg-dark-7)
   box-shadow: 0 -1px 0 0 $media-manager-border; // var(--template-bg-dark-7);
 }
@@ -76,7 +76,7 @@
 .media-infobar {
   border-inline-start: $media-manager-border; // 1px solid $border-color;
   h2 {
-    border-bottom: $media-manager-border;
+    border-block-end: $media-manager-border;
   }
 }
 
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_modules.scss b/media_source/templates/administrator/atum/scss/pages/_com_modules.scss
similarity index 93%
rename from build/media_source/templates/administrator/atum/scss/pages/_com_modules.scss
rename to media_source/templates/administrator/atum/scss/pages/_com_modules.scss
index b16891b297620..657b684391d8f 100644
--- a/build/media_source/templates/administrator/atum/scss/pages/_com_modules.scss
+++ b/media_source/templates/administrator/atum/scss/pages/_com_modules.scss
@@ -29,7 +29,7 @@
   }
 
   &-title {
-    margin-bottom: .25rem;
+    margin-block-end: .25rem;
     font-size: 1rem;
     font-weight: 700;
   }
@@ -44,12 +44,12 @@
     display: flex;
     align-items: flex-end;
     justify-content: center;
-    width: 2.5rem;
+    inline-size: 2.5rem;
     font-size: 1.2rem;
     background: $new-module-link-bg;
 
     span {
-      margin-bottom: 10px;
+      margin-block-end: 10px;
       color: $new-module-link-span;
     }
 
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_privacy.scss b/media_source/templates/administrator/atum/scss/pages/_com_privacy.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/pages/_com_privacy.scss
rename to media_source/templates/administrator/atum/scss/pages/_com_privacy.scss
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss b/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss
similarity index 93%
rename from build/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss
rename to media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss
index 1dbed24deb2fc..37ec87d68af9e 100644
--- a/build/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss
+++ b/media_source/templates/administrator/atum/scss/pages/_com_scheduler.scss
@@ -29,7 +29,7 @@
   }
 
   &-title {
-    margin-bottom: .25rem;
+    margin-block-end: .25rem;
     font-size: 1rem;
     font-weight: 700;
   }
@@ -52,12 +52,12 @@
     display: flex;
     align-items: flex-end;
     justify-content: center;
-    width: 2.5rem;
+    inline-size: 2.5rem;
     font-size: 1.2rem;
     background: $quickicon-linkadd-bg;
 
     span {
-      margin-bottom: 10px;
+      margin-block-end: 10px;
       color: var(--quickicon-linkadd-color);
     }
 
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_tags.scss b/media_source/templates/administrator/atum/scss/pages/_com_tags.scss
similarity index 89%
rename from build/media_source/templates/administrator/atum/scss/pages/_com_tags.scss
rename to media_source/templates/administrator/atum/scss/pages/_com_tags.scss
index e4c0e26e44125..29dcadcf43795 100644
--- a/build/media_source/templates/administrator/atum/scss/pages/_com_tags.scss
+++ b/media_source/templates/administrator/atum/scss/pages/_com_tags.scss
@@ -8,7 +8,7 @@
 
     @include media-breakpoint-up(md) {
       display: inline-block;
-      width: calc(50% - 15px);
+      inline-size: calc(50% - 15px);
     }
   }
 
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_templates.scss b/media_source/templates/administrator/atum/scss/pages/_com_templates.scss
similarity index 81%
rename from build/media_source/templates/administrator/atum/scss/pages/_com_templates.scss
rename to media_source/templates/administrator/atum/scss/pages/_com_templates.scss
index d96464d460117..a5f7f85605267 100644
--- a/build/media_source/templates/administrator/atum/scss/pages/_com_templates.scss
+++ b/media_source/templates/administrator/atum/scss/pages/_com_templates.scss
@@ -5,9 +5,9 @@
     position: relative;
 
     .menu-links {
-      padding-left: 0;
-      margin-top: 15px;
-      margin-left: 0;
+      padding-inline-start: 0;
+      margin-block-start: 15px;
+      margin-inline-start: 0;
       column-count: 3;
       column-gap: 15px;
 
@@ -17,8 +17,8 @@
 
       > li {
         display: inline-block;
-        width: 100%;
-        margin-bottom: 15px;
+        inline-size: 100%;
+        margin-block-end: 15px;
         vertical-align: top;
         list-style: none;
         backface-visibility: hidden;
@@ -52,7 +52,7 @@
   }
 
   .thumbnail > img {
-    max-width: 100%;
-    max-height: 100%;
+    max-inline-size: 100%;
+    max-block-size: 100%;
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_com_users.scss b/media_source/templates/administrator/atum/scss/pages/_com_users.scss
similarity index 98%
rename from build/media_source/templates/administrator/atum/scss/pages/_com_users.scss
rename to media_source/templates/administrator/atum/scss/pages/_com_users.scss
index e1f4412a73cca..4428bc1462259 100644
--- a/build/media_source/templates/administrator/atum/scss/pages/_com_users.scss
+++ b/media_source/templates/administrator/atum/scss/pages/_com_users.scss
@@ -17,7 +17,7 @@
   &.view-mail {
 
     .form-control {
-      max-width: 100%;
+      max-inline-size: 100%;
     }
   }
 
diff --git a/build/media_source/templates/administrator/atum/scss/pages/_plg_web_installer.scss b/media_source/templates/administrator/atum/scss/pages/_plg_web_installer.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/pages/_plg_web_installer.scss
rename to media_source/templates/administrator/atum/scss/pages/_plg_web_installer.scss
diff --git a/build/media_source/templates/administrator/atum/scss/system/fields/_calendar.scss b/media_source/templates/administrator/atum/scss/system/fields/_calendar.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/system/fields/_calendar.scss
rename to media_source/templates/administrator/atum/scss/system/fields/_calendar.scss
diff --git a/build/media_source/templates/administrator/atum/scss/system/fields/_switcher.scss b/media_source/templates/administrator/atum/scss/system/fields/_switcher.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/system/fields/_switcher.scss
rename to media_source/templates/administrator/atum/scss/system/fields/_switcher.scss
diff --git a/build/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss b/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss
similarity index 93%
rename from build/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss
rename to media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss
index a837ce30e4acb..c03f773122599 100644
--- a/build/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss
+++ b/media_source/templates/administrator/atum/scss/system/searchtools/searchtools.scss
@@ -1,5 +1,5 @@
 @import "../../variables";
-@import "../../../../../../../../media/vendor/bootstrap/scss/mixins";
+@import "../../../../../../../media/vendor/bootstrap/scss/mixins";
 
 // Search tools
 
@@ -10,7 +10,7 @@
 
 .js-stools-container-bar,
 .js-stools-container-filters {
-  margin-bottom: 10px;
+  margin-block-end: 10px;
 }
 
 .js-stools-container-bar {
@@ -51,7 +51,7 @@
 
 .js-stools-container-filters {
   display: none;
-  width: 100%;
+  inline-size: 100%;
 
   &-visible {
     display: grid;
diff --git a/installation/template/scss/template-rtl.scss b/media_source/templates/administrator/atum/scss/template-rtl.scss
similarity index 100%
rename from installation/template/scss/template-rtl.scss
rename to media_source/templates/administrator/atum/scss/template-rtl.scss
diff --git a/build/media_source/templates/administrator/atum/scss/template.scss b/media_source/templates/administrator/atum/scss/template.scss
similarity index 87%
rename from build/media_source/templates/administrator/atum/scss/template.scss
rename to media_source/templates/administrator/atum/scss/template.scss
index e8fa8e138b2bb..19c53e4c9ed24 100644
--- a/build/media_source/templates/administrator/atum/scss/template.scss
+++ b/media_source/templates/administrator/atum/scss/template.scss
@@ -1,27 +1,27 @@
 // Bootstrap functions
-@import "../../../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../media/vendor/bootstrap/scss/functions";
 
 // Atum Variables
 @import "variables";
 @import "variables-dark";
 
-@import "../../../../../../media/vendor/bootstrap/scss/variables";
-@import "../../../../../../media/vendor/bootstrap/scss/variables-dark";
-@import "../../../../../../media/vendor/bootstrap/scss/maps";
+@import "../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../media/vendor/bootstrap/scss/variables-dark";
+@import "../../../../../media/vendor/bootstrap/scss/maps";
 @import "maps-atum";
-@import "../../../../../../media/vendor/bootstrap/scss/mixins";
-@import "../../../../../../media/vendor/bootstrap/scss/utilities";
+@import "../../../../../media/vendor/bootstrap/scss/mixins";
+@import "../../../../../media/vendor/bootstrap/scss/utilities";
 
 // Bootstrap other
-@import "../../../../../../media/vendor/bootstrap/scss/bootstrap";
+@import "../../../../../media/vendor/bootstrap/scss/bootstrap";
 
 // Fonts
-@import "../../../../../../media/vendor/roboto-fontface/scss/roboto/sass/roboto-fontface";
+@import "../../../../../media/vendor/roboto-fontface/scss/roboto/sass/roboto-fontface";
 
 @import "blocks/global"; // Leave this first
 
 // jQuery Minicolors
-@import "../../../../../../media/system/scss/jquery-minicolors";
+@import "../../../../../media/system/scss/jquery-minicolors";
 
 // System overrides
 @import "system/fields/calendar";
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/_codemirror.scss b/media_source/templates/administrator/atum/scss/vendor/_codemirror.scss
similarity index 53%
rename from build/media_source/templates/administrator/atum/scss/vendor/_codemirror.scss
rename to media_source/templates/administrator/atum/scss/vendor/_codemirror.scss
index d4e29274c3a86..b90fd9ff99b25 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/_codemirror.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/_codemirror.scss
@@ -1,18 +1,18 @@
 // Codemirror
 
 joomla-editor-codemirror.fullscreen {
-  top: 133px;
+  inset-block-start: 133px;
 
   .cm-editor {
-    height: calc(90vh - 133px) !important;
+    block-size: calc(90vh - 133px) !important;
   }
 
   @include media-breakpoint-down(sm) {
-    top: 54px;
+    inset-block-start: 54px;
     z-index: 890;
 
     .cm-editor {
-      height: 100vh !important;
+      block-size: 100vh !important;
     }
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/_dragula.scss b/media_source/templates/administrator/atum/scss/vendor/_dragula.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/vendor/_dragula.scss
rename to media_source/templates/administrator/atum/scss/vendor/_dragula.scss
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/_tinymce.scss b/media_source/templates/administrator/atum/scss/vendor/_tinymce.scss
similarity index 80%
rename from build/media_source/templates/administrator/atum/scss/vendor/_tinymce.scss
rename to media_source/templates/administrator/atum/scss/vendor/_tinymce.scss
index d89abc5617916..7413b3e94e5eb 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/_tinymce.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/_tinymce.scss
@@ -3,7 +3,7 @@
 .editor {
 
   .toggle-editor {
-    margin-top: 1rem;
+    margin-block-start: 1rem;
   }
 
   .mce-tinymce {
@@ -16,7 +16,7 @@
   }
 }
 
-.tox-fullscreen {
+.tox-tinymce.tox-fullscreen {
   z-index: $zindex-modal-backdrop - 1 !important;
 }
 
@@ -28,7 +28,7 @@
   }
 
   .mce-top-part {
-    margin-bottom: 1rem;
+    margin-block-end: 1rem;
 
     &::before {
       box-shadow: none;
@@ -46,8 +46,8 @@
   .mce-btn-group {
 
     &:not(:first-child) {
-      margin-right: 6px;
-      margin-left: 0;
+      margin-inline-end: 6px;
+      margin-inline-start: 0;
     }
 
     .mce-btn {
@@ -58,7 +58,7 @@
 
   .mce-statusbar .mce-container-body {
     background-color: $white;
-    border-top: var(--template-bg-light) 1px solid;
+    border-block-start: var(--template-bg-light) 1px solid;
   }
 }
 
@@ -69,5 +69,6 @@
 
 // Adjust the border radius for the editor
 .tox-tinymce {
+  z-index: 1 !important;
   border-radius: 0 !important;
 }
diff --git a/media_source/templates/administrator/atum/scss/vendor/awesomplete/awesomplete.scss b/media_source/templates/administrator/atum/scss/vendor/awesomplete/awesomplete.scss
new file mode 100644
index 0000000000000..fa45accb48839
--- /dev/null
+++ b/media_source/templates/administrator/atum/scss/vendor/awesomplete/awesomplete.scss
@@ -0,0 +1,6 @@
+// Awesomplete
+@import "../../../../../../../media/vendor/awesomplete/css/awesomplete";
+
+.awesomplete {
+  display: block;
+}
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_accordion.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_accordion.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_accordion.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_accordion.scss
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_badge.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_badge.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_badge.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_badge.scss
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss
similarity index 97%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss
index 018acf32fc207..d74b740eadeae 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_buttons.scss
@@ -6,10 +6,10 @@
 
 @include media-breakpoint-down(sm) {
   .btn {
-    margin-bottom: .25rem;
+    margin-block-end: .25rem;
   }
   .input-group .btn {
-    margin-bottom: 0;
+    margin-block-end: 0;
   }
 }
 
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss
similarity index 88%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss
index 4899fb01753b0..217275750faff 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_card.scss
@@ -3,7 +3,7 @@
 // Backport Bootstrap 4 card-columns
 .card-columns {
   .card {
-    margin-bottom: $card-spacer-y;
+    margin-block-end: $card-spacer-y;
   }
 
   @include media-breakpoint-up(sm) {
@@ -14,7 +14,7 @@
 
     .card {
       display: inline-block; // Don't let them vertically span multiple columns
-      width: 100%; // Don't let their width change
+      inline-size: 100%; // Don't let their width change
     }
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss
similarity index 95%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss
index 516e1f748f696..e450e76107902 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_collapse.scss
@@ -1,28 +1,28 @@
-// Collapse
-
-.accordion {
-
-  .card-header {
-    display: block;
-    font-size: $h5-font-size;
-    font-weight: $font-weight-bold;
-    line-height: $headings-line-height;
-  }
-
-  /**
-   * TODO: This seems fairly specifically built for the menu types view and might be better scoped to
-   *       that view rather than just being overridden for everything.
-   */
-  .list-group-item {
-    --list-group-color: var(--link-color);
-    --list-group-bg: var(--white-offset);
-  }
-
-  @if $enable-dark-mode {
-    @include color-mode(dark) {
-      .list-group-item {
-        --list-group-bg: var(--gray-800);
-      }
-    }
-  }
-}
+// Collapse
+
+.accordion {
+
+  .card-header {
+    display: block;
+    font-size: $h5-font-size;
+    font-weight: $font-weight-bold;
+    line-height: $headings-line-height;
+  }
+
+  /**
+   * TODO: This seems fairly specifically built for the menu types view and might be better scoped to
+   *       that view rather than just being overridden for everything.
+   */
+  .list-group-item {
+    --list-group-color: var(--link-color);
+    --list-group-bg: var(--white-offset);
+  }
+
+  @if $enable-dark-mode {
+    @include color-mode(dark) {
+      .list-group-item {
+        --list-group-bg: var(--gray-800);
+      }
+    }
+  }
+}
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss
similarity index 97%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss
index 9c172f7913c26..4135036b45399 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_custom-forms.scss
@@ -5,7 +5,7 @@
 }
 
 .form-select {
-  max-width: $input-max-width;
+  max-inline-size: $input-max-width;
   cursor: pointer;
   background: $form-select-background;
   border: $form-select-border;
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_dropdown.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_dropdown.scss
similarity index 82%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_dropdown.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_dropdown.scss
index 5832ad4297fa2..263ca6623feac 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_dropdown.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_dropdown.scss
@@ -1,7 +1,7 @@
 // Dropdown
 
 .btn-group .dropdown-menu {
-  min-width: 100%;
+  min-inline-size: 100%;
   background: var(--body-bg);
   box-shadow: $dropdown-box-shadow;
 
@@ -17,7 +17,7 @@
 
 .dropdown-item {
   text-align: start;
-  border-bottom: var(--dropdown-item-border-bottom);
+  border-block-end: var(--dropdown-item-border-bottom);
 
   &:hover,
   &:focus {
@@ -53,7 +53,7 @@
   }
 
   + .dropdown-item {
-    border-top: 1px solid rgba(0, 0, 0, .1);
+    border-block-start: 1px solid rgba(0, 0, 0, .1);
   }
 
   .dropdown-status-group .dropdown-menu &:not(.disabled) {
@@ -65,13 +65,13 @@
   }
 
   &.first:not(.last) {
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
+    border-end-end-radius: 0;
+    border-end-start-radius: 0;
   }
 
   &.last:not(.first) {
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
+    border-start-start-radius: 0;
+    border-start-end-radius: 0;
   }
 
   &:not(.first):not(.last):not(:only-of-type) {
@@ -82,7 +82,7 @@
 @if $enable-dark-mode {
   @include color-mode(dark) {
     .dropdown-divider {
-      border-top: map-get($atum-colors-dark, "dropdown-divider-bg");
+      border-block-start: map-get($atum-colors-dark, "dropdown-divider-bg");
     }
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss
similarity index 77%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss
index e446f1bf112db..3a03569852cbd 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_form.scss
@@ -3,7 +3,7 @@
 // Form
 
 label {
-  margin-bottom: 0;
+  margin-block-end: 0;
 }
 
 .form-control {
@@ -15,31 +15,31 @@ label {
 
 td .form-control {
   display: inline-block;
-  width: auto;
+  inline-size: auto;
 }
 
 legend {
-  margin-bottom: 1.1rem;
+  margin-block-end: 1.1rem;
   font-size: 1rem;
   font-weight: $font-weight-normal;
 }
 
 .checkboxes {
-  padding-top: 5px;
+  padding-block-start: 5px;
 
   .checkbox input {
     position: static;
-    margin-left: 0;
+    margin-inline-start: 0;
   }
 }
 
 .form-check {
-  padding-top: 5px;
-  margin-bottom: 0;
+  padding-block-start: 5px;
+  margin-block-end: 0;
 }
 
 .modal label {
-  width: 100%;
+  inline-size: 100%;
 }
 
 // Validation
@@ -65,12 +65,12 @@ select.form-control {
 
 .field-media-wrapper {
   display: block;
-  width: 100%;
-  max-width: calc(50vw - 5rem);
+  inline-size: 100%;
+  max-inline-size: calc(50vw - 5rem);
 
   .field-media-preview {
-    width: 100%;
-    max-width: none;
+    inline-size: 100%;
+    max-inline-size: none;
   }
 
   .button-select {
@@ -87,18 +87,18 @@ select.form-control {
   }
 
   @include media-breakpoint-down(lg) {
-    min-width: 100%;
+    min-inline-size: 100%;
   }
 }
 
 // Bootstrap 4 b/c
 .form-inline .form-select, .form-inline .custom-select, .form-inline .form-control {
   display: inline-block;
-  width: auto;
+  inline-size: auto;
 }
 
 @include media-breakpoint-down(md) {
   .form-inline .form-select, .form-inline .custom-select, .form-inline .form-control {
-    width: 100%;
+    inline-size: 100%;
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_list-group.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_list-group.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_list-group.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_list-group.scss
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_lists.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_lists.scss
similarity index 59%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_lists.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_lists.scss
index d0d8005b0efe4..796d661fee63a 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_lists.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_lists.scss
@@ -1,5 +1,5 @@
 // Lists
 
 .list-unstyled .list-unstyled {
-  padding-left: 20px;
+  padding-inline-start: 20px;
 }
diff --git a/media_source/templates/administrator/atum/scss/vendor/bootstrap/_modal.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_modal.scss
new file mode 100644
index 0000000000000..ec5520c00f679
--- /dev/null
+++ b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_modal.scss
@@ -0,0 +1,108 @@
+// Modal
+
+.jviewport-height {
+  &10 {
+    block-size: 10vh;
+  }
+
+  &20 {
+    block-size: 20vh;
+  }
+
+  &30 {
+    block-size: 30vh;
+  }
+
+  &40 {
+    block-size: 40vh;
+  }
+
+  &50 {
+    block-size: 50vh;
+  }
+
+  &60 {
+    block-size: 60vh;
+  }
+
+  &70 {
+    block-size: 70vh;
+  }
+
+  &80 {
+    block-size: 80vh;
+  }
+
+  &90 {
+    block-size: 90vh;
+  }
+
+  &100 {
+    block-size: 100vh;
+  }
+}
+
+[class*=jviewport-height] iframe {
+  block-size: 100%;
+}
+
+.modal-dialog.jviewport-width {
+  &10 {
+    inline-size: 10vw;
+  }
+
+  &20 {
+    inline-size: 20vw;
+    max-inline-size: none;
+  }
+
+  &30 {
+    inline-size: 30vw;
+    max-inline-size: none;
+  }
+
+  &40 {
+    inline-size: 40vw;
+    max-inline-size: none;
+  }
+
+  &50 {
+    inline-size: 50vw;
+    max-inline-size: none;
+  }
+
+  &60 {
+    inline-size: 60vw;
+    max-inline-size: none;
+  }
+
+  &70 {
+    inline-size: 70vw;
+    max-inline-size: none;
+  }
+
+  &80 {
+    inline-size: 80vw;
+    max-inline-size: none;
+  }
+
+  &90 {
+    inline-size: 90vw;
+    max-inline-size: none;
+  }
+
+  &100 {
+    inline-size: 100vw;
+    max-inline-size: none;
+  }
+}
+
+.modal-dialog {
+  @include media-breakpoint-down(md) {
+    margin: 1.75rem auto;
+  }
+
+  .modal-body {
+    padding: 0;
+  }
+}
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_pagination.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_pagination.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_pagination.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_pagination.scss
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_reboot.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_reboot.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_reboot.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_reboot.scss
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss
similarity index 96%
rename from build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss
rename to media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss
index c4547069a57c6..3fde78b620b8a 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/bootstrap/_table.scss
@@ -38,7 +38,7 @@
     .actions,
     .actions-th1 {
       @include media-breakpoint-down(md) {
-        width: 28%;
+        inline-size: 28%;
       }
     }
   }
@@ -54,7 +54,7 @@
       &:last-of-type {
         th,
         td {
-          border-bottom: 0;
+          border-block-end: 0;
         }
       }
     }
@@ -86,7 +86,7 @@
   th,
   td {
     label {
-      margin-bottom: 0;
+      margin-block-end: 0;
     }
 
     .inactive [class^="#{$jicon-css-prefix}-"],
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss b/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
similarity index 88%
rename from build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
rename to media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
index 1afb8ac6f0d9b..cbd3abed8dae0 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/choicesjs/choices.scss
@@ -1,14 +1,14 @@
-@import "../../../../../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../../media/vendor/bootstrap/scss/functions";
 
 // Atum Variables
 @import "../../variables";
 @import "../../variables-dark";
 
-@import "../../../../../../../../media/vendor/bootstrap/scss/variables";
-@import "../../../../../../../../media/vendor/bootstrap/scss/mixins";
+@import "../../../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../../../media/vendor/bootstrap/scss/mixins";
 
 // choices.js
-@import "../../../../../../../../media/vendor/choicesjs/scss/choices";
+@import "../../../../../../../media/vendor/choicesjs/scss/choices";
 
 .choices {
   border: $form-select-border; //$form-select-border-width solid $form-select-border-color;
@@ -28,9 +28,9 @@
 }
 
 .choices__inner {
-  min-height: 42px;
+  min-block-size: 42px;
   padding: .1rem 1rem;
-  margin-bottom: 0;
+  margin-block-end: 0;
   font-size: 1rem;
   border: none;
   border-radius: 0;
@@ -38,7 +38,7 @@
 
 .choices__input {
   padding: 0;
-  margin-bottom: 0;
+  margin-block-end: 0;
   font-size: 1rem;
   background-color: transparent;
 
@@ -49,7 +49,7 @@
 }
 
 .choices__list--dropdown {
-  z-index: $zindex-popover;
+  z-index: $zindex-popover !important;
 }
 
 .choices__list--single {
@@ -81,10 +81,11 @@
   }
 }
 
-.choices .choices__list--dropdown {
+.choices .choices__list--dropdown,
+.choices .choices__list[aria-expanded] {
   background-color: var(--body-bg);
 
-  .choices__item {
+  .choices__item--selectable[data-select-text] {
     padding-inline-end: 25px;
   }
 
@@ -99,7 +100,8 @@
   @include color-mode(dark) {
     .choices .choices__list--dropdown {
       .choices__item--selectable {
-        &.is-highlighted {
+        &.is-highlighted,
+        &.is-selected {
           background-color: var(--gray-800);
         }
       }
@@ -120,10 +122,7 @@
 
   &::before {
     position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
+    inset: 0;
     display: block;
     text-align: center;
     text-indent: 0;
@@ -196,10 +195,10 @@
 
   .choices__button_joomla {
     position: absolute;
-    top: 50%;
+    inset-block-start: 50%;
     inset-inline-end: 0;
-    width: 20px;
-    height: 20px;
+    inline-size: 20px;
+    block-size: 20px;
     padding: 0;
     margin-block-start: -10px;
     margin-inline-end: 50px;
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss b/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss
similarity index 61%
rename from build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss
rename to media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss
index 7af0051d9c1b2..c2ad33d50d7f7 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss
@@ -3,15 +3,15 @@ $fa-css-prefix:                    fa;
 $fa-font-path:                     "../../../../../../vendor/fontawesome-free/webfonts" !default;
 
 // Font Awesome 6 Free
-@import "../../../../../../../../media/vendor/fontawesome-free/scss/fontawesome";
-@import "../../../../../../../../media/vendor/fontawesome-free/scss/regular";
-@import "../../../../../../../../media/vendor/fontawesome-free/scss/solid";
+@import "../../../../../../../media/vendor/fontawesome-free/scss/fontawesome";
+@import "../../../../../../../media/vendor/fontawesome-free/scss/regular";
+@import "../../../../../../../media/vendor/fontawesome-free/scss/solid";
 
 // Brands must be imported last
-@import "../../../../../../../../media/vendor/fontawesome-free/scss/brands";
+@import "../../../../../../../media/vendor/fontawesome-free/scss/brands";
 
 // B/C with Font Awesome 5
-@import "../../../../../../../../media/vendor/fontawesome-free/scss/shims";
+@import "../../../../../../../media/vendor/fontawesome-free/scss/shims";
 
 // B/C for Icomoon
 @import "../../../../../../system/scss/icomoon";
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss b/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
similarity index 91%
rename from build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
rename to media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
index 7285c2de9b638..8cc5fd5a6cf85 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-alert.scss
@@ -1,17 +1,17 @@
 @import "../../variables";
 @import "../../variables-dark";
-@import "../../../../../../../../media/vendor/joomla-custom-elements/css/joomla-alert";
-@import "../../../../../../../../media/vendor/bootstrap/scss/mixins/color-mode";
+@import "../../../../../../../media/vendor/joomla-custom-elements/css/joomla-alert";
+@import "../../../../../../../media/vendor/bootstrap/scss/mixins/color-mode";
 
 // The following is a restyle for the system alerts
 
 #system-message-container joomla-alert {
   position: relative;
   display: flex;
-  width: 100%;
-  min-width: 16rem;
+  inline-size: 100%;
+  min-inline-size: 16rem;
   padding: 0;
-  margin-bottom: 1rem;
+  margin-block-end: 1rem;
   color: var(--alert-accent-color);
   background-color: var(--alert-bg-color);
   border: 1px solid;
@@ -87,8 +87,8 @@
     .message::before,
     .success::before {
       display: inline-block;
-      width: 1em;
-      height: 1em;
+      inline-size: 1em;
+      block-size: 1em;
       content: "";
       background-image: url('data:image/svg+xml;utf8,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path fill="rgba(255, 255, 255, .95)" d="M1299 813l-422 422q-19 19-45 19t-45-19l-294-294q-19-19-19-45t19-45l102-102q19-19 45-19t45 19l147 147 275-275q19-19 45-19t45 19l102 102q19 19 19 45t-19 45zm141 83q0-148-73-273t-198-198-273-73-273 73-198 198-73 273 73 273 198 198 273 73 273-73 198-198 73-273zm224 0q0 209-103 385.5t-279.5 279.5-385.5 103-385.5-103-279.5-279.5-103-385.5 103-385.5 279.5-279.5 385.5-103 385.5 103 279.5 279.5 103 385.5z"/></svg>');
       background-size: 100%;
@@ -97,8 +97,8 @@
     .notice::before,
     .info::before {
       display: inline-block;
-      width: 1em;
-      height: 1em;
+      inline-size: 1em;
+      block-size: 1em;
       content: "";
       background-image: url('data:image/svg+xml;utf8,<svg width="1792" height="1792" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path fill="rgba(255, 255, 255, .95)" d="M256 8C119.043 8 8 119.083 8 256c0 136.997 111.043 248 248 248s248-111.003 248-248C504 119.083 392.957 8 256 8zm0 110c23.196 0 42 18.804 42 42s-18.804 42-42 42-42-18.804-42-42 18.804-42 42-42zm56 254c0 6.627-5.373 12-12 12h-88c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h12v-64h-12c-6.627 0-12-5.373-12-12v-24c0-6.627 5.373-12 12-12h64c6.627 0 12 5.373 12 12v100h12c6.627 0 12 5.373 12 12v24z"/></svg>');
       background-size: 100%;
@@ -106,8 +106,8 @@
 
     .warning::before {
       display: inline-block;
-      width: 1em;
-      height: 1em;
+      inline-size: 1em;
+      block-size: 1em;
       content: "";
       background-image: url('data:image/svg+xml;utf8,<svg width="1792" height="1792" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path fill="rgba(0, 0, 0, .95)" d="M1024 1375v-190q0-14-9.5-23.5t-22.5-9.5h-192q-13 0-22.5 9.5t-9.5 23.5v190q0 14 9.5 23.5t22.5 9.5h192q13 0 22.5-9.5t9.5-23.5zm-2-374l18-459q0-12-10-19-13-11-24-11h-220q-11 0-24 11-10 7-10 21l17 457q0 10 10 16.5t24 6.5h185q14 0 23.5-6.5t10.5-16.5zm-14-934l768 1408q35 63-2 126-17 29-46.5 46t-63.5 17h-1536q-34 0-63.5-17t-46.5-46q-37-63-2-126l768-1408q17-31 47-49t65-18 65 18 47 49z"/></svg>');
       background-size: 100%;
@@ -116,8 +116,8 @@
     .error::before,
     .danger::before {
       display: inline-block;
-      width: 1em;
-      height: 1em;
+      inline-size: 1em;
+      block-size: 1em;
       content: "";
       background-image: url('data:image/svg+xml;utf8,<svg width="1792" height="1792" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path fill="rgba(255, 255, 255, .95)" d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8zm0 448c-110.5 0-200-89.5-200-200S145.5 56 256 56s200 89.5 200 200-89.5 200-200 200zm101.8-262.2L295.6 256l62.2 62.2c4.7 4.7 4.7 12.3 0 17l-22.6 22.6c-4.7 4.7-12.3 4.7-17 0L256 295.6l-62.2 62.2c-4.7 4.7-12.3 4.7-17 0l-22.6-22.6c-4.7-4.7-4.7-12.3 0-17l62.2-62.2-62.2-62.2c-4.7-4.7-4.7-12.3 0-17l22.6-22.6c4.7-4.7 12.3-4.7 17 0l62.2 62.2 62.2-62.2c4.7-4.7 12.3-4.7 17 0l22.6 22.6c4.7 4.7 4.7 12.3 0 17z"/></svg>');
       background-size: 100%;
@@ -125,7 +125,7 @@
   }
 
   .alert-wrapper {
-    width: 100%;
+    inline-size: 100%;
   }
 
   .alert-link {
@@ -137,7 +137,7 @@
   .joomla-alert--close,
   .joomla-alert-button--close {
     position: absolute;
-    top: 0;
+    inset-block-start: 0;
     inset-inline-end: 0;
     padding: .75rem .8rem;
     font-size: 2rem;
@@ -165,7 +165,7 @@
     }
 
     .alert-message:not(:first-of-type) {
-      border-top: 1px solid var(--alert-accent-color);
+      border-block-start: 1px solid var(--alert-accent-color);
     }
   }
 }
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss b/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
similarity index 78%
rename from build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
rename to media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
index 62bc59a657453..f6d2507e350c5 100644
--- a/build/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
+++ b/media_source/templates/administrator/atum/scss/vendor/joomla-custom-elements/joomla-tab.scss
@@ -1,10 +1,10 @@
-@import "../../../../../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../../media/vendor/bootstrap/scss/functions";
 
 // Atum Variables
 @import "../../variables";
 
-@import "../../../../../../../../media/vendor/bootstrap/scss/variables";
-@import "../../../../../../../../media/vendor/bootstrap/scss/mixins";
+@import "../../../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../../../media/vendor/bootstrap/scss/mixins";
 
 // Tabs
 
@@ -17,12 +17,12 @@ joomla-tab {
   flex-direction: column;
 
   &[orientation=horizontal]:not([view=accordion]) {
-    margin-bottom: 0;
+    margin-block-end: 0;
   }
 
   &[orientation=horizontal]:not([view=accordion]) > div[role=tablist] {
-    width: 100%;
-    margin-bottom: 0;
+    inline-size: 100%;
+    margin-block-end: 0;
   }
 
   > div[role=tablist] {
@@ -31,7 +31,7 @@ joomla-tab {
     padding: 0;
     white-space: nowrap;
     list-style: outside none none;
-    border-bottom: $joomla-tablist-border-bottom; // 1px solid var(--template-bg-dark-10);
+    border-block-end: $joomla-tablist-border-bottom; // 1px solid var(--template-bg-dark-10);
 
     > button[role=tab] {
       position: relative;
@@ -62,10 +62,9 @@ joomla-tab {
 
         &::after {
           position: absolute;
-          right: 0;
-          bottom: 0;
-          left: 0;
-          height: 3px;
+          inset-inline: 0;
+          inset-block-end: 0;
+          block-size: 3px;
           content: "";
           background-color: var(--btn-primary-bg);
           opacity: .8;
@@ -88,13 +87,13 @@ joomla-tab {
   }
 
   > button[role=region] {
-    width: 100%;
+    inline-size: 100%;
     padding: .7rem;
     color: var(--template-text-light);
     text-align: start;
     background-color: var(--template-link-color);
     border: $joomla-tab-btn-region-border;
-    border-top: 0;
+    border-block-start: 0;
 
     &[aria-selected=true],
     &:hover,
@@ -123,23 +122,23 @@ joomla-tab {
   }
 
   .main-card-columns > * > & {
-    height: 100%;
-    border-left: $main-card-col-border-left; // 1px solid var(--template-bg-dark-10);
+    block-size: 100%;
+    border-inline-start: $main-card-col-border-left; // 1px solid var(--template-bg-dark-10);
   }
 }
 
 joomla-tab[orientation=vertical] {
   flex-direction: row;
   align-items: flex-start;
-  width: 100%;
+  inline-size: 100%;
 
   > div[role=tablist] {
     flex: 0 0 25%;
     flex-direction: column;
-    width: 100%;
-    min-width: 25%;
-    max-width: 25%;
-    height: auto;
+    inline-size: 100%;
+    min-inline-size: 25%;
+    max-inline-size: 25%;
+    block-size: auto;
     padding: 0;
     overflow: hidden;
     border: $joomla-tab-tablist-border; // 1px solid $gray-300;
@@ -148,7 +147,7 @@ joomla-tab[orientation=vertical] {
 
     @include media-breakpoint-down(lg) {
       flex: 0 0 100%;
-      max-width: 100%;
+      max-inline-size: 100%;
     }
 
     > button[role=tab] {
@@ -161,7 +160,7 @@ joomla-tab[orientation=vertical] {
     }
 
     > button[role=tab]:last-of-type {
-      border-bottom: 0;
+      border-block-end: 0;
     }
 
     > button[role=tab] {
@@ -170,8 +169,8 @@ joomla-tab[orientation=vertical] {
       padding: .75em 1em;
       margin: -1px 0;
       text-decoration: none;
-      border-top: 1px solid transparent;
-      border-bottom: $joomla-tab-vert-border-bottom; // 1px solid $gray-300;
+      border-block-start: 1px solid transparent;
+      border-block-end: $joomla-tab-vert-border-bottom; // 1px solid $gray-300;
       box-shadow: none;
 
       &[aria-selected=true],
@@ -180,15 +179,14 @@ joomla-tab[orientation=vertical] {
         color: var(--template-text-light);
         background-color: $joomla-tablist-btn-aria-exp-bg; // var(--template-bg-dark-60);
         background-image: none;
-        border-right: 0;
+        border-inline-end: 0;
         box-shadow: none;
 
         &::after {
-          top: 0;
-          bottom: 0;
-          left: -1px;
-          width: 5px;
-          height: auto;
+          inset-block: 0;
+          inset-inline-start: -1px;
+          inline-size: 5px;
+          block-size: auto;
           background-color: $joomla-tablist-btn-aria-exp-aft-bg; // var(--template-bg-dark);
         }
 
@@ -204,7 +202,7 @@ joomla-tab[orientation=vertical] {
   }
 
   > joomla-tab-element {
-    width: 100%;
+    inline-size: 100%;
     padding: $grid-gutter-width-s 0 $grid-gutter-width-s $grid-gutter-width-s;
     border: 0 none;
     box-shadow: none;
@@ -228,19 +226,18 @@ joomla-tab[view=accordion] {
       text-align: start;
       text-decoration: none;
       border: 0;
-      border-bottom: $joomla-tab-vert-border-bottom; // 1px solid $gray-300;
+      border-block-end: $joomla-tab-vert-border-bottom; // 1px solid $gray-300;
       box-shadow: none;
 
       &[aria-selected=true]::after,
       &:hover::after {
         position: absolute;
-        top: auto;
-        right: -1px;
-        bottom: -1px;
-        left: -1px;
+        inset-inline: -1px;
+        inset-block-start: auto;
+        inset-block-end: -1px;
         display: block;
-        width: calc(100% + 2px);
-        height: 5px;
+        inline-size: calc(100% + 2px);
+        block-size: 5px;
         content: "";
         background-color: var(--template-bg-dark);
         opacity: .8;
@@ -254,9 +251,9 @@ joomla-tab[view=accordion] {
 
     &[active] {
       display: block;
-      width: 100%;
-      max-width: 100%;
-      border-bottom: $joomla-tab-vert-border-bottom; // 1px solid $gray-300;
+      inline-size: 100%;
+      max-inline-size: 100%;
+      border-block-end: $joomla-tab-vert-border-bottom; // 1px solid $gray-300;
     }
   }
 
@@ -301,7 +298,7 @@ joomla-tab[view=accordion] {
       }
 
       .respTable td:last-child {
-        border-bottom: $respTable-border-bottom; // 1em var(--template-bg-dark-80) solid;
+        border-block-end: $respTable-border-bottom; // 1em var(--template-bg-dark-80) solid;
       }
 
       .oddCol {
@@ -333,8 +330,8 @@ joomla-tab[view=accordion] {
 
     [dir=rtl] joomla-tab {
       div[role="tablist"] > button[role="tab"][aria-selected="true"]::after {
-        right: auto;
-        left: 0;
+        inset-inline-end: auto;
+        inset-inline-start: 0;
       }
     }
   }
diff --git a/media_source/templates/administrator/atum/scss/vendor/minicolors/minicolors.scss b/media_source/templates/administrator/atum/scss/vendor/minicolors/minicolors.scss
new file mode 100644
index 0000000000000..6930253b2e445
--- /dev/null
+++ b/media_source/templates/administrator/atum/scss/vendor/minicolors/minicolors.scss
@@ -0,0 +1,17 @@
+// Minicolours
+@import "../../../../../../../media/vendor/minicolors/css/jquery.minicolors";
+
+.minicolors-theme-bootstrap {
+
+  .minicolors-input {
+    inline-size: 140px;
+  }
+
+  .rgb {
+    inline-size: 175px;
+  }
+
+  .rgba {
+    inline-size: 220px;
+  }
+}
diff --git a/build/media_source/templates/site/cassiopeia/images/logo.svg b/media_source/templates/site/cassiopeia/images/logo.svg
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/images/logo.svg
rename to media_source/templates/site/cassiopeia/images/logo.svg
diff --git a/build/media_source/templates/site/cassiopeia/images/select-bg-active-rtl.svg b/media_source/templates/site/cassiopeia/images/select-bg-active-rtl.svg
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/images/select-bg-active-rtl.svg
rename to media_source/templates/site/cassiopeia/images/select-bg-active-rtl.svg
diff --git a/build/media_source/templates/site/cassiopeia/images/select-bg-active.svg b/media_source/templates/site/cassiopeia/images/select-bg-active.svg
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/images/select-bg-active.svg
rename to media_source/templates/site/cassiopeia/images/select-bg-active.svg
diff --git a/installation/template/images/select-bg-rtl.svg b/media_source/templates/site/cassiopeia/images/select-bg-rtl.svg
similarity index 100%
rename from installation/template/images/select-bg-rtl.svg
rename to media_source/templates/site/cassiopeia/images/select-bg-rtl.svg
diff --git a/installation/template/images/select-bg.svg b/media_source/templates/site/cassiopeia/images/select-bg.svg
similarity index 100%
rename from installation/template/images/select-bg.svg
rename to media_source/templates/site/cassiopeia/images/select-bg.svg
diff --git a/build/media_source/templates/site/cassiopeia/images/template_preview.png b/media_source/templates/site/cassiopeia/images/template_preview.png
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/images/template_preview.png
rename to media_source/templates/site/cassiopeia/images/template_preview.png
diff --git a/build/media_source/templates/site/cassiopeia/images/template_thumbnail.png b/media_source/templates/site/cassiopeia/images/template_thumbnail.png
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/images/template_thumbnail.png
rename to media_source/templates/site/cassiopeia/images/template_thumbnail.png
diff --git a/build/media_source/templates/site/cassiopeia/js/mod_menu/menu-metismenu.es6.js b/media_source/templates/site/cassiopeia/js/mod_menu/menu-metismenu.es6.js
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/js/mod_menu/menu-metismenu.es6.js
rename to media_source/templates/site/cassiopeia/js/mod_menu/menu-metismenu.es6.js
diff --git a/build/media_source/templates/site/cassiopeia/js/template.es6.js b/media_source/templates/site/cassiopeia/js/template.es6.js
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/js/template.es6.js
rename to media_source/templates/site/cassiopeia/js/template.es6.js
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_alerts.scss b/media_source/templates/site/cassiopeia/scss/blocks/_alerts.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_alerts.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_alerts.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_back-to-top.scss b/media_source/templates/site/cassiopeia/scss/blocks/_back-to-top.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_back-to-top.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_back-to-top.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_banner.scss b/media_source/templates/site/cassiopeia/scss/blocks/_banner.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_banner.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_banner.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_css-grid.scss b/media_source/templates/site/cassiopeia/scss/blocks/_css-grid.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_css-grid.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_css-grid.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_footer.scss b/media_source/templates/site/cassiopeia/scss/blocks/_footer.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_footer.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_footer.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_form.scss b/media_source/templates/site/cassiopeia/scss/blocks/_form.scss
similarity index 87%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_form.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_form.scss
index 41fa174ae1911..6a8d1a1a9d056 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_form.scss
+++ b/media_source/templates/site/cassiopeia/scss/blocks/_form.scss
@@ -212,6 +212,41 @@ div.subform-repeatable-group {
   }
 }
 
+// Subform Grid layout
+.subform-repeatable-grid>.subform-repeatable-group {
+  padding-top: 16px;
+}
+.subform-grid-row {
+  display: flex;
+  flex-flow: row wrap;
+  column-gap: 1rem;
+
+  > .control-group {
+    flex: 1 1 220px;
+    flex-flow: column;
+
+    > .control-label {
+      width: 100%;
+    }
+
+    > .controls {
+      width: 100%;
+      min-width: unset;
+    }
+  }
+
+  // For groupByFieldset="true"
+  > fieldset {
+    flex: 1 1 220px;
+
+    > .control-group {
+      > .control-label {
+        width: 100%;
+      }
+    }
+  }
+}
+
 // Highlight draggable section
 .subform-repeatable-group[draggable="true"] {
   // For non table layout
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_frontend-edit.scss b/media_source/templates/site/cassiopeia/scss/blocks/_frontend-edit.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_frontend-edit.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_frontend-edit.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss b/media_source/templates/site/cassiopeia/scss/blocks/_global.scss
similarity index 97%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_global.scss
index 72d3db710b482..c6beebb56fb03 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_global.scss
+++ b/media_source/templates/site/cassiopeia/scss/blocks/_global.scss
@@ -1,4 +1,10 @@
 // Global
+@media screen and (prefers-reduced-motion: no-preference) {
+  @view-transition {
+    navigation: auto;
+  }
+}
+
 :root {
   scroll-behavior: smooth;
   font-size: $font-size-root;
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss b/media_source/templates/site/cassiopeia/scss/blocks/_header.scss
similarity index 87%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_header.scss
index f18189a50c80a..46c4b0e731867 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_header.scss
+++ b/media_source/templates/site/cassiopeia/scss/blocks/_header.scss
@@ -83,6 +83,34 @@
       display: flex;
       flex: 1 1 0%;
       flex-direction: row;
+      :where(.mod-menu__sub:not(.mod-menu__sub *)) {
+        position: absolute;
+        top: 100%;
+        z-index: 1001;
+        display: block;
+        min-width: 12rem;
+        padding: 0;
+        margin: 0;
+        background-color: #fff;
+      }
+    }
+
+    @include media-breakpoint-down(lg) {
+      &.mod-list > li > a:hover {
+        text-decoration: underline;
+      }
+      .mod-menu__sub {
+        a,
+        span {
+          color: $white;
+        }
+      }
+    }
+
+    .mod-menu__sub {
+      a:hover {
+        text-decoration: underline;
+      }
     }
 
     > li {
@@ -138,6 +166,9 @@
         display: none;
         color: $gray-900;
       }
+      > [aria-hidden="false"] {
+        display: block;
+      }
     }
   }
 
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_icons.scss b/media_source/templates/site/cassiopeia/scss/blocks/_icons.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_icons.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_icons.scss
diff --git a/build/media_source/templates/administrator/atum/scss/blocks/_iframe.scss b/media_source/templates/site/cassiopeia/scss/blocks/_iframe.scss
similarity index 100%
rename from build/media_source/templates/administrator/atum/scss/blocks/_iframe.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_iframe.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_layout.scss b/media_source/templates/site/cassiopeia/scss/blocks/_layout.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_layout.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_layout.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_legacy.scss b/media_source/templates/site/cassiopeia/scss/blocks/_legacy.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_legacy.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_legacy.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_modals.scss b/media_source/templates/site/cassiopeia/scss/blocks/_modals.scss
similarity index 96%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_modals.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_modals.scss
index c4a36b3af9810..dd08fd03aa26a 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_modals.scss
+++ b/media_source/templates/site/cassiopeia/scss/blocks/_modals.scss
@@ -85,7 +85,8 @@ joomla-dialog {
         width: 66px;
         height: 66px;
         content: "";
-        background: url("../../../../system/images/ajax-loader.gif") no-repeat center;
+        background: url("../../../../system/images/joomla-loader.svg") no-repeat center;
+        background-size: 66px 66px;
         transform: translate(-50%, -50%);
       }
     }
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_modifiers.scss b/media_source/templates/site/cassiopeia/scss/blocks/_modifiers.scss
similarity index 96%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_modifiers.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_modifiers.scss
index b310f02a3ffdf..59ae922946b52 100644
--- a/build/media_source/templates/site/cassiopeia/scss/blocks/_modifiers.scss
+++ b/media_source/templates/site/cassiopeia/scss/blocks/_modifiers.scss
@@ -328,3 +328,16 @@
     }
   }
 }
+
+.mod-menu a,
+.mod-menu button {
+  color: var(--link-color);
+  @at-root .container-header & {
+    color: currentColor;
+  }
+  &:focus-visible {
+    outline: 2px solid currentColor;
+    outline-offset: 2px;
+  }
+}
+
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_tags.scss b/media_source/templates/site/cassiopeia/scss/blocks/_tags.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_tags.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_tags.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss b/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_toolbar.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/blocks/_utilities.scss b/media_source/templates/site/cassiopeia/scss/blocks/_utilities.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/blocks/_utilities.scss
rename to media_source/templates/site/cassiopeia/scss/blocks/_utilities.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/editor.scss b/media_source/templates/site/cassiopeia/scss/editor.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/editor.scss
rename to media_source/templates/site/cassiopeia/scss/editor.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss b/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss
similarity index 88%
rename from build/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss
rename to media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss
index 61b1c546f2f3b..a4c9ef8af248d 100644
--- a/build/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss
+++ b/media_source/templates/site/cassiopeia/scss/global/colors_alternative.scss
@@ -1,6 +1,6 @@
 // Variables, Functions and Mixins
 @import "../tools/tools";
-@import "../../../../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../media/vendor/bootstrap/scss/functions";
 
 :root {
   --cassiopeia-color-primary: #{$alternative-color-primary};
diff --git a/build/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss b/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss
similarity index 88%
rename from build/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss
rename to media_source/templates/site/cassiopeia/scss/global/colors_standard.scss
index 3b72dbad656de..c968cc56d6054 100644
--- a/build/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss
+++ b/media_source/templates/site/cassiopeia/scss/global/colors_standard.scss
@@ -1,6 +1,6 @@
 // Variables, Functions and Mixins
 @import "../tools/tools";
-@import "../../../../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../media/vendor/bootstrap/scss/functions";
 
 :root {
   --cassiopeia-color-primary: #{$standard-color-primary};
diff --git a/build/media_source/templates/site/cassiopeia/scss/global/fonts-local_roboto.scss b/media_source/templates/site/cassiopeia/scss/global/fonts-local_roboto.scss
similarity index 75%
rename from build/media_source/templates/site/cassiopeia/scss/global/fonts-local_roboto.scss
rename to media_source/templates/site/cassiopeia/scss/global/fonts-local_roboto.scss
index 1e11feb32bc53..0c2dbe8e65ae1 100644
--- a/build/media_source/templates/site/cassiopeia/scss/global/fonts-local_roboto.scss
+++ b/media_source/templates/site/cassiopeia/scss/global/fonts-local_roboto.scss
@@ -1,6 +1,6 @@
 // Fonts
 $roboto-font-path: "../../../../../vendor/roboto-fontface/fonts" !default;
-@import "../../../../../../../media/vendor/roboto-fontface/scss/roboto/sass/roboto-fontface";
+@import "../../../../../../media/vendor/roboto-fontface/scss/roboto/sass/roboto-fontface";
 
 :root {
   --cassiopeia-font-family-body: "Roboto", sans-serif;
diff --git a/build/media_source/templates/site/cassiopeia/scss/offline.scss b/media_source/templates/site/cassiopeia/scss/offline.scss
similarity index 95%
rename from build/media_source/templates/site/cassiopeia/scss/offline.scss
rename to media_source/templates/site/cassiopeia/scss/offline.scss
index 69376dfdc5da9..b7b2c39161ed9 100644
--- a/build/media_source/templates/site/cassiopeia/scss/offline.scss
+++ b/media_source/templates/site/cassiopeia/scss/offline.scss
@@ -1,5 +1,5 @@
 // Bootstrap functions
-@import "../../../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../media/vendor/bootstrap/scss/functions";
 
 // Variables, Functions and Mixins
 @import "tools/tools";
diff --git a/build/media_source/templates/site/cassiopeia/scss/system/fields/calendar.scss b/media_source/templates/site/cassiopeia/scss/system/fields/calendar.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/system/fields/calendar.scss
rename to media_source/templates/site/cassiopeia/scss/system/fields/calendar.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/system/searchtools/searchtools.scss b/media_source/templates/site/cassiopeia/scss/system/searchtools/searchtools.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/system/searchtools/searchtools.scss
rename to media_source/templates/site/cassiopeia/scss/system/searchtools/searchtools.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/template-rtl.scss b/media_source/templates/site/cassiopeia/scss/template-rtl.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/template-rtl.scss
rename to media_source/templates/site/cassiopeia/scss/template-rtl.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/template.scss b/media_source/templates/site/cassiopeia/scss/template.scss
similarity index 70%
rename from build/media_source/templates/site/cassiopeia/scss/template.scss
rename to media_source/templates/site/cassiopeia/scss/template.scss
index ed3f24078e2cc..fa8ca715d4390 100644
--- a/build/media_source/templates/site/cassiopeia/scss/template.scss
+++ b/media_source/templates/site/cassiopeia/scss/template.scss
@@ -1,20 +1,20 @@
 // Bootstrap functions
-@import "../../../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../media/vendor/bootstrap/scss/functions";
 @import "tools/variables/variables";
-@import "../../../../../../media/vendor/bootstrap/scss/variables";
-@import "../../../../../../media/vendor/bootstrap/scss/variables-dark";
-@import "../../../../../../media/vendor/bootstrap/scss/maps";
-@import "../../../../../../media/vendor/bootstrap/scss/mixins";
-@import "../../../../../../media/vendor/bootstrap/scss/utilities";
+@import "../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../media/vendor/bootstrap/scss/variables-dark";
+@import "../../../../../media/vendor/bootstrap/scss/maps";
+@import "../../../../../media/vendor/bootstrap/scss/mixins";
+@import "../../../../../media/vendor/bootstrap/scss/utilities";
 
 // Variables, Functions and Mixins
 @import "tools/tools";
 
 // Bootstrap
-@import "../../../../../../media/vendor/bootstrap/scss/bootstrap";
+@import "../../../../../media/vendor/bootstrap/scss/bootstrap";
 
 // jQuery Minicolors
-@import "../../../../../../media/system/scss/jquery-minicolors";
+@import "../../../../../media/system/scss/jquery-minicolors";
 
 // Blocks
 @import "blocks/global"; // Leave this first
@@ -48,7 +48,6 @@
 @import "vendor/bootstrap/nav";
 @import "vendor/bootstrap/pagination";
 @import "vendor/bootstrap/table";
-@import "vendor/chosen";
 @import "vendor/dragula";
 @import "vendor/metismenu/metismenu";
 @import "vendor/minicolors";
diff --git a/build/media_source/templates/site/cassiopeia/scss/tools/_tools.scss b/media_source/templates/site/cassiopeia/scss/tools/_tools.scss
similarity index 59%
rename from build/media_source/templates/site/cassiopeia/scss/tools/_tools.scss
rename to media_source/templates/site/cassiopeia/scss/tools/_tools.scss
index 9d37de1a8b110..6ebe99adcf054 100644
--- a/build/media_source/templates/site/cassiopeia/scss/tools/_tools.scss
+++ b/media_source/templates/site/cassiopeia/scss/tools/_tools.scss
@@ -1,5 +1,5 @@
 // Vendor
-@import "../../../../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../media/vendor/bootstrap/scss/functions";
 
 
 // Variables
diff --git a/build/media_source/templates/site/cassiopeia/scss/tools/functions/_max-width.scss b/media_source/templates/site/cassiopeia/scss/tools/functions/_max-width.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/tools/functions/_max-width.scss
rename to media_source/templates/site/cassiopeia/scss/tools/functions/_max-width.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss b/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss
similarity index 99%
rename from build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss
rename to media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss
index af02216ddd4ef..8f7d9081bb9c7 100644
--- a/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss
+++ b/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss
@@ -3,7 +3,7 @@
 // Remove prefix added in BS5 for compat with Joomla beta's shipped with Betas
 $prefix: "";
 
-// Disable dark mode in J4.4 - it's going to cause major b/c breaks to introduce. We will enable it in 5.0
+// Disable dark mode in J4.4 - it's going to cause major b/c breaks to introduce. We will enable it in 7.0
 $enable-dark-mode: false;
 
 // Global
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/_awesomplete.scss b/media_source/templates/site/cassiopeia/scss/vendor/_awesomplete.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/_awesomplete.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/_awesomplete.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/_dragula.scss b/media_source/templates/site/cassiopeia/scss/vendor/_dragula.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/_dragula.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/_dragula.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/_minicolors.scss b/media_source/templates/site/cassiopeia/scss/vendor/_minicolors.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/_minicolors.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/_minicolors.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/_tinymce.scss b/media_source/templates/site/cassiopeia/scss/vendor/_tinymce.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/_tinymce.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/_tinymce.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_buttons.scss b/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_buttons.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_buttons.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_buttons.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_collapse.scss b/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_collapse.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_collapse.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_collapse.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_custom-forms.scss b/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_custom-forms.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_custom-forms.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_custom-forms.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_dropdown.scss b/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_dropdown.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_dropdown.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_dropdown.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_forms.scss b/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_forms.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_forms.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_forms.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_lists.scss b/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_lists.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_lists.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_lists.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_modal.scss b/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_modal.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_modal.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_modal.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_nav.scss b/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_nav.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_nav.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_nav.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_pagination.scss b/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_pagination.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_pagination.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_pagination.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_table.scss b/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_table.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_table.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/bootstrap/_table.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/choicesjs/choices.scss b/media_source/templates/site/cassiopeia/scss/vendor/choicesjs/choices.scss
similarity index 87%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/choicesjs/choices.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/choicesjs/choices.scss
index a41bdd5c4db8b..6dff049869151 100644
--- a/build/media_source/templates/site/cassiopeia/scss/vendor/choicesjs/choices.scss
+++ b/media_source/templates/site/cassiopeia/scss/vendor/choicesjs/choices.scss
@@ -1,15 +1,16 @@
-@import "../../../../../../../../media/vendor/bootstrap/scss/functions";
-@import "../../../../../../../../media/templates/site/cassiopeia/scss/tools/variables/variables";
-@import "../../../../../../../../media/vendor/bootstrap/scss/variables";
-@import "../../../../../../../../media/vendor/bootstrap/scss/mixins";
+@import "../../../../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../../media/templates/site/cassiopeia/scss/tools/variables/variables";
+@import "../../../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../../../media/vendor/bootstrap/scss/mixins";
 
 // choices.js
-@import "../../../../../../../../media/vendor/choicesjs/scss/choices";
+@import "../../../../../../../media/vendor/choicesjs/scss/choices";
 
 // Cassiopea Variables, Functions and Mixins
 @import "../../tools/tools";
 
 .choices {
+  --choices-item-disabled-color: var(--gray-700);
   border: $form-select-border-width solid $form-select-border-color;
   @include border-radius($form-select-border-radius, 0);
   @include box-shadow($form-select-box-shadow);
@@ -46,7 +47,8 @@
   }
 }
 
-.choices__list--dropdown {
+.choices__list--dropdown,
+.choices__list[aria-expanded] {
   z-index: $zindex-popover;
 }
 
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/joomla-custom-elements/joomla-alert.scss b/media_source/templates/site/cassiopeia/scss/vendor/joomla-custom-elements/joomla-alert.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/joomla-custom-elements/joomla-alert.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/joomla-custom-elements/joomla-alert.scss
diff --git a/build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss b/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss
similarity index 100%
rename from build/media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss
rename to media_source/templates/site/cassiopeia/scss/vendor/metismenu/_metismenu.scss
diff --git a/media_source/templates/site/cassiopeia_extended/images/template_preview.png b/media_source/templates/site/cassiopeia_extended/images/template_preview.png
new file mode 100644
index 0000000000000..c209db60f6f2d
Binary files /dev/null and b/media_source/templates/site/cassiopeia_extended/images/template_preview.png differ
diff --git a/media_source/templates/site/cassiopeia_extended/images/template_thumbnail.png b/media_source/templates/site/cassiopeia_extended/images/template_thumbnail.png
new file mode 100644
index 0000000000000..3f8da20a7dc66
Binary files /dev/null and b/media_source/templates/site/cassiopeia_extended/images/template_thumbnail.png differ
diff --git a/media_source/templates/site/cassiopeia_extended/scss/global/colors.scss b/media_source/templates/site/cassiopeia_extended/scss/global/colors.scss
new file mode 100644
index 0000000000000..cc1f4ce6cddcf
--- /dev/null
+++ b/media_source/templates/site/cassiopeia_extended/scss/global/colors.scss
@@ -0,0 +1,77 @@
+.container-header {
+  background-color: var(--headerbg);
+  background-image: none;
+  .navbar-brand a {
+    color: var(--headercolor);
+    text-decoration: none;
+  }
+  .mod-menu {
+    color: var(--headercolor);
+  }
+}
+.container-header .metismenu > li > a:hover::after, .container-header .metismenu > li > button:hover::before, .container-header .metismenu > li.active > a::after, .container-header .metismenu > li.active > button::before {
+  background: color-mix(in srgb, currentColor, #fff 25%);
+}
+a:focus-visible,
+.metismenu.mod-menu .metismenu-item > a:focus,
+.metismenu.mod-menu .metismenu-item > button:focus {
+  outline: 2px solid currentColor;
+  outline-offset: 2px;
+}
+.form-control:focus,
+.form-check-input:focus {
+  outline: 2px solid currentColor;
+  outline-offset: 2px;
+  box-shadow: none;
+}
+.form-check-input:checked {
+  background-color: var(--body-color);
+  border-color: var(--body-color);
+}
+.btn-primary {
+  --btn-color: var(--btncolor);
+  --btn-bg: var(--btnbg);
+  --btn-border-color: var(--btnbg);
+  --btn-hover-color: var(--btncolorh);
+  --btn-hover-bg: var(--btnbgh);
+  --btn-hover-border-color: var(--btnbgh);
+  --btn-active-color: var(--btncolorh);
+  --btn-active-bg: var(--btnbgh);
+  --btn-active-border-color: var(--btnbgh);
+  --btn-disabled-color: var(--btncolor);
+  --btn-disabled-bg: var(--btnbg);
+  --btn-disabled-border-color: var(--btnbg);
+}
+.btn-primary {
+  background-color: var(--btn-bg);
+  border-color: var(--btn-bg);
+  &:hover,
+  &:focus {
+    background-color: var(--btn-hover-bg);
+    border-color: var(--btn-hover-bg);
+  }
+}
+.btn-primary:focus-visible {
+  outline: 2px solid var(--btn-hover-bg);
+  outline-offset: 2px;
+  box-shadow: none;
+}
+.boxed .blog-item {
+  --cassiopeia-color-primary: var(--link-color);
+}
+.pagination {
+  --pagination-active-bg: var(--link-color);
+}
+.container-footer {
+  color: var(--footercolor);
+  background-color: var(--footerbg);
+  background-image: none;
+  a {
+    color: var(--footercolor);
+  }
+}
+.offline-card .header {
+  color: var(--headercolor);
+  background-color: var(--headerbg);
+  background-image: none;
+}
diff --git a/media_source/templates/site/cassiopeia_extended/scss/global/fonts.scss b/media_source/templates/site/cassiopeia_extended/scss/global/fonts.scss
new file mode 100644
index 0000000000000..b5410dbb1b923
--- /dev/null
+++ b/media_source/templates/site/cassiopeia_extended/scss/global/fonts.scss
@@ -0,0 +1,11 @@
+@media (width >= 1200px) {
+  h1, .h1 {
+    font-size: var(--h1size);
+  }
+  h2, .h2 {
+    font-size: var(--h2size);
+  }
+  h3, .h3 {
+    font-size: var(--h3size);
+  }
+}
diff --git a/media_source/vendor/bootstrap/builder.mjs b/media_source/vendor/bootstrap/builder.mjs
new file mode 100644
index 0000000000000..837d7b8223226
--- /dev/null
+++ b/media_source/vendor/bootstrap/builder.mjs
@@ -0,0 +1,149 @@
+/**
+ * Assets Builder
+ */
+import fs from 'node:fs';
+import fsp from 'node:fs/promises';
+import path from 'node:path';
+import { rollup } from 'rollup';
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import replace from '@rollup/plugin-replace';
+import { babel } from '@rollup/plugin-babel';
+import DefaultModuleBuilder from '../../../build/build-modules-js/builder/default-module-builder.mjs';
+import { resolvePackageFile } from '../../../build/build-modules-js/utils/resolve-package.mjs';
+import { minifyJSContent } from '../../../build/build-modules-js/javascript/js-handle.mjs';
+
+const minifyBootstrapModule = async (targetFile, code) => {
+  const code2 = code
+    .replace('./popper.js', './popper.min.js')
+    .replace('./dom.js', './dom.min.js');
+
+  return minifyJSContent(code2).then((jsMin) => {
+    return fsp.writeFile(
+      targetFile.replace('.js', '.min.js'),
+      jsMin,
+      { encoding: 'utf8', mode: 0o644 },
+    );
+  });
+};
+
+const compileBootstrapJS = async (basePath, targetPath) => {
+  const modulePathJson = resolvePackageFile(path.join('bootstrap', 'package.json'));
+
+  if (!modulePathJson) {
+    throw new Error('Package "bootstrap" not found');
+  }
+
+  const moduleOptions = JSON.parse(fs.readFileSync(modulePathJson, { encoding: 'utf8' }));
+  const modulePathBase = path.dirname(modulePathJson);
+  const domImports = fs.readdirSync(path.join(modulePathBase, 'js/src/dom'));
+  const utilImports = fs.readdirSync(path.join(modulePathBase, 'js/src/util'));
+  const bsVersion = moduleOptions.version;
+
+  return rollup({
+    input: path.join(basePath, 'js', 'index.es6.js'),
+    plugins: [
+      nodeResolve(),
+      replace({
+        preventAssignment: true,
+        'process.env.NODE_ENV': "'production'",
+      }),
+      babel({
+        exclude: 'node_modules/core-js/**',
+        babelHelpers: 'bundled',
+        babelrc: false,
+        presets: [
+          [
+            '@babel/preset-env',
+            {
+              targets: {
+                browsers: ['> 1%', 'not op_mini all'],
+              },
+            },
+          ],
+        ],
+      }),
+      {
+        name: 'bootstrap-version-plugin',
+        renderChunk(code) {
+          return code
+            .replace('./popper.js', `./popper.js?${bsVersion}`)
+            .replace('./dom.js', `./dom.js?${bsVersion}`);
+        },
+      },
+    ],
+  }).then((build) => {
+    return build.write({
+      format: 'es',
+      sourcemap: false,
+      dir: path.join(targetPath, 'js'),
+      chunkFileNames: '[name].js',
+      manualChunks: {
+        alert: ['media_source/vendor/bootstrap/js/alert.es6.js'],
+        button: ['media_source/vendor/bootstrap/js/button.es6.js'],
+        carousel: ['media_source/vendor/bootstrap/js/carousel.es6.js'],
+        collapse: ['media_source/vendor/bootstrap/js/collapse.es6.js'],
+        dropdown: ['media_source/vendor/bootstrap/js/dropdown.es6.js'],
+        modal: ['media_source/vendor/bootstrap/js/modal.es6.js'],
+        offcanvas: ['media_source/vendor/bootstrap/js/offcanvas.es6.js'],
+        popover: ['media_source/vendor/bootstrap/js/popover.es6.js'],
+        scrollspy: ['media_source/vendor/bootstrap/js/scrollspy.es6.js'],
+        tab: ['media_source/vendor/bootstrap/js/tab.es6.js'],
+        toast: ['media_source/vendor/bootstrap/js/toast.es6.js'],
+        popper: ['@popperjs/core'],
+        dom: [
+          'node_modules/bootstrap/js/src/base-component.js',
+          ...domImports.map((file) => `node_modules/bootstrap/js/src/dom/${file}`),
+          ...utilImports.map((file) => `node_modules/bootstrap/js/src/util/${file}`),
+        ],
+      },
+    }).then((result) => {
+      fs.unlinkSync(path.join(targetPath, 'js', 'index.es6.js'));
+
+      const promises = [];
+      result.output.forEach((chunk) => {
+        if (chunk.fileName === 'index.es6.js') return;
+
+        promises.push(minifyBootstrapModule(
+          path.join(targetPath, 'js', chunk.fileName),
+          chunk.code,
+        ));
+      });
+
+      return Promise.all(promises).then(() => build.close());
+    });
+  });
+};
+
+export default class BootstrapModuleBuilder extends DefaultModuleBuilder {
+  /**
+   * Remove files on target location
+   * @returns { Promise }
+   */
+  async clear() {
+    // Do not clear whole target because it is mix of customized JS and source files from the bootstrap package.
+    // Remove only related JS
+    const jsPath = path.join(this.targetPath, 'js');
+
+    if (!fs.existsSync(jsPath)) {
+      return;
+    }
+
+    return fsp.rm(jsPath, { recursive: true });
+  }
+
+  /**
+   * Process CSS files
+   * @returns { Promise }
+   */
+  async css() {
+    // Nothing to do here
+  }
+
+  /**
+   * Process JavaScript files and Modules
+   * @returns { Promise }
+   */
+  async js() {
+    return compileBootstrapJS(this.basePath, this.targetPath);
+  }
+};
diff --git a/build/media_source/vendor/bootstrap/js/alert.es6.js b/media_source/vendor/bootstrap/js/alert.es6.js
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/alert.es6.js
rename to media_source/vendor/bootstrap/js/alert.es6.js
diff --git a/build/media_source/vendor/bootstrap/js/button.es6.js b/media_source/vendor/bootstrap/js/button.es6.js
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/button.es6.js
rename to media_source/vendor/bootstrap/js/button.es6.js
diff --git a/build/media_source/vendor/bootstrap/js/carousel.es6.js b/media_source/vendor/bootstrap/js/carousel.es6.js
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/carousel.es6.js
rename to media_source/vendor/bootstrap/js/carousel.es6.js
diff --git a/build/media_source/vendor/bootstrap/js/collapse.es6.js b/media_source/vendor/bootstrap/js/collapse.es6.js
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/collapse.es6.js
rename to media_source/vendor/bootstrap/js/collapse.es6.js
diff --git a/build/media_source/vendor/bootstrap/js/dropdown.es6.js b/media_source/vendor/bootstrap/js/dropdown.es6.js
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/dropdown.es6.js
rename to media_source/vendor/bootstrap/js/dropdown.es6.js
diff --git a/build/media_source/vendor/bootstrap/js/index.es6.js b/media_source/vendor/bootstrap/js/index.es6.js
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/index.es6.js
rename to media_source/vendor/bootstrap/js/index.es6.js
diff --git a/build/media_source/vendor/bootstrap/js/modal.es6.js b/media_source/vendor/bootstrap/js/modal.es6.js
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/modal.es6.js
rename to media_source/vendor/bootstrap/js/modal.es6.js
diff --git a/build/media_source/vendor/bootstrap/js/offcanvas.es6.js b/media_source/vendor/bootstrap/js/offcanvas.es6.js
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/offcanvas.es6.js
rename to media_source/vendor/bootstrap/js/offcanvas.es6.js
diff --git a/build/media_source/vendor/bootstrap/js/popover.es6.js b/media_source/vendor/bootstrap/js/popover.es6.js
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/popover.es6.js
rename to media_source/vendor/bootstrap/js/popover.es6.js
diff --git a/build/media_source/vendor/bootstrap/js/scrollspy.es6.js b/media_source/vendor/bootstrap/js/scrollspy.es6.js
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/scrollspy.es6.js
rename to media_source/vendor/bootstrap/js/scrollspy.es6.js
diff --git a/build/media_source/vendor/bootstrap/js/tab.es6.js b/media_source/vendor/bootstrap/js/tab.es6.js
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/tab.es6.js
rename to media_source/vendor/bootstrap/js/tab.es6.js
diff --git a/build/media_source/vendor/bootstrap/js/toast.es6.js b/media_source/vendor/bootstrap/js/toast.es6.js
similarity index 100%
rename from build/media_source/vendor/bootstrap/js/toast.es6.js
rename to media_source/vendor/bootstrap/js/toast.es6.js
diff --git a/media_source/vendor/builder.mjs b/media_source/vendor/builder.mjs
new file mode 100644
index 0000000000000..ecf302d575b97
--- /dev/null
+++ b/media_source/vendor/builder.mjs
@@ -0,0 +1,244 @@
+/**
+ * Assets Builder
+ */
+import { pathToFileURL } from 'node:url';
+import path from 'node:path';
+import fsp from 'node:fs/promises';
+import fs from 'node:fs';
+
+import pkgOptions from '../../package.json' with { type: 'json' };
+import buildSettings from '../../build/build-modules-js/settings.json' with { type: 'json' };
+import DefaultModuleBuilder from '../../build/build-modules-js/builder/default-module-builder.mjs';
+import { resolvePackageFile } from '../../build/build-modules-js/utils/resolve-package.mjs';
+import { handleJSFile } from '../../build/build-modules-js/javascript/js-handle.mjs';
+
+/**
+ * Copy package files.
+ *
+ * @param {Object} vendor           Vendor info from settings.json
+ * @param {String} packageName      Original package name. This may be different from vendor.name.
+ * @param {String} mediaVendorPath  Full path to /media/vendor
+ *
+ * @returns { Promise }
+ */
+const copyVendorFiles = async (vendor, packageName, mediaVendorPath) => {
+  const vendorName = vendor.name || packageName;
+  const modulePathJson = resolvePackageFile(path.join(packageName, 'package.json'));
+
+  if (!modulePathJson) {
+    throw new Error(`Package "${packageName}" not found`);
+  }
+
+  const modulePathRoot = path.dirname(modulePathJson);
+  const modulePathTarget = path.join(mediaVendorPath, vendorName);
+
+  // Make sure target folder exists
+  if (!fs.existsSync(modulePathTarget)) {
+    fs.mkdirSync(modulePathTarget);
+  }
+
+  // Check files that need to copy
+  const promises = [];
+  ['js', 'css', 'filesExtra'].forEach((type) => {
+    if (!vendor[type]) return;
+    const files = vendor[type];
+
+    for (const srcFile in files) {
+      promises.push(fsp.cp(
+        path.join(modulePathRoot, srcFile),
+        path.join(modulePathTarget, files[srcFile]),
+        { preserveTimestamps: true, recursive: true },
+      ));
+    }
+  });
+
+  // Copy the license if exists
+  const licensePath = vendor.licenseFilename ? resolvePackageFile(path.join(packageName, vendor.licenseFilename)) : false;
+  if (licensePath) {
+    promises.push(fsp.cp(licensePath, path.join(modulePathTarget, vendor.licenseFilename), { preserveTimestamps: true }));
+  }
+
+  return Promise.all(promises);
+};
+
+/**
+ * Create Asset entries for the Registry
+ *
+ * @param {Object} vendor           Vendor info from settings.json
+ * @param {String} packageName      Original package name. This may be different from vendor.name.
+ *
+ * @returns { Promise<[]> }       List of asset entries for the vendor.
+ */
+const prepareVendorAssets = async (vendor, packageName) => {
+  if (!vendor.provideAssets || !vendor.provideAssets.length) {
+    return [];
+  }
+
+  const vendorName = vendor.name || packageName;
+  const modulePathJson = resolvePackageFile(path.join(packageName, 'package.json'));
+
+  if (!modulePathJson) {
+    throw new Error(`Package "${packageName}" not found`);
+  }
+
+  const moduleOptions = await import(pathToFileURL(modulePathJson).href, { with: { type: 'json' } });
+
+  const entries = [];
+  vendor.provideAssets.forEach((assetInfo) => {
+    const entryBase = {
+      package: packageName,
+      name: assetInfo.name || vendorName,
+      version: moduleOptions.default.version,
+      type: assetInfo.type,
+    };
+
+    const entry = Object.assign(assetInfo, entryBase);
+
+    // Update path to file
+    if (assetInfo.uri && (assetInfo.type === 'script' || assetInfo.type === 'style' || assetInfo.type === 'webcomponent')) {
+      let itemPath = assetInfo.uri;
+
+      // Check for external path
+      if (!itemPath.startsWith('http://') && !itemPath.startsWith('https://') && !itemPath.startsWith('//')) {
+        itemPath = `vendor/${vendorName}/${itemPath}`;
+      }
+
+      entry.uri = itemPath;
+    }
+
+    entries.push(entry);
+  });
+
+  return entries;
+};
+
+export default class VendorModuleBuilder extends DefaultModuleBuilder {
+  /**
+   * Copy all vendor files according to Joomla's specs from build/settings.json
+   * And create vendor/joomla.asset.json registry.
+   *
+   * @returns { Promise }
+   */
+  async copy() {
+    const modulesSrcBasePath = path.join(process.cwd(), 'node_modules');
+
+    // This should never happen
+    if (!fs.existsSync(modulesSrcBasePath)) {
+      throw new Error(`Modules source "${modulesSrcBasePath}" not found`);
+    }
+
+    // Prepare target
+    if (!fs.existsSync(this.targetPath)) {
+      fs.mkdirSync(this.targetPath, { recursive: true, mode: 0o755 });
+    }
+
+    const promises = [];
+    // Store entries as object to keep sorting steady
+    const assets = {};
+
+    // Loop the vendors
+    Object.keys(buildSettings.settings.vendors).forEach((packageName) => {
+      const vendor = buildSettings.settings.vendors[packageName];
+      const vendorName = vendor.name || packageName;
+      // Keep sorting steady
+      assets[vendorName] = [];
+
+      promises.push(
+        copyVendorFiles(vendor, packageName, this.targetPath)
+          .then(() => prepareVendorAssets(vendor, packageName))
+          .then((entries) => {
+            if (!entries.length) return;
+            assets[vendorName] = entries;
+          }),
+      );
+    });
+
+    // Prepare registry data
+    const registry = {
+      $schema: 'https://developer.joomla.org/schemas/json-schema/web_assets.json',
+      name: pkgOptions.name,
+      version: pkgOptions.version,
+      description: pkgOptions.description,
+      license: pkgOptions.license,
+      assets: [],
+    };
+
+    return Promise.all(promises).then(() => {
+      // Finalize and save the Registry file
+      const assetsArray = [];
+
+      // Transform from Object to List
+      Object.keys(assets).forEach((vendorName) => {
+        assetsArray.push(...assets[vendorName]);
+      });
+
+      registry.assets = assetsArray;
+
+      return fsp.writeFile(
+        path.join(this.targetPath, 'joomla.asset.json'),
+        JSON.stringify(registry, null, 2),
+        { encoding: 'utf8', mode: 0o644 },
+      );
+    });
+  }
+
+  /**
+   * Process CSS files
+   * @returns { Promise }
+   */
+  async css() {
+    // Nothing to do here
+  }
+
+  /**
+   * Process JavaScript files and Modules
+   * @returns { Promise }
+   */
+  async js() {
+    // Minify few non minified files
+    const folders = [
+      'diff/js',
+      'es-module-shims/js',
+      'qrcode/js',
+    ];
+
+    const promises = [];
+    folders.forEach((folder) => {
+      const basePath = path.join(this.targetPath, folder);
+
+      promises.push(
+        fsp.readdir(basePath, { recursive: false, withFileTypes: true })
+          .then((files) => {
+            const jsFiles = [];
+
+            files.forEach((file) => {
+              if (!file.isFile()) return;
+
+              const baseName = file.name;
+              const ext = path.extname(baseName);
+              const fullSrcPath = path.join(file.parentPath, file.name);
+
+              if (ext !== '.js' || baseName.endsWith('.min.js')) return;
+
+              jsFiles.push(handleJSFile(
+                fullSrcPath,
+                fullSrcPath,
+              ));
+            });
+
+            return Promise.all(jsFiles);
+          }),
+      );
+    });
+
+    return Promise.all(promises);
+  }
+
+  /**
+   * Watch handler
+   * @returns { Promise }
+   */
+  async watch() {
+    throw new Error(`Watch is not implemented for [${this.name}]`);
+  }
+};
diff --git a/media_source/vendor/jquery/builder.mjs b/media_source/vendor/jquery/builder.mjs
new file mode 100644
index 0000000000000..a4453c4d5b3b1
--- /dev/null
+++ b/media_source/vendor/jquery/builder.mjs
@@ -0,0 +1,18 @@
+/**
+ * Assets Builder
+ */
+import fs from 'node:fs';
+import path from 'node:path';
+import fsp from 'node:fs/promises';
+
+import DefaultModuleBuilder from '../../../build/build-modules-js/builder/default-module-builder.mjs';
+
+export default class VendorJQueryModuleBuilder extends DefaultModuleBuilder {
+  /**
+   * Remove files on target location
+   * @returns { Promise }
+   */
+  async clear() {
+    // Bypass clear, it is conflicting with Vendor builder
+  }
+};
diff --git a/media_source/vendor/jquery/js/jquery-noconflict.es6.js b/media_source/vendor/jquery/js/jquery-noconflict.es6.js
new file mode 100644
index 0000000000000..7641941cf21c1
--- /dev/null
+++ b/media_source/vendor/jquery/js/jquery-noconflict.es6.js
@@ -0,0 +1 @@
+window.$ = jQuery.noConflict();
diff --git a/media_source/vendor/short-and-sweet/builder.mjs b/media_source/vendor/short-and-sweet/builder.mjs
new file mode 100644
index 0000000000000..179138d0048c3
--- /dev/null
+++ b/media_source/vendor/short-and-sweet/builder.mjs
@@ -0,0 +1,25 @@
+/**
+ * Assets Builder
+ */
+import fs from 'node:fs';
+import fsp from 'node:fs/promises';
+import path from 'node:path';
+
+import DefaultModuleBuilder from '../../../build/build-modules-js/builder/default-module-builder.mjs';
+
+export default class ShortAndSweetModuleBuilder extends DefaultModuleBuilder {
+  /**
+   * Remove files on target location
+   * @returns { Promise }
+   */
+  async clear() {
+    // Remove only custom files from this builder and leave vendor files
+    const jsPath = path.join(this.targetPath, 'js');
+
+    if (!fs.existsSync(jsPath)) {
+      return;
+    }
+
+    return fsp.rm(jsPath, { recursive: true });
+  }
+};
diff --git a/build/media_source/vendor/short-and-sweet/js/short-and-sweet.es6.js b/media_source/vendor/short-and-sweet/js/short-and-sweet.es6.js
similarity index 100%
rename from build/media_source/vendor/short-and-sweet/js/short-and-sweet.es6.js
rename to media_source/vendor/short-and-sweet/js/short-and-sweet.es6.js
diff --git a/build/media_source/vendor/tinymce/templates/layout1.html b/media_source/vendor/tinymce/templates/layout1.html
similarity index 100%
rename from build/media_source/vendor/tinymce/templates/layout1.html
rename to media_source/vendor/tinymce/templates/layout1.html
diff --git a/build/media_source/vendor/tinymce/templates/snippet1.html b/media_source/vendor/tinymce/templates/snippet1.html
similarity index 100%
rename from build/media_source/vendor/tinymce/templates/snippet1.html
rename to media_source/vendor/tinymce/templates/snippet1.html
diff --git a/modules/mod_articles/mod_articles.xml b/modules/mod_articles/mod_articles.xml
index 0db2d925f7b05..1253b382198f0 100644
--- a/modules/mod_articles/mod_articles.xml
+++ b/modules/mod_articles/mod_articles.xml
@@ -501,6 +501,19 @@
 					<option value="hide">MOD_ARTICLES_OPTION_ONLYARCHIVEDHIDE_VALUE</option>
 				</field>
 
+				<field
+					name="show_unpublished"
+					type="radio"
+					label="MOD_ARTICLES_FIELD_UNPUBLISHED_LABEL"
+					layout="joomla.form.field.radio.switcher"
+					default="0"
+					filter="integer"
+					showon="show_archived!:show"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+
 				<field
 					name="filteringspacer2"
 					type="spacer"
diff --git a/modules/mod_articles/src/Helper/ArticlesHelper.php b/modules/mod_articles/src/Helper/ArticlesHelper.php
index 020c9185d57e4..8f2c0bbfef797 100644
--- a/modules/mod_articles/src/Helper/ArticlesHelper.php
+++ b/modules/mod_articles/src/Helper/ArticlesHelper.php
@@ -170,7 +170,7 @@ public function getArticles(Registry $params, SiteApplication $app)
 
         switch ($ordering) {
             case 'random':
-                $articles->setState('list.ordering', $this->getDatabase()->getQuery(true)->rand());
+                $articles->setState('list.ordering', $this->getDatabase()->createQuery()->rand());
                 break;
 
             case 'rating_count':
@@ -212,6 +212,11 @@ public function getArticles(Registry $params, SiteApplication $app)
             $articles->setState('filter.published', ContentComponent::CONDITION_ARCHIVED);
         }
 
+        // Filter unpublished articles
+        if ($params->get('show_unpublished', 0) === 1 && (($user->authorise('core.edit.state', 'com_content') && $user->authorise('core.edit', 'com_content')) || ($user->authorise('core.edit.state', 'com_content') && $user->authorise('core.edit.own', 'com_content')))) {
+            $articles->setState('filter.published', [ContentComponent::CONDITION_UNPUBLISHED, ContentComponent::CONDITION_PUBLISHED]);
+        }
+
         // Check if we include or exclude articles and process data
         $ex_or_include_articles = $params->get('ex_or_include_articles', 0);
         $filterInclude          = true;
diff --git a/modules/mod_articles/tmpl/default_items.php b/modules/mod_articles/tmpl/default_items.php
index 7a9e36347db84..57d84087c43af 100644
--- a/modules/mod_articles/tmpl/default_items.php
+++ b/modules/mod_articles/tmpl/default_items.php
@@ -10,6 +10,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
@@ -18,11 +19,14 @@
     $gridCols = 'grid-cols-' . $params->get('layout_columns');
 }
 
+$currentDate = Factory::getDate()->format('Y-m-d H:i:s');
+
 ?>
 <ul class="mod-articles-items<?php echo ($params->get('articles_layout') == 1 ? ' mod-articles-grid ' . $gridCols : ''); ?> mod-list">
     <?php foreach ($items as $item) : ?>
         <?php
         $displayInfo = $item->displayHits || $item->displayAuthorName || $item->displayCategoryTitle || $item->displayDate;
+        $canEdit = $item->params->get('access-edit');
         ?>
         <?php if ($params->get('item_title') || $displayInfo || $params->get('show_tags') || $params->get('show_introtext') || $params->get('img_intro_full')  && !empty($item->imageSrc) || $params->get('show_readmore')) : ?>
             <li>
@@ -43,6 +47,18 @@
                             </<?php echo $item_heading; ?>>
                         <?php endif; ?>
 
+                        <?php if ($item->state === 0) : ?>
+                            <span class="badge bg-warning"><?php echo Text::_('JUNPUBLISHED'); ?></span>
+                        <?php endif; ?>
+
+                        <?php if ($item->publish_up > $currentDate) : ?>
+                            <span class="badge bg-warning"><?php echo Text::_('JNOTPUBLISHEDYET'); ?></span>
+                        <?php endif; ?>
+
+                        <?php if ($item->publish_down !== null && $item->publish_down < $currentDate) : ?>
+                            <span class="badge bg-warning"><?php echo Text::_('JEXPIRED'); ?></span>
+                        <?php endif; ?>
+
                         <?php echo $item->event->afterDisplayTitle; ?>
 
                         <?php if ($displayInfo) : ?>
diff --git a/modules/mod_articles/tmpl/default_titles.php b/modules/mod_articles/tmpl/default_titles.php
index 853349a8f4eb2..7e570c09f5cd1 100644
--- a/modules/mod_articles/tmpl/default_titles.php
+++ b/modules/mod_articles/tmpl/default_titles.php
@@ -10,6 +10,11 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Text;
+
+$currentDate = Factory::getDate()->format('Y-m-d H:i:s');
+
 ?>
 <ul class="mod-articles mod-list">
     <?php foreach ($items as $item) : ?>
@@ -19,6 +24,18 @@
                     <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>
                 </span>
             </a>
+
+            <?php if ($item->state == 0) : ?>
+                <span class="badge bg-warning"><?php echo Text::_('JUNPUBLISHED'); ?></span>
+            <?php endif; ?>
+
+            <?php if ($item->publish_up > $currentDate) : ?>
+                <span class="badge bg-warning"><?php echo Text::_('JNOTPUBLISHEDYET'); ?></span>
+            <?php endif; ?>
+
+            <?php if ($item->publish_down !== null && $item->publish_down < $currentDate) : ?>
+                <span class="badge bg-warning"><?php echo Text::_('JEXPIRED'); ?></span>
+            <?php endif; ?>
         </li>
     <?php endforeach; ?>
 </ul>
diff --git a/modules/mod_articles_archive/src/Helper/ArticlesArchiveHelper.php b/modules/mod_articles_archive/src/Helper/ArticlesArchiveHelper.php
index a8fd6be30f6b4..7fab3711c7afd 100644
--- a/modules/mod_articles_archive/src/Helper/ArticlesArchiveHelper.php
+++ b/modules/mod_articles_archive/src/Helper/ArticlesArchiveHelper.php
@@ -47,7 +47,7 @@ class ArticlesArchiveHelper implements DatabaseAwareInterface
     public function getArticlesByMonths(Registry $moduleParams, SiteApplication $app): array
     {
         $db        = $this->getDatabase();
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
 
         $query->select($query->month($db->quoteName('created')) . ' AS created_month')
             ->select('MIN(' . $db->quoteName('created') . ') AS created')
@@ -109,7 +109,7 @@ public function getArticlesByMonths(Registry $moduleParams, SiteApplication $app
      *
      * @since   1.5
      *
-     * @deprecated  4.4.0  will be removed in 6.0
+     * @deprecated  4.4.0  will be removed in 7.0
      *              Use the non-static method getArticlesByMonths
      *              Example: Factory::getApplication()->bootModule('mod_articles_archive', 'site')
      *                           ->getHelper('ArticlesArchiveHelper')
diff --git a/modules/mod_articles_categories/src/Helper/ArticlesCategoriesHelper.php b/modules/mod_articles_categories/src/Helper/ArticlesCategoriesHelper.php
index 86db1928bb9cb..744d5e878c691 100644
--- a/modules/mod_articles_categories/src/Helper/ArticlesCategoriesHelper.php
+++ b/modules/mod_articles_categories/src/Helper/ArticlesCategoriesHelper.php
@@ -80,7 +80,7 @@ public function getChildrenCategories(Registry $moduleParams, SiteApplication $a
      *
      * @since   1.6
      *
-     * @deprecated  4.4.0  will be removed in 6.0
+     * @deprecated  4.4.0  will be removed in 7.0
      *              Use the non-static method getChildrenCategories
      *              Example: Factory::getApplication()->bootModule('mod_articles_categories', 'site')
      *                           ->getHelper('ArticlesCategoriesHelper')
diff --git a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
index 87f6c57bda87d..58857680f1988 100644
--- a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
+++ b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
@@ -165,7 +165,7 @@ public function getArticles(Registry $params, SiteApplication $app)
 
         switch ($ordering) {
             case 'random':
-                $articles->setState('list.ordering', $this->getDatabase()->getQuery(true)->rand());
+                $articles->setState('list.ordering', $this->getDatabase()->createQuery()->rand());
                 break;
 
             case 'rating_count':
@@ -325,7 +325,7 @@ public function getArticles(Registry $params, SiteApplication $app)
      *
      * @since   1.6
      *
-     * @deprecated  4.4.0  will be removed in 6.0
+     * @deprecated  4.4.0  will be removed in 7.0
      *              Use the non-static method getArticles
      *              Example: Factory::getApplication()->bootModule('mod_articles_category', 'site')
      *                           ->getHelper('ArticlesCategoryHelper')
diff --git a/modules/mod_articles_latest/src/Helper/ArticlesLatestHelper.php b/modules/mod_articles_latest/src/Helper/ArticlesLatestHelper.php
index 011e15d706e7b..75cb8f6c9c0bd 100644
--- a/modules/mod_articles_latest/src/Helper/ArticlesLatestHelper.php
+++ b/modules/mod_articles_latest/src/Helper/ArticlesLatestHelper.php
@@ -121,7 +121,7 @@ public function getArticles(Registry $params, SiteApplication $app)
             'mc_dsc' => 'a.modified',
             'c_dsc'  => 'a.created',
             'p_dsc'  => 'a.publish_up',
-            'random' => $db->getQuery(true)->rand(),
+            'random' => $db->createQuery()->rand(),
         ];
 
         $ordering = ArrayHelper::getValue($order_map, $params->get('ordering', 'p_dsc'), 'a.publish_up');
@@ -156,7 +156,7 @@ public function getArticles(Registry $params, SiteApplication $app)
      *
      * @since   1.6
      *
-     * @deprecated 4.3 will be removed in 6.0
+     * @deprecated 4.3 will be removed in 7.0
      *             Use the non-static method getArticles
      *             Example: Factory::getApplication()->bootModule('mod_articles_latest', 'site')
      *                          ->getHelper('ArticlesLatestHelper')
diff --git a/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php b/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php
index ec8ef68b4459b..143a09f6b860c 100644
--- a/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php
+++ b/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php
@@ -13,6 +13,10 @@
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Application\SiteApplication;
 use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\Event\Content\AfterDisplayEvent;
+use Joomla\CMS\Event\Content\AfterTitleEvent;
+use Joomla\CMS\Event\Content\BeforeDisplayEvent;
+use Joomla\CMS\Event\Content\ContentPrepareEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
@@ -21,6 +25,7 @@
 use Joomla\Component\Content\Site\Helper\RouteHelper;
 use Joomla\Database\DatabaseAwareInterface;
 use Joomla\Database\DatabaseAwareTrait;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -107,7 +112,7 @@ public function getArticles(Registry $params, SiteApplication $app)
         $model->setState('list.ordering', $ordering);
 
         if (trim($ordering) === 'rand()') {
-            $model->setState('list.ordering', $this->getDatabase()->getQuery(true)->rand());
+            $model->setState('list.ordering', $this->getDatabase()->createQuery()->rand());
         } else {
             $direction = $params->get('direction', 1) ? 'DESC' : 'ASC';
             $model->setState('list.direction', $direction);
@@ -117,6 +122,10 @@ public function getArticles(Registry $params, SiteApplication $app)
         // Check if we should trigger additional plugin events
         $triggerEvents = $params->get('triggerevents', 1);
 
+        if ($triggerEvents) {
+            $dispatcher = Factory::getContainer()->get(DispatcherInterface::class);
+        }
+
         // Retrieve Content
         $items = $model->getItems();
 
@@ -168,16 +177,30 @@ public function getArticles(Registry $params, SiteApplication $app)
 
             if ($triggerEvents) {
                 $item->text = '';
-                $app->triggerEvent('onContentPrepare', ['com_content.article', &$item, &$params, 0]);
 
-                $results                 = $app->triggerEvent('onContentAfterTitle', ['com_content.article', &$item, &$params, 0]);
-                $item->afterDisplayTitle = trim(implode("\n", $results));
+                $contentEventArguments = [
+                    'context' => 'com_content.article',
+                    'subject' => $item,
+                    'params'  => $params,
+                    'page'    => 0,
+                ];
+
+                $dispatcher->dispatch(
+                    'onContentPrepare',
+                    new ContentPrepareEvent('onContentPrepare', $contentEventArguments)
+                );
 
-                $results                    = $app->triggerEvent('onContentBeforeDisplay', ['com_content.article', &$item, &$params, 0]);
-                $item->beforeDisplayContent = trim(implode("\n", $results));
+                $contentEvents = [
+                    'afterDisplayTitle'    => new AfterTitleEvent('onContentAfterTitle', $contentEventArguments),
+                    'beforeDisplayContent' => new BeforeDisplayEvent('onContentBeforeDisplay', $contentEventArguments),
+                    'afterDisplayContent'  => new AfterDisplayEvent('onContentAfterDisplay', $contentEventArguments),
+                ];
 
-                $results                   = $app->triggerEvent('onContentAfterDisplay', ['com_content.article', &$item, &$params, 0]);
-                $item->afterDisplayContent = trim(implode("\n", $results));
+                foreach ($contentEvents as $resultKey => $event) {
+                    $results = $dispatcher->dispatch($event->getName(), $event)->getArgument('result', []);
+
+                    $item->{$resultKey} = trim(implode("\n", $results));
+                }
             } else {
                 $item->afterDisplayTitle    = '';
                 $item->beforeDisplayContent = '';
@@ -197,7 +220,7 @@ public function getArticles(Registry $params, SiteApplication $app)
      *
      * @since 1.6
      *
-     * @deprecated 4.3 will be removed in 6.0
+     * @deprecated 4.3 will be removed in 7.0
      *             Use the non-static method getArticles
      *             Example: Factory::getApplication()->bootModule('mod_articles_news', 'site')
      *                          ->getHelper('ArticlesNewsHelper')
diff --git a/modules/mod_articles_popular/src/Helper/ArticlesPopularHelper.php b/modules/mod_articles_popular/src/Helper/ArticlesPopularHelper.php
index cb353a7cdc9f6..b49a832e9f2e8 100644
--- a/modules/mod_articles_popular/src/Helper/ArticlesPopularHelper.php
+++ b/modules/mod_articles_popular/src/Helper/ArticlesPopularHelper.php
@@ -171,7 +171,7 @@ private function prepareItem($item, $params): object
      *
      * @since  4.3.0
      *
-     * @deprecated 4.3 will be removed in 6.0
+     * @deprecated 4.3 will be removed in 7.0
      *             Use the non-static method getArticles
      *             Example: Factory::getApplication()->bootModule('mod_articles_popular', 'site')
      *                          ->getHelper('ArticlesPopularHelper')
diff --git a/modules/mod_breadcrumbs/src/Helper/BreadcrumbsHelper.php b/modules/mod_breadcrumbs/src/Helper/BreadcrumbsHelper.php
index 33f90faf86081..7cd4037ebe4a7 100644
--- a/modules/mod_breadcrumbs/src/Helper/BreadcrumbsHelper.php
+++ b/modules/mod_breadcrumbs/src/Helper/BreadcrumbsHelper.php
@@ -13,7 +13,6 @@
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Application\SiteApplication;
 use Joomla\CMS\Factory;
-use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\Registry\Registry;
 
@@ -88,36 +87,6 @@ public function getHomeItem(Registry $params, SiteApplication $app): object
         return $item;
     }
 
-    /**
-     * Set the breadcrumbs separator for the breadcrumbs display.
-     *
-     * @param   string  $custom  Custom xhtml compliant string to separate the items of the breadcrumbs
-     *
-     * @return  string  Separator string
-     *
-     * @since   1.5
-     *
-     * @deprecated 4.4.0 will be removed in 6.0 as this function is not used anymore
-     */
-    public static function setSeparator($custom = null)
-    {
-        $lang = Factory::getApplication()->getLanguage();
-
-        // If a custom separator has not been provided we try to load a template
-        // specific one first, and if that is not present we load the default separator
-        if ($custom === null) {
-            if ($lang->isRtl()) {
-                $_separator = HTMLHelper::_('image', 'system/arrow_rtl.png', null, null, true);
-            } else {
-                $_separator = HTMLHelper::_('image', 'system/arrow.png', null, null, true);
-            }
-        } else {
-            $_separator = htmlspecialchars($custom, ENT_COMPAT, 'UTF-8');
-        }
-
-        return $_separator;
-    }
-
     /**
      * Retrieve breadcrumb items
      *
@@ -128,7 +97,7 @@ public static function setSeparator($custom = null)
      *
      * @since   1.5
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *             Use the non-static method getBreadcrumbs
      *             Example: Factory::getApplication()->bootModule('mod_breadcrumbs', 'site')
      *                          ->getHelper('BreadcrumbsHelper')
@@ -149,7 +118,7 @@ public static function getList(Registry $params, CMSApplication $app)
      *
      * @since   4.2.0
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *             Use the non-static method getHomeItem
      *             Example: Factory::getApplication()->bootModule('mod_breadcrumbs', 'site')
      *                          ->getHelper('BreadcrumbsHelper')
diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index b8448d058a925..5cf0607150e6d 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -118,9 +118,16 @@
         /** @var WebAssetManager $wa */
         $wa = $app->getDocument()->getWebAssetManager();
         $prettyPrint = JDEBUG ? JSON_PRETTY_PRINT : 0;
+        $bitmask = JSON_UNESCAPED_SLASHES
+            | JSON_HEX_TAG
+            | JSON_HEX_AMP
+            | JSON_HEX_APOS
+            | JSON_HEX_QUOT
+            | JSON_UNESCAPED_UNICODE
+            | $prettyPrint;
         $wa->addInline(
             'script',
-            json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | $prettyPrint),
+            json_encode($data, $bitmask),
             ['name' => 'inline.breadcrumbs-schemaorg'],
             ['type' => 'application/ld+json']
         );
diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php
index ea91cea6a53e0..bd81891d524f0 100644
--- a/modules/mod_finder/tmpl/default.php
+++ b/modules/mod_finder/tmpl/default.php
@@ -62,17 +62,19 @@
 
 ?>
 
-<form class="mod-finder js-finder-searchform form-search" action="<?php echo Route::_($route); ?>" method="get" role="search">
-    <?php echo $output; ?>
-
-    <?php $show_advanced = $params->get('show_advanced', 0); ?>
-    <?php if ($show_advanced == 2) : ?>
-        <br>
-        <a href="<?php echo Route::_($route); ?>" class="mod-finder__advanced-link"><?php echo Text::_('COM_FINDER_ADVANCED_SEARCH'); ?></a>
-    <?php elseif ($show_advanced == 1) : ?>
-        <div class="mod-finder__advanced js-finder-advanced">
-            <?php echo HTMLHelper::_('filter.select', $query, $params); ?>
-        </div>
-    <?php endif; ?>
-    <?php echo $finderHelper->getHiddenFields($route); ?>
-</form>
+<search>
+    <form class="mod-finder js-finder-searchform form-search" action="<?php echo Route::_($route); ?>" method="get" aria-label="search">
+        <?php echo $output; ?>
+
+        <?php $show_advanced = $params->get('show_advanced', 0); ?>
+        <?php if ($show_advanced == 2) : ?>
+            <br>
+            <a href="<?php echo Route::_($route); ?>" class="mod-finder__advanced-link"><?php echo Text::_('COM_FINDER_ADVANCED_SEARCH'); ?></a>
+        <?php elseif ($show_advanced == 1) : ?>
+            <div class="mod-finder__advanced js-finder-advanced">
+                <?php echo HTMLHelper::_('filter.select', $query, $params); ?>
+            </div>
+        <?php endif; ?>
+        <?php echo $finderHelper->getHiddenFields($route); ?>
+    </form>
+</search>
diff --git a/modules/mod_login/mod_login.xml b/modules/mod_login/mod_login.xml
index 9c6278c8a177b..33a377a53db22 100644
--- a/modules/mod_login/mod_login.xml
+++ b/modules/mod_login/mod_login.xml
@@ -83,10 +83,36 @@
 				</field>
 
 				<field
-					name="greeting"
+					name="showPasswordReset"
 					type="radio"
+					label="MOD_LOGIN_FIELD_SHOW_PASSWORD_RESET_LABEL"
+					description="MOD_LOGIN_FIELD_SHOW_PASSWORD_RESET_DESC"
 					layout="joomla.form.field.radio.switcher"
+					default="1"
+					filter="integer"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="showUsernameReminder"
+					type="radio"
+					label="MOD_LOGIN_FIELD_SHOW_USERNAME_REMINDER_LABEL"
+					description="MOD_LOGIN_FIELD_SHOW_USERNAME_REMINDER_DESC"
+					layout="joomla.form.field.radio.switcher"
+					default="1"
+					filter="integer"
+					>
+					<option value="0">JHIDE</option>
+					<option value="1">JSHOW</option>
+				</field>
+
+				<field
+					name="greeting"
+					type="radio"
 					label="MOD_LOGIN_FIELD_GREETING_LABEL"
+					layout="joomla.form.field.radio.switcher"
 					default="1"
 					filter="integer"
 					>
@@ -97,8 +123,8 @@
 				<field
 					name="name"
 					type="radio"
-					layout="joomla.form.field.radio.switcher"
 					label="MOD_LOGIN_FIELD_NAME_LABEL"
+					layout="joomla.form.field.radio.switcher"
 					default="0"
 					filter="integer"
 					showon="greeting:1"
@@ -122,8 +148,8 @@
 				<field
 					name="usetext"
 					type="radio"
-					layout="joomla.form.field.radio.switcher"
 					label="MOD_LOGIN_FIELD_USETEXT_LABEL"
+					layout="joomla.form.field.radio.switcher"
 					default="0"
 					filter="integer"
 					>
diff --git a/modules/mod_login/tmpl/default.php b/modules/mod_login/tmpl/default.php
index 4acacc9544b73..7cce2518b0cbf 100644
--- a/modules/mod_login/tmpl/default.php
+++ b/modules/mod_login/tmpl/default.php
@@ -117,14 +117,18 @@ class="btn btn-secondary w-100 <?php echo $button['class'] ?? '' ?>"
         <?php
             $usersConfig = ComponentHelper::getParams('com_users'); ?>
             <ul class="mod-login__options list-unstyled">
+                <?php if ($params->get('showPasswordReset', 1)) : ?>
                 <li>
                     <a href="<?php echo Route::_('index.php?option=com_users&view=reset'); ?>">
                     <?php echo Text::_('MOD_LOGIN_FORGOT_YOUR_PASSWORD'); ?></a>
                 </li>
+                <?php endif; ?>
+                <?php if ($params->get('showUsernameReminder', 1)) : ?>
                 <li>
                     <a href="<?php echo Route::_('index.php?option=com_users&view=remind'); ?>">
                     <?php echo Text::_('MOD_LOGIN_FORGOT_YOUR_USERNAME'); ?></a>
                 </li>
+                <?php endif; ?>
                 <?php if ($usersConfig->get('allowUserRegistration')) : ?>
                 <li>
                     <a href="<?php echo Route::_($registerLink); ?>">
diff --git a/modules/mod_menu/tmpl/collapse-default.php b/modules/mod_menu/tmpl/collapse-default.php
index d41f70689460e..38c7b4ca5c8ea 100644
--- a/modules/mod_menu/tmpl/collapse-default.php
+++ b/modules/mod_menu/tmpl/collapse-default.php
@@ -10,6 +10,7 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 
@@ -21,6 +22,6 @@
         <span class="icon-menu" aria-hidden="true"></span>
     </button>
     <div class="collapse navbar-collapse" id="navbar<?php echo $module->id; ?>">
-        <?php require __DIR__ . '/default.php'; ?>
+        <?php require ModuleHelper::getLayoutPath(module: 'mod_menu', layout:'default'); ?>
     </div>
 </nav>
diff --git a/modules/mod_menu/tmpl/default.php b/modules/mod_menu/tmpl/default.php
index 415e67568dd23..beb1d03565ce7 100644
--- a/modules/mod_menu/tmpl/default.php
+++ b/modules/mod_menu/tmpl/default.php
@@ -11,16 +11,16 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Helper\ModuleHelper;
+use Joomla\CMS\Language\Text;
 
 /** @var Joomla\CMS\WebAsset\WebAssetManager $wa */
 $wa = $app->getDocument()->getWebAssetManager();
-$wa->registerAndUseScript('mod_menu', 'mod_menu/menu.min.js', [], ['type' => 'module']);
+$wa->getRegistry()->addExtensionRegistryFile('mod_menu');
+$wa->usePreset('mod_menu.menu');
 
-$id = '';
-
-if ($tagId = $params->get('tag_id', '')) {
-    $id = ' id="' . htmlspecialchars($tagId, ENT_QUOTES, 'UTF-8') . '"';
-}
+$tagId      = $params->get('tag_id', '') ?: 'mod-menu' . $module->id;
+$id         = ' id="' . htmlspecialchars($tagId, ENT_QUOTES, 'UTF-8') . '"';
+$startLevel = (int) $params->get('startLevel', 1);
 
 // The menu class is deprecated. Use mod-menu instead
 ?>
@@ -63,6 +63,12 @@
 
     echo '<li class="' . $class . '">';
 
+    // The next item is deeper - add toggle only here it is a heading or separator
+    if ($item->deeper && in_array($item->type, ['separator', 'heading'])) {
+        // Add a toggle button.
+        echo '<button class="mod-menu__toggle-sub" aria-expanded="false">';
+    }
+
     switch ($item->type) :
         case 'separator':
         case 'component':
@@ -78,6 +84,20 @@
 
     // The next item is deeper.
     if ($item->deeper) {
+        // @todo aria-label - set in menu item ???
+        switch ($item->type) {
+            case 'heading':
+            case 'separator':
+                echo '<span class="icon-chevron-down" aria-hidden="true">' .
+                    '</span></button>';
+                break;
+
+            default:
+                echo '<button class="mod-menu__toggle-sub" aria-expanded="false">' .
+                '<span class="icon-chevron-down" aria-hidden="true"></span>' .
+                '<span class="visually-hidden">' . Text::sprintf('MOD_MENU_TOGGLE_SUBMENU_LABEL', $item->title) . '</span>' .
+                '</button>';
+        }
         echo '<ul class="mod-menu__sub list-unstyled small">';
     } elseif ($item->shallower) {
         // The next item is shallower.
diff --git a/modules/mod_menu/tmpl/default_component.php b/modules/mod_menu/tmpl/default_component.php
index d17a9046f03f6..90d9fca097625 100644
--- a/modules/mod_menu/tmpl/default_component.php
+++ b/modules/mod_menu/tmpl/default_component.php
@@ -41,10 +41,10 @@
     // The link is an icon
     if ($itemParams->get('menu_text', 1)) {
         // If the link text is to be displayed, the icon is added with aria-hidden
-        $linktype = '<span class="p-2 ' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
+        $linktype = '<span class="p-2 pt-0 ' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {
         // If the icon itself is the link, it needs a visually hidden text
-        $linktype = '<span class="p-2 ' . $item->menu_icon . '" aria-hidden="true"></span><span class="visually-hidden">' . $item->title . '</span>';
+        $linktype = '<span class="p-2 pt-0 ' . $item->menu_icon . '" aria-hidden="true"></span><span class="visually-hidden">' . $item->title . '</span>';
     }
 } elseif ($item->menu_image) {
     // The link is an image, maybe with its own class
diff --git a/modules/mod_menu/tmpl/default_heading.php b/modules/mod_menu/tmpl/default_heading.php
index 7ca4befa8c93c..b3185746b83ae 100644
--- a/modules/mod_menu/tmpl/default_heading.php
+++ b/modules/mod_menu/tmpl/default_heading.php
@@ -20,10 +20,10 @@
     // The link is an icon
     if ($itemParams->get('menu_text', 1)) {
         // If the link text is to be displayed, the icon is added with aria-hidden
-        $linktype = '<span class="p-2 ' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
+        $linktype = '<span class="p-2 pt-0 ' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {
         // If the icon itself is the link, it needs a visually hidden text
-        $linktype = '<span class="p-2 ' . $item->menu_icon . '" aria-hidden="true"></span><span class="visually-hidden">' . $item->title . '</span>';
+        $linktype = '<span class="p-2 pt-0 ' . $item->menu_icon . '" aria-hidden="true"></span><span class="visually-hidden">' . $item->title . '</span>';
     }
 } elseif ($item->menu_image) {
     // The link is an image, maybe with its own class
diff --git a/modules/mod_menu/tmpl/default_separator.php b/modules/mod_menu/tmpl/default_separator.php
index 1ec1aebf0c851..03de090b6ce95 100644
--- a/modules/mod_menu/tmpl/default_separator.php
+++ b/modules/mod_menu/tmpl/default_separator.php
@@ -20,10 +20,10 @@
     // The link is an icon
     if ($itemParams->get('menu_text', 1)) {
         // If the link text is to be displayed, the icon is added with aria-hidden
-        $linktype = '<span class="p-2 ' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
+        $linktype = '<span class="p-2 pt-0 ' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {
         // If the icon itself is the link, it needs a visually hidden text
-        $linktype = '<span class="p-2 ' . $item->menu_icon . '" aria-hidden="true"></span><span class="visually-hidden">' . $item->title . '</span>';
+        $linktype = '<span class="p-2 pt-0 ' . $item->menu_icon . '" aria-hidden="true"></span><span class="visually-hidden">' . $item->title . '</span>';
     }
 } elseif ($item->menu_image) {
     // The link is an image, maybe with its own class
diff --git a/modules/mod_menu/tmpl/default_url.php b/modules/mod_menu/tmpl/default_url.php
index 011cd5066ab9d..7ddfae96830ed 100644
--- a/modules/mod_menu/tmpl/default_url.php
+++ b/modules/mod_menu/tmpl/default_url.php
@@ -33,10 +33,10 @@
     // The link is an icon
     if ($itemParams->get('menu_text', 1)) {
         // If the link text is to be displayed, the icon is added with aria-hidden
-        $linktype = '<span class="p-2 ' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
+        $linktype = '<span class="p-2 pt-0 ' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {
         // If the icon itself is the link, it needs a visually hidden text
-        $linktype = '<span class="p-2 ' . $item->menu_icon . '" aria-hidden="true"></span><span class="visually-hidden">' . $item->title . '</span>';
+        $linktype = '<span class="p-2 pt-0 ' . $item->menu_icon . '" aria-hidden="true"></span><span class="visually-hidden">' . $item->title . '</span>';
     }
 } elseif ($item->menu_image) {
     // The link is an image, maybe with an own class
diff --git a/modules/mod_random_image/src/Helper/RandomImageHelper.php b/modules/mod_random_image/src/Helper/RandomImageHelper.php
index 17002e3b8e864..aa05e1c5f9e8a 100644
--- a/modules/mod_random_image/src/Helper/RandomImageHelper.php
+++ b/modules/mod_random_image/src/Helper/RandomImageHelper.php
@@ -87,7 +87,14 @@ public function getImage(Registry &$params, array $images): mixed
      */
     public function getImagesFromFolder(Registry &$params, string $folder): array
     {
-        $type   = $params->get('type', 'jpg');
+        $type       = $params->get('type', 'jpg');
+        $extensions = array_map('trim', explode(',', $type));
+
+        // Normalize to lowercase and strip leading dots
+        $extensions = array_map(function ($ext) {
+            return ltrim(strtolower($ext), '.');
+        }, $extensions);
+
         $files  = [];
         $images = [];
 
@@ -108,9 +115,14 @@ public function getImagesFromFolder(Registry &$params, string $folder): array
             $i = 0;
 
             foreach ($files as $img) {
-                if (!is_dir($dir . '/' . $img) && preg_match('/' . $type . '/', $img)) {
-                    $images[$i] = new \stdClass();
+                if (is_dir($dir . '/' . $img)) {
+                    continue;
+                }
+
+                $ext = pathinfo($img, PATHINFO_EXTENSION);
 
+                if (\in_array(strtolower($ext), $extensions, true)) {
+                    $images[$i]         = new \stdClass();
                     $images[$i]->name   = $img;
                     $images[$i]->folder = $folder;
                     $i++;
diff --git a/modules/mod_related_items/src/Helper/RelatedItemsHelper.php b/modules/mod_related_items/src/Helper/RelatedItemsHelper.php
index 1cb33963268c9..eee9140db6300 100644
--- a/modules/mod_related_items/src/Helper/RelatedItemsHelper.php
+++ b/modules/mod_related_items/src/Helper/RelatedItemsHelper.php
@@ -74,7 +74,7 @@ public function getRelatedArticles(Registry $params, SiteApplication $app): arra
 
         $now      = Factory::getDate()->toSql();
         $related  = [];
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
 
         if ($id) {
             // Select the meta keywords from the item
@@ -186,7 +186,7 @@ public function getRelatedArticles(Registry $params, SiteApplication $app): arra
      *
      * @since   1.6
      *
-     * @deprecated  4.4.0  will be removed in 6.0
+     * @deprecated  4.4.0  will be removed in 7.0
      *              Use the non-static method getRelatedArticles
      *              Example: Factory::getApplication()->bootModule('mod_related_items', 'site')
      *                           ->getHelper('RelatedItemsHelper')
diff --git a/modules/mod_stats/src/Helper/StatsHelper.php b/modules/mod_stats/src/Helper/StatsHelper.php
index 2abf2eb9261e7..93a9d0782860b 100644
--- a/modules/mod_stats/src/Helper/StatsHelper.php
+++ b/modules/mod_stats/src/Helper/StatsHelper.php
@@ -47,7 +47,7 @@ public function getStats(Registry &$params, CMSApplicationInterface $app)
     {
         $db         = $this->getDatabase();
         $rows       = [];
-        $query      = $db->getQuery(true);
+        $query      = $db->createQuery();
         $serverinfo = $params->get('serverinfo', 0);
         $siteinfo   = $params->get('siteinfo', 0);
         $counter    = $params->get('counter', 0);
diff --git a/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php b/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php
index 074166b43825e..3930bb1b0cca9 100644
--- a/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php
+++ b/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php
@@ -51,7 +51,7 @@ public function getTags(&$params)
         $nowDate     = Factory::getDate()->toSql();
         $nullDate    = $db->getNullDate();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     'MAX(' . $db->quoteName('tag_id') . ') AS ' . $db->quoteName('tag_id'),
@@ -151,7 +151,7 @@ public function getTags(&$params)
                 }
 
                 $query->order($db->quoteName('count') . ' DESC');
-                $equery = $db->getQuery(true)
+                $equery = $db->createQuery()
                     ->select(
                         $db->quoteName(
                             [
diff --git a/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php b/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php
index e5bde10ae20c6..6c38d0fc293e8 100644
--- a/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php
+++ b/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php
@@ -76,7 +76,7 @@ public function getItems(&$params)
         $tagsToMatch = explode(',', $tagsToMatch);
         $tagCount    = \count($tagsToMatch);
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query
             ->select(
                 [
diff --git a/modules/mod_users_latest/src/Helper/UsersLatestHelper.php b/modules/mod_users_latest/src/Helper/UsersLatestHelper.php
index c32614d7a9598..81120ba3ebb4c 100644
--- a/modules/mod_users_latest/src/Helper/UsersLatestHelper.php
+++ b/modules/mod_users_latest/src/Helper/UsersLatestHelper.php
@@ -46,7 +46,7 @@ public function getLatestUsers(Registry $params, SiteApplication $app): array
         $db   = $this->getDatabase();
         $user = $app->getIdentity();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['a.id', 'a.name', 'a.username', 'a.registerDate']))
             ->order($db->quoteName('a.registerDate') . ' DESC')
             ->from($db->quoteName('#__users', 'a'));
@@ -85,7 +85,7 @@ public function getLatestUsers(Registry $params, SiteApplication $app): array
      *
      * @since   1.6
      *
-     * @deprecated 4.4.0 will be removed in 6.0
+     * @deprecated 4.4.0 will be removed in 7.0
      *             Use the non-static method getLatestUsers
      *             Example: Factory::getApplication()->bootModule('mod_users_latest', 'site')
      *                          ->getHelper('UsersLatestHelper')
diff --git a/modules/mod_whosonline/src/Helper/WhosonlineHelper.php b/modules/mod_whosonline/src/Helper/WhosonlineHelper.php
index 5747099efe282..03133eb2c57e1 100644
--- a/modules/mod_whosonline/src/Helper/WhosonlineHelper.php
+++ b/modules/mod_whosonline/src/Helper/WhosonlineHelper.php
@@ -49,7 +49,7 @@ public function getOnlineUsersCount(CMSApplicationInterface $app): array
 
         $whereCondition = $app->get('shared_session', '0') ? 'IS NULL' : '= 0';
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('guest, client_id')
             ->from('#__session')
             ->where('client_id ' . $whereCondition);
@@ -96,7 +96,7 @@ public function fetchOnlineUserNames(CMSApplicationInterface $app, Registry $par
         $whereCondition = $app->get('shared_session', '0') ? 'IS NULL' : '= 0';
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['a.username', 'a.userid', 'a.client_id']))
             ->from($db->quoteName('#__session', 'a'))
             ->where($db->quoteName('a.userid') . ' != 0')
diff --git a/package-lock.json b/package-lock.json
index 2637e85d26de6..e03de74e675e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,1349 +1,1136 @@
 {
   "name": "joomla",
-  "version": "5.4.8",
+  "version": "6.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "joomla",
-      "version": "5.4.8",
+      "version": "6.2.0",
       "hasInstallScript": true,
       "license": "GPL-2.0-or-later",
       "dependencies": {
         "@claviska/jquery-minicolors": "^2.3.6",
-        "@codemirror/autocomplete": "^6.18.7",
-        "@codemirror/commands": "^6.8.1",
+        "@codemirror/autocomplete": "^6.20.1",
+        "@codemirror/commands": "^6.10.3",
         "@codemirror/lang-css": "^6.3.1",
-        "@codemirror/lang-html": "^6.4.10",
-        "@codemirror/lang-javascript": "^6.2.4",
+        "@codemirror/lang-html": "^6.4.11",
+        "@codemirror/lang-javascript": "^6.2.5",
         "@codemirror/lang-json": "^6.0.2",
-        "@codemirror/lang-markdown": "^6.3.4",
+        "@codemirror/lang-markdown": "^6.5.0",
         "@codemirror/lang-php": "^6.0.2",
         "@codemirror/lang-xml": "^6.1.0",
-        "@codemirror/language": "^6.11.3",
-        "@codemirror/lint": "^6.8.5",
-        "@codemirror/search": "^6.5.11",
-        "@codemirror/state": "^6.5.2",
+        "@codemirror/language": "^6.12.2",
+        "@codemirror/lint": "^6.9.5",
+        "@codemirror/search": "^6.6.0",
+        "@codemirror/state": "^6.6.0",
         "@codemirror/theme-one-dark": "^6.1.3",
-        "@codemirror/view": "^6.38.3",
+        "@codemirror/view": "^6.40.0",
         "@fortawesome/fontawesome-free": "^6.7.2",
         "@popperjs/core": "^2.11.8",
-        "@webcomponents/webcomponentsjs": "^2.8.0",
+        "@vue-flow/background": "^1.3.2",
+        "@vue-flow/controls": "^1.1.3",
+        "@vue-flow/core": "^1.48.2",
+        "@vue-flow/minimap": "^1.5.4",
+        "@vue-flow/node-resizer": "^1.5.1",
         "accessibility": "^3.0.17",
+        "altcha": "^2.3.0",
         "awesomplete": "^1.1.7",
         "bootstrap": "^5.3.8",
-        "choices.js": "^9.1.0",
-        "chosen-js": "^1.8.7",
+        "choices.js": "^11.2.1",
         "cropperjs": "^1.6.2",
-        "diff": "^5.2.2",
-        "dotenv": "^16.6.1",
+        "diff": "^8.0.3",
         "dragula": "^3.7.3",
-        "es-module-shims": "^1.10.1",
+        "es-module-shims": "^2.8.0",
         "focus-visible": "^5.2.1",
         "hotkeys-js": "^3.13.15",
         "joomla-ui-custom-elements": "^0.4.1",
         "jquery": "^3.7.1",
-        "jquery-migrate": "^3.5.2",
+        "jquery-migrate": "^3.6.0",
         "mark.js": "^8.11.1",
-        "mediaelement": "^5.1.2",
+        "mediaelement": "^7.1.0",
         "metismenujs": "^1.4.0",
         "punycode": "^2.3.1",
-        "qrcode-generator": "^1.5.2",
+        "qrcode-generator": "^2.0.4",
         "roboto-fontface": "^0.10.0",
-        "sa11y": "^4.2.3",
+        "sa11y": "^4.4.1",
         "shepherd.js": "^11.2.0",
         "short-and-sweet": "^1.0.4",
         "skipto": "^4.1.7",
-        "tinymce": "^6.8.6",
-        "vue": "^3.5.22",
+        "tinymce": "^8.3.2",
+        "tinymce-i18n": "^26.2.16",
+        "vue": "^3.5.30",
         "vue-focus-lock": "^2.0.7",
         "vuex": "^4.1.0",
         "vuex-persist": "^3.1.3"
       },
       "devDependencies": {
-        "@babel/core": "^7.29.7",
-        "@babel/preset-env": "^7.28.3",
-        "@rollup/plugin-babel": "^6.0.4",
-        "@rollup/plugin-commonjs": "^28.0.6",
-        "@rollup/plugin-node-resolve": "^16.0.1",
-        "@rollup/plugin-replace": "^6.0.2",
-        "@stylistic/stylelint-plugin": "^4.0.0",
-        "@vue/compiler-sfc": "^3.5.22",
-        "chokidar": "^4.0.3",
+        "@babel/core": "^7.29.0",
+        "@babel/preset-env": "^7.29.0",
+        "@rollup/plugin-babel": "^6.1.0",
+        "@rollup/plugin-commonjs": "^29.0.2",
+        "@rollup/plugin-node-resolve": "^16.0.3",
+        "@rollup/plugin-replace": "^6.0.3",
+        "@stylistic/eslint-plugin": "^5.10.0",
+        "@stylistic/stylelint-plugin": "^4.0.1",
+        "@vue/compiler-sfc": "^3.5.30",
+        "chokidar": "^5.0.0",
         "cli-progress": "^3.12.0",
-        "commander": "^14.0.1",
-        "core-js": "^3.45.1",
+        "commander": "^14.0.3",
+        "core-js": "^3.48.0",
         "cypress": "^15.18.0",
-        "esbuild": "^0.25.10",
-        "eslint": "^9.36.0",
+        "dotenv": "^17.3.1",
+        "esbuild": "^0.27.7",
+        "eslint": "^9.39.4",
+        "eslint-plugin-cypress": "^6.4.1",
         "eslint-plugin-import": "^2.32.0",
-        "eslint-plugin-vue": "^10.5.0",
-        "fs-extra": "^11.3.2",
-        "ini": "^5.0.0",
-        "jasmine-core": "^5.10.0",
-        "joomla-cypress": "^1.3.1",
-        "lightningcss": "^1.30.1",
-        "mysql2": "^3.15.3",
-        "pg": "^8.16.3",
+        "eslint-plugin-vue": "^10.8.0",
+        "fs-extra": "^11.3.4",
+        "ini": "^6.0.0",
+        "jasmine-core": "^5.13.0",
+        "joomla-cypress": "^2.0.0",
+        "lightningcss": "^1.32.0",
+        "mysql2": "^3.19.1",
+        "pg": "^8.20.0",
         "postcss-scss": "^4.0.9",
         "recursive-readdir": "^2.2.3",
-        "rimraf": "^6.0.1",
+        "rimraf": "^6.1.3",
         "rollup": "^4.59.0",
         "rollup-plugin-vue": "^6.0.0",
         "rtlcss": "^4.3.0",
-        "sass-embedded": "^1.93.2",
-        "semver": "^7.7.2",
+        "sass-embedded": "^1.98.0",
+        "semver": "^7.7.4",
         "smtp-tester": "^2.1.0",
-        "stylelint": "^16.24.0",
-        "stylelint-config-standard": "^39.0.0",
-        "stylelint-order": "^7.0.0",
-        "stylelint-scss": "^6.12.1",
-        "totp-generator": "1.0.0"
+        "stylelint": "^16.26.1",
+        "stylelint-config-standard": "^39.0.1",
+        "stylelint-order": "^7.0.1",
+        "stylelint-scss": "^6.14.0",
+        "totp-generator": "^1.0.0"
       },
       "engines": {
         "node": ">=20.0.0",
         "npm": ">=10.1.0"
       }
     },
-    "node_modules/@aws-crypto/sha256-browser": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz",
-      "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-crypto/sha256-js": "^5.2.0",
-        "@aws-crypto/supports-web-crypto": "^5.2.0",
-        "@aws-crypto/util": "^5.2.0",
-        "@aws-sdk/types": "^3.222.0",
-        "@aws-sdk/util-locate-window": "^3.0.0",
-        "@smithy/util-utf8": "^2.0.0",
-        "tslib": "^2.6.2"
-      }
+    "node_modules/@altcha/crypto": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/@altcha/crypto/-/crypto-0.0.1.tgz",
+      "integrity": "sha512-qZMdnoD3lAyvfSUMNtC2adRi666Pxdcw9zqfMU5qBOaJWqpN9K+eqQGWqeiKDMqL0SF+EytNG4kR/Pr/99GJ6g==",
+      "license": "MIT"
     },
-    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
-      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+    "node_modules/@babel/code-frame": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
+      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "tslib": "^2.6.2"
+        "@babel/helper-validator-identifier": "^7.29.7",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
-      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+    "node_modules/@babel/compat-data": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz",
+      "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/is-array-buffer": "^2.2.0",
-        "tslib": "^2.6.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
-      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+    "node_modules/@babel/core": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
+      "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@smithy/util-buffer-from": "^2.2.0",
-        "tslib": "^2.6.2"
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.7",
+        "@babel/helper-compilation-targets": "^7.29.7",
+        "@babel/helper-module-transforms": "^7.29.7",
+        "@babel/helpers": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/template": "^7.29.7",
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7",
+        "@jridgewell/remapping": "^2.3.5",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
       },
       "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@aws-crypto/sha256-js": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz",
-      "integrity": "sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-crypto/util": "^5.2.0",
-        "@aws-sdk/types": "^3.222.0",
-        "tslib": "^2.6.2"
+        "node": ">=6.9.0"
       },
-      "engines": {
-        "node": ">=16.0.0"
-      }
-    },
-    "node_modules/@aws-crypto/supports-web-crypto": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz",
-      "integrity": "sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.6.2"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
       }
     },
-    "node_modules/@aws-crypto/util": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz",
-      "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==",
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.222.0",
-        "@smithy/util-utf8": "^2.0.0",
-        "tslib": "^2.6.2"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz",
-      "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==",
+    "node_modules/@babel/generator": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz",
+      "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "tslib": "^2.6.2"
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz",
-      "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==",
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
+      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@smithy/is-array-buffer": "^2.2.0",
-        "tslib": "^2.6.2"
+        "@babel/types": "^7.27.3"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz",
-      "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==",
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
+      "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@smithy/util-buffer-from": "^2.2.0",
-        "tslib": "^2.6.2"
+        "@babel/compat-data": "^7.29.7",
+        "@babel/helper-validator-option": "^7.29.7",
+        "browserslist": "^4.24.0",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-sdk/client-sesv2": {
-      "version": "3.981.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sesv2/-/client-sesv2-3.981.0.tgz",
-      "integrity": "sha512-2KckJDqgUDMiLeVqsWsEp5C/VGZG5WQTXl7gU51Zd9tQ1jyLL8MY+duxsDHAZUL36mZiN2iChW/SS0VBrO1sTg==",
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-crypto/sha256-browser": "5.2.0",
-        "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/credential-provider-node": "^3.972.4",
-        "@aws-sdk/middleware-host-header": "^3.972.3",
-        "@aws-sdk/middleware-logger": "^3.972.3",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.3",
-        "@aws-sdk/middleware-user-agent": "^3.972.5",
-        "@aws-sdk/region-config-resolver": "^3.972.3",
-        "@aws-sdk/signature-v4-multi-region": "3.981.0",
-        "@aws-sdk/types": "^3.973.1",
-        "@aws-sdk/util-endpoints": "3.981.0",
-        "@aws-sdk/util-user-agent-browser": "^3.972.3",
-        "@aws-sdk/util-user-agent-node": "^3.972.3",
-        "@smithy/config-resolver": "^4.4.6",
-        "@smithy/core": "^3.22.0",
-        "@smithy/fetch-http-handler": "^5.3.9",
-        "@smithy/hash-node": "^4.2.8",
-        "@smithy/invalid-dependency": "^4.2.8",
-        "@smithy/middleware-content-length": "^4.2.8",
-        "@smithy/middleware-endpoint": "^4.4.12",
-        "@smithy/middleware-retry": "^4.4.29",
-        "@smithy/middleware-serde": "^4.2.9",
-        "@smithy/middleware-stack": "^4.2.8",
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/node-http-handler": "^4.4.8",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/smithy-client": "^4.11.1",
-        "@smithy/types": "^4.12.0",
-        "@smithy/url-parser": "^4.2.8",
-        "@smithy/util-base64": "^4.3.0",
-        "@smithy/util-body-length-browser": "^4.2.0",
-        "@smithy/util-body-length-node": "^4.2.1",
-        "@smithy/util-defaults-mode-browser": "^4.3.28",
-        "@smithy/util-defaults-mode-node": "^4.2.31",
-        "@smithy/util-endpoints": "^3.2.8",
-        "@smithy/util-middleware": "^4.2.8",
-        "@smithy/util-retry": "^4.2.8",
-        "@smithy/util-utf8": "^4.2.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/@aws-sdk/client-sso": {
-      "version": "3.980.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.980.0.tgz",
-      "integrity": "sha512-AhNXQaJ46C1I+lQ+6Kj+L24il5K9lqqIanJd8lMszPmP7bLnmX0wTKK0dxywcvrLdij3zhWttjAKEBNgLtS8/A==",
+    "node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.6.tgz",
+      "integrity": "sha512-dTOdvsjnG3xNT9Y0AUg1wAl38y+4Rl4sf9caSQZOXdNqVn+H+HbbJ4IyyHaIqNR6SW9oJpA/RuRjsjCw2IdIow==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-crypto/sha256-browser": "5.2.0",
-        "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/middleware-host-header": "^3.972.3",
-        "@aws-sdk/middleware-logger": "^3.972.3",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.3",
-        "@aws-sdk/middleware-user-agent": "^3.972.5",
-        "@aws-sdk/region-config-resolver": "^3.972.3",
-        "@aws-sdk/types": "^3.973.1",
-        "@aws-sdk/util-endpoints": "3.980.0",
-        "@aws-sdk/util-user-agent-browser": "^3.972.3",
-        "@aws-sdk/util-user-agent-node": "^3.972.3",
-        "@smithy/config-resolver": "^4.4.6",
-        "@smithy/core": "^3.22.0",
-        "@smithy/fetch-http-handler": "^5.3.9",
-        "@smithy/hash-node": "^4.2.8",
-        "@smithy/invalid-dependency": "^4.2.8",
-        "@smithy/middleware-content-length": "^4.2.8",
-        "@smithy/middleware-endpoint": "^4.4.12",
-        "@smithy/middleware-retry": "^4.4.29",
-        "@smithy/middleware-serde": "^4.2.9",
-        "@smithy/middleware-stack": "^4.2.8",
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/node-http-handler": "^4.4.8",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/smithy-client": "^4.11.1",
-        "@smithy/types": "^4.12.0",
-        "@smithy/url-parser": "^4.2.8",
-        "@smithy/util-base64": "^4.3.0",
-        "@smithy/util-body-length-browser": "^4.2.0",
-        "@smithy/util-body-length-node": "^4.2.1",
-        "@smithy/util-defaults-mode-browser": "^4.3.28",
-        "@smithy/util-defaults-mode-node": "^4.2.31",
-        "@smithy/util-endpoints": "^3.2.8",
-        "@smithy/util-middleware": "^4.2.8",
-        "@smithy/util-retry": "^4.2.8",
-        "@smithy/util-utf8": "^4.2.0",
-        "tslib": "^2.6.2"
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-member-expression-to-functions": "^7.28.5",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.28.6",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/traverse": "^7.28.6",
+        "semver": "^6.3.1"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/util-endpoints": {
-      "version": "3.980.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.980.0.tgz",
-      "integrity": "sha512-AjKBNEc+rjOZQE1HwcD9aCELqg1GmUj1rtICKuY8cgwB73xJ4U/kNyqKKpN2k9emGqlfDY2D8itIp/vDc6OKpw==",
+    "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/types": "^4.12.0",
-        "@smithy/url-parser": "^4.2.8",
-        "@smithy/util-endpoints": "^3.2.8",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/@aws-sdk/core": {
-      "version": "3.973.5",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.5.tgz",
-      "integrity": "sha512-IMM7xGfLGW6lMvubsA4j6BHU5FPgGAxoQ/NA63KqNLMwTS+PeMBcx8DPHL12Vg6yqOZnqok9Mu4H2BdQyq7gSA==",
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.28.5.tgz",
+      "integrity": "sha512-N1EhvLtHzOvj7QQOUCCS3NrPJP8c5W6ZXCHDn7Yialuy1iu4r5EmIYkXlKNqT99Ciw+W0mDqWoR6HWMZlFP3hw==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.1",
-        "@aws-sdk/xml-builder": "^3.972.2",
-        "@smithy/core": "^3.22.0",
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/signature-v4": "^5.3.8",
-        "@smithy/smithy-client": "^4.11.1",
-        "@smithy/types": "^4.12.0",
-        "@smithy/util-base64": "^4.3.0",
-        "@smithy/util-middleware": "^4.2.8",
-        "@smithy/util-utf8": "^4.2.0",
-        "tslib": "^2.6.2"
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "regexpu-core": "^6.3.1",
+        "semver": "^6.3.1"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-env": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.3.tgz",
-      "integrity": "sha512-OBYNY4xQPq7Rx+oOhtyuyO0AQvdJSpXRg7JuPNBJH4a1XXIzJQl4UHQTPKZKwfJXmYLpv4+OkcFen4LYmDPd3g==",
+    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=20.0.0"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-http": {
-      "version": "3.972.5",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.5.tgz",
-      "integrity": "sha512-GpvBgEmSZPvlDekd26Zi+XsI27Qz7y0utUx0g2fSTSiDzhnd1FSa1owuodxR0BcUKNL7U2cOVhhDxgZ4iSoPVg==",
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.6.tgz",
+      "integrity": "sha512-mOAsxeeKkUKayvZR3HeTYD/fICpCPLJrU5ZjelT/PA6WHtNDBOE436YiaEUvHN454bRM3CebhDsIpieCc4texA==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/fetch-http-handler": "^5.3.9",
-        "@smithy/node-http-handler": "^4.4.8",
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/smithy-client": "^4.11.1",
-        "@smithy/types": "^4.12.0",
-        "@smithy/util-stream": "^4.5.10",
-        "tslib": "^2.6.2"
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "debug": "^4.4.3",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.22.11"
       },
-      "engines": {
-        "node": ">=20.0.0"
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-ini": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.972.3.tgz",
-      "integrity": "sha512-rMQAIxstP7cLgYfsRGrGOlpyMl0l8JL2mcke3dsIPLWke05zKOFyR7yoJzWCsI/QiIxjRbxpvPiAeKEA6CoYkg==",
+    "node_modules/@babel/helper-globals": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
+      "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/credential-provider-env": "^3.972.3",
-        "@aws-sdk/credential-provider-http": "^3.972.5",
-        "@aws-sdk/credential-provider-login": "^3.972.3",
-        "@aws-sdk/credential-provider-process": "^3.972.3",
-        "@aws-sdk/credential-provider-sso": "^3.972.3",
-        "@aws-sdk/credential-provider-web-identity": "^3.972.3",
-        "@aws-sdk/nested-clients": "3.980.0",
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/credential-provider-imds": "^4.2.8",
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/shared-ini-file-loader": "^4.4.3",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-login": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.3.tgz",
-      "integrity": "sha512-Gc3O91iVvA47kp2CLIXOwuo5ffo1cIpmmyIewcYjAcvurdFHQ8YdcBe1KHidnbbBO4/ZtywGBACsAX5vr3UdoA==",
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz",
+      "integrity": "sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/nested-clients": "3.980.0",
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/shared-ini-file-loader": "^4.4.3",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/traverse": "^7.28.5",
+        "@babel/types": "^7.28.5"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-node": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.4.tgz",
-      "integrity": "sha512-UwerdzosMSY7V5oIZm3NsMDZPv2aSVzSkZxYxIOWHBeKTZlUqW7XpHtJMZ4PZpJ+HMRhgP+MDGQx4THndgqJfQ==",
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz",
+      "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/credential-provider-env": "^3.972.3",
-        "@aws-sdk/credential-provider-http": "^3.972.5",
-        "@aws-sdk/credential-provider-ini": "^3.972.3",
-        "@aws-sdk/credential-provider-process": "^3.972.3",
-        "@aws-sdk/credential-provider-sso": "^3.972.3",
-        "@aws-sdk/credential-provider-web-identity": "^3.972.3",
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/credential-provider-imds": "^4.2.8",
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/shared-ini-file-loader": "^4.4.3",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-process": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.3.tgz",
-      "integrity": "sha512-xkSY7zjRqeVc6TXK2xr3z1bTLm0wD8cj3lAkproRGaO4Ku7dPlKy843YKnHrUOUzOnMezdZ4xtmFc0eKIDTo2w==",
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
+      "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/shared-ini-file-loader": "^4.4.3",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/helper-module-imports": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-sso": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.972.3.tgz",
-      "integrity": "sha512-8Ww3F5Ngk8dZ6JPL/V5LhCU1BwMfQd3tLdoEuzaewX8FdnT633tPr+KTHySz9FK7fFPcz5qG3R5edVEhWQD4AA==",
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz",
+      "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/client-sso": "3.980.0",
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/token-providers": "3.980.0",
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/shared-ini-file-loader": "^4.4.3",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/types": "^7.27.1"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-sdk/credential-provider-web-identity": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.3.tgz",
-      "integrity": "sha512-62VufdcH5rRfiRKZRcf1wVbbt/1jAntMj1+J0qAd+r5pQRg2t0/P9/Rz16B1o5/0Se9lVL506LRjrhIJAhYBfA==",
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
+      "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/nested-clients": "3.980.0",
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/shared-ini-file-loader": "^4.4.3",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-host-header": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.3.tgz",
-      "integrity": "sha512-aknPTb2M+G3s+0qLCx4Li/qGZH8IIYjugHMv15JTYMe6mgZO8VBpYgeGYsNMGCqCZOcWzuf900jFBG5bopfzmA==",
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz",
+      "integrity": "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/helper-annotate-as-pure": "^7.27.1",
+        "@babel/helper-wrap-function": "^7.27.1",
+        "@babel/traverse": "^7.27.1"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-logger": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.3.tgz",
-      "integrity": "sha512-Ftg09xNNRqaz9QNzlfdQWfpqMCJbsQdnZVJP55jfhbKi1+FTWxGuvfPoBhDHIovqWKjqbuiew3HuhxbJ0+OjgA==",
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.28.6.tgz",
+      "integrity": "sha512-mq8e+laIk94/yFec3DxSjCRD2Z0TAjhVbEJY3UQrlwVo15Lmt7C2wAUbK4bjnTs4APkwsYLTahXRraQXhb1WCg==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/helper-member-expression-to-functions": "^7.28.5",
+        "@babel/helper-optimise-call-expression": "^7.27.1",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-recursion-detection": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.3.tgz",
-      "integrity": "sha512-PY57QhzNuXHnwbJgbWYTrqIDHYSeOlhfYERTAuc16LKZpTZRJUjzBFokp9hF7u1fuGeE3D70ERXzdbMBOqQz7Q==",
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz",
+      "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.1",
-        "@aws/lambda-invoke-store": "^0.2.2",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
+      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-sdk-s3": {
-      "version": "3.972.5",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.972.5.tgz",
-      "integrity": "sha512-3IgeIDiQ15tmMBFIdJ1cTy3A9rXHGo+b9p22V38vA3MozeMyVC8VmCYdDLA0iMWo4VHA9LDJTgCM0+xU3wjBOg==",
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
+      "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/types": "^3.973.1",
-        "@aws-sdk/util-arn-parser": "^3.972.2",
-        "@smithy/core": "^3.22.0",
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/signature-v4": "^5.3.8",
-        "@smithy/smithy-client": "^4.11.1",
-        "@smithy/types": "^4.12.0",
-        "@smithy/util-config-provider": "^4.2.0",
-        "@smithy/util-middleware": "^4.2.8",
-        "@smithy/util-stream": "^4.5.10",
-        "@smithy/util-utf8": "^4.2.0",
-        "tslib": "^2.6.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.972.5",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.5.tgz",
-      "integrity": "sha512-TVZQ6PWPwQbahUI8V+Er+gS41ctIawcI/uMNmQtQ7RMcg3JYn6gyKAFKUb3HFYx2OjYlx1u11sETSwwEUxVHTg==",
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.28.6.tgz",
+      "integrity": "sha512-z+PwLziMNBeSQJonizz2AGnndLsP2DeGHIxDAn+wdHOGuo4Fo1x1HBPPXeE9TAOPHNNWQKCSlA2VZyYyyibDnQ==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/types": "^3.973.1",
-        "@aws-sdk/util-endpoints": "3.980.0",
-        "@smithy/core": "^3.22.0",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/template": "^7.28.6",
+        "@babel/traverse": "^7.28.6",
+        "@babel/types": "^7.28.6"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-sdk/middleware-user-agent/node_modules/@aws-sdk/util-endpoints": {
-      "version": "3.980.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.980.0.tgz",
-      "integrity": "sha512-AjKBNEc+rjOZQE1HwcD9aCELqg1GmUj1rtICKuY8cgwB73xJ4U/kNyqKKpN2k9emGqlfDY2D8itIp/vDc6OKpw==",
+    "node_modules/@babel/helpers": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz",
+      "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/types": "^4.12.0",
-        "@smithy/url-parser": "^4.2.8",
-        "@smithy/util-endpoints": "^3.2.8",
-        "tslib": "^2.6.2"
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@aws-sdk/nested-clients": {
-      "version": "3.980.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.980.0.tgz",
-      "integrity": "sha512-/dONY5xc5/CCKzOqHZCTidtAR4lJXWkGefXvTRKdSKMGaYbbKsxDckisd6GfnvPSLxWtvQzwgRGRutMRoYUApQ==",
-      "dev": true,
-      "license": "Apache-2.0",
+    "node_modules/@babel/parser": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz",
+      "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==",
+      "license": "MIT",
       "dependencies": {
-        "@aws-crypto/sha256-browser": "5.2.0",
-        "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/middleware-host-header": "^3.972.3",
-        "@aws-sdk/middleware-logger": "^3.972.3",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.3",
-        "@aws-sdk/middleware-user-agent": "^3.972.5",
-        "@aws-sdk/region-config-resolver": "^3.972.3",
-        "@aws-sdk/types": "^3.973.1",
-        "@aws-sdk/util-endpoints": "3.980.0",
-        "@aws-sdk/util-user-agent-browser": "^3.972.3",
-        "@aws-sdk/util-user-agent-node": "^3.972.3",
-        "@smithy/config-resolver": "^4.4.6",
-        "@smithy/core": "^3.22.0",
-        "@smithy/fetch-http-handler": "^5.3.9",
-        "@smithy/hash-node": "^4.2.8",
-        "@smithy/invalid-dependency": "^4.2.8",
-        "@smithy/middleware-content-length": "^4.2.8",
-        "@smithy/middleware-endpoint": "^4.4.12",
-        "@smithy/middleware-retry": "^4.4.29",
-        "@smithy/middleware-serde": "^4.2.9",
-        "@smithy/middleware-stack": "^4.2.8",
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/node-http-handler": "^4.4.8",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/smithy-client": "^4.11.1",
-        "@smithy/types": "^4.12.0",
-        "@smithy/url-parser": "^4.2.8",
-        "@smithy/util-base64": "^4.3.0",
-        "@smithy/util-body-length-browser": "^4.2.0",
-        "@smithy/util-body-length-node": "^4.2.1",
-        "@smithy/util-defaults-mode-browser": "^4.3.28",
-        "@smithy/util-defaults-mode-node": "^4.2.31",
-        "@smithy/util-endpoints": "^3.2.8",
-        "@smithy/util-middleware": "^4.2.8",
-        "@smithy/util-retry": "^4.2.8",
-        "@smithy/util-utf8": "^4.2.0",
-        "tslib": "^2.6.2"
+        "@babel/types": "^7.29.7"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/@aws-sdk/nested-clients/node_modules/@aws-sdk/util-endpoints": {
-      "version": "3.980.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.980.0.tgz",
-      "integrity": "sha512-AjKBNEc+rjOZQE1HwcD9aCELqg1GmUj1rtICKuY8cgwB73xJ4U/kNyqKKpN2k9emGqlfDY2D8itIp/vDc6OKpw==",
+    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.28.5.tgz",
+      "integrity": "sha512-87GDMS3tsmMSi/3bWOte1UblL+YUTFMV8SZPZ2eSEL17s74Cw/l63rR6NmGVKMYW2GYi85nE+/d6Hw5N0bEk2Q==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/types": "^4.12.0",
-        "@smithy/url-parser": "^4.2.8",
-        "@smithy/util-endpoints": "^3.2.8",
-        "tslib": "^2.6.2"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.28.5"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@aws-sdk/region-config-resolver": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.3.tgz",
-      "integrity": "sha512-v4J8qYAWfOMcZ4MJUyatntOicTzEMaU7j3OpkRCGGFSL2NgXQ5VbxauIyORA+pxdKZ0qQG2tCQjQjZDlXEC3Ow==",
+    "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz",
+      "integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/config-resolver": "^4.4.6",
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@aws-sdk/signature-v4-multi-region": {
-      "version": "3.981.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.981.0.tgz",
-      "integrity": "sha512-T/+h9df0DALAXXP+YfZ8bgmH6cEN7HAg6BqHe3t38GhHgQ1HULXwK5XMhiLWiHpytDdhLqiVH41SRgW8ynBl6Q==",
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz",
+      "integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/middleware-sdk-s3": "^3.972.5",
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/signature-v4": "^5.3.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@aws-sdk/token-providers": {
-      "version": "3.980.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.980.0.tgz",
-      "integrity": "sha512-1nFileg1wAgDmieRoj9dOawgr2hhlh7xdvcH57b1NnqfPaVlcqVJyPc6k3TLDUFPY69eEwNxdGue/0wIz58vjA==",
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz",
+      "integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.5",
-        "@aws-sdk/nested-clients": "3.980.0",
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/shared-ini-file-loader": "^4.4.3",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
+        "@babel/plugin-transform-optional-chaining": "^7.27.1"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
       }
     },
-    "node_modules/@aws-sdk/types": {
-      "version": "3.973.1",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.1.tgz",
-      "integrity": "sha512-DwHBiMNOB468JiX6+i34c+THsKHErYUdNQ3HexeXZvVn4zouLjgaS4FejiGSi2HyBuzuyHg7SuOPmjSvoU9NRg==",
+    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.6.tgz",
+      "integrity": "sha512-a0aBScVTlNaiUe35UtfxAN7A/tehvvG4/ByO6+46VPKTRSlfnAFsgKy0FUh+qAkQrDTmhDkT+IBOKlOoMUxQ0g==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@aws-sdk/util-arn-parser": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.972.2.tgz",
-      "integrity": "sha512-VkykWbqMjlSgBFDyrY3nOSqupMc6ivXuGmvci6Q3NnLq5kC+mKQe2QBZ4nrWRE/jqOxeFP2uYzLtwncYYcvQDg==",
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@aws-sdk/util-endpoints": {
-      "version": "3.981.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.981.0.tgz",
-      "integrity": "sha512-a8nXh/H3/4j+sxhZk+N3acSDlgwTVSZbX9i55dx41gI1H+geuonuRG+Shv3GZsCb46vzc08RK2qC78ypO8uRlg==",
+    "node_modules/@babel/plugin-syntax-import-assertions": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.28.6.tgz",
+      "integrity": "sha512-pSJUpFHdx9z5nqTSirOCMtYVP2wFgoWhP0p3g8ONK/4IHhLIBd0B9NYqAvIUAhq+OkhO4VM1tENCt0cjlsNShw==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/types": "^4.12.0",
-        "@smithy/url-parser": "^4.2.8",
-        "@smithy/util-endpoints": "^3.2.8",
-        "tslib": "^2.6.2"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@aws-sdk/util-locate-window": {
-      "version": "3.965.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.965.4.tgz",
-      "integrity": "sha512-H1onv5SkgPBK2P6JR2MjGgbOnttoNzSPIRoeZTNPZYyaplwGg50zS3amXvXqF0/qfXpWEC9rLWU564QTB9bSog==",
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.28.6.tgz",
+      "integrity": "sha512-jiLC0ma9XkQT3TKJ9uYvlakm66Pamywo+qwL+oL8HJOvc6TWdZXVfhqJr8CCzbSGUAbDOzlGHJC1U+vRfLQDvw==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "tslib": "^2.6.2"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@aws-sdk/util-user-agent-browser": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.3.tgz",
-      "integrity": "sha512-JurOwkRUcXD/5MTDBcqdyQ9eVedtAsZgw5rBwktsPTN7QtPiS2Ld1jkJepNgYoCufz1Wcut9iup7GJDoIHp8Fw==",
+    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/types": "^4.12.0",
-        "bowser": "^2.11.0",
-        "tslib": "^2.6.2"
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+        "@babel/helper-plugin-utils": "^7.18.6"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.972.3.tgz",
-      "integrity": "sha512-gqG+02/lXQtO0j3US6EVnxtwwoXQC5l2qkhLCrqUrqdtcQxV7FDMbm9wLjKqoronSHyELGTjbFKK/xV5q1bZNA==",
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz",
+      "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@aws-sdk/middleware-user-agent": "^3.972.5",
-        "@aws-sdk/types": "^3.973.1",
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "aws-crt": ">=1.0.0"
-      },
-      "peerDependenciesMeta": {
-        "aws-crt": {
-          "optional": true
-        }
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@aws-sdk/xml-builder": {
-      "version": "3.972.22",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.22.tgz",
-      "integrity": "sha512-PMYKKtJd70IsSG0yHrdAbxBr+ZWBKLvzFZfD3/urxgf6hXVMzuU5M+3MJ5G67RpOmLBu1fAUN65SbWuKUCOlAA==",
+    "node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.29.0.tgz",
+      "integrity": "sha512-va0VdWro4zlBr2JsXC+ofCPB2iG12wPtVGTWFx2WLDOM3nYQZZIGP82qku2eW/JR83sD+k2k+CsNtyEbUqhU6w==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@nodable/entities": "2.1.0",
-        "@smithy/types": "^4.14.1",
-        "fast-xml-parser": "5.7.2",
-        "tslib": "^2.6.2"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-remap-async-to-generator": "^7.27.1",
+        "@babel/traverse": "^7.29.0"
       },
       "engines": {
-        "node": ">=20.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@aws/lambda-invoke-store": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.3.tgz",
-      "integrity": "sha512-oLvsaPMTBejkkmHhjf09xTgk71mOqyr/409NKhRIL08If7AhVfUsJhVsx386uJaqNd42v9kWamQ9lFbkoC2dYw==",
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.28.6.tgz",
+      "integrity": "sha512-ilTRcmbuXjsMmcZ3HASTe4caH5Tpo93PkTxF9oG2VZsSWsahydmcEHhix9Ik122RcTnZnUzPbmux4wh1swfv7g==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-remap-async-to-generator": "^7.27.1"
+      },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/code-frame": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
-      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz",
+      "integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.29.7",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.1.1"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/compat-data": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz",
-      "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.6.tgz",
+      "integrity": "sha512-tt/7wOtBmwHPNMPu7ax4pdPz6shjFrmHDghvNC+FG9Qvj7D6mJcoRQIF5dy4njmxR941l6rgtvfSB2zX3VlUIw==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/core": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
-      "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
+    "node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.28.6.tgz",
+      "integrity": "sha512-dY2wS3I2G7D697VHndN91TJr8/AAfXQNt5ynCTI/MpxMsSzHp+52uNivYT5wCPax3whc47DR8Ba7cmlQMg24bw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.29.7",
-        "@babel/generator": "^7.29.7",
-        "@babel/helper-compilation-targets": "^7.29.7",
-        "@babel/helper-module-transforms": "^7.29.7",
-        "@babel/helpers": "^7.29.7",
-        "@babel/parser": "^7.29.7",
-        "@babel/template": "^7.29.7",
-        "@babel/traverse": "^7.29.7",
-        "@babel/types": "^7.29.7",
-        "@jridgewell/remapping": "^2.3.5",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/generator": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz",
-      "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==",
+    "node_modules/@babel/plugin-transform-class-static-block": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.6.tgz",
+      "integrity": "sha512-rfQ++ghVwTWTqQ7w8qyDxL1XGihjBss4CmTgGRCTAC9RIbhVpyp4fOeZtta0Lbf+dTNIVJer6ych2ibHwkZqsQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.29.7",
-        "@babel/types": "^7.29.7",
-        "@jridgewell/gen-mapping": "^0.3.12",
-        "@jridgewell/trace-mapping": "^0.3.28",
-        "jsesc": "^3.0.2"
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
       }
     },
-    "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.27.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz",
-      "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==",
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.6.tgz",
+      "integrity": "sha512-EF5KONAqC5zAqT783iMGuM2ZtmEBy+mJMOKl2BCvPZ2lVrwvXnB6o+OBWCS+CoeCCpVRF2sA2RBKUxvT8tQT5Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.3"
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-replace-supers": "^7.28.6",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
-      "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.28.6.tgz",
+      "integrity": "sha512-bcc3k0ijhHbc2lEfpFHgx7eYw9KNXqOerKWfzbxEHUGKnS3sz9C4CNL9OiFN1297bDNfUiSO7DaLzbvHQQQ1BQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.29.7",
-        "@babel/helper-validator-option": "^7.29.7",
-        "browserslist": "^4.24.0",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/template": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.3.tgz",
-      "integrity": "sha512-V9f6ZFIYSLNEbuGA/92uOvYsGCJNsuA8ESZ4ldc09bWk/j8H8TKiPw8Mk1eG6olpnO0ALHJmYfZvF4MEE4gajg==",
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.5.tgz",
+      "integrity": "sha512-Kl9Bc6D0zTUcFUvkNuQh4eGXPKKNDOJQXVyyM4ZAQPMveniJdxi8XMJwLo+xSoW3MIq81bD33lcUe9kZpl0MCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.3",
-        "@babel/helper-member-expression-to-functions": "^7.27.1",
-        "@babel/helper-optimise-call-expression": "^7.27.1",
-        "@babel/helper-replace-supers": "^7.27.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
-        "@babel/traverse": "^7.28.3",
-        "semver": "^6.3.1"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/traverse": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.27.1.tgz",
-      "integrity": "sha512-uVDC72XVf8UbrH5qQTc18Agb8emwjTiZrQE11Nv3CuBEZmVvTwwE9CBUEvHku06gQCAyYf8Nv6ja1IN+6LMbxQ==",
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.28.6.tgz",
+      "integrity": "sha512-SljjowuNKB7q5Oayv4FoPzeB74g3QgLt8IVJw9ADvWy3QnUb/01aw8I4AVv8wYnPvQz2GDDZ/g3GhcNyDBI4Bg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.1",
-        "regexpu-core": "^6.2.0",
-        "semver": "^6.3.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.5.tgz",
-      "integrity": "sha512-uJnGFcPsWQK8fvjgGP5LZUZZsYGIoPeRjSF5PGwrelYgq7Q15/Ft9NGFp1zglwgIv//W0uG4BevRuSJRyylZPg==",
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz",
+      "integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "debug": "^4.4.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.22.10"
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-globals": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
-      "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==",
+    "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.29.0.tgz",
+      "integrity": "sha512-zBPcW2lFGxdiD8PUnPwJjag2J9otbcLQzvbiOzDxpYXyCuYX9agOwMPGn1prVH0a4qzhCKu24rlH4c1f7yA8rw==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-member-expression-to-functions": {
+    "node_modules/@babel/plugin-transform-dynamic-import": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.27.1.tgz",
-      "integrity": "sha512-E5chM8eWjTp/aNoVpcbfM7mLxu9XGLWYise2eBKGQomAk/Mb4XoxyqXTZbuTohbsl8EKqdlMhnDI2CCLfcs9wA==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz",
+      "integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz",
-      "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==",
+    "node_modules/@babel/plugin-transform-explicit-resource-management": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.28.6.tgz",
+      "integrity": "sha512-Iao5Konzx2b6g7EPqTy40UZbcdXE126tTxVFr/nAIj+WItNxjKSYTEw3RC+A2/ZetmdJsgueL1KhaMCQHkLPIg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.29.7",
-        "@babel/types": "^7.29.7"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/plugin-transform-destructuring": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
-      "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.28.6.tgz",
+      "integrity": "sha512-WitabqiGjV/vJ0aPOLSFfNY1u9U3R7W36B03r5I2KoNix+a3sOhJ3pKFB3R5It9/UiK78NiO0KE9P21cMhlPkw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.29.7",
-        "@babel/helper-validator-identifier": "^7.29.7",
-        "@babel/traverse": "^7.29.7"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-optimise-call-expression": {
+    "node_modules/@babel/plugin-transform-export-namespace-from": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz",
-      "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz",
+      "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.28.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz",
-      "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==",
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz",
+      "integrity": "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-remap-async-to-generator": {
+    "node_modules/@babel/plugin-transform-function-name": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.27.1.tgz",
-      "integrity": "sha512-7fiA521aVw8lSPeI4ZOD3vRFkoqkJcS+z4hFo82bFSH/2tNd6eJ5qCVMS5OzDmZh/kaHQeBaeyxK6wljcPtveA==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz",
+      "integrity": "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.1",
-        "@babel/helper-wrap-function": "^7.27.1",
+        "@babel/helper-compilation-targets": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1",
         "@babel/traverse": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-replace-supers": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz",
-      "integrity": "sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==",
+    "node_modules/@babel/plugin-transform-json-strings": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.28.6.tgz",
+      "integrity": "sha512-Nr+hEN+0geQkzhbdgQVPoqr47lZbm+5fCUmO70722xJZd0Mvb59+33QLImGj6F+DkK3xgDi1YVysP8whD6FQAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.27.1",
-        "@babel/helper-optimise-call-expression": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+    "node_modules/@babel/plugin-transform-literals": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz",
-      "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz",
+      "integrity": "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.27.1",
-        "@babel/types": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
-      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
+    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.28.6.tgz",
+      "integrity": "sha512-+anKKair6gpi8VsM/95kmomGNMD0eLz1NQ8+Pfw5sAwWH9fGYXT50E55ZpV0pHUHWf6IUTWPM+f/7AAff+wr9A==",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.28.6"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
-      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
-      "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
-      "dev": true,
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz",
+      "integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.28.3.tgz",
-      "integrity": "sha512-zdf983tNfLZFletc0RRXYrHrucBEg95NIFMkn6K9dbeMYnsgHaSBGcQqdsCSStG2PYwRre0Qc2NNSCXbG+xc6g==",
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz",
+      "integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.27.2",
-        "@babel/traverse": "^7.28.3",
-        "@babel/types": "^7.28.2"
+        "@babel/helper-module-transforms": "^7.27.1",
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/helpers": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz",
-      "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==",
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.28.6.tgz",
+      "integrity": "sha512-jppVbf8IV9iWWwWTQIxJMAJCWBuuKx71475wHwYytrRGQ2CWiDvYlADQno3tcYpS/T2UUWFQp3nVtYfK/YBQrA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.29.7",
-        "@babel/types": "^7.29.7"
+        "@babel/helper-module-transforms": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz",
-      "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.29.7"
-      },
-      "bin": {
-        "parser": "bin/babel-parser.js"
       },
-      "engines": {
-        "node": ">=6.0.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz",
-      "integrity": "sha512-QPG3C9cCVRQLxAVwmefEmwdTanECuUBMQZ/ym5kiw3XKCGA7qkuQLcjWWHcrD/GKbn/WmJwaezfuuAOcyKlRPA==",
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.29.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.4.tgz",
+      "integrity": "sha512-N7QmZ0xRZfjHOfZeQLJjwgX2zS9pdGHSVl/cjSGlo4dXMqvurfxXDMKY4RqEKzPozV78VMcd0lxyG13mlbKc4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/helper-module-transforms": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-validator-identifier": "^7.28.5",
+        "@babel/traverse": "^7.29.0"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+    "node_modules/@babel/plugin-transform-modules-umd": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.27.1.tgz",
-      "integrity": "sha512-qNeq3bCKnGgLkEXUuFry6dPlGfCdQNZbn7yUAPCInwAJHMU7THJfrBSozkcWq5sNM6RcF3S8XyQL2A52KNR9IA==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz",
+      "integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@babel/helper-module-transforms": "^7.27.1",
         "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.27.1.tgz",
-      "integrity": "sha512-g4L7OYun04N1WyqMNjldFwlfPCLVkgB54A/YCXICZYBsvJJE3kByKv9c9+R/nAfmIfjl2rKYLNyMHboYbZaWaA==",
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.29.0.tgz",
+      "integrity": "sha512-1CZQA5KNAD6ZYQLPw7oi5ewtDNxH/2vuCh+6SmvgDfhumForvs8a1o9n0UrEoBD8HU4djO2yWngTQlXl1NDVEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1352,47 +1139,31 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+    "node_modules/@babel/plugin-transform-new-target": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.27.1.tgz",
-      "integrity": "sha512-oO02gcONcD5O1iTLi/6frMJBIwWEHceWGSGqrpCmEL8nogiS6J9PBlE48CaK20/Jx1LuRml9aDftLgdjXT8+Cw==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz",
+      "integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1",
-        "@babel/plugin-transform-optional-chaining": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.13.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.3.tgz",
-      "integrity": "sha512-b6YTX108evsvE4YgWyQ921ZAFFQm3Bn+CA3+ZXlNVnPhx+UfsVURoPjfGAPCjBgrqo30yX/C2nZGX96DxvR9Iw==",
+    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.28.6.tgz",
+      "integrity": "sha512-3wKbRgmzYbw24mDJXT7N+ADXw8BC/imU9yo9c9X9NKaLF1fW+e5H1U5QjMUBe4Qo4Ox/o++IyUkl1sVCLgevKg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/traverse": "^7.28.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.21.0-placeholder-for-preset-env.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
-      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
-      "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       },
@@ -1400,14 +1171,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.27.1.tgz",
-      "integrity": "sha512-UT/Jrhw57xg4ILHLFnzFpPDlMbcdEicaAtjPQpbj9wa8T4r5KVWCimHcL/460g8Ht0DMxDyjsLgiWSkVjnwPFg==",
+    "node_modules/@babel/plugin-transform-numeric-separator": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.28.6.tgz",
+      "integrity": "sha512-SJR8hPynj8outz+SlStQSwvziMN4+Bq99it4tMIf5/Caq+3iOc0JtKyse8puvyXkk3eFRIA5ID/XfunGgO5i6w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1416,14 +1187,18 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
-      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
+    "node_modules/@babel/plugin-transform-object-rest-spread": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.6.tgz",
+      "integrity": "sha512-5rh+JR4JBC4pGkXLAcYdLHZjXudVxWMXbB6u6+E9lRL5TrGVbHt1TjxGbZ8CkmYw9zjkB7jutzOROArsqtncEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/plugin-transform-destructuring": "^7.28.5",
+        "@babel/plugin-transform-parameters": "^7.27.7",
+        "@babel/traverse": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1432,31 +1207,31 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
-      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz",
+      "integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.27.1",
+        "@babel/helper-replace-supers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz",
-      "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==",
+    "node_modules/@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.28.6.tgz",
+      "integrity": "sha512-R8ja/Pyrv0OGAvAXQhSTmWyPJPml+0TMqXlO5w+AsMEiwb2fg3WkOvob7UxFSL3OIttFSGSRFKQsOhJ/X6HQdQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1465,16 +1240,15 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.28.0.tgz",
-      "integrity": "sha512-BEOdvX4+M765icNPZeidyADIvQ1m1gmunXufXxvRESy/jNNyfovIqUyE7MVgGBjWktCoJlzvFA1To2O4ymIO3Q==",
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.28.6.tgz",
+      "integrity": "sha512-A4zobikRGJTsX9uqVFdafzGkqD30t26ck2LmOzAuLL8b2x6k3TIqRiT2xVvA9fNmFeTX484VpsdgmKNA0bS23w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-remap-async-to-generator": "^7.27.1",
-        "@babel/traverse": "^7.28.0"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1483,16 +1257,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.27.1.tgz",
-      "integrity": "sha512-NREkZsZVJS4xmTr8qzE5y8AfIPqsdQfRuUiLRTEzb7Qii8iFWCyDKaUV2c0rCuh4ljDZ98ALHP/PetiBV2nddA==",
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.27.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.7.tgz",
+      "integrity": "sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-remap-async-to-generator": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1501,14 +1273,15 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.27.1.tgz",
-      "integrity": "sha512-cnqkuOtZLapWYZUYM5rVIdv1nXYuFVIltZ6ZJ7nIj585QsjKM5dhL2Fu/lICXZ1OyIAFc7Qy+bvDAtTXqGrlhg==",
+    "node_modules/@babel/plugin-transform-private-methods": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.28.6.tgz",
+      "integrity": "sha512-piiuapX9CRv7+0st8lmuUlRSmX6mBcVeNQ1b4AYzJxfCMuBfB0vBXDiGSmm03pKJw1v6cZ8KSeM+oUnM6yAExg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1517,14 +1290,16 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.28.4.tgz",
-      "integrity": "sha512-1yxmvN0MJHOhPVmAsmoW5liWwoILobu/d/ShymZmj867bAdxGbehIrew1DuLpw2Ukv+qDSSPQdYW1dLNE7t11A==",
+    "node_modules/@babel/plugin-transform-private-property-in-object": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.28.6.tgz",
+      "integrity": "sha512-b97jvNSOb5+ehyQmBpmhOCiUC5oVK4PMnpRvO7+ymFBoqYjeDHIU9jnrNUuwHOiL9RpGDoKBpSViarV+BU+eVA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-annotate-as-pure": "^7.27.3",
+        "@babel/helper-create-class-features-plugin": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1533,14 +1308,13 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-class-properties": {
+    "node_modules/@babel/plugin-transform-property-literals": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.27.1.tgz",
-      "integrity": "sha512-D0VcalChDMtuRvJIu3U/fwWjf8ZMykz5iZsg77Nuj821vCKI3zCyRLwRdWbsuJ/uRwZhZ002QtCqIkwC/ZkvbA==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz",
+      "integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.27.1",
         "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
@@ -1550,53 +1324,47 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.3.tgz",
-      "integrity": "sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==",
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.29.0.tgz",
+      "integrity": "sha512-FijqlqMA7DmRdg/aINBSs04y8XNTYw/lr1gJ2WsmBnnaNw1iS43EPkJW+zK7z65auG3AWRFXWj+NcTQwYptUog==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.28.3",
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.12.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.4.tgz",
-      "integrity": "sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==",
+    "node_modules/@babel/plugin-transform-regexp-modifiers": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.28.6.tgz",
+      "integrity": "sha512-QGWAepm9qxpaIs7UM9FvUSnCGlb8Ua1RhyM4/veAxLwt3gMat/LSGrZixyuj4I6+Kn9iwvqCyPTtbdxanYoWYg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.3",
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-globals": "^7.28.0",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-replace-supers": "^7.27.1",
-        "@babel/traverse": "^7.28.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-computed-properties": {
+    "node_modules/@babel/plugin-transform-reserved-words": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.27.1.tgz",
-      "integrity": "sha512-lj9PGWvMTVksbWiDT2tW68zGS/cyo4AkZ/QTp0sQT0mjPopCmrSkzxeXkznjqBxzDI6TclZhOJbBmbBLjuOZUw==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz",
+      "integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/template": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1605,15 +1373,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.28.0.tgz",
-      "integrity": "sha512-v1nrSMBiKcodhsyJ4Gf+Z0U/yawmJDBOTpEB3mcQY52r9RIyPneGyAS/yM6seP/8I+mWI3elOMtT5dB8GJVs+A==",
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz",
+      "integrity": "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/traverse": "^7.28.0"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1622,15 +1389,15 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.27.1.tgz",
-      "integrity": "sha512-gEbkDVGRvjj7+T1ivxrfgygpT7GUd4vmODtYpbs0gZATdkX8/iSnOtZSxiZnsgm1YjTgjI6VKBGSJJevkrclzw==",
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.28.6.tgz",
+      "integrity": "sha512-9U4QObUC0FtJl05AsUcodau/RWDytrU6uKgkxu09mLR9HLDAtUMoPuuskm5huQsoktmsYpI+bGmq+iapDcriKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1639,10 +1406,10 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-duplicate-keys": {
+    "node_modules/@babel/plugin-transform-sticky-regex": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.27.1.tgz",
-      "integrity": "sha512-MTyJk98sHvSs+cvZ4nOauwTTG1JeonDjSGvGGUNHreGQns+Mpt6WX/dVzWBHgg+dYZhkC4X+zTDfkTU+Vy9y7Q==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz",
+      "integrity": "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1655,27 +1422,26 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+    "node_modules/@babel/plugin-transform-template-literals": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.27.1.tgz",
-      "integrity": "sha512-hkGcueTEzuhB30B3eJCbCYeCaaEQOmQR0AdvzpD4LoN0GXMWzzGSuRrxR2xTnCrvNbVwK9N6/jQ92GSLfiZWoQ==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz",
+      "integrity": "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
         "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-dynamic-import": {
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.27.1.tgz",
-      "integrity": "sha512-MHzkWQcEmjzzVW9j2q8LGjwGWpG2mjwaaB0BNQwst3FIjqsg8Ct/mIZlvSPJvfi9y2AC8mi/ktxbFVL9pZ1I4A==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz",
+      "integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1688,15 +1454,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-explicit-resource-management": {
-      "version": "7.28.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-explicit-resource-management/-/plugin-transform-explicit-resource-management-7.28.0.tgz",
-      "integrity": "sha512-K8nhUcn3f6iB+P3gwCv/no7OdzOZQcKchW6N389V6PD8NUWKZHzndOd9sPDVbMoBsbmjMqlB4L9fm+fEFNVlwQ==",
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz",
+      "integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/plugin-transform-destructuring": "^7.28.0"
+        "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1705,14 +1470,15 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.27.1.tgz",
-      "integrity": "sha512-uspvXnhHvGKf2r4VVtBpeFnuDWsJLQ6MF6lGJLC89jBR1uoVeqM416AZtTuhTezOfgHicpJQmoD5YUakO/YmXQ==",
+    "node_modules/@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.28.6.tgz",
+      "integrity": "sha512-4Wlbdl/sIZjzi/8St0evF0gEZrgOswVO6aOzqxh1kDZOl9WmLrHq2HtGhnOJZmHZYKP8WZ1MDLCt5DAWwRo57A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1721,13 +1487,14 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-export-namespace-from": {
+    "node_modules/@babel/plugin-transform-unicode-regex": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.27.1.tgz",
-      "integrity": "sha512-tQvHWSZ3/jH2xuq/vZDy0jNn+ZdXJeM8gHvX4lnJmsc3+50yPlWdZXIc5ay+umX+2/tJIqHqiEqcJvxlmIvRvQ==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz",
+      "integrity": "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
         "@babel/helper-plugin-utils": "^7.27.1"
       },
       "engines": {
@@ -1737,33 +1504,100 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.27.1.tgz",
-      "integrity": "sha512-BfbWFFEJFQzLCQ5N8VocnCtA8J1CLkNTe2Ms2wocj75dd6VpiqS5Z5quTYcUoo4Yq+DN0rtikODccuv7RU81sw==",
+    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.28.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.28.6.tgz",
+      "integrity": "sha512-/wHc/paTUmsDYN7SZkpWxogTOBNnlx7nBQYfy6JJlCT7G3mVhltk3e++N7zV0XfgGsrqBxd4rJQt9H16I21Y1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
+        "@babel/helper-create-regexp-features-plugin": "^7.28.5",
+        "@babel/helper-plugin-utils": "^7.28.6"
       },
       "engines": {
         "node": ">=6.9.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.27.1.tgz",
-      "integrity": "sha512-1bQeydJF9Nr1eBCMMbC+hdwmRlsv5XYOMu03YSWFwNs0HsAmtSxxF1fyuYPqemVldVyFmlCU7w8UE14LupUSZQ==",
+    "node_modules/@babel/preset-env": {
+      "version": "7.29.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.29.0.tgz",
+      "integrity": "sha512-fNEdfc0yi16lt6IZo2Qxk3knHVdfMYX33czNb4v8yWhemoBhibCpQK/uYHtSKIiO+p/zd3+8fYVXhQdOVV608w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/traverse": "^7.27.1"
+        "@babel/compat-data": "^7.29.0",
+        "@babel/helper-compilation-targets": "^7.28.6",
+        "@babel/helper-plugin-utils": "^7.28.6",
+        "@babel/helper-validator-option": "^7.27.1",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.28.5",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.6",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+        "@babel/plugin-syntax-import-assertions": "^7.28.6",
+        "@babel/plugin-syntax-import-attributes": "^7.28.6",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.27.1",
+        "@babel/plugin-transform-async-generator-functions": "^7.29.0",
+        "@babel/plugin-transform-async-to-generator": "^7.28.6",
+        "@babel/plugin-transform-block-scoped-functions": "^7.27.1",
+        "@babel/plugin-transform-block-scoping": "^7.28.6",
+        "@babel/plugin-transform-class-properties": "^7.28.6",
+        "@babel/plugin-transform-class-static-block": "^7.28.6",
+        "@babel/plugin-transform-classes": "^7.28.6",
+        "@babel/plugin-transform-computed-properties": "^7.28.6",
+        "@babel/plugin-transform-destructuring": "^7.28.5",
+        "@babel/plugin-transform-dotall-regex": "^7.28.6",
+        "@babel/plugin-transform-duplicate-keys": "^7.27.1",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.29.0",
+        "@babel/plugin-transform-dynamic-import": "^7.27.1",
+        "@babel/plugin-transform-explicit-resource-management": "^7.28.6",
+        "@babel/plugin-transform-exponentiation-operator": "^7.28.6",
+        "@babel/plugin-transform-export-namespace-from": "^7.27.1",
+        "@babel/plugin-transform-for-of": "^7.27.1",
+        "@babel/plugin-transform-function-name": "^7.27.1",
+        "@babel/plugin-transform-json-strings": "^7.28.6",
+        "@babel/plugin-transform-literals": "^7.27.1",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.28.6",
+        "@babel/plugin-transform-member-expression-literals": "^7.27.1",
+        "@babel/plugin-transform-modules-amd": "^7.27.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.28.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.29.0",
+        "@babel/plugin-transform-modules-umd": "^7.27.1",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.29.0",
+        "@babel/plugin-transform-new-target": "^7.27.1",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.28.6",
+        "@babel/plugin-transform-numeric-separator": "^7.28.6",
+        "@babel/plugin-transform-object-rest-spread": "^7.28.6",
+        "@babel/plugin-transform-object-super": "^7.27.1",
+        "@babel/plugin-transform-optional-catch-binding": "^7.28.6",
+        "@babel/plugin-transform-optional-chaining": "^7.28.6",
+        "@babel/plugin-transform-parameters": "^7.27.7",
+        "@babel/plugin-transform-private-methods": "^7.28.6",
+        "@babel/plugin-transform-private-property-in-object": "^7.28.6",
+        "@babel/plugin-transform-property-literals": "^7.27.1",
+        "@babel/plugin-transform-regenerator": "^7.29.0",
+        "@babel/plugin-transform-regexp-modifiers": "^7.28.6",
+        "@babel/plugin-transform-reserved-words": "^7.27.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.27.1",
+        "@babel/plugin-transform-spread": "^7.28.6",
+        "@babel/plugin-transform-sticky-regex": "^7.27.1",
+        "@babel/plugin-transform-template-literals": "^7.27.1",
+        "@babel/plugin-transform-typeof-symbol": "^7.27.1",
+        "@babel/plugin-transform-unicode-escapes": "^7.27.1",
+        "@babel/plugin-transform-unicode-property-regex": "^7.28.6",
+        "@babel/plugin-transform-unicode-regex": "^7.27.1",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.28.6",
+        "@babel/preset-modules": "0.1.6-no-external-plugins",
+        "babel-plugin-polyfill-corejs2": "^0.4.15",
+        "babel-plugin-polyfill-corejs3": "^0.14.0",
+        "babel-plugin-polyfill-regenerator": "^0.6.6",
+        "core-js-compat": "^3.48.0",
+        "semver": "^6.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1772,1142 +1606,840 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.27.1.tgz",
-      "integrity": "sha512-6WVLVJiTjqcQauBhn1LkICsR2H+zm62I3h9faTDKt1qP4jn2o72tSvqMwtGFKGTpojce0gJs+76eZ2uCHRZh0Q==",
+    "node_modules/@babel/preset-env/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.27.1.tgz",
-      "integrity": "sha512-0HCFSepIpLTkLcsi86GG3mTUzxV5jpmbv97hTETW3yzrAij8aqlD36toB1D0daVFJM8NK6GvKO0gslVQmm+zZA==",
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.6-no-external-plugins",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.27.1.tgz",
-      "integrity": "sha512-SJvDs5dXxiae4FbSL1aBJlG4wvl594N6YEVVn9e3JGulwioy6z3oPjx/sQBO3Y4NwUu5HNix6KJ3wBZoewcdbw==",
+    "node_modules/@babel/template": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz",
+      "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/code-frame": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.27.1.tgz",
-      "integrity": "sha512-hqoBX4dcZ1I33jCSWcXrP+1Ku7kdqXf1oeah7ooKOIiAdKQ+uqftgCFNOSzA5AMS2XIHEYeGFg4cKRCdpxzVOQ==",
+    "node_modules/@babel/traverse": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz",
+      "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.7",
+        "@babel/helper-globals": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.7",
+        "debug": "^4.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.27.1.tgz",
-      "integrity": "sha512-iCsytMg/N9/oFq6n+gFTvUYDZQOMK5kEdeYxmxt91fcJGycfxVP9CnrxoliM0oumFERba2i8ZtwRUCMhvP1LnA==",
-      "dev": true,
+    "node_modules/@babel/types": {
+      "version": "7.29.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz",
+      "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "@babel/helper-string-parser": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7"
       },
       "engines": {
         "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz",
-      "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==",
+    "node_modules/@bufbuild/protobuf": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.11.0.tgz",
+      "integrity": "sha512-sBXGT13cpmPR5BMgHE6UEEfEaShh5Ror6rfN3yEK5si7QVrtZg8LEPQb0VVhiLRUslD2yLnXtnRzG035J/mZXQ==",
+      "dev": true,
+      "license": "(Apache-2.0 AND BSD-3-Clause)"
+    },
+    "node_modules/@cacheable/memory": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@cacheable/memory/-/memory-2.0.8.tgz",
+      "integrity": "sha512-FvEb29x5wVwu/Kf93IWwsOOEuhHh6dYCJF3vcKLzXc0KXIW181AOzv6ceT4ZpBHDvAfG60eqb+ekmrnLHIy+jw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@cacheable/utils": "^2.4.0",
+        "@keyv/bigmap": "^1.3.1",
+        "hookified": "^1.15.1",
+        "keyv": "^5.6.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.29.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.4.tgz",
-      "integrity": "sha512-N7QmZ0xRZfjHOfZeQLJjwgX2zS9pdGHSVl/cjSGlo4dXMqvurfxXDMKY4RqEKzPozV78VMcd0lxyG13mlbKc4w==",
+    "node_modules/@cacheable/memory/node_modules/@keyv/bigmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@keyv/bigmap/-/bigmap-1.3.1.tgz",
+      "integrity": "sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.28.6",
-        "@babel/helper-plugin-utils": "^7.28.6",
-        "@babel/helper-validator-identifier": "^7.28.5",
-        "@babel/traverse": "^7.29.0"
+        "hashery": "^1.4.0",
+        "hookified": "^1.15.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 18"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "keyv": "^5.6.0"
       }
     },
-    "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.27.1.tgz",
-      "integrity": "sha512-iQBE/xC5BV1OxJbp6WG7jq9IWiD+xxlZhLrdwpPkTX3ydmXdvoCpyfJN7acaIBZaOqTfr76pgzqBJflNbeRK+w==",
+    "node_modules/@cacheable/memory/node_modules/keyv": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+      "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@keyv/serialize": "^1.1.1"
       }
     },
-    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.27.1.tgz",
-      "integrity": "sha512-SstR5JYy8ddZvD6MhV0tM/j16Qds4mIpJTOd1Yu9J9pJjH93bxHECF7pgtc28XvkzTD6Pxcm/0Z73Hvk7kb3Ng==",
+    "node_modules/@cacheable/utils": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@cacheable/utils/-/utils-2.4.0.tgz",
+      "integrity": "sha512-PeMMsqjVq+bF0WBsxFBxr/WozBJiZKY0rUojuaCoIaKnEl3Ju1wfEwS+SV1DU/cSe8fqHIPiYJFif8T3MVt4cQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "hashery": "^1.5.0",
+        "keyv": "^5.6.0"
       }
     },
-    "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.27.1.tgz",
-      "integrity": "sha512-f6PiYeqXQ05lYq3TIfIDu/MtliKUbNwkGApPUvyo6+tc7uaR4cPjPe7DFPr15Uyycg2lZU6btZ575CuQoYh7MQ==",
+    "node_modules/@cacheable/utils/node_modules/keyv": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+      "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@keyv/serialize": "^1.1.1"
       }
     },
-    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.27.1.tgz",
-      "integrity": "sha512-aGZh6xMo6q9vq1JGcw58lZ1Z0+i0xB2x0XaauNIUXd6O1xXc3RwoWEBlsTQrY4KQ9Jf0s5rgD6SiNkaUdJegTA==",
-      "dev": true,
+    "node_modules/@claviska/jquery-minicolors": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.6.tgz",
+      "integrity": "sha512-8Ro6D4GCrmOl41+6w4NFhEOpx8vjxwVRI69bulXsFDt49uVRKhLU5TnzEV7AmOJrylkVq+ugnYNMiGHBieeKUQ==",
       "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "jquery": ">= 1.7.x"
       }
     },
-    "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.27.1.tgz",
-      "integrity": "sha512-fdPKAcujuvEChxDBJ5c+0BTaS6revLV7CJL08e4m3de8qJfNIuCc2nc7XJYOjBoTMJeqSmwXJ0ypE14RCjLwaw==",
-      "dev": true,
+    "node_modules/@codemirror/autocomplete": {
+      "version": "6.20.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.20.1.tgz",
+      "integrity": "sha512-1cvg3Vz1dSSToCNlJfRA2WSI4ht3K+WplO0UMOgmUYPivCyy2oueZY6Lx7M9wThm7SDUBViRmuT+OG/i8+ON9A==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.17.0",
+        "@lezer/common": "^1.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.28.4.tgz",
-      "integrity": "sha512-373KA2HQzKhQCYiRVIRr+3MjpCObqzDlyrM6u4I201wL8Mp2wHf7uB8GhDwis03k2ti8Zr65Zyyqs1xOxUF/Ew==",
-      "dev": true,
+    "node_modules/@codemirror/commands": {
+      "version": "6.10.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.10.3.tgz",
+      "integrity": "sha512-JFRiqhKu+bvSkDLI+rUhJwSxQxYb759W5GBezE8Uc8mHLqC9aV/9aTC7yJSqCtB3F00pylrLCwnyS91Ap5ej4Q==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/plugin-transform-destructuring": "^7.28.0",
-        "@babel/plugin-transform-parameters": "^7.27.7",
-        "@babel/traverse": "^7.28.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.6.0",
+        "@codemirror/view": "^6.27.0",
+        "@lezer/common": "^1.1.0"
       }
     },
-    "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.27.1.tgz",
-      "integrity": "sha512-SFy8S9plRPbIcxlJ8A6mT/CxFdJx/c04JEctz4jf8YZaVS2px34j7NXRrlGlHkN/M2gnpL37ZpGRGVFLd3l8Ng==",
-      "dev": true,
+    "node_modules/@codemirror/lang-css": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.1.tgz",
+      "integrity": "sha512-kr5fwBGiGtmz6l0LSJIbno9QrifNMUusivHbnA1H6Dmqy4HZFte3UAICix1VuKo0lMPKQr2rqB+0BkKi/S3Ejg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-replace-supers": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@lezer/common": "^1.0.2",
+        "@lezer/css": "^1.1.7"
       }
     },
-    "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.27.1.tgz",
-      "integrity": "sha512-txEAEKzYrHEX4xSZN4kJ+OfKXFVSWKB2ZxM9dpcE3wT7smwkNmXo5ORRlVzMVdJbD+Q8ILTgSD7959uj+3Dm3Q==",
-      "dev": true,
+    "node_modules/@codemirror/lang-html": {
+      "version": "6.4.11",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.11.tgz",
+      "integrity": "sha512-9NsXp7Nwp891pQchI7gPdTwBuSuT3K65NGTHWHNJ55HjYcHLllr0rbIZNdOzas9ztc1EUVBlHou85FFZS4BNnw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/lang-css": "^6.0.0",
+        "@codemirror/lang-javascript": "^6.0.0",
+        "@codemirror/language": "^6.4.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.17.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/css": "^1.1.0",
+        "@lezer/html": "^1.3.12"
       }
     },
-    "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.27.1.tgz",
-      "integrity": "sha512-BQmKPPIuc8EkZgNKsv0X4bPmOoayeu4F1YCwx2/CfmDSXDbp7GnzlUH+/ul5VGfRg1AoFPsrIThlEBj2xb4CAg==",
-      "dev": true,
+    "node_modules/@codemirror/lang-javascript": {
+      "version": "6.2.5",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.5.tgz",
+      "integrity": "sha512-zD4e5mS+50htS7F+TYjBPsiIFGanfVqg4HyUz6WNFikgOPf2BgKlx+TQedI1w6n/IqRBVBbBWmGFdLB/7uxO4A==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.6.0",
+        "@codemirror/lint": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.17.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/javascript": "^1.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.27.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.27.7.tgz",
-      "integrity": "sha512-qBkYTYCb76RRxUM6CcZA5KRu8K4SM8ajzVeUgVdMVO9NN9uI/GaVmBg/WKJJGnNokV9SY8FxNOVWGXzqzUidBg==",
-      "dev": true,
+    "node_modules/@codemirror/lang-json": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.2.tgz",
+      "integrity": "sha512-x2OtO+AvwEHrEwR0FyyPtfDUiloG3rnVTSZV1W8UteaLL8/MajQd8DpvUb2YVzC+/T18aSDv0H9mu+xw0EStoQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/language": "^6.0.0",
+        "@lezer/json": "^1.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.27.1.tgz",
-      "integrity": "sha512-10FVt+X55AjRAYI9BrdISN9/AQWHqldOeZDUoLyif1Kn05a56xVBXb8ZouL8pZ9jem8QpXaOt8TS7RHUIS+GPA==",
-      "dev": true,
+    "node_modules/@codemirror/lang-markdown": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.5.0.tgz",
+      "integrity": "sha512-0K40bZ35jpHya6FriukbgaleaqzBLZfOh7HuzqbMxBXkbYMJDxfF39c23xOgxFezR+3G+tR2/Mup+Xk865OMvw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/autocomplete": "^6.7.1",
+        "@codemirror/lang-html": "^6.0.0",
+        "@codemirror/language": "^6.3.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.2.1",
+        "@lezer/markdown": "^1.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.27.1.tgz",
-      "integrity": "sha512-5J+IhqTi1XPa0DXF83jYOaARrX+41gOewWbkPyjMNRDqgOCqdffGh8L3f/Ek5utaEBZExjSAzcyjmV9SSAWObQ==",
-      "dev": true,
+    "node_modules/@codemirror/lang-php": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-php/-/lang-php-6.0.2.tgz",
+      "integrity": "sha512-ZKy2v1n8Fc8oEXj0Th0PUMXzQJ0AIR6TaZU+PbDHExFwdu+guzOA4jmCHS1Nz4vbFezwD7LyBdDnddSJeScMCA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.27.1",
-        "@babel/helper-create-class-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/lang-html": "^6.0.0",
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/php": "^1.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.27.1.tgz",
-      "integrity": "sha512-oThy3BCuCha8kDZ8ZkgOg2exvPYUlprMukKQXI1r1pJ47NCvxfkEy8vK+r/hT9nF0Aa4H1WUPZZjHTFtAhGfmQ==",
-      "dev": true,
+    "node_modules/@codemirror/lang-xml": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.1.0.tgz",
+      "integrity": "sha512-3z0blhicHLfwi2UgkZYRPioSgVTo9PV5GP5ducFH6FaHy0IAJRg+ixj5gTR1gnT/glAIC8xv4w2VL1LoZfs+Jg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/autocomplete": "^6.0.0",
+        "@codemirror/language": "^6.4.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/common": "^1.0.0",
+        "@lezer/xml": "^1.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.4.tgz",
-      "integrity": "sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==",
-      "dev": true,
+    "node_modules/@codemirror/language": {
+      "version": "6.12.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.12.2.tgz",
+      "integrity": "sha512-jEPmz2nGGDxhRTg3lTpzmIyGKxz3Gp3SJES4b0nAuE5SWQoKdT5GoQ69cwMmFd+wvFUhYirtDTr0/DRHpQAyWg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.23.0",
+        "@lezer/common": "^1.5.0",
+        "@lezer/highlight": "^1.0.0",
+        "@lezer/lr": "^1.0.0",
+        "style-mod": "^4.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-regexp-modifiers": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.27.1.tgz",
-      "integrity": "sha512-TtEciroaiODtXvLZv4rmfMhkCv8jx3wgKpL68PuiPh2M4fvz5jhsA7697N1gMvkvr/JTF13DrFYyEbY9U7cVPA==",
-      "dev": true,
+    "node_modules/@codemirror/lint": {
+      "version": "6.9.5",
+      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.9.5.tgz",
+      "integrity": "sha512-GElsbU9G7QT9xXhpUg1zWGmftA/7jamh+7+ydKRuT0ORpWS3wOSP0yT1FOlIZa7mIJjpVPipErsyvVqB9cfTFA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.35.0",
+        "crelt": "^1.0.5"
       }
     },
-    "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.27.1.tgz",
-      "integrity": "sha512-V2ABPHIJX4kC7HegLkYoDpfg9PVmuWy/i6vUM5eGK22bx4YVFD3M5F0QQnWQoDs6AGsUWTVOopBiMFQgHaSkVw==",
-      "dev": true,
+    "node_modules/@codemirror/search": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.6.0.tgz",
+      "integrity": "sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.37.0",
+        "crelt": "^1.0.5"
       }
     },
-    "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.27.1.tgz",
-      "integrity": "sha512-N/wH1vcn4oYawbJ13Y/FxcQrWk63jhfNa7jef0ih7PHSIHX2LB7GWE1rkPrOnka9kwMxb6hMl19p7lidA+EHmQ==",
-      "dev": true,
+    "node_modules/@codemirror/state": {
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.6.0.tgz",
+      "integrity": "sha512-4nbvra5R5EtiCzr9BTHiTLc+MLXK2QGiAVYMyi8PkQd3SR+6ixar/Q/01Fa21TBIDOZXgeWV4WppsQolSreAPQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@marijn/find-cluster-break": "^1.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.27.1.tgz",
-      "integrity": "sha512-kpb3HUqaILBJcRFVhFUs6Trdd4mkrzcGXss+6/mxUd273PfbWqSDHRzMT2234gIg2QYfAjvXLSquP1xECSg09Q==",
-      "dev": true,
+    "node_modules/@codemirror/theme-one-dark": {
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.3.tgz",
+      "integrity": "sha512-NzBdIvEJmx6fjeremiGp3t/okrLPYT0d9orIc7AFun8oZcRk58aejkqhv6spnz4MLAevrKNPMQYXEWMg4s+sKA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/highlight": "^1.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.27.1.tgz",
-      "integrity": "sha512-lhInBO5bi/Kowe2/aLdBAawijx+q1pQzicSgnkB6dUPc1+RC8QmJHKf2OjvU+NZWitguJHEaEmbV6VWEouT58g==",
-      "dev": true,
+    "node_modules/@codemirror/view": {
+      "version": "6.40.0",
+      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.40.0.tgz",
+      "integrity": "sha512-WA0zdU7xfF10+5I3HhUUq3kqOx3KjqmtQ9lqZjfK7jtYk4G72YW9rezcSywpaUMCWOMlq+6E0pO1IWg1TNIhtg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@codemirror/state": "^6.6.0",
+        "crelt": "^1.0.6",
+        "style-mod": "^4.1.0",
+        "w3c-keyname": "^2.2.4"
       }
     },
-    "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.27.1.tgz",
-      "integrity": "sha512-fBJKiV7F2DxZUkg5EtHKXQdbsbURW3DZKQUWphDum0uRP6eHGGa/He9mc0mypL680pb+e/lDIthRohlv8NCHkg==",
+    "node_modules/@csstools/css-parser-algorithms": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
+      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
       "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
-    "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.27.1.tgz",
-      "integrity": "sha512-RiSILC+nRJM7FY5srIyc4/fGIwUhyDuuBSdWn4y6yT6gm652DpCHZjIipgn6B7MQ1ITOUnAKWixEUjQRIBIcLw==",
+    "node_modules/@csstools/css-syntax-patches-for-csstree": {
+      "version": "1.0.29",
+      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.29.tgz",
+      "integrity": "sha512-jx9GjkkP5YHuTmko2eWAvpPnb0mB4mGRr2U7XwVNwevm8nlpobZEVk+GNmiYMk2VuA75v+plfXWyroWKmICZXg==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0"
     },
-    "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.27.1.tgz",
-      "integrity": "sha512-Ysg4v6AmF26k9vpfFuTZg8HRfVWzsh1kVfowA23y9j/Gu6dOuahdUVhkLqpObp3JIv27MLSii6noRnuKN8H0Mg==",
+    "node_modules/@csstools/css-tokenizer": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
+      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
       "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.27.1.tgz",
-      "integrity": "sha512-uW20S39PnaTImxp39O5qFlHLS9LJEmANjMG7SxIhap8rCHqu0Ik+tLEPX5DKmHn6CsWQ7j3lix2tFOa5YtL12Q==",
+    "node_modules/@csstools/media-query-list-parser": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.3.tgz",
+      "integrity": "sha512-HAYH7d3TLRHDOUQK4mZKf9k9Ph/m8Akstg66ywKR4SFAigjs3yBiUeZtFxywiTm5moZMAp/5W/ZuFnNXXYLuuQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
       "license": "MIT",
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.27.1.tgz",
-      "integrity": "sha512-xvINq24TRojDuyt6JGtHmkVkrfVV3FPT16uytxImLeBZqW3/H52yN+kM1MGuyPkIQxrzKwPHs5U/MP3qKyzkGw==",
+    "node_modules/@csstools/selector-specificity": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
+      "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
-      },
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/csstools"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/csstools"
+        }
+      ],
+      "license": "MIT-0",
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "postcss-selector-parser": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.27.1.tgz",
-      "integrity": "sha512-EtkOujbc4cgvb0mlpQefi4NTPBzhSIevblFevACNLUspmrALgmEBdL/XfnyyITfd8fKBZrZys92zOWcik7j9Tw==",
+    "node_modules/@cypress/request": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-4.0.1.tgz",
+      "integrity": "sha512-y20e+e6dFYkOUUJLVUZTsJRuTiXZaUQ32WD+R/ux/HBybbTx4ge7cNINcua0pU8+SNkKuRbOF12mBmzuzM8n5w==",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.27.1",
-        "@babel/helper-plugin-utils": "^7.27.1"
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~4.0.4",
+        "http-signature": "~1.4.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "performance-now": "^2.1.0",
+        "qs": "^6.15.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "^5.0.0",
+        "tunnel-agent": "^0.6.0"
       },
       "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "node": ">= 14.17.0"
       }
     },
-    "node_modules/@babel/preset-env": {
-      "version": "7.28.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.28.3.tgz",
-      "integrity": "sha512-ROiDcM+GbYVPYBOeCR6uBXKkQpBExLl8k9HO1ygXEyds39j+vCCsjmj7S8GOniZQlEs81QlkdJZe76IpLSiqpg==",
+    "node_modules/@cypress/xvfb": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
+      "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.28.0",
-        "@babel/helper-compilation-targets": "^7.27.2",
-        "@babel/helper-plugin-utils": "^7.27.1",
-        "@babel/helper-validator-option": "^7.27.1",
-        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.27.1",
-        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.3",
-        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
-        "@babel/plugin-syntax-import-assertions": "^7.27.1",
-        "@babel/plugin-syntax-import-attributes": "^7.27.1",
-        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.27.1",
-        "@babel/plugin-transform-async-generator-functions": "^7.28.0",
-        "@babel/plugin-transform-async-to-generator": "^7.27.1",
-        "@babel/plugin-transform-block-scoped-functions": "^7.27.1",
-        "@babel/plugin-transform-block-scoping": "^7.28.0",
-        "@babel/plugin-transform-class-properties": "^7.27.1",
-        "@babel/plugin-transform-class-static-block": "^7.28.3",
-        "@babel/plugin-transform-classes": "^7.28.3",
-        "@babel/plugin-transform-computed-properties": "^7.27.1",
-        "@babel/plugin-transform-destructuring": "^7.28.0",
-        "@babel/plugin-transform-dotall-regex": "^7.27.1",
-        "@babel/plugin-transform-duplicate-keys": "^7.27.1",
-        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.27.1",
-        "@babel/plugin-transform-dynamic-import": "^7.27.1",
-        "@babel/plugin-transform-explicit-resource-management": "^7.28.0",
-        "@babel/plugin-transform-exponentiation-operator": "^7.27.1",
-        "@babel/plugin-transform-export-namespace-from": "^7.27.1",
-        "@babel/plugin-transform-for-of": "^7.27.1",
-        "@babel/plugin-transform-function-name": "^7.27.1",
-        "@babel/plugin-transform-json-strings": "^7.27.1",
-        "@babel/plugin-transform-literals": "^7.27.1",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.27.1",
-        "@babel/plugin-transform-member-expression-literals": "^7.27.1",
-        "@babel/plugin-transform-modules-amd": "^7.27.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.27.1",
-        "@babel/plugin-transform-modules-systemjs": "^7.27.1",
-        "@babel/plugin-transform-modules-umd": "^7.27.1",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.27.1",
-        "@babel/plugin-transform-new-target": "^7.27.1",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.27.1",
-        "@babel/plugin-transform-numeric-separator": "^7.27.1",
-        "@babel/plugin-transform-object-rest-spread": "^7.28.0",
-        "@babel/plugin-transform-object-super": "^7.27.1",
-        "@babel/plugin-transform-optional-catch-binding": "^7.27.1",
-        "@babel/plugin-transform-optional-chaining": "^7.27.1",
-        "@babel/plugin-transform-parameters": "^7.27.7",
-        "@babel/plugin-transform-private-methods": "^7.27.1",
-        "@babel/plugin-transform-private-property-in-object": "^7.27.1",
-        "@babel/plugin-transform-property-literals": "^7.27.1",
-        "@babel/plugin-transform-regenerator": "^7.28.3",
-        "@babel/plugin-transform-regexp-modifiers": "^7.27.1",
-        "@babel/plugin-transform-reserved-words": "^7.27.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.27.1",
-        "@babel/plugin-transform-spread": "^7.27.1",
-        "@babel/plugin-transform-sticky-regex": "^7.27.1",
-        "@babel/plugin-transform-template-literals": "^7.27.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.27.1",
-        "@babel/plugin-transform-unicode-escapes": "^7.27.1",
-        "@babel/plugin-transform-unicode-property-regex": "^7.27.1",
-        "@babel/plugin-transform-unicode-regex": "^7.27.1",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.27.1",
-        "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.14",
-        "babel-plugin-polyfill-corejs3": "^0.13.0",
-        "babel-plugin-polyfill-regenerator": "^0.6.5",
-        "core-js-compat": "^3.43.0",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/preset-env/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+        "debug": "^3.1.0",
+        "lodash.once": "^4.1.1"
       }
     },
-    "node_modules/@babel/preset-modules": {
-      "version": "0.1.6-no-external-plugins",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
-      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+    "node_modules/@cypress/xvfb/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/types": "^7.4.4",
-        "esutils": "^2.0.2"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/@babel/runtime": {
-      "version": "7.28.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
-      "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
+    "node_modules/@dual-bundle/import-meta-resolve": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.2.1.tgz",
+      "integrity": "sha512-id+7YRUgoUX6CgV0DtuhirQWodeeA7Lf4i2x71JS/vtA5pRb/hIGWlw+G6MeXvsM+MXrz0VAydTGElX1rAfgPg==",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/JounQin"
       }
     },
-    "node_modules/@babel/template": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz",
-      "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==",
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz",
+      "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==",
+      "cpu": [
+        "ppc64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.29.7",
-        "@babel/parser": "^7.29.7",
-        "@babel/types": "^7.29.7"
-      },
+      "optional": true,
+      "os": [
+        "aix"
+      ],
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/traverse": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz",
-      "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==",
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz",
+      "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.29.7",
-        "@babel/generator": "^7.29.7",
-        "@babel/helper-globals": "^7.29.7",
-        "@babel/parser": "^7.29.7",
-        "@babel/template": "^7.29.7",
-        "@babel/types": "^7.29.7",
-        "debug": "^4.3.1"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@babel/types": {
-      "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz",
-      "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==",
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz",
+      "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.29.7",
-        "@babel/helper-validator-identifier": "^7.29.7"
-      },
+      "optional": true,
+      "os": [
+        "android"
+      ],
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@bufbuild/protobuf": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.9.0.tgz",
-      "integrity": "sha512-rnJenoStJ8nvmt9Gzye8nkYd6V22xUAnu4086ER7h1zJ508vStko4pMvDeQ446ilDTFpV5wnoc5YS7XvMwwMqA==",
-      "dev": true,
-      "license": "(Apache-2.0 AND BSD-3-Clause)"
-    },
-    "node_modules/@cacheable/memoize": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@cacheable/memoize/-/memoize-2.0.2.tgz",
-      "integrity": "sha512-wPrr7FUiq3Qt4yQyda2/NcOLTJCFcQSU3Am2adP+WLy+sz93/fKTokVTHmtz+rjp4PD7ee0AEOeRVNN6IvIfsg==",
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz",
+      "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@cacheable/utils": "^2.0.2"
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@cacheable/memory": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@cacheable/memory/-/memory-2.0.2.tgz",
-      "integrity": "sha512-sJTITLfeCI1rg7P3ssaGmQryq235EGT8dXGcx6oZwX5NRnKq9IE6lddlllcOl+oXW+yaeTRddCjo0xrfU6ZySA==",
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz",
+      "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@cacheable/memoize": "^2.0.1",
-        "@cacheable/utils": "^2.0.2",
-        "@keyv/bigmap": "^1.0.2",
-        "hookified": "^1.12.1",
-        "keyv": "^5.5.2"
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@cacheable/memory/node_modules/keyv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.2.tgz",
-      "integrity": "sha512-TXcFHbmm/z7MGd1u9ASiCSfTS+ei6Z8B3a5JHzx3oPa/o7QzWVtPRpc4KGER5RR469IC+/nfg4U5YLIuDUua2g==",
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz",
+      "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@keyv/serialize": "^1.1.1"
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@cacheable/utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@cacheable/utils/-/utils-2.0.2.tgz",
-      "integrity": "sha512-JTFM3raFhVv8LH95T7YnZbf2YoE9wEtkPPStuRF9a6ExZ103hFvs+QyCuYJ6r0hA9wRtbzgZtwUCoDWxssZd4Q==",
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@claviska/jquery-minicolors": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.6.tgz",
-      "integrity": "sha512-8Ro6D4GCrmOl41+6w4NFhEOpx8vjxwVRI69bulXsFDt49uVRKhLU5TnzEV7AmOJrylkVq+ugnYNMiGHBieeKUQ==",
       "license": "MIT",
-      "peerDependencies": {
-        "jquery": ">= 1.7.x"
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@codemirror/autocomplete": {
-      "version": "6.18.7",
-      "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.18.7.tgz",
-      "integrity": "sha512-8EzdeIoWPJDsMBwz3zdzwXnUpCzMiCyz5/A3FIPpriaclFCGDkAzK13sMcnsu5rowqiyeQN2Vs2TsOcoDPZirQ==",
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz",
+      "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.17.0",
-        "@lezer/common": "^1.0.0"
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@codemirror/commands": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.8.1.tgz",
-      "integrity": "sha512-KlGVYufHMQzxbdQONiLyGQDUW0itrLZwq3CcY7xpv9ZLRHqzkBSoteocBHtMCoY7/Ci4xhzSrToIeLg7FxHuaw==",
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz",
+      "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.4.0",
-        "@codemirror/view": "^6.27.0",
-        "@lezer/common": "^1.1.0"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@codemirror/lang-css": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.1.tgz",
-      "integrity": "sha512-kr5fwBGiGtmz6l0LSJIbno9QrifNMUusivHbnA1H6Dmqy4HZFte3UAICix1VuKo0lMPKQr2rqB+0BkKi/S3Ejg==",
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz",
+      "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@codemirror/autocomplete": "^6.0.0",
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@lezer/common": "^1.0.2",
-        "@lezer/css": "^1.1.7"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@codemirror/lang-html": {
-      "version": "6.4.10",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-html/-/lang-html-6.4.10.tgz",
-      "integrity": "sha512-h/SceTVsN5r+WE+TVP2g3KDvNoSzbSrtZXCKo4vkKdbfT5t4otuVgngGdFukOO/rwRD2++pCxoh6xD4TEVMkQA==",
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz",
+      "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@codemirror/autocomplete": "^6.0.0",
-        "@codemirror/lang-css": "^6.0.0",
-        "@codemirror/lang-javascript": "^6.0.0",
-        "@codemirror/language": "^6.4.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.17.0",
-        "@lezer/common": "^1.0.0",
-        "@lezer/css": "^1.1.0",
-        "@lezer/html": "^1.3.0"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@codemirror/lang-javascript": {
-      "version": "6.2.4",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.2.4.tgz",
-      "integrity": "sha512-0WVmhp1QOqZ4Rt6GlVGwKJN3KW7Xh4H2q8ZZNGZaP6lRdxXJzmjm4FqvmOojVj6khWJHIb9sp7U/72W7xQgqAA==",
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz",
+      "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@codemirror/autocomplete": "^6.0.0",
-        "@codemirror/language": "^6.6.0",
-        "@codemirror/lint": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.17.0",
-        "@lezer/common": "^1.0.0",
-        "@lezer/javascript": "^1.0.0"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@codemirror/lang-json": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.2.tgz",
-      "integrity": "sha512-x2OtO+AvwEHrEwR0FyyPtfDUiloG3rnVTSZV1W8UteaLL8/MajQd8DpvUb2YVzC+/T18aSDv0H9mu+xw0EStoQ==",
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz",
+      "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@codemirror/language": "^6.0.0",
-        "@lezer/json": "^1.0.0"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@codemirror/lang-markdown": {
-      "version": "6.3.4",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-markdown/-/lang-markdown-6.3.4.tgz",
-      "integrity": "sha512-fBm0BO03azXnTAsxhONDYHi/qWSI+uSEIpzKM7h/bkIc9fHnFp9y7KTMXKON0teNT97pFhc1a9DQTtWBYEZ7ug==",
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz",
+      "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@codemirror/autocomplete": "^6.7.1",
-        "@codemirror/lang-html": "^6.0.0",
-        "@codemirror/language": "^6.3.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
-        "@lezer/common": "^1.2.1",
-        "@lezer/markdown": "^1.0.0"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@codemirror/lang-php": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-php/-/lang-php-6.0.2.tgz",
-      "integrity": "sha512-ZKy2v1n8Fc8oEXj0Th0PUMXzQJ0AIR6TaZU+PbDHExFwdu+guzOA4jmCHS1Nz4vbFezwD7LyBdDnddSJeScMCA==",
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz",
+      "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@codemirror/lang-html": "^6.0.0",
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@lezer/common": "^1.0.0",
-        "@lezer/php": "^1.0.0"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@codemirror/lang-xml": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.1.0.tgz",
-      "integrity": "sha512-3z0blhicHLfwi2UgkZYRPioSgVTo9PV5GP5ducFH6FaHy0IAJRg+ixj5gTR1gnT/glAIC8xv4w2VL1LoZfs+Jg==",
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz",
+      "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@codemirror/autocomplete": "^6.0.0",
-        "@codemirror/language": "^6.4.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
-        "@lezer/common": "^1.0.0",
-        "@lezer/xml": "^1.0.0"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@codemirror/language": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.11.3.tgz",
-      "integrity": "sha512-9HBM2XnwDj7fnu0551HkGdrUrrqmYq/WC5iv6nbY2WdicXdGbhR/gfbZOH73Aqj4351alY1+aoG9rCNfiwS1RA==",
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.7.tgz",
+      "integrity": "sha512-hzznmADPt+OmsYzw1EE33ccA+HPdIqiCRq7cQeL1Jlq2gb1+OyWBkMCrYGBJ+sxVzve2ZJEVeePbLM2iEIZSxA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.23.0",
-        "@lezer/common": "^1.1.0",
-        "@lezer/highlight": "^1.0.0",
-        "@lezer/lr": "^1.0.0",
-        "style-mod": "^4.0.0"
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@codemirror/lint": {
-      "version": "6.8.5",
-      "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.5.tgz",
-      "integrity": "sha512-s3n3KisH7dx3vsoeGMxsbRAgKe4O1vbrnKBClm99PU0fWxmxsx5rR2PfqQgIt+2MMJBHbiJ5rfIdLYfB9NNvsA==",
-      "license": "MIT",
-      "dependencies": {
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.35.0",
-        "crelt": "^1.0.5"
-      }
-    },
-    "node_modules/@codemirror/search": {
-      "version": "6.5.11",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.11.tgz",
-      "integrity": "sha512-KmWepDE6jUdL6n8cAAqIpRmLPBZ5ZKnicE8oGU/s3QrAVID+0VhLFrzUucVKHG5035/BSykhExDL/Xm7dHthiA==",
-      "license": "MIT",
-      "dependencies": {
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
-        "crelt": "^1.0.5"
-      }
-    },
-    "node_modules/@codemirror/state": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.5.2.tgz",
-      "integrity": "sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==",
-      "license": "MIT",
-      "dependencies": {
-        "@marijn/find-cluster-break": "^1.0.0"
-      }
-    },
-    "node_modules/@codemirror/theme-one-dark": {
-      "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.3.tgz",
-      "integrity": "sha512-NzBdIvEJmx6fjeremiGp3t/okrLPYT0d9orIc7AFun8oZcRk58aejkqhv6spnz4MLAevrKNPMQYXEWMg4s+sKA==",
-      "license": "MIT",
-      "dependencies": {
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0",
-        "@lezer/highlight": "^1.0.0"
-      }
-    },
-    "node_modules/@codemirror/view": {
-      "version": "6.38.3",
-      "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.38.3.tgz",
-      "integrity": "sha512-x2t87+oqwB1mduiQZ6huIghjMt4uZKFEdj66IcXw7+a5iBEvv9lh7EWDRHI7crnD4BMGpnyq/RzmCGbiEZLcvQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@codemirror/state": "^6.5.0",
-        "crelt": "^1.0.6",
-        "style-mod": "^4.1.0",
-        "w3c-keyname": "^2.2.4"
-      }
-    },
-    "node_modules/@csstools/css-parser-algorithms": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
-      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@csstools/css-tokenizer": "^3.0.4"
-      }
-    },
-    "node_modules/@csstools/css-tokenizer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
-      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@csstools/media-query-list-parser": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.3.tgz",
-      "integrity": "sha512-HAYH7d3TLRHDOUQK4mZKf9k9Ph/m8Akstg66ywKR4SFAigjs3yBiUeZtFxywiTm5moZMAp/5W/ZuFnNXXYLuuQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.5",
-        "@csstools/css-tokenizer": "^3.0.4"
-      }
-    },
-    "node_modules/@csstools/selector-specificity": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
-      "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "license": "MIT-0",
-      "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "postcss-selector-parser": "^7.0.0"
-      }
-    },
-    "node_modules/@cypress/request": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.10.tgz",
-      "integrity": "sha512-hauBrOdvu08vOsagkZ/Aju5XuiZx6ldsLfByg1htFeldhex+PeMrYauANzFsMJeAA0+dyPLbDoX2OYuvVoLDkQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~4.0.4",
-        "http-signature": "~1.4.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "performance-now": "^2.1.0",
-        "qs": "~6.14.1",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "^5.0.0",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^8.3.2"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/@cypress/xvfb": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
-      "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^3.1.0",
-        "lodash.once": "^4.1.1"
-      }
-    },
-    "node_modules/@cypress/xvfb/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/@dual-bundle/import-meta-resolve": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@dual-bundle/import-meta-resolve/-/import-meta-resolve-4.2.1.tgz",
-      "integrity": "sha512-id+7YRUgoUX6CgV0DtuhirQWodeeA7Lf4i2x71JS/vtA5pRb/hIGWlw+G6MeXvsM+MXrz0VAydTGElX1rAfgPg==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/JounQin"
-      }
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz",
-      "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "aix"
+        "netbsd"
       ],
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.10.tgz",
-      "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==",
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz",
+      "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==",
       "cpu": [
-        "arm"
+        "x64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "android"
+        "netbsd"
       ],
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz",
-      "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==",
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==",
       "cpu": [
         "arm64"
       ],
@@ -2915,16 +2447,16 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "android"
+        "openbsd"
       ],
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.10.tgz",
-      "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==",
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz",
+      "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==",
       "cpu": [
         "x64"
       ],
@@ -2932,16 +2464,16 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "android"
+        "openbsd"
       ],
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz",
-      "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==",
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz",
+      "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==",
       "cpu": [
         "arm64"
       ],
@@ -2949,16 +2481,16 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "darwin"
+        "openharmony"
       ],
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz",
-      "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==",
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz",
+      "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==",
       "cpu": [
         "x64"
       ],
@@ -2966,16 +2498,16 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "darwin"
+        "sunos"
       ],
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz",
-      "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==",
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz",
+      "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==",
       "cpu": [
         "arm64"
       ],
@@ -2983,352 +2515,63 @@
       "license": "MIT",
       "optional": true,
       "os": [
-        "freebsd"
+        "win32"
       ],
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz",
-      "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==",
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz",
+      "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==",
       "cpu": [
-        "x64"
+        "ia32"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "freebsd"
+        "win32"
       ],
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz",
-      "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==",
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz",
+      "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==",
       "cpu": [
-        "arm"
+        "x64"
       ],
       "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "win32"
       ],
       "engines": {
         "node": ">=18"
       }
     },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz",
-      "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==",
-      "cpu": [
-        "arm64"
-      ],
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz",
+      "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+      "dependencies": {
+        "eslint-visitor-keys": "^3.4.3"
+      },
       "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz",
-      "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz",
-      "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz",
-      "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz",
-      "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz",
-      "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz",
-      "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz",
-      "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz",
-      "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz",
-      "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz",
-      "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz",
-      "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz",
-      "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz",
-      "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz",
-      "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz",
-      "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz",
-      "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.9.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
-      "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
     "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
@@ -3345,9 +2588,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+      "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3355,34 +2598,37 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
-      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
+      "version": "0.21.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.2.tgz",
+      "integrity": "sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/object-schema": "^2.1.6",
+        "@eslint/object-schema": "^2.1.7",
         "debug": "^4.3.1",
-        "minimatch": "^3.1.2"
+        "minimatch": "^3.1.5"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
-      "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
+      "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
       "dev": true,
       "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^0.17.0"
+      },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
-      "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
+      "version": "0.17.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
+      "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -3393,20 +2639,20 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
-      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.5.tgz",
+      "integrity": "sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ajv": "^6.12.4",
+        "ajv": "^6.14.0",
         "debug": "^4.3.2",
         "espree": "^10.0.1",
         "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
+        "js-yaml": "^4.1.1",
+        "minimatch": "^3.1.5",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
@@ -3417,9 +2663,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.36.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.36.0.tgz",
-      "integrity": "sha512-uhCbYtYynH30iZErszX78U+nR3pJU3RHGQ57NXy5QupD4SBVwDeU8TNBy+MjMngc1UyIW9noKqsRqfjQTBU2dw==",
+      "version": "9.39.4",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz",
+      "integrity": "sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3430,9 +2676,9 @@
       }
     },
     "node_modules/@eslint/object-schema": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
-      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
+      "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -3440,13 +2686,13 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
-      "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz",
+      "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.15.2",
+        "@eslint/core": "^0.17.0",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -3454,28 +2700,28 @@
       }
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.3.tgz",
-      "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz",
+      "integrity": "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.10"
+        "@floating-ui/utils": "^0.2.11"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz",
-      "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
+      "version": "1.7.6",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz",
+      "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/core": "^1.7.3",
-        "@floating-ui/utils": "^0.2.10"
+        "@floating-ui/core": "^1.7.5",
+        "@floating-ui/utils": "^0.2.11"
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.10",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
-      "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz",
+      "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
       "license": "MIT"
     },
     "node_modules/@fortawesome/fontawesome-free": {
@@ -3539,118 +2785,15 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@isaacs/cliui": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "string-width": "^5.1.2",
-        "string-width-cjs": "npm:string-width@^4.2.0",
-        "strip-ansi": "^7.0.1",
-        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-        "wrap-ansi": "^8.1.0",
-        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@isaacs/cliui/node_modules/string-width": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eastasianwidth": "^0.2.0",
-        "emoji-regex": "^9.2.2",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.1.0",
-        "string-width": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
-      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0",
-        "@jridgewell/trace-mapping": "^0.3.24"
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
       }
     },
     "node_modules/@jridgewell/remapping": {
@@ -3691,19 +2834,6 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@keyv/bigmap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@keyv/bigmap/-/bigmap-1.0.2.tgz",
-      "integrity": "sha512-KR03xkEZlAZNF4IxXgVXb+uNIVNvwdh8UwI0cnc7WI6a+aQcDp8GL80qVfeB4E5NpsKJzou5jU0r6yLSSbMOtA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "hookified": "^1.12.1"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
     "node_modules/@keyv/serialize": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
@@ -3712,15 +2842,15 @@
       "license": "MIT"
     },
     "node_modules/@lezer/common": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.2.3.tgz",
-      "integrity": "sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.5.1.tgz",
+      "integrity": "sha512-6YRVG9vBkaY7p1IVxL4s44n5nUnaNnGM2/AckNgYOnxTG2kWh1vR8BMxPseWPjRNpb5VtXnMpeYAEAADoRV1Iw==",
       "license": "MIT"
     },
     "node_modules/@lezer/css": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.0.tgz",
-      "integrity": "sha512-pBL7hup88KbI7hXnZV3PQsn43DHy6TWyzuyk2AO9UyoXcDltvIdqWKE1dLL/45JVZ+YZkHe1WVHqO6wugZZWcw==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.3.1.tgz",
+      "integrity": "sha512-PYAKeUVBo3HFThruRyp/iK91SwiZJnzXh8QzkQlwijB5y+N5iB28+iLk78o2zmKqqV0uolNhCwFqB8LA7b0Svg==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
@@ -3729,18 +2859,18 @@
       }
     },
     "node_modules/@lezer/highlight": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.1.tgz",
-      "integrity": "sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.2.3.tgz",
+      "integrity": "sha512-qXdH7UqTvGfdVBINrgKhDsVTJTxactNNxLk7+UMwZhU13lMHaOBlJe9Vqp907ya56Y3+ed2tlqzys7jDkTmW0g==",
       "license": "MIT",
       "dependencies": {
-        "@lezer/common": "^1.0.0"
+        "@lezer/common": "^1.3.0"
       }
     },
     "node_modules/@lezer/html": {
-      "version": "1.3.11",
-      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.11.tgz",
-      "integrity": "sha512-SV04kK5EHDPPecMCiFNZAnQhUIxktP04yHxgOKK7TZ3+KUAlK9f4dcYbjAWwDx2C2pJmiOeSV05QEbHeQo5JqA==",
+      "version": "1.3.13",
+      "resolved": "https://registry.npmjs.org/@lezer/html/-/html-1.3.13.tgz",
+      "integrity": "sha512-oI7n6NJml729m7pjm9lvLvmXbdoMoi2f+1pwSDJkl9d68zGr7a9Btz8NdHTGQZtW2DA25ybeuv/SyDb9D5tseg==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
@@ -3771,21 +2901,21 @@
       }
     },
     "node_modules/@lezer/lr": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.2.tgz",
-      "integrity": "sha512-pu0K1jCIdnQ12aWNaAVU5bzi7Bd1w54J3ECgANPmYLtQKP0HBj2cE/5coBD66MT10xbtIuUr7tg0Shbsvk0mDA==",
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.8.tgz",
+      "integrity": "sha512-bPWa0Pgx69ylNlMlPvBPryqeLYQjyJjqPx+Aupm5zydLIF3NE+6MMLT8Yi23Bd9cif9VS00aUebn+6fDIGBcDA==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.0.0"
       }
     },
     "node_modules/@lezer/markdown": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.4.3.tgz",
-      "integrity": "sha512-kfw+2uMrQ/wy/+ONfrH83OkdFNM0ye5Xq96cLlaCy7h5UT9FO54DU4oRoIc0CSBh5NWmWuiIJA7NGLMJbQ+Oxg==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@lezer/markdown/-/markdown-1.6.3.tgz",
+      "integrity": "sha512-jpGm5Ps+XErS+xA4urw7ogEGkeZOahVQF21Z6oECF0sj+2liwZopd2+I8uH5I/vZsRuuze3OxBREIANLf6KKUw==",
       "license": "MIT",
       "dependencies": {
-        "@lezer/common": "^1.0.0",
+        "@lezer/common": "^1.5.0",
         "@lezer/highlight": "^1.0.0"
       }
     },
@@ -3817,19 +2947,6 @@
       "integrity": "sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==",
       "license": "MIT"
     },
-    "node_modules/@nodable/entities": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/nodable"
-        }
-      ],
-      "license": "MIT"
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3869,18 +2986,18 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
+      "integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "detect-libc": "^1.0.3",
+        "detect-libc": "^2.0.3",
         "is-glob": "^4.0.3",
-        "micromatch": "^4.0.5",
-        "node-addon-api": "^7.0.0"
+        "node-addon-api": "^7.0.0",
+        "picomatch": "^4.0.3"
       },
       "engines": {
         "node": ">= 10.0.0"
@@ -3890,25 +3007,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
+        "@parcel/watcher-android-arm64": "2.5.6",
+        "@parcel/watcher-darwin-arm64": "2.5.6",
+        "@parcel/watcher-darwin-x64": "2.5.6",
+        "@parcel/watcher-freebsd-x64": "2.5.6",
+        "@parcel/watcher-linux-arm-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm-musl": "2.5.6",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.6",
+        "@parcel/watcher-linux-arm64-musl": "2.5.6",
+        "@parcel/watcher-linux-x64-glibc": "2.5.6",
+        "@parcel/watcher-linux-x64-musl": "2.5.6",
+        "@parcel/watcher-win32-arm64": "2.5.6",
+        "@parcel/watcher-win32-ia32": "2.5.6",
+        "@parcel/watcher-win32-x64": "2.5.6"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.6.tgz",
+      "integrity": "sha512-YQxSS34tPF/6ZG7r/Ih9xy+kP/WwediEUsqmtf0cuCV5TPPKw/PQHRhueUo6JdeFJaqV3pyjm0GdYjZotbRt/A==",
       "cpu": [
         "arm64"
       ],
@@ -3927,9 +3044,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz",
+      "integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==",
       "cpu": [
         "arm64"
       ],
@@ -3948,9 +3065,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.6.tgz",
+      "integrity": "sha512-HgvOf3W9dhithcwOWX9uDZyn1lW9R+7tPZ4sug+NGrGIo4Rk1hAXLEbcH1TQSqxts0NYXXlOWqVpvS1SFS4fRg==",
       "cpu": [
         "x64"
       ],
@@ -3969,9 +3086,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.6.tgz",
+      "integrity": "sha512-vJVi8yd/qzJxEKHkeemh7w3YAn6RJCtYlE4HPMoVnCpIXEzSrxErBW5SJBgKLbXU3WdIpkjBTeUNtyBVn8TRng==",
       "cpu": [
         "x64"
       ],
@@ -3990,9 +3107,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.6.tgz",
+      "integrity": "sha512-9JiYfB6h6BgV50CCfasfLf/uvOcJskMSwcdH1PHH9rvS1IrNy8zad6IUVPVUfmXr+u+Km9IxcfMLzgdOudz9EQ==",
       "cpu": [
         "arm"
       ],
@@ -4011,9 +3128,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.6.tgz",
+      "integrity": "sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==",
       "cpu": [
         "arm"
       ],
@@ -4032,9 +3149,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.6.tgz",
+      "integrity": "sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==",
       "cpu": [
         "arm64"
       ],
@@ -4053,9 +3170,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.6.tgz",
+      "integrity": "sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==",
       "cpu": [
         "arm64"
       ],
@@ -4074,9 +3191,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.6.tgz",
+      "integrity": "sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==",
       "cpu": [
         "x64"
       ],
@@ -4095,9 +3212,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.6.tgz",
+      "integrity": "sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==",
       "cpu": [
         "x64"
       ],
@@ -4116,9 +3233,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.6.tgz",
+      "integrity": "sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==",
       "cpu": [
         "arm64"
       ],
@@ -4137,9 +3254,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.6.tgz",
+      "integrity": "sha512-k35yLp1ZMwwee3Ez/pxBi5cf4AoBKYXj00CZ80jUz5h8prpiaQsiRPKQMxoLstNuqe2vR4RNPEAEcjEFzhEz/g==",
       "cpu": [
         "ia32"
       ],
@@ -4158,9 +3275,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+      "version": "2.5.6",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.6.tgz",
+      "integrity": "sha512-hbQlYcCq5dlAX9Qx+kFb0FHue6vbjlf0FrNzSKdYK2APUf7tGfGxQCk2ihEREmbR6ZMc0MVAD5RIX/41gpUzTw==",
       "cpu": [
         "x64"
       ],
@@ -4178,20 +3295,6 @@
         "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/@parcel/watcher/node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
     "node_modules/@popperjs/core": {
       "version": "2.11.8",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
@@ -4203,9 +3306,9 @@
       }
     },
     "node_modules/@rollup/plugin-babel": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-6.0.4.tgz",
-      "integrity": "sha512-YF7Y52kFdFT/xVSuVdjkV5ZdX/3YtmX0QulG+x0taQOtJdHYzVU61aSSkAgVJ7NOv6qPkIYiJSgSWWN/DM5sGw==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-6.1.0.tgz",
+      "integrity": "sha512-dFZNuFD2YRcoomP4oYf+DvQNSUA9ih+A3vUqopQx5EdtPGo3WBnQcI/S8pwpz91UsGfL0HsMSOlaMld8HrbubA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4230,9 +3333,9 @@
       }
     },
     "node_modules/@rollup/plugin-commonjs": {
-      "version": "28.0.6",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-28.0.6.tgz",
-      "integrity": "sha512-XSQB1K7FUU5QP+3lOQmVCE3I0FcbbNvmNT4VJSj93iUjayaARrTQeoRdiYQoftAJBLrR9t2agwAd3ekaTgHNlw==",
+      "version": "29.0.2",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-29.0.2.tgz",
+      "integrity": "sha512-S/ggWH1LU7jTyi9DxZOKyxpVd4hF/OZ0JrEbeLjXk/DFXwRny0tjD2c992zOUYQobLrVkRVMDdmHP16HKP7GRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4257,9 +3360,9 @@
       }
     },
     "node_modules/@rollup/plugin-node-resolve": {
-      "version": "16.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.1.tgz",
-      "integrity": "sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==",
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-16.0.3.tgz",
+      "integrity": "sha512-lUYM3UBGuM93CnMPG1YocWu7X802BrNF3jW2zny5gQyLQgRFJhV1Sq0Zi74+dh/6NBx1DxFC4b4GXg9wUCG5Qg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4282,9 +3385,9 @@
       }
     },
     "node_modules/@rollup/plugin-replace": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-6.0.2.tgz",
-      "integrity": "sha512-7QaYCf8bqF04dOy7w/eHmJeNExxTYwvKAmlSAH/EaWWUzbT0h5sbF6bktFoX/0F/0qwng5/dWFMyf3gzaM8DsQ==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-6.0.3.tgz",
+      "integrity": "sha512-J4RZarRvQAm5IF0/LwUUg+obsm+xZhYnbMXmXROyoSE1ATJe3oXSb9L5MMppdxP2ylNSjv6zFBwKYjcKMucVfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4565,13 +3668,12 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.59.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz",
-      "integrity": "sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==",
+      "version": "4.18.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
+      "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -4695,1505 +3797,552 @@
       },
       "funding": {
         "url": "https://github.com/sponsors/KillyMXI"
-      },
-      "peerDependencies": {
-        "selderee": "~0.12.0"
-      }
-    },
-    "node_modules/@smithy/abort-controller": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.2.8.tgz",
-      "integrity": "sha512-peuVfkYHAmS5ybKxWcfraK7WBBP0J+rkfUcbHJJKQ4ir3UAUNQI+Y4Vt/PqSzGqgloJ5O1dk7+WzNL8wcCSXbw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/config-resolver": {
-      "version": "4.4.6",
-      "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.4.6.tgz",
-      "integrity": "sha512-qJpzYC64kaj3S0fueiu3kXm8xPrR3PcXDPEgnaNMRn0EjNSZFoFjvbUp0YUDsRhN1CB90EnHJtbxWKevnH99UQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/types": "^4.12.0",
-        "@smithy/util-config-provider": "^4.2.0",
-        "@smithy/util-endpoints": "^3.2.8",
-        "@smithy/util-middleware": "^4.2.8",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/core": {
-      "version": "3.22.1",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.22.1.tgz",
-      "integrity": "sha512-x3ie6Crr58MWrm4viHqqy2Du2rHYZjwu8BekasrQx4ca+Y24dzVAwq3yErdqIbc2G3I0kLQA13PQ+/rde+u65g==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/middleware-serde": "^4.2.9",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/types": "^4.12.0",
-        "@smithy/util-base64": "^4.3.0",
-        "@smithy/util-body-length-browser": "^4.2.0",
-        "@smithy/util-middleware": "^4.2.8",
-        "@smithy/util-stream": "^4.5.11",
-        "@smithy/util-utf8": "^4.2.0",
-        "@smithy/uuid": "^1.1.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/credential-provider-imds": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.8.tgz",
-      "integrity": "sha512-FNT0xHS1c/CPN8upqbMFP83+ul5YgdisfCfkZ86Jh2NSmnqw/AJ6x5pEogVCTVvSm7j9MopRU89bmDelxuDMYw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/types": "^4.12.0",
-        "@smithy/url-parser": "^4.2.8",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/fetch-http-handler": {
-      "version": "5.3.9",
-      "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.9.tgz",
-      "integrity": "sha512-I4UhmcTYXBrct03rwzQX1Y/iqQlzVQaPxWjCjula++5EmWq9YGBrx6bbGqluGc1f0XEfhSkiY4jhLgbsJUMKRA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/querystring-builder": "^4.2.8",
-        "@smithy/types": "^4.12.0",
-        "@smithy/util-base64": "^4.3.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/hash-node": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.2.8.tgz",
-      "integrity": "sha512-7ZIlPbmaDGxVoxErDZnuFG18WekhbA/g2/i97wGj+wUBeS6pcUeAym8u4BXh/75RXWhgIJhyC11hBzig6MljwA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.12.0",
-        "@smithy/util-buffer-from": "^4.2.0",
-        "@smithy/util-utf8": "^4.2.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/invalid-dependency": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.2.8.tgz",
-      "integrity": "sha512-N9iozRybwAQ2dn9Fot9kI6/w9vos2oTXLhtK7ovGqwZjlOcxu6XhPlpLpC+INsxktqHinn5gS2DXDjDF2kG5sQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/is-array-buffer": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.2.0.tgz",
-      "integrity": "sha512-DZZZBvC7sjcYh4MazJSGiWMI2L7E0oCiRHREDzIxi/M2LY79/21iXt6aPLHge82wi5LsuRF5A06Ds3+0mlh6CQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/middleware-content-length": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.2.8.tgz",
-      "integrity": "sha512-RO0jeoaYAB1qBRhfVyq0pMgBoUK34YEJxVxyjOWYZiOKOq2yMZ4MnVXMZCUDenpozHue207+9P5ilTV1zeda0A==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/middleware-endpoint": {
-      "version": "4.4.13",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.13.tgz",
-      "integrity": "sha512-x6vn0PjYmGdNuKh/juUJJewZh7MoQ46jYaJ2mvekF4EesMuFfrl4LaW/k97Zjf8PTCPQmPgMvwewg7eNoH9n5w==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/core": "^3.22.1",
-        "@smithy/middleware-serde": "^4.2.9",
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/shared-ini-file-loader": "^4.4.3",
-        "@smithy/types": "^4.12.0",
-        "@smithy/url-parser": "^4.2.8",
-        "@smithy/util-middleware": "^4.2.8",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/middleware-retry": {
-      "version": "4.4.30",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.4.30.tgz",
-      "integrity": "sha512-CBGyFvN0f8hlnqKH/jckRDz78Snrp345+PVk8Ux7pnkUCW97Iinse59lY78hBt04h1GZ6hjBN94BRwZy1xC8Bg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/service-error-classification": "^4.2.8",
-        "@smithy/smithy-client": "^4.11.2",
-        "@smithy/types": "^4.12.0",
-        "@smithy/util-middleware": "^4.2.8",
-        "@smithy/util-retry": "^4.2.8",
-        "@smithy/uuid": "^1.1.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/middleware-serde": {
-      "version": "4.2.9",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.2.9.tgz",
-      "integrity": "sha512-eMNiej0u/snzDvlqRGSN3Vl0ESn3838+nKyVfF2FKNXFbi4SERYT6PR392D39iczngbqqGG0Jl1DlCnp7tBbXQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/middleware-stack": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.2.8.tgz",
-      "integrity": "sha512-w6LCfOviTYQjBctOKSwy6A8FIkQy7ICvglrZFl6Bw4FmcQ1Z420fUtIhxaUZZshRe0VCq4kvDiPiXrPZAe8oRA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/node-config-provider": {
-      "version": "4.3.8",
-      "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.3.8.tgz",
-      "integrity": "sha512-aFP1ai4lrbVlWjfpAfRSL8KFcnJQYfTl5QxLJXY32vghJrDuFyPZ6LtUL+JEGYiFRG1PfPLHLoxj107ulncLIg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/shared-ini-file-loader": "^4.4.3",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/node-http-handler": {
-      "version": "4.4.9",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.4.9.tgz",
-      "integrity": "sha512-KX5Wml5mF+luxm1szW4QDz32e3NObgJ4Fyw+irhph4I/2geXwUy4jkIMUs5ZPGflRBeR6BUkC2wqIab4Llgm3w==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/abort-controller": "^4.2.8",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/querystring-builder": "^4.2.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/property-provider": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.2.8.tgz",
-      "integrity": "sha512-EtCTbyIveCKeOXDSWSdze3k612yCPq1YbXsbqX3UHhkOSW8zKsM9NOJG5gTIya0vbY2DIaieG8pKo1rITHYL0w==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/protocol-http": {
-      "version": "5.3.8",
-      "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.3.8.tgz",
-      "integrity": "sha512-QNINVDhxpZ5QnP3aviNHQFlRogQZDfYlCkQT+7tJnErPQbDhysondEjhikuANxgMsZrkGeiAxXy4jguEGsDrWQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/querystring-builder": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.2.8.tgz",
-      "integrity": "sha512-Xr83r31+DrE8CP3MqPgMJl+pQlLLmOfiEUnoyAlGzzJIrEsbKsPy1hqH0qySaQm4oWrCBlUqRt+idEgunKB+iw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.12.0",
-        "@smithy/util-uri-escape": "^4.2.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/querystring-parser": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.2.8.tgz",
-      "integrity": "sha512-vUurovluVy50CUlazOiXkPq40KGvGWSdmusa3130MwrR1UNnNgKAlj58wlOe61XSHRpUfIIh6cE0zZ8mzKaDPA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/service-error-classification": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.2.8.tgz",
-      "integrity": "sha512-mZ5xddodpJhEt3RkCjbmUQuXUOaPNTkbMGR0bcS8FE0bJDLMZlhmpgrvPNCYglVw5rsYTpSnv19womw9WWXKQQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.12.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/shared-ini-file-loader": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.3.tgz",
-      "integrity": "sha512-DfQjxXQnzC5UbCUPeC3Ie8u+rIWZTvuDPAGU/BxzrOGhRvgUanaP68kDZA+jaT3ZI+djOf+4dERGlm9mWfFDrg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/signature-v4": {
-      "version": "5.3.8",
-      "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.3.8.tgz",
-      "integrity": "sha512-6A4vdGj7qKNRF16UIcO8HhHjKW27thsxYci+5r/uVRkdcBEkOEiY8OMPuydLX4QHSrJqGHPJzPRwwVTqbLZJhg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/is-array-buffer": "^4.2.0",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/types": "^4.12.0",
-        "@smithy/util-hex-encoding": "^4.2.0",
-        "@smithy/util-middleware": "^4.2.8",
-        "@smithy/util-uri-escape": "^4.2.0",
-        "@smithy/util-utf8": "^4.2.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/smithy-client": {
-      "version": "4.11.2",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.11.2.tgz",
-      "integrity": "sha512-SCkGmFak/xC1n7hKRsUr6wOnBTJ3L22Qd4e8H1fQIuKTAjntwgU8lrdMe7uHdiT2mJAOWA/60qaW9tiMu69n1A==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/core": "^3.22.1",
-        "@smithy/middleware-endpoint": "^4.4.13",
-        "@smithy/middleware-stack": "^4.2.8",
-        "@smithy/protocol-http": "^5.3.8",
-        "@smithy/types": "^4.12.0",
-        "@smithy/util-stream": "^4.5.11",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/types": {
-      "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.14.1.tgz",
-      "integrity": "sha512-59b5HtSVrVR/eYNei3BUj3DCPKD/G7EtDDe7OEJE7i7FtQFugYo6MxbotS8mVJkLNVf8gYaAlEBwwtJ9HzhWSg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/url-parser": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.2.8.tgz",
-      "integrity": "sha512-NQho9U68TGMEU639YkXnVMV3GEFFULmmaWdlu1E9qzyIePOHsoSnagTGSDv1Zi8DCNN6btxOSdgmy5E/hsZwhA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/querystring-parser": "^4.2.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-base64": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.3.0.tgz",
-      "integrity": "sha512-GkXZ59JfyxsIwNTWFnjmFEI8kZpRNIBfxKjv09+nkAWPt/4aGaEWMM04m4sxgNVWkbt2MdSvE3KF/PfX4nFedQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/util-buffer-from": "^4.2.0",
-        "@smithy/util-utf8": "^4.2.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-body-length-browser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.0.tgz",
-      "integrity": "sha512-Fkoh/I76szMKJnBXWPdFkQJl2r9SjPt3cMzLdOB6eJ4Pnpas8hVoWPYemX/peO0yrrvldgCUVJqOAjUrOLjbxg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-body-length-node": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.2.1.tgz",
-      "integrity": "sha512-h53dz/pISVrVrfxV1iqXlx5pRg3V2YWFcSQyPyXZRrZoZj4R4DeWRDo1a7dd3CPTcFi3kE+98tuNyD2axyZReA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-buffer-from": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.2.0.tgz",
-      "integrity": "sha512-kAY9hTKulTNevM2nlRtxAG2FQ3B2OR6QIrPY3zE5LqJy1oxzmgBGsHLWTcNhWXKchgA0WHW+mZkQrng/pgcCew==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/is-array-buffer": "^4.2.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-config-provider": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.2.0.tgz",
-      "integrity": "sha512-YEjpl6XJ36FTKmD+kRJJWYvrHeUvm5ykaUS5xK+6oXffQPHeEM4/nXlZPe+Wu0lsgRUcNZiliYNh/y7q9c2y6Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-defaults-mode-browser": {
-      "version": "4.3.29",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.29.tgz",
-      "integrity": "sha512-nIGy3DNRmOjaYaaKcQDzmWsro9uxlaqUOhZDHQed9MW/GmkBZPtnU70Pu1+GT9IBmUXwRdDuiyaeiy9Xtpn3+Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/smithy-client": "^4.11.2",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-defaults-mode-node": {
-      "version": "4.2.32",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.32.tgz",
-      "integrity": "sha512-7dtFff6pu5fsjqrVve0YMhrnzJtccCWDacNKOkiZjJ++fmjGExmmSu341x+WU6Oc1IccL7lDuaUj7SfrHpWc5Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/config-resolver": "^4.4.6",
-        "@smithy/credential-provider-imds": "^4.2.8",
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/property-provider": "^4.2.8",
-        "@smithy/smithy-client": "^4.11.2",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-endpoints": {
-      "version": "3.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.2.8.tgz",
-      "integrity": "sha512-8JaVTn3pBDkhZgHQ8R0epwWt+BqPSLCjdjXXusK1onwJlRuN69fbvSK66aIKKO7SwVFM6x2J2ox5X8pOaWcUEw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-hex-encoding": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.0.tgz",
-      "integrity": "sha512-CCQBwJIvXMLKxVbO88IukazJD9a4kQ9ZN7/UMGBjBcJYvatpWk+9g870El4cB8/EJxfe+k+y0GmR9CAzkF+Nbw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-middleware": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.2.8.tgz",
-      "integrity": "sha512-PMqfeJxLcNPMDgvPbbLl/2Vpin+luxqTGPpW3NAQVLbRrFRzTa4rNAASYeIGjRV9Ytuhzny39SpyU04EQreF+A==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-retry": {
-      "version": "4.2.8",
-      "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.2.8.tgz",
-      "integrity": "sha512-CfJqwvoRY0kTGe5AkQokpURNCT1u/MkRzMTASWMPPo2hNSnKtF1D45dQl3DE2LKLr4m+PW9mCeBMJr5mCAVThg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/service-error-classification": "^4.2.8",
-        "@smithy/types": "^4.12.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-stream": {
-      "version": "4.5.11",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.11.tgz",
-      "integrity": "sha512-lKmZ0S/3Qj2OF5H1+VzvDLb6kRxGzZHq6f3rAsoSu5cTLGsn3v3VQBA8czkNNXlLjoFEtVu3OQT2jEeOtOE2CA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/fetch-http-handler": "^5.3.9",
-        "@smithy/node-http-handler": "^4.4.9",
-        "@smithy/types": "^4.12.0",
-        "@smithy/util-base64": "^4.3.0",
-        "@smithy/util-buffer-from": "^4.2.0",
-        "@smithy/util-hex-encoding": "^4.2.0",
-        "@smithy/util-utf8": "^4.2.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-uri-escape": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.2.0.tgz",
-      "integrity": "sha512-igZpCKV9+E/Mzrpq6YacdTQ0qTiLm85gD6N/IrmyDvQFA4UnU3d5g3m8tMT/6zG/vVkWSU+VxeUyGonL62DuxA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/util-utf8": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.2.0.tgz",
-      "integrity": "sha512-zBPfuzoI8xyBtR2P6WQj63Rz8i3AmfAaJLuNG8dWsfvPe8lO4aCPYLn879mEgHndZH1zQ2oXmG8O1GGzzaoZiw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@smithy/util-buffer-from": "^4.2.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@smithy/uuid": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@smithy/uuid/-/uuid-1.1.0.tgz",
-      "integrity": "sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@stylistic/stylelint-plugin": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@stylistic/stylelint-plugin/-/stylelint-plugin-4.0.0.tgz",
-      "integrity": "sha512-CFwt3K4Y/7bygNCLCQ8Sy4Hzgbhxq3BsNW0FIuYxl17HD3ywptm54ocyeiLVRrk5jtz1Zwks7Xr9eiZt8SWHAw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@csstools/css-parser-algorithms": "^3.0.5",
-        "@csstools/css-tokenizer": "^3.0.4",
-        "@csstools/media-query-list-parser": "^4.0.3",
-        "postcss": "^8.5.6",
-        "postcss-selector-parser": "^7.1.0",
-        "postcss-value-parser": "^4.2.0",
-        "style-search": "^0.1.0"
-      },
-      "engines": {
-        "node": "^18.12 || >=20.9"
-      },
-      "peerDependencies": {
-        "stylelint": "^16.22.0"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
-      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/mailparser": {
-      "version": "3.4.6",
-      "resolved": "https://registry.npmjs.org/@types/mailparser/-/mailparser-3.4.6.tgz",
-      "integrity": "sha512-wVV3cnIKzxTffaPH8iRnddX1zahbYB1ZEoAxyhoBo3TBCBuK6nZ8M8JYO/RhsCuuBVOw/DEN/t/ENbruwlxn6Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "iconv-lite": "^0.6.3"
-      }
-    },
-    "node_modules/@types/node": {
-      "version": "24.5.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.2.tgz",
-      "integrity": "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~7.12.0"
-      }
-    },
-    "node_modules/@types/nodemailer": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-7.0.1.tgz",
-      "integrity": "sha512-UfHAghPmGZVzaL8x9y+mKZMWyHC399+iq0MOmya5tIyenWX3lcdSb60vOmp0DocR6gCDTYTozv/ULQnREyyjkg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@aws-sdk/client-sesv2": "^3.839.0",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/resolve": {
-      "version": "1.20.2",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
-      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/sinonjs__fake-timers": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
-      "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/sizzle": {
-      "version": "2.3.10",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.10.tgz",
-      "integrity": "sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/smtp-server": {
-      "version": "3.5.12",
-      "resolved": "https://registry.npmjs.org/@types/smtp-server/-/smtp-server-3.5.12.tgz",
-      "integrity": "sha512-IBemrqI6nzvbgwE41Lnd4v4Yf1Kc7F1UHjk1GFBLNhLcI/Zop1ggHQ8g7Y8QYc6jGVgzWQcsa0MBNcGnDY9UGw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "@types/nodemailer": "*"
-      }
-    },
-    "node_modules/@types/tmp": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz",
-      "integrity": "sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/yauzl": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz",
-      "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@vue/compiler-core": {
-      "version": "3.5.22",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.22.tgz",
-      "integrity": "sha512-jQ0pFPmZwTEiRNSb+i9Ow/I/cHv2tXYqsnHKKyCQ08irI2kdF5qmYedmF8si8mA7zepUFmJ2hqzS8CQmNOWOkQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/parser": "^7.28.4",
-        "@vue/shared": "3.5.22",
-        "entities": "^4.5.0",
-        "estree-walker": "^2.0.2",
-        "source-map-js": "^1.2.1"
-      }
-    },
-    "node_modules/@vue/compiler-dom": {
-      "version": "3.5.22",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.22.tgz",
-      "integrity": "sha512-W8RknzUM1BLkypvdz10OVsGxnMAuSIZs9Wdx1vzA3mL5fNMN15rhrSCLiTm6blWeACwUwizzPVqGJgOGBEN/hA==",
-      "license": "MIT",
-      "dependencies": {
-        "@vue/compiler-core": "3.5.22",
-        "@vue/shared": "3.5.22"
-      }
-    },
-    "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.22",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.22.tgz",
-      "integrity": "sha512-tbTR1zKGce4Lj+JLzFXDq36K4vcSZbJ1RBu8FxcDv1IGRz//Dh2EBqksyGVypz3kXpshIfWKGOCcqpSbyGWRJQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/parser": "^7.28.4",
-        "@vue/compiler-core": "3.5.22",
-        "@vue/compiler-dom": "3.5.22",
-        "@vue/compiler-ssr": "3.5.22",
-        "@vue/shared": "3.5.22",
-        "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.19",
-        "postcss": "^8.5.6",
-        "source-map-js": "^1.2.1"
-      }
-    },
-    "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.22",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.22.tgz",
-      "integrity": "sha512-GdgyLvg4R+7T8Nk2Mlighx7XGxq/fJf9jaVofc3IL0EPesTE86cP/8DD1lT3h1JeZr2ySBvyqKQJgbS54IX1Ww==",
-      "license": "MIT",
-      "dependencies": {
-        "@vue/compiler-dom": "3.5.22",
-        "@vue/shared": "3.5.22"
-      }
-    },
-    "node_modules/@vue/devtools-api": {
-      "version": "6.6.4",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
-      "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
-      "license": "MIT"
-    },
-    "node_modules/@vue/reactivity": {
-      "version": "3.5.22",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.22.tgz",
-      "integrity": "sha512-f2Wux4v/Z2pqc9+4SmgZC1p73Z53fyD90NFWXiX9AKVnVBEvLFOWCEgJD3GdGnlxPZt01PSlfmLqbLYzY/Fw4A==",
-      "license": "MIT",
-      "dependencies": {
-        "@vue/shared": "3.5.22"
-      }
-    },
-    "node_modules/@vue/runtime-core": {
-      "version": "3.5.22",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.22.tgz",
-      "integrity": "sha512-EHo4W/eiYeAzRTN5PCextDUZ0dMs9I8mQ2Fy+OkzvRPUYQEyK9yAjbasrMCXbLNhF7P0OUyivLjIy0yc6VrLJQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@vue/reactivity": "3.5.22",
-        "@vue/shared": "3.5.22"
-      }
-    },
-    "node_modules/@vue/runtime-dom": {
-      "version": "3.5.22",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.22.tgz",
-      "integrity": "sha512-Av60jsryAkI023PlN7LsqrfPvwfxOd2yAwtReCjeuugTJTkgrksYJJstg1e12qle0NarkfhfFu1ox2D+cQotww==",
-      "license": "MIT",
-      "dependencies": {
-        "@vue/reactivity": "3.5.22",
-        "@vue/runtime-core": "3.5.22",
-        "@vue/shared": "3.5.22",
-        "csstype": "^3.1.3"
-      }
-    },
-    "node_modules/@vue/server-renderer": {
-      "version": "3.5.22",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.22.tgz",
-      "integrity": "sha512-gXjo+ao0oHYTSswF+a3KRHZ1WszxIqO7u6XwNHqcqb9JfyIL/pbWrrh/xLv7jeDqla9u+LK7yfZKHih1e1RKAQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@vue/compiler-ssr": "3.5.22",
-        "@vue/shared": "3.5.22"
-      },
-      "peerDependencies": {
-        "vue": "3.5.22"
-      }
-    },
-    "node_modules/@vue/shared": {
-      "version": "3.5.22",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.22.tgz",
-      "integrity": "sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==",
-      "license": "MIT"
-    },
-    "node_modules/@webcomponents/webcomponentsjs": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.8.0.tgz",
-      "integrity": "sha512-loGD63sacRzOzSJgQnB9ZAhaQGkN7wl2Zuw7tsphI5Isa0irijrRo6EnJii/GgjGefIFO8AIO7UivzRhFaEk9w==",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@zone-eu/mailsplit": {
-      "version": "5.4.15",
-      "resolved": "https://registry.npmjs.org/@zone-eu/mailsplit/-/mailsplit-5.4.15.tgz",
-      "integrity": "sha512-c7ZpxauvF4AEkDJlKDYO7iMUtMuqJMBnDWNff1cyx+d7zaBVR3iFEmXhNHOVoMmVyVF3pTZLsLIJsEFKDldOAA==",
-      "dev": true,
-      "license": "(MIT OR EUPL-1.1+)",
-      "dependencies": {
-        "libbase64": "1.3.0",
-        "libmime": "5.4.2",
-        "libqp": "2.1.1"
-      }
-    },
-    "node_modules/accessibility": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/accessibility/-/accessibility-3.0.17.tgz",
-      "integrity": "sha512-rQx2I1FE4Vd4Ejzd/PvXkSFYqQ0agUa26m9iSXcDkbQUmR81J7De/EmjYCh7dfcMVKbII1fsA7weQI4yJrE5QA==",
-      "license": "MIT"
-    },
-    "node_modules/acorn": {
-      "version": "8.15.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
-      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ajv": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
-      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ansi-colors": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      },
+      "peerDependencies": {
+        "selderee": "~0.12.0"
       }
     },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+    "node_modules/@stylistic/eslint-plugin": {
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin/-/eslint-plugin-5.10.0.tgz",
+      "integrity": "sha512-nPK52ZHvot8Ju/0A4ucSX1dcPV2/1clx0kLcH5wDmrE4naKso7TUC/voUyU1O9OTKTrR6MYip6LP0ogEMQ9jPQ==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.9.1",
+        "@typescript-eslint/types": "^8.56.0",
+        "eslint-visitor-keys": "^4.2.1",
+        "espree": "^10.4.0",
+        "estraverse": "^5.3.0",
+        "picomatch": "^4.0.3"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "peerDependencies": {
+        "eslint": "^9.0.0 || ^10.0.0"
       }
     },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/@stylistic/stylelint-plugin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@stylistic/stylelint-plugin/-/stylelint-plugin-4.0.1.tgz",
+      "integrity": "sha512-jKZSZr/S/NehfgayNJI3O/JEq+W5lSeHUJNvdOebRPNFP2ZylTbAx/p5qR8scQFpiVzy1VQM9R+G0kIB62r1Pw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-tokenizer": "^3.0.4",
+        "@csstools/media-query-list-parser": "^4.0.3",
+        "postcss": "^8.5.6",
+        "postcss-selector-parser": "^7.1.0",
+        "postcss-value-parser": "^4.2.0",
+        "style-search": "^0.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^18.12 || >=20.9"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "peerDependencies": {
+        "stylelint": "^16.22.0"
       }
     },
-    "node_modules/apca-w3": {
-      "version": "0.1.9",
-      "resolved": "https://registry.npmjs.org/apca-w3/-/apca-w3-0.1.9.tgz",
-      "integrity": "sha512-Zrf6AeBeQjNe/fxK7U1jCo5zfdjDl6T4/kdw5Xlky3G7u+EJTZkyItjMYQGtwf9pkftsINxcYyOpuLkzKf1ITQ==",
-      "license": "Limited W3 License",
-      "dependencies": {
-        "colorparsley": "^0.1.8"
-      }
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/arch": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
-      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
       "license": "MIT"
     },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
       "dev": true,
-      "license": "Python-2.0"
+      "license": "MIT"
     },
-    "node_modules/array-buffer-byte-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
-      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
+    "node_modules/@types/mailparser": {
+      "version": "3.4.6",
+      "resolved": "https://registry.npmjs.org/@types/mailparser/-/mailparser-3.4.6.tgz",
+      "integrity": "sha512-wVV3cnIKzxTffaPH8iRnddX1zahbYB1ZEoAxyhoBo3TBCBuK6nZ8M8JYO/RhsCuuBVOw/DEN/t/ENbruwlxn6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "is-array-buffer": "^3.0.5"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@types/node": "*",
+        "iconv-lite": "^0.6.3"
       }
     },
-    "node_modules/array-includes": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
-      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
+    "node_modules/@types/mailparser/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.24.0",
-        "es-object-atoms": "^1.1.1",
-        "get-intrinsic": "^1.3.0",
-        "is-string": "^1.1.1",
-        "math-intrinsics": "^1.1.0"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+    "node_modules/@types/node": {
+      "version": "25.3.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.3.3.tgz",
+      "integrity": "sha512-DpzbrH7wIcBaJibpKo9nnSQL0MTRdnWttGyE5haGwK86xgMOkFLp7vEyfQPGLOJh5wNYiJ3V9PmUMDhV9u8kkQ==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "undici-types": "~7.18.0"
       }
     },
-    "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz",
-      "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==",
+    "node_modules/@types/nodemailer": {
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-7.0.11.tgz",
+      "integrity": "sha512-E+U4RzR2dKrx+u3N4DlsmLaDC6mMZOM/TPROxA0UAPiTgI0y4CEFBmZE+coGWTjakDriRsXG368lNk1u9Q0a2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.4",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.9",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "es-shim-unscopables": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@types/node": "*"
       }
     },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
-      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
+    "node_modules/@types/resolve": {
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz",
+      "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/sinonjs__fake-timers": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
+      "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/sizzle": {
+      "version": "2.3.10",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.10.tgz",
+      "integrity": "sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/smtp-server": {
+      "version": "3.5.12",
+      "resolved": "https://registry.npmjs.org/@types/smtp-server/-/smtp-server-3.5.12.tgz",
+      "integrity": "sha512-IBemrqI6nzvbgwE41Lnd4v4Yf1Kc7F1UHjk1GFBLNhLcI/Zop1ggHQ8g7Y8QYc6jGVgzWQcsa0MBNcGnDY9UGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-shim-unscopables": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@types/node": "*",
+        "@types/nodemailer": "*"
       }
     },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
-      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
+    "node_modules/@types/tmp": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@types/tmp/-/tmp-0.2.6.tgz",
+      "integrity": "sha512-chhaNf2oKHlRkDGt+tiKE2Z5aJ6qalm7Z9rlLdBwmOiAAf09YQvvoLXjWK4HWPF1xU/fqvMgfNfpVoBscA/tKA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/web-bluetooth": {
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
+      "integrity": "sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==",
+      "license": "MIT"
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "8.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.0.tgz",
+      "integrity": "sha512-KvAclkktORPvM54TgLgA4z9HIV1M8zOgw9ZVNXl9f/8dLYfXYX1wkMXP7qmabpijQRV5bHJLOmoyGQbLMaUYeg==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-shim-unscopables": "^1.0.2"
-      },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
-      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
-      "dev": true,
+    "node_modules/@vue-flow/background": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@vue-flow/background/-/background-1.3.2.tgz",
+      "integrity": "sha512-eJPhDcLj1wEo45bBoqTXw1uhl0yK2RaQGnEINqvvBsAFKh/camHJd5NPmOdS1w+M9lggc9igUewxaEd3iCQX2w==",
       "license": "MIT",
-      "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.5",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "is-array-buffer": "^3.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "@vue-flow/core": "^1.23.0",
+        "vue": "^3.3.0"
       }
     },
-    "node_modules/asn1": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-      "dev": true,
+    "node_modules/@vue-flow/controls": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@vue-flow/controls/-/controls-1.1.3.tgz",
+      "integrity": "sha512-XCf+G+jCvaWURdFlZmOjifZGw3XMhN5hHlfMGkWh9xot+9nH9gdTZtn+ldIJKtarg3B21iyHU8JjKDhYcB6JMw==",
       "license": "MIT",
-      "dependencies": {
-        "safer-buffer": "~2.1.0"
+      "peerDependencies": {
+        "@vue-flow/core": "^1.23.0",
+        "vue": "^3.3.0"
       }
     },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-      "dev": true,
+    "node_modules/@vue-flow/core": {
+      "version": "1.48.2",
+      "resolved": "https://registry.npmjs.org/@vue-flow/core/-/core-1.48.2.tgz",
+      "integrity": "sha512-raxhgKWE+G/mcEvXJjGFUDYW9rAI3GOtiHR3ZkNpwBWuIaCC1EYiBmKGwJOoNzVFgwO7COgErnK7i08i287AFA==",
       "license": "MIT",
-      "engines": {
-        "node": ">=0.8"
+      "dependencies": {
+        "@vueuse/core": "^10.5.0",
+        "d3-drag": "^3.0.0",
+        "d3-interpolate": "^3.0.1",
+        "d3-selection": "^3.0.0",
+        "d3-zoom": "^3.0.0"
+      },
+      "peerDependencies": {
+        "vue": "^3.3.0"
       }
     },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
+    "node_modules/@vue-flow/minimap": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@vue-flow/minimap/-/minimap-1.5.4.tgz",
+      "integrity": "sha512-l4C+XTAXnRxsRpUdN7cAVFBennC1sVRzq4bDSpVK+ag7tdMczAnhFYGgbLkUw3v3sY6gokyWwMl8CDonp8eB2g==",
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "d3-selection": "^3.0.0",
+        "d3-zoom": "^3.0.0"
+      },
+      "peerDependencies": {
+        "@vue-flow/core": "^1.23.0",
+        "vue": "^3.3.0"
       }
     },
-    "node_modules/async": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/async-function": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
-      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
-      "dev": true,
+    "node_modules/@vue-flow/node-resizer": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@vue-flow/node-resizer/-/node-resizer-1.5.1.tgz",
+      "integrity": "sha512-DNYgXTF39GXPAygVMFmgn5azgFztaWfqbWvv8D/X0HGgeunRrexJ0W94DyXH1rnndGyYAJ0KexEjyelsb+Nlbg==",
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
+      "dependencies": {
+        "d3-drag": "^3.0.0",
+        "d3-selection": "^3.0.0"
+      },
+      "peerDependencies": {
+        "@vue-flow/core": "^1.23.0",
+        "vue": "^3.3.0"
       }
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@vue/compiler-core": {
+      "version": "3.5.30",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.30.tgz",
+      "integrity": "sha512-s3DfdZkcu/qExZ+td75015ljzHc6vE+30cFMGRPROYjqkroYI5NV2X1yAMX9UeyBNWB9MxCfPcsjpLS11nzkkw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.29.0",
+        "@vue/shared": "3.5.30",
+        "entities": "^7.0.1",
+        "estree-walker": "^2.0.2",
+        "source-map-js": "^1.2.1"
+      }
     },
-    "node_modules/at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 4.0.0"
+    "node_modules/@vue/compiler-dom": {
+      "version": "3.5.30",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.30.tgz",
+      "integrity": "sha512-eCFYESUEVYHhiMuK4SQTldO3RYxyMR/UQL4KdGD1Yrkfdx4m/HYuZ9jSfPdA+nWJY34VWndiYdW/wZXyiPEB9g==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/compiler-core": "3.5.30",
+        "@vue/shared": "3.5.30"
       }
     },
-    "node_modules/atoa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/atoa/-/atoa-1.0.0.tgz",
-      "integrity": "sha512-VVE1H6cc4ai+ZXo/CRWoJiHXrA1qfA31DPnx6D20+kSI547hQN5Greh51LQ1baMRMfxO5K5M4ImMtZbZt2DODQ==",
-      "license": "MIT"
+    "node_modules/@vue/compiler-sfc": {
+      "version": "3.5.30",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.30.tgz",
+      "integrity": "sha512-LqmFPDn89dtU9vI3wHJnwaV6GfTRD87AjWpTWpyrdVOObVtjIuSeZr181z5C4PmVx/V3j2p+0f7edFKGRMpQ5A==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.29.0",
+        "@vue/compiler-core": "3.5.30",
+        "@vue/compiler-dom": "3.5.30",
+        "@vue/compiler-ssr": "3.5.30",
+        "@vue/shared": "3.5.30",
+        "estree-walker": "^2.0.2",
+        "magic-string": "^0.30.21",
+        "postcss": "^8.5.8",
+        "source-map-js": "^1.2.1"
+      }
     },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
-      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
-      "dev": true,
+    "node_modules/@vue/compiler-ssr": {
+      "version": "3.5.30",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.30.tgz",
+      "integrity": "sha512-NsYK6OMTnx109PSL2IAyf62JP6EUdk4Dmj6AkWcJGBvN0dQoMYtVekAmdqgTtWQgEJo+Okstbf/1p7qZr5H+bA==",
       "license": "MIT",
       "dependencies": {
-        "possible-typed-array-names": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@vue/compiler-dom": "3.5.30",
+        "@vue/shared": "3.5.30"
       }
     },
-    "node_modules/awesomplete": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/awesomplete/-/awesomplete-1.1.7.tgz",
-      "integrity": "sha512-hwClzFReIIfheoMWpoJ7juLp1o6Q7YjTtEdZIGfXvhRHA9ewKM03VS4ZoK+OEFIKM066PfQt9pzRIGV1TguRBw==",
+    "node_modules/@vue/devtools-api": {
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.4.tgz",
+      "integrity": "sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==",
       "license": "MIT"
     },
-    "node_modules/aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "*"
+    "node_modules/@vue/reactivity": {
+      "version": "3.5.30",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.30.tgz",
+      "integrity": "sha512-179YNgKATuwj9gB+66snskRDOitDiuOZqkYia7mHKJaidOMo/WJxHKF8DuGc4V4XbYTJANlfEKb0yxTQotnx4Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/shared": "3.5.30"
       }
     },
-    "node_modules/aws-ssl-profiles": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz",
-      "integrity": "sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==",
-      "dev": true,
+    "node_modules/@vue/runtime-core": {
+      "version": "3.5.30",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.30.tgz",
+      "integrity": "sha512-e0Z+8PQsUTdwV8TtEsLzUM7SzC7lQwYKePydb7K2ZnmS6jjND+WJXkmmfh/swYzRyfP1EY3fpdesyYoymCzYfg==",
       "license": "MIT",
-      "engines": {
-        "node": ">= 6.0.0"
+      "dependencies": {
+        "@vue/reactivity": "3.5.30",
+        "@vue/shared": "3.5.30"
       }
     },
-    "node_modules/aws4": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
-      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@vue/runtime-dom": {
+      "version": "3.5.30",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.30.tgz",
+      "integrity": "sha512-2UIGakjU4WSQ0T4iwDEW0W7vQj6n7AFn7taqZ9Cvm0Q/RA2FFOziLESrDL4GmtI1wV3jXg5nMoJSYO66egDUBw==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/reactivity": "3.5.30",
+        "@vue/runtime-core": "3.5.30",
+        "@vue/shared": "3.5.30",
+        "csstype": "^3.2.3"
+      }
     },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.14",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.14.tgz",
-      "integrity": "sha512-Co2Y9wX854ts6U8gAAPXfn0GmAyctHuK8n0Yhfjd6t30g7yvKjspvvOo9yG+z52PZRgFErt7Ka2pYnXCjLKEpg==",
-      "dev": true,
+    "node_modules/@vue/server-renderer": {
+      "version": "3.5.30",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.30.tgz",
+      "integrity": "sha512-v+R34icapydRwbZRD0sXwtHqrQJv38JuMB4JxbOxd8NEpGLny7cncMp53W9UH/zo4j8eDHjQ1dEJXwzFQknjtQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.27.7",
-        "@babel/helper-define-polyfill-provider": "^0.6.5",
-        "semver": "^6.3.1"
+        "@vue/compiler-ssr": "3.5.30",
+        "@vue/shared": "3.5.30"
       },
       "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+        "vue": "3.5.30"
       }
     },
-    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
+    "node_modules/@vue/shared": {
+      "version": "3.5.30",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.30.tgz",
+      "integrity": "sha512-YXgQ7JjaO18NeK2K9VTbDHaFy62WrObMa6XERNfNOkAhD1F1oDSf3ZJ7K6GqabZ0BvSDHajp8qfS5Sa2I9n8uQ==",
+      "license": "MIT"
     },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.13.0.tgz",
-      "integrity": "sha512-U+GNwMdSFgzVmfhNm8GJUX88AadB3uo9KpJqS3FaqNIPKgySuvMb+bHPsOmmuWyIcuqZj/pzt1RUIUZns4y2+A==",
-      "dev": true,
+    "node_modules/@vueuse/core": {
+      "version": "10.11.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.11.1.tgz",
+      "integrity": "sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.5",
-        "core-js-compat": "^3.43.0"
+        "@types/web-bluetooth": "^0.0.20",
+        "@vueuse/metadata": "10.11.1",
+        "@vueuse/shared": "10.11.1",
+        "vue-demi": ">=0.14.8"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
       }
     },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.5.tgz",
-      "integrity": "sha512-ISqQ2frbiNU9vIJkzg7dlPpznPZ4jOiUQ1uSmB0fEHeowtN3COYRsXr/xexn64NpU13P06jc/L5TgiJXOgrbEg==",
-      "dev": true,
+    "node_modules/@vueuse/core/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
       "license": "MIT",
-      "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.6.5"
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
       },
       "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
       }
     },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/@vueuse/metadata": {
+      "version": "10.11.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.11.1.tgz",
+      "integrity": "sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
     },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
+    "node_modules/@vueuse/shared": {
+      "version": "10.11.1",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.11.1.tgz",
+      "integrity": "sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==",
+      "license": "MIT",
+      "dependencies": {
+        "vue-demi": ">=0.14.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
     },
-    "node_modules/baseline-browser-mapping": {
-      "version": "2.11.12",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.11.12.tgz",
-      "integrity": "sha512-r7WnVImvVCeFpf2DOXfy41aPWzeNg3H/A2X4dKmy1QL0MSyyk/e7z8ihJ3N6Nn2PsdhkVlqnEfnUE4a05P2aTA==",
-      "dev": true,
-      "license": "Apache-2.0",
+    "node_modules/@vueuse/shared/node_modules/vue-demi": {
+      "version": "0.14.10",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz",
+      "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==",
+      "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
-        "baseline-browser-mapping": "dist/cli.cjs"
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
       }
     },
-    "node_modules/bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
+    "node_modules/@zone-eu/mailsplit": {
+      "version": "5.4.15",
+      "resolved": "https://registry.npmjs.org/@zone-eu/mailsplit/-/mailsplit-5.4.15.tgz",
+      "integrity": "sha512-c7ZpxauvF4AEkDJlKDYO7iMUtMuqJMBnDWNff1cyx+d7zaBVR3iFEmXhNHOVoMmVyVF3pTZLsLIJsEFKDldOAA==",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "license": "(MIT OR EUPL-1.1+)",
       "dependencies": {
-        "tweetnacl": "^0.14.3"
+        "libbase64": "1.3.0",
+        "libmime": "5.4.2",
+        "libqp": "2.1.1"
       }
     },
-    "node_modules/blob-util": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
-      "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true,
+    "node_modules/accessibility": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/accessibility/-/accessibility-3.0.17.tgz",
+      "integrity": "sha512-rQx2I1FE4Vd4Ejzd/PvXkSFYqQ0agUa26m9iSXcDkbQUmR81J7De/EmjYCh7dfcMVKbII1fsA7weQI4yJrE5QA==",
       "license": "MIT"
     },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+    "node_modules/acorn": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/bootstrap": {
-      "version": "5.3.8",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz",
-      "integrity": "sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/twbs"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/bootstrap"
-        }
-      ],
       "license": "MIT",
       "peerDependencies": {
-        "@popperjs/core": "^2.11.8"
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/bowser": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.13.1.tgz",
-      "integrity": "sha512-OHawaAbjwx6rqICCKgSG0SAnT05bzd7ppyKLVUITZpANBaaMFBAsaNkto3LoQ31tyFP5kNujE8Cdx85G9VzOkw==",
+    "node_modules/ajv": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz",
+      "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
     },
-    "node_modules/brace-expansion": {
-      "version": "1.1.18",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz",
-      "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==",
-      "dev": true,
+    "node_modules/altcha": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/altcha/-/altcha-2.3.0.tgz",
+      "integrity": "sha512-vl8I0dQvSQB7/Mx09XuWZ1+LdSP7vEda6OLbg9kUQ2ZO2LT7MzgUyLK7Iips+GAV6c0ntVcS1XWOqhEPpwbDhQ==",
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "@altcha/crypto": "^0.0.1"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-linux-x64-gnu": "4.18.0"
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+    "node_modules/ansi-escapes": {
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz",
+      "integrity": "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.1.1"
+        "environment": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/browserslist": {
-      "version": "4.26.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.2.tgz",
-      "integrity": "sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==",
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
       "license": "MIT",
       "dependencies": {
-        "baseline-browser-mapping": "^2.8.3",
-        "caniuse-lite": "^1.0.30001741",
-        "electron-to-chromium": "^1.5.218",
-        "node-releases": "^2.0.21",
-        "update-browserslist-db": "^1.1.3"
-      },
-      "bin": {
-        "browserslist": "cli.js"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+    "node_modules/arch": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
+      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
       "dev": true,
       "funding": [
         {
@@ -6209,74 +4358,79 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/buffer-builder": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
-      "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
-      "dev": true,
-      "license": "MIT/X11"
+      "license": "MIT"
     },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "*"
-      }
+      "license": "Python-2.0"
     },
-    "node_modules/cacheable": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-2.0.2.tgz",
-      "integrity": "sha512-dWjhLx8RWnPsAWVKwW/wI6OJpQ/hSVb1qS0NUif8TR9vRiSwci7Gey8x04kRU9iAF+Rnbtex5Kjjfg/aB5w8Pg==",
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cacheable/memoize": "^2.0.2",
-        "@cacheable/memory": "^2.0.2",
-        "@cacheable/utils": "^2.0.2",
-        "hookified": "^1.12.1",
-        "keyv": "^5.5.2"
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/cacheable/node_modules/keyv": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.2.tgz",
-      "integrity": "sha512-TXcFHbmm/z7MGd1u9ASiCSfTS+ei6Z8B3a5JHzx3oPa/o7QzWVtPRpc4KGER5RR469IC+/nfg4U5YLIuDUua2g==",
+    "node_modules/array-includes": {
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz",
+      "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@keyv/serialize": "^1.1.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.24.0",
+        "es-object-atoms": "^1.1.1",
+        "get-intrinsic": "^1.3.0",
+        "is-string": "^1.1.1",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/cachedir": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
-      "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==",
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
-      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz",
+      "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.0",
-        "es-define-property": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.2"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.4",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "es-shim-unscopables": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6285,29 +4439,36 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
+      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/call-bound": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
-      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
+      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "get-intrinsic": "^1.3.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6316,576 +4477,622 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001809",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001809.tgz",
-      "integrity": "sha512-xxWVywk6a6Arlk+hymeycyn/VgqEfLDxupvhH/xiY5SJ/18kmi9o6MiO320DCUzypORHLtvh0I4i04tUhCNHNQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "CC-BY-4.0"
-    },
-    "node_modules/caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/asn1": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
+      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.8"
       }
     },
-    "node_modules/check-more-types": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
-      "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==",
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=8"
       }
     },
-    "node_modules/choices.js": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/choices.js/-/choices.js-9.1.0.tgz",
-      "integrity": "sha512-6NnqiE/MNnNAiMzdW7phJ49nMQylkKMQ6La6PAS1+h1VhrGt38MOPnjzEJ3cRaECieqaGpl9eFGtI2icW27r8A==",
+    "node_modules/async-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "deepmerge": "^4.2.2",
-        "fuse.js": "^3.4.6",
-        "redux": "^4.1.2"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/atoa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/atoa/-/atoa-1.0.0.tgz",
+      "integrity": "sha512-VVE1H6cc4ai+ZXo/CRWoJiHXrA1qfA31DPnx6D20+kSI547hQN5Greh51LQ1baMRMfxO5K5M4ImMtZbZt2DODQ==",
+      "license": "MIT"
+    },
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
+      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "readdirp": "^4.0.1"
+        "possible-typed-array-names": "^1.0.0"
       },
       "engines": {
-        "node": ">= 14.16.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/chosen-js": {
-      "version": "1.8.7",
-      "resolved": "https://registry.npmjs.org/chosen-js/-/chosen-js-1.8.7.tgz",
-      "integrity": "sha512-eVdrZJ2U5ISdObkgsi0od5vIJdLwq1P1Xa/Vj/mgxkMZf14DlgobfB6nrlFi3kW4kkvKLsKk4NDqZj1MU1DCpw==",
+    "node_modules/awesomplete": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/awesomplete/-/awesomplete-1.1.7.tgz",
+      "integrity": "sha512-hwClzFReIIfheoMWpoJ7juLp1o6Q7YjTtEdZIGfXvhRHA9ewKM03VS4ZoK+OEFIKM066PfQt9pzRIGV1TguRBw==",
       "license": "MIT"
     },
-    "node_modules/ci-info": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.0.tgz",
-      "integrity": "sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==",
+    "node_modules/aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
-      "license": "MIT",
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=8"
+        "node": "*"
       }
     },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+    "node_modules/aws-ssl-profiles": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz",
+      "integrity": "sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">= 6.0.0"
       }
     },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+    "node_modules/aws4": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
+      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.4.15",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.15.tgz",
+      "integrity": "sha512-hR3GwrRwHUfYwGfrisXPIDP3JcYfBrW7wKE7+Au6wDYl7fm/ka1NEII6kORzxNU556JjfidZeBsO10kYvtV1aw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "restore-cursor": "^3.1.0"
+        "@babel/compat-data": "^7.28.6",
+        "@babel/helper-define-polyfill-provider": "^0.6.6",
+        "semver": "^6.3.1"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/cli-progress": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz",
-      "integrity": "sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==",
+    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "string-width": "^4.2.3"
-      },
-      "engines": {
-        "node": ">=4"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/cli-table3": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.1.tgz",
-      "integrity": "sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==",
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.14.0.tgz",
+      "integrity": "sha512-AvDcMxJ34W4Wgy4KBIIePQTAOP1Ie2WFwkQp3dB7FQ/f0lI5+nM96zUnYEOE1P9sEg0es5VCP0HxiWu5fUHZAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": "10.* || >= 12.*"
+        "@babel/helper-define-polyfill-provider": "^0.6.6",
+        "core-js-compat": "^3.48.0"
       },
-      "optionalDependencies": {
-        "colors": "1.4.0"
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.6.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.6.tgz",
+      "integrity": "sha512-hYm+XLYRMvupxiQzrvXUj7YyvFFVfv5gI0R71AJzudg1g2AI2vyCPPIFEBjk162/wFzti3inBHo7isWFuEVS/A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "@babel/helper-define-polyfill-provider": "^0.6.6"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
+      "license": "MIT"
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.10.7",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.7.tgz",
+      "integrity": "sha512-1ghYO3HnxGec0TCGBXiDLVns4eCSx4zJpxnHrlqFQajmhfKMQBzUGDdkMK7fUW7PTHTeLf+j87aTuKuuwWzMGw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.cjs"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
       "dev": true,
-      "license": "MIT"
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
     },
-    "node_modules/colord": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+    "node_modules/blob-util": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
+      "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "Apache-2.0"
     },
-    "node_modules/colorette": {
-      "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/colorjs.io": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz",
-      "integrity": "sha512-twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw==",
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true,
-      "license": "MIT"
+      "license": "ISC"
     },
-    "node_modules/colorparsley": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/colorparsley/-/colorparsley-0.1.8.tgz",
-      "integrity": "sha512-rObESTTTE6G5qO5WFwFxWPggpw4KfpxnLC6Ssl8bITBnNVRhDsyCeTRAUxWQNVTx2pRknKlO2nddYTxjkdNFaw==",
-      "license": "AGPL v3"
+    "node_modules/bootstrap": {
+      "version": "5.3.8",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz",
+      "integrity": "sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/twbs"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/bootstrap"
+        }
+      ],
+      "license": "MIT",
+      "peerDependencies": {
+        "@popperjs/core": "^2.11.8"
+      }
     },
-    "node_modules/colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+    "node_modules/brace-expansion": {
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.18.tgz",
+      "integrity": "sha512-Edep/X9fGqVNmzKBVsDYIOtD+z1tuezV70LBjdCst9Tqu76lsnvRiZ6oTic1n+/BIwX6QDGAO94PN4N2SADvtw==",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.1.90"
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "delayed-stream": "~1.0.0"
+        "fill-range": "^7.1.1"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=8"
       }
     },
-    "node_modules/commander": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.1.tgz",
-      "integrity": "sha512-2JkV3gUZUVrbNA+1sjBOYLsMZ5cEEl8GTFP2a4AVz5hvasAMCQ1D2l2le/cX+pV4N6ZU17zjUahLpIXRrnWL8A==",
+    "node_modules/browserslist": {
+      "version": "4.28.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz",
+      "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
       "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "license": "MIT",
+      "dependencies": {
+        "baseline-browser-mapping": "^2.9.0",
+        "caniuse-lite": "^1.0.30001759",
+        "electron-to-chromium": "^1.5.263",
+        "node-releases": "^2.0.27",
+        "update-browserslist-db": "^1.2.0"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
       "engines": {
-        "node": ">=20"
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/common-tags": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
-      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
       "license": "MIT",
-      "engines": {
-        "node": ">=4.0.0"
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
       }
     },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+    "node_modules/cacheable": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-2.3.3.tgz",
+      "integrity": "sha512-iffYMX4zxKp54evOH27fm92hs+DeC1DhXmNVN8Tr94M/iZIV42dqTHSR2Ik4TOSPyOAwKr7Yu3rN9ALoLkbWyQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "@cacheable/memory": "^2.0.8",
+        "@cacheable/utils": "^2.4.0",
+        "hookified": "^1.15.0",
+        "keyv": "^5.6.0",
+        "qified": "^0.6.0"
+      }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+    "node_modules/cacheable/node_modules/keyv": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+      "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/contra": {
-      "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/contra/-/contra-1.9.4.tgz",
-      "integrity": "sha512-N9ArHAqwR/lhPq4OdIAwH4e1btn6EIZMAz4TazjnzCiVECcWUPTma+dRAM38ERImEJBh8NiCCpjoQruSZ+agYg==",
       "license": "MIT",
       "dependencies": {
-        "atoa": "1.0.0",
-        "ticky": "1.0.1"
+        "@keyv/serialize": "^1.1.1"
       }
     },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+    "node_modules/cachedir": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
+      "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "node_modules/core-js": {
-      "version": "3.45.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.45.1.tgz",
-      "integrity": "sha512-L4NPsJlCfZsPeXukyzHFlg/i7IIVwHSItR0wg0FLNqYClJ4MQYTYLbC7EkjKYRLZF2iof2MUgN0EGy7MdQFChg==",
+    "node_modules/call-bind": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/core-js-compat": {
-      "version": "3.45.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.45.1.tgz",
-      "integrity": "sha512-tqTt5T4PzsMIZ430XGviK4vzYSoeNJ6CXODi6c/voxOT6IZqBht5/EKaSNnYiEjjRYxjVz7DQIsOsY0XNi8PIA==",
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.25.3"
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/cosmiconfig": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz",
-      "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==",
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "env-paths": "^2.2.1",
-        "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.2.0"
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.9.5"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/crelt": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
-      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
-      "license": "MIT"
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "node_modules/cropperjs": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.6.2.tgz",
-      "integrity": "sha512-nhymn9GdnV3CqiEHJVai54TULFAE3VshJTXSqSJKa8yXAKyBKDWdhHarnlIPrshJ0WMFTGuFvG02YjLXfPiuOA==",
-      "license": "MIT"
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001778",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001778.tgz",
+      "integrity": "sha512-PN7uxFL+ExFJO61aVmP1aIEG4i9whQd4eoSCebav62UwDyp5OHh06zN4jqKSMePVgxHifCw1QJxdRkA1Pisekg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
     },
-    "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+    "node_modules/caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/crossvent": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/crossvent/-/crossvent-1.5.5.tgz",
-      "integrity": "sha512-MY4xhBYEnVi+pmTpHCOCsCLYczc0PVtGdPBz6NXNXxikLaUZo4HdAeUb1UqAo3t3yXAloSelTmfxJ+/oUqkW5w==",
+    "node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "custom-event": "^1.0.0"
-      }
-    },
-    "node_modules/css-functions-list": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.3.tgz",
-      "integrity": "sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==",
-      "dev": true,
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/choices.js": {
+      "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/choices.js/-/choices.js-11.2.1.tgz",
+      "integrity": "sha512-SyA0FRr0+UHOjKO/9oR0/hVYRgk3v5C9ZD+CLnQfLFR7ZSiNb/rQeAUOsqXaPTk/552X5dtvRaDiG94Ga7G2Gg==",
       "license": "MIT",
-      "engines": {
-        "node": ">=12 || >=16"
+      "dependencies": {
+        "fuse.js": "^7.0.0"
       }
     },
-    "node_modules/css-tree": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz",
-      "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==",
+    "node_modules/chokidar": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
+      "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "mdn-data": "2.12.2",
-        "source-map-js": "^1.0.1"
+        "readdirp": "^5.0.0"
       },
       "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+        "node": ">= 20.19.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+    "node_modules/ci-info": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz",
+      "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
       "license": "MIT",
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "license": "MIT"
-    },
-    "node_modules/custom-event": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==",
-      "license": "MIT"
-    },
-    "node_modules/cypress": {
-      "version": "15.18.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.18.0.tgz",
-      "integrity": "sha512-aLfOYSLlVt1b6QSoVUjbCY27taZlYAT8ST47xQbwd9pvQrY/g5gXi12yItZTB+kxkkj+ZcvUYmRLUC95SlCJsw==",
+    "node_modules/cli-cursor": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
+      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "@cypress/request": "^4.0.0",
-        "@cypress/xvfb": "^1.2.4",
-        "@types/sinonjs__fake-timers": "8.1.1",
-        "@types/sizzle": "^2.3.2",
-        "@types/tmp": "^0.2.3",
-        "arch": "^2.2.0",
-        "blob-util": "^2.0.2",
-        "bluebird": "^3.7.2",
-        "buffer": "^5.7.1",
-        "cachedir": "^2.4.0",
-        "chalk": "^4.1.0",
-        "ci-info": "^4.1.0",
-        "cli-table3": "0.6.1",
-        "commander": "^6.2.1",
-        "common-tags": "^1.8.0",
-        "dayjs": "^1.10.4",
-        "debug": "^4.3.4",
-        "eventemitter2": "6.4.7",
-        "execa": "4.1.0",
-        "executable": "^4.1.1",
-        "fs-extra": "^9.1.0",
-        "hasha": "5.2.2",
-        "is-installed-globally": "~0.4.0",
-        "listr2": "^9.0.5",
-        "lodash": "^4.17.23",
-        "log-symbols": "^4.0.0",
-        "minimist": "^1.2.8",
-        "ospath": "^1.2.2",
-        "pretty-bytes": "^5.6.0",
-        "process": "^0.11.10",
-        "proxy-from-env": "1.0.0",
-        "request-progress": "^3.0.0",
-        "supports-color": "^8.1.1",
-        "systeminformation": "^5.31.1",
-        "tmp": "~0.2.4",
-        "tree-kill": "1.2.2",
-        "tslib": "1.14.1",
-        "untildify": "^4.0.0",
-        "yauzl": "^3.3.1"
-      },
-      "bin": {
-        "cypress": "bin/cypress"
+        "restore-cursor": "^5.0.0"
       },
       "engines": {
-        "node": "^20.1.0 || ^22.0.0 || >=24.0.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cypress-file-upload": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz",
-      "integrity": "sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==",
+    "node_modules/cli-progress": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz",
+      "integrity": "sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8.2.1"
+      "dependencies": {
+        "string-width": "^4.2.3"
       },
-      "peerDependencies": {
-        "cypress": ">3.0.0"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/cypress/node_modules/@cypress/request": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-4.0.1.tgz",
-      "integrity": "sha512-y20e+e6dFYkOUUJLVUZTsJRuTiXZaUQ32WD+R/ux/HBybbTx4ge7cNINcua0pU8+SNkKuRbOF12mBmzuzM8n5w==",
+    "node_modules/cli-table3": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.1.tgz",
+      "integrity": "sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~4.0.4",
-        "http-signature": "~1.4.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "performance-now": "^2.1.0",
-        "qs": "^6.15.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "^5.0.0",
-        "tunnel-agent": "^0.6.0"
+        "string-width": "^4.2.0"
       },
       "engines": {
-        "node": ">= 14.17.0"
+        "node": "10.* || >= 12.*"
+      },
+      "optionalDependencies": {
+        "colors": "1.4.0"
       }
     },
-    "node_modules/cypress/node_modules/ansi-escapes": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.3.0.tgz",
-      "integrity": "sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==",
+    "node_modules/cli-truncate": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.2.0.tgz",
+      "integrity": "sha512-xRwvIOMGrfOAnM1JYtqQImuaNtDEv9v6oIYAs4LIHwTiKee8uwvIi363igssOC0O5U04i4AlENs79LQLu9tEMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "environment": "^1.0.0"
+        "slice-ansi": "^8.0.0",
+        "string-width": "^8.2.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cypress/node_modules/ansi-regex": {
+    "node_modules/cli-truncate/node_modules/ansi-regex": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
       "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
@@ -6898,320 +5105,494 @@
         "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
-    "node_modules/cypress/node_modules/ansi-styles": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+    "node_modules/cli-truncate/node_modules/string-width": {
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.1.tgz",
+      "integrity": "sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "get-east-asian-width": "^1.5.0",
+        "strip-ansi": "^7.1.2"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=20"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cypress/node_modules/cli-cursor": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
-      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
+    "node_modules/cli-truncate/node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "restore-cursor": "^5.0.0"
+        "ansi-regex": "^6.2.2"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/cypress/node_modules/cli-truncate": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-5.2.0.tgz",
-      "integrity": "sha512-xRwvIOMGrfOAnM1JYtqQImuaNtDEv9v6oIYAs4LIHwTiKee8uwvIi363igssOC0O5U04i4AlENs79LQLu9tEMw==",
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colord": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colorjs.io": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz",
+      "integrity": "sha512-twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.3.tgz",
+      "integrity": "sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "slice-ansi": "^8.0.0",
-        "string-width": "^8.2.0"
-      },
       "engines": {
         "node": ">=20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cypress/node_modules/commander": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+    "node_modules/common-tags": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
+      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 6"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/cypress/node_modules/emoji-regex": {
-      "version": "10.6.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
-      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/cypress/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/contra": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/contra/-/contra-1.9.4.tgz",
+      "integrity": "sha512-N9ArHAqwR/lhPq4OdIAwH4e1btn6EIZMAz4TazjnzCiVECcWUPTma+dRAM38ERImEJBh8NiCCpjoQruSZ+agYg==",
       "license": "MIT",
       "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "atoa": "1.0.0",
+        "ticky": "1.0.1"
       }
     },
-    "node_modules/cypress/node_modules/is-fullwidth-code-point": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz",
-      "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==",
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/core-js": {
+      "version": "3.48.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.48.0.tgz",
+      "integrity": "sha512-zpEHTy1fjTMZCKLHUZoVeylt9XrzaIN2rbPXEt0k+q7JE5CkCZdo6bNq55bn24a69CH7ErAVLKijxJja4fw+UQ==",
       "dev": true,
+      "hasInstallScript": true,
       "license": "MIT",
-      "dependencies": {
-        "get-east-asian-width": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=18"
-      },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/cypress/node_modules/listr2": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.5.tgz",
-      "integrity": "sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==",
+    "node_modules/core-js-compat": {
+      "version": "3.48.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.48.0.tgz",
+      "integrity": "sha512-OM4cAF3D6VtH/WkLtWvyNC56EZVXsZdU3iqaMG2B4WvYrlqU831pc4UtG5yp0sE9z8Y02wVN7PjW5Zf9Gt0f1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cli-truncate": "^5.0.0",
-        "colorette": "^2.0.20",
-        "eventemitter3": "^5.0.1",
-        "log-update": "^6.1.0",
-        "rfdc": "^1.4.1",
-        "wrap-ansi": "^9.0.0"
+        "browserslist": "^4.28.1"
       },
-      "engines": {
-        "node": ">=20.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/cypress/node_modules/log-update": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
-      "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cosmiconfig": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.1.tgz",
+      "integrity": "sha512-hr4ihw+DBqcvrsEDioRO31Z17x71pUYoNe/4h6Z0wB72p7MU7/9gH8Q3s12NFhHPfYBBOV3qyfUxmr/Yn3shnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-escapes": "^7.0.0",
-        "cli-cursor": "^5.0.0",
-        "slice-ansi": "^7.1.0",
-        "strip-ansi": "^7.1.0",
-        "wrap-ansi": "^9.0.0"
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=14"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/cypress/node_modules/log-update/node_modules/slice-ansi": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz",
-      "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==",
+    "node_modules/crelt": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz",
+      "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==",
+      "license": "MIT"
+    },
+    "node_modules/cropperjs": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/cropperjs/-/cropperjs-1.6.2.tgz",
+      "integrity": "sha512-nhymn9GdnV3CqiEHJVai54TULFAE3VshJTXSqSJKa8yXAKyBKDWdhHarnlIPrshJ0WMFTGuFvG02YjLXfPiuOA==",
+      "license": "MIT"
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^6.2.1",
-        "is-fullwidth-code-point": "^5.0.0"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+        "node": ">= 8"
       }
     },
-    "node_modules/cypress/node_modules/onetime": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
-      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
-      "dev": true,
+    "node_modules/crossvent": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/crossvent/-/crossvent-1.5.5.tgz",
+      "integrity": "sha512-MY4xhBYEnVi+pmTpHCOCsCLYczc0PVtGdPBz6NXNXxikLaUZo4HdAeUb1UqAo3t3yXAloSelTmfxJ+/oUqkW5w==",
       "license": "MIT",
       "dependencies": {
-        "mimic-function": "^5.0.0"
-      },
+        "custom-event": "^1.0.0"
+      }
+    },
+    "node_modules/css-functions-list": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.3.3.tgz",
+      "integrity": "sha512-8HFEBPKhOpJPEPu70wJJetjKta86Gw9+CCyCnB3sui2qQfOvRyqBy4IKLKKAwdMpWb2lHXWk9Wb4Z6AmaUT1Pg==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=12"
       }
     },
-    "node_modules/cypress/node_modules/qs": {
-      "version": "6.15.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz",
-      "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==",
+    "node_modules/css-tree": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz",
+      "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "license": "MIT",
       "dependencies": {
-        "es-define-property": "^1.0.1",
-        "side-channel": "^1.1.1"
+        "mdn-data": "2.12.2",
+        "source-map-js": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.6"
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "cssesc": "bin/cssesc"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/cypress/node_modules/restore-cursor": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
-      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
+    "node_modules/csstype": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
+      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+      "license": "MIT"
+    },
+    "node_modules/custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==",
+      "license": "MIT"
+    },
+    "node_modules/cypress": {
+      "version": "15.18.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-15.18.0.tgz",
+      "integrity": "sha512-aLfOYSLlVt1b6QSoVUjbCY27taZlYAT8ST47xQbwd9pvQrY/g5gXi12yItZTB+kxkkj+ZcvUYmRLUC95SlCJsw==",
       "dev": true,
+      "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "onetime": "^7.0.0",
-        "signal-exit": "^4.1.0"
+        "@cypress/request": "^4.0.0",
+        "@cypress/xvfb": "^1.2.4",
+        "@types/sinonjs__fake-timers": "8.1.1",
+        "@types/sizzle": "^2.3.2",
+        "@types/tmp": "^0.2.3",
+        "arch": "^2.2.0",
+        "blob-util": "^2.0.2",
+        "bluebird": "^3.7.2",
+        "buffer": "^5.7.1",
+        "cachedir": "^2.4.0",
+        "chalk": "^4.1.0",
+        "ci-info": "^4.1.0",
+        "cli-table3": "0.6.1",
+        "commander": "^6.2.1",
+        "common-tags": "^1.8.0",
+        "dayjs": "^1.10.4",
+        "debug": "^4.3.4",
+        "eventemitter2": "6.4.7",
+        "execa": "4.1.0",
+        "executable": "^4.1.1",
+        "fs-extra": "^9.1.0",
+        "hasha": "5.2.2",
+        "is-installed-globally": "~0.4.0",
+        "listr2": "^9.0.5",
+        "lodash": "^4.17.23",
+        "log-symbols": "^4.0.0",
+        "minimist": "^1.2.8",
+        "ospath": "^1.2.2",
+        "pretty-bytes": "^5.6.0",
+        "process": "^0.11.10",
+        "proxy-from-env": "1.0.0",
+        "request-progress": "^3.0.0",
+        "supports-color": "^8.1.1",
+        "systeminformation": "^5.31.1",
+        "tmp": "~0.2.4",
+        "tree-kill": "1.2.2",
+        "tslib": "1.14.1",
+        "untildify": "^4.0.0",
+        "yauzl": "^3.3.1"
+      },
+      "bin": {
+        "cypress": "bin/cypress"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^20.1.0 || ^22.0.0 || >=24.0.0"
       }
     },
-    "node_modules/cypress/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+    "node_modules/cypress-file-upload": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz",
+      "integrity": "sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "engines": {
-        "node": ">=14"
+        "node": ">=8.2.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "peerDependencies": {
+        "cypress": ">3.0.0"
       }
     },
-    "node_modules/cypress/node_modules/slice-ansi": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-8.0.0.tgz",
-      "integrity": "sha512-stxByr12oeeOyY2BlviTNQlYV5xOj47GirPr4yA1hE9JCtxfQN0+tVbkxwCtYDQWhEKWFHsEK48ORg5jrouCAg==",
+    "node_modules/cypress/node_modules/commander": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^6.2.3",
-        "is-fullwidth-code-point": "^5.1.0"
-      },
       "engines": {
-        "node": ">=20"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+        "node": ">= 6"
       }
     },
-    "node_modules/cypress/node_modules/string-width": {
-      "version": "8.2.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.1.tgz",
-      "integrity": "sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==",
+    "node_modules/cypress/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "get-east-asian-width": "^1.5.0",
-        "strip-ansi": "^7.1.2"
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=10"
       }
     },
-    "node_modules/cypress/node_modules/strip-ansi": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
-      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/d3-color": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
+      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-dispatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-3.0.1.tgz",
+      "integrity": "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-drag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-3.0.0.tgz",
+      "integrity": "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==",
+      "license": "ISC",
       "dependencies": {
-        "ansi-regex": "^6.2.2"
+        "d3-dispatch": "1 - 3",
+        "d3-selection": "3"
       },
       "engines": {
         "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "node_modules/cypress/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true,
-      "license": "0BSD"
+    "node_modules/d3-ease": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
+      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/cypress/node_modules/wrap-ansi": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
-      "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/d3-interpolate": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
+      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "license": "ISC",
       "dependencies": {
-        "ansi-styles": "^6.2.1",
-        "string-width": "^7.0.0",
-        "strip-ansi": "^7.1.0"
+        "d3-color": "1 - 3"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+        "node": ">=12"
       }
     },
-    "node_modules/cypress/node_modules/wrap-ansi/node_modules/string-width": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/d3-selection": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-3.0.0.tgz",
+      "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-timer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
+      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/d3-transition": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-3.0.1.tgz",
+      "integrity": "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==",
+      "license": "ISC",
       "dependencies": {
-        "emoji-regex": "^10.3.0",
-        "get-east-asian-width": "^1.0.0",
-        "strip-ansi": "^7.1.0"
+        "d3-color": "1 - 3",
+        "d3-dispatch": "1 - 3",
+        "d3-ease": "1 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-timer": "1 - 3"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=12"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "d3-selection": "2 - 3"
       }
     },
-    "node_modules/cypress/node_modules/yauzl": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
-      "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/d3-zoom": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-3.0.0.tgz",
+      "integrity": "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==",
+      "license": "ISC",
       "dependencies": {
-        "pend": "~1.2.0"
+        "d3-dispatch": "1 - 3",
+        "d3-drag": "2 - 3",
+        "d3-interpolate": "1 - 3",
+        "d3-selection": "2 - 3",
+        "d3-transition": "2 - 3"
       },
       "engines": {
         "node": ">=12"
@@ -7285,9 +5666,9 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.18",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz",
-      "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==",
+      "version": "1.11.19",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.19.tgz",
+      "integrity": "sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==",
       "dev": true,
       "license": "MIT"
     },
@@ -7326,10 +5707,20 @@
       }
     },
     "node_modules/deepmerge-ts": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.5.tgz",
-      "integrity": "sha512-HOJkrhaYsweh+W+e74Yn7YStZOilkoPb6fycpwNLKzSPtruFs48nYis0zy5yJz1+ktUhHxoRDJ27RQAWLIJVJw==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/deepmerge-ts/-/deepmerge-ts-7.1.6.tgz",
+      "integrity": "sha512-gQhL1ksGBLQbHeAo47YU6cs2ahd3Pv+8PFYoWogNZbQnNwQyOh9Ad5kbeHFiWwbKdeWQJ5Z7Y7mwb9ew2hXBLw==",
       "dev": true,
+      "funding": [
+        {
+          "type": "ko-fi",
+          "url": "https://ko-fi.com/rebeccastevens"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/deepmerge-ts"
+        }
+      ],
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=16.0.0"
@@ -7392,9 +5783,9 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.1.tgz",
-      "integrity": "sha512-ecqj/sy1jcK1uWrwpR67UhYrIFQ+5WlGxth34WquCbamhFA6hkkwiu37o6J5xCHdo1oixJRfVRw+ywV+Hq/0Aw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -7402,9 +5793,9 @@
       }
     },
     "node_modules/diff": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.2.tgz",
-      "integrity": "sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A==",
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.3.tgz",
+      "integrity": "sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
@@ -7451,6 +5842,19 @@
         "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
+    "node_modules/dom-serializer/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/dom-walk": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
@@ -7501,9 +5905,10 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "16.6.1",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.6.1.tgz",
-      "integrity": "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==",
+      "version": "17.3.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.3.1.tgz",
+      "integrity": "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA==",
+      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -7537,13 +5942,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -7556,9 +5954,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.223",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.223.tgz",
-      "integrity": "sha512-qKm55ic6nbEmagFlTFczML33rF90aU+WtrJ9MdTCThrcvDNdUHN4p6QfVN78U06ZmguqXIyMPyYhw2TrbDUwPQ==",
+      "version": "1.5.307",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.307.tgz",
+      "integrity": "sha512-5z3uFKBWjiNR44nFcYdkcXjKMbg5KXNdciu7mhTPo9tB7NbqSNP2sSnGR+fqknZSCwKkBN+oxiiajWs4dT6ORg==",
       "dev": true,
       "license": "ISC"
     },
@@ -7589,24 +5987,10 @@
         "once": "^1.4.0"
       }
     },
-    "node_modules/enquirer": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
-      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-colors": "^4.1.1",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
     "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
+      "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
@@ -7649,9 +6033,9 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.24.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz",
-      "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==",
+      "version": "1.24.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.1.tgz",
+      "integrity": "sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7738,9 +6122,9 @@
       }
     },
     "node_modules/es-module-shims": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-1.10.1.tgz",
-      "integrity": "sha512-HSSkRLkqFEyX6GrCAHrSOR5iz/QzQJRqZUF7bFJOZ4aoSw0WoSggfsTIGN2yFbF8v6xjQFhT4HGP6b+0qQZmEQ==",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/es-module-shims/-/es-module-shims-2.8.0.tgz",
+      "integrity": "sha512-7eBj0nIBTMjg8WspPfHOXVxwvDPeYjTMH7PipzrbecfLS4SFwRvWeakZNsAx0y9yF3TydxrG32tj3y+GKzlpYg==",
       "license": "MIT"
     },
     "node_modules/es-object-atoms": {
@@ -7804,9 +6188,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.25.10",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz",
-      "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==",
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.7.tgz",
+      "integrity": "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -7817,32 +6201,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.10",
-        "@esbuild/android-arm": "0.25.10",
-        "@esbuild/android-arm64": "0.25.10",
-        "@esbuild/android-x64": "0.25.10",
-        "@esbuild/darwin-arm64": "0.25.10",
-        "@esbuild/darwin-x64": "0.25.10",
-        "@esbuild/freebsd-arm64": "0.25.10",
-        "@esbuild/freebsd-x64": "0.25.10",
-        "@esbuild/linux-arm": "0.25.10",
-        "@esbuild/linux-arm64": "0.25.10",
-        "@esbuild/linux-ia32": "0.25.10",
-        "@esbuild/linux-loong64": "0.25.10",
-        "@esbuild/linux-mips64el": "0.25.10",
-        "@esbuild/linux-ppc64": "0.25.10",
-        "@esbuild/linux-riscv64": "0.25.10",
-        "@esbuild/linux-s390x": "0.25.10",
-        "@esbuild/linux-x64": "0.25.10",
-        "@esbuild/netbsd-arm64": "0.25.10",
-        "@esbuild/netbsd-x64": "0.25.10",
-        "@esbuild/openbsd-arm64": "0.25.10",
-        "@esbuild/openbsd-x64": "0.25.10",
-        "@esbuild/openharmony-arm64": "0.25.10",
-        "@esbuild/sunos-x64": "0.25.10",
-        "@esbuild/win32-arm64": "0.25.10",
-        "@esbuild/win32-ia32": "0.25.10",
-        "@esbuild/win32-x64": "0.25.10"
+        "@esbuild/aix-ppc64": "0.27.7",
+        "@esbuild/android-arm": "0.27.7",
+        "@esbuild/android-arm64": "0.27.7",
+        "@esbuild/android-x64": "0.27.7",
+        "@esbuild/darwin-arm64": "0.27.7",
+        "@esbuild/darwin-x64": "0.27.7",
+        "@esbuild/freebsd-arm64": "0.27.7",
+        "@esbuild/freebsd-x64": "0.27.7",
+        "@esbuild/linux-arm": "0.27.7",
+        "@esbuild/linux-arm64": "0.27.7",
+        "@esbuild/linux-ia32": "0.27.7",
+        "@esbuild/linux-loong64": "0.27.7",
+        "@esbuild/linux-mips64el": "0.27.7",
+        "@esbuild/linux-ppc64": "0.27.7",
+        "@esbuild/linux-riscv64": "0.27.7",
+        "@esbuild/linux-s390x": "0.27.7",
+        "@esbuild/linux-x64": "0.27.7",
+        "@esbuild/netbsd-arm64": "0.27.7",
+        "@esbuild/netbsd-x64": "0.27.7",
+        "@esbuild/openbsd-arm64": "0.27.7",
+        "@esbuild/openbsd-x64": "0.27.7",
+        "@esbuild/openharmony-arm64": "0.27.7",
+        "@esbuild/sunos-x64": "0.27.7",
+        "@esbuild/win32-arm64": "0.27.7",
+        "@esbuild/win32-ia32": "0.27.7",
+        "@esbuild/win32-x64": "0.27.7"
       }
     },
     "node_modules/escalade": {
@@ -7869,26 +6253,25 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.36.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.36.0.tgz",
-      "integrity": "sha512-hB4FIzXovouYzwzECDcUkJ4OcfOEkXTv2zRY6B9bkwjx/cprAq0uvm1nl7zvQ0/TsUk0zQiN4uPfJpB9m+rPMQ==",
+      "version": "9.39.4",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.4.tgz",
+      "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.21.0",
-        "@eslint/config-helpers": "^0.3.1",
-        "@eslint/core": "^0.15.2",
-        "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.36.0",
-        "@eslint/plugin-kit": "^0.3.5",
+        "@eslint/config-array": "^0.21.2",
+        "@eslint/config-helpers": "^0.4.2",
+        "@eslint/core": "^0.17.0",
+        "@eslint/eslintrc": "^3.3.5",
+        "@eslint/js": "9.39.4",
+        "@eslint/plugin-kit": "^0.4.1",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
         "@types/estree": "^1.0.6",
-        "@types/json-schema": "^7.0.15",
-        "ajv": "^6.12.4",
+        "ajv": "^6.14.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
@@ -7907,7 +6290,7 @@
         "is-glob": "^4.0.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
+        "minimatch": "^3.1.5",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.3"
       },
@@ -7979,6 +6362,38 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/eslint-plugin-cypress": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-6.4.1.tgz",
+      "integrity": "sha512-8mnfR3q0Lr41Fu9SYZGeZ5nbSBgtS44+bbtSs7k0KvfoQ2pPmK43IvaTP6FGTfwBTN6S7w027CpqjrLAd65AYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "globals": "^17.6.0"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": ">=8",
+        "eslint": ">=9"
+      },
+      "peerDependenciesMeta": {
+        "@typescript-eslint/parser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/eslint-plugin-cypress/node_modules/globals": {
+      "version": "17.7.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-17.7.0.tgz",
+      "integrity": "sha512-Czmyns5dUsq4seFBR/Kdydhmo8y9kC79hiSkPn0YcGtNnYWnrgt0vjrSjx9tspoDGWm2CMarffRuLjM4xUz8xg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/eslint-plugin-import": {
       "version": "2.32.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz",
@@ -8034,16 +6449,16 @@
       }
     },
     "node_modules/eslint-plugin-vue": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.5.0.tgz",
-      "integrity": "sha512-7BZHsG3kC2vei8F2W8hnfDi9RK+cv5eKPMvzBdrl8Vuc0hR5odGQRli8VVzUkrmUHkxFEm4Iio1r5HOKslO0Aw==",
+      "version": "10.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.8.0.tgz",
+      "integrity": "sha512-f1J/tcbnrpgC8suPN5AtdJ5MQjuXbSU9pGRSSYAuF3SHoiYCOdEX6O22pLaRyLHXvDcOe+O5ENgc1owQ587agA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "natural-compare": "^1.4.0",
         "nth-check": "^2.1.1",
-        "postcss-selector-parser": "^6.0.15",
+        "postcss-selector-parser": "^7.1.0",
         "semver": "^7.6.3",
         "xml-name-validator": "^4.0.0"
       },
@@ -8053,7 +6468,7 @@
       "peerDependencies": {
         "@stylistic/eslint-plugin": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0",
         "@typescript-eslint/parser": "^7.0.0 || ^8.0.0",
-        "eslint": "^8.57.0 || ^9.0.0",
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
         "vue-eslint-parser": "^10.0.0"
       },
       "peerDependenciesMeta": {
@@ -8065,20 +6480,6 @@
         }
       }
     },
-    "node_modules/eslint-plugin-vue/node_modules/postcss-selector-parser": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/eslint-scope": {
       "version": "8.4.0",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
@@ -8128,9 +6529,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz",
+      "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -8237,27 +6638,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/extract-zip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "extract-zip": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "optionalDependencies": {
-        "@types/yauzl": "^2.9.1"
-      }
-    },
     "node_modules/extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -8336,44 +6716,6 @@
       ],
       "license": "BSD-3-Clause"
     },
-    "node_modules/fast-xml-builder": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.9.tgz",
-      "integrity": "sha512-jcyKVSEX13iseJqg7n/KWw+xnu/7fdrZ333Fac54KjHDIELVCfDDJXYIm6DTJ0Su4gSzrhqiK0DzY/wZbF40mw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "path-expression-matcher": "^1.1.3"
-      }
-    },
-    "node_modules/fast-xml-parser": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.2.tgz",
-      "integrity": "sha512-P7oW7tLbYnhOLQk/Gv7cZgzgMPP/XN03K02/Jy6Y/NHzyIAIpxuZIM/YqAkfiXFPxA2CTm7NtCijK9EDu09u2w==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@nodable/entities": "^2.1.0",
-        "fast-xml-builder": "^1.1.5",
-        "path-expression-matcher": "^1.5.0",
-        "strnum": "^2.2.3"
-      },
-      "bin": {
-        "fxparser": "src/cli/cli.js"
-      }
-    },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.16",
       "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
@@ -8385,23 +6727,13 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
-      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+      "version": "1.20.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+      "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "pend": "~1.2.0"
+        "reusify": "^1.0.4"
       }
     },
     "node_modules/fdir": {
@@ -8422,32 +6754,6 @@
         }
       }
     },
-    "node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/figures/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/file-entry-cache": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
@@ -8523,6 +6829,12 @@
         "node": ">=10"
       }
     },
+    "node_modules/focus-lock/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD"
+    },
     "node_modules/focus-visible": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/focus-visible/-/focus-visible-5.2.1.tgz",
@@ -8545,36 +6857,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/foreground-child": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
-      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "cross-spawn": "^7.0.6",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/foreground-child/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -8603,9 +6885,9 @@
       }
     },
     "node_modules/fs-extra": {
-      "version": "11.3.2",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz",
-      "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==",
+      "version": "11.3.4",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz",
+      "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8674,12 +6956,12 @@
       }
     },
     "node_modules/fuse.js": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.6.1.tgz",
-      "integrity": "sha512-hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.1.0.tgz",
+      "integrity": "sha512-trLf4SzuuUxfusZADLINj+dE8clK1frKdmqiJNb1Es75fmI5oY6X2mxLVUciLLjxqw/xr72Dhy+lER6dGd02FQ==",
       "license": "Apache-2.0",
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       }
     },
     "node_modules/generate-function": {
@@ -8692,6 +6974,16 @@
         "is-property": "^1.0.2"
       }
     },
+    "node_modules/generator-function": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz",
+      "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -8788,16 +7080,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/getos": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
-      "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "async": "^3.2.0"
-      }
-    },
     "node_modules/getpass": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -8809,24 +7091,18 @@
       }
     },
     "node_modules/glob": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-11.1.0.tgz",
-      "integrity": "sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==",
+      "version": "13.0.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
+      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
-        "foreground-child": "^3.3.1",
-        "jackspeak": "^4.1.1",
-        "minimatch": "^10.1.1",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^2.0.0"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
+        "minimatch": "^10.2.2",
+        "minipass": "^7.1.3",
+        "path-scurry": "^2.0.2"
       },
       "engines": {
-        "node": "20 || >=22"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -9151,6 +7427,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/hashery": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/hashery/-/hashery-1.5.0.tgz",
+      "integrity": "sha512-nhQ6ExaOIqti2FDWoEMWARUqIKyjr2VcZzXShrI+A3zpeiuPWzx6iPftt44LhP74E5sW36B75N6VHbvRtpvO6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hookified": "^1.14.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
     "node_modules/hasown": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz",
@@ -9175,9 +7464,9 @@
       }
     },
     "node_modules/hookified": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.12.1.tgz",
-      "integrity": "sha512-xnKGl+iMIlhrZmGHB729MqlmPoWBznctSQTYCpFKqNsCgimJQmithcW0xSQMMFzYnV2iKUh25alswn6epgxS0Q==",
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.15.1.tgz",
+      "integrity": "sha512-MvG/clsADq1GPM2KGo2nyfaWVyn9naPiXrqIe4jYjXNZQt238kWyOGrsyc/DmRAQ+Re6yeo6yX/yoNCG5KAEVg==",
       "dev": true,
       "license": "MIT"
     },
@@ -9243,19 +7532,6 @@
         "entities": "^7.0.1"
       }
     },
-    "node_modules/htmlparser2/node_modules/entities": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
-      "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
     "node_modules/http-signature": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz",
@@ -9282,9 +7558,9 @@
       }
     },
     "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz",
+      "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9292,6 +7568,10 @@
       },
       "engines": {
         "node": ">=0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/ieee754": {
@@ -9359,24 +7639,14 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ini": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-5.0.0.tgz",
-      "integrity": "sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-6.0.0.tgz",
+      "integrity": "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
-        "node": "^18.17.0 || >=20.5.0"
+        "node": "^20.17.0 || >=22.9.0"
       }
     },
     "node_modules/internal-slot": {
@@ -9580,14 +7850,15 @@
       }
     },
     "node_modules/is-generator-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
-      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz",
+      "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.0",
+        "call-bound": "^1.0.4",
+        "generator-function": "^2.0.0",
+        "get-proto": "^1.0.1",
         "has-tostringtag": "^1.0.2",
         "safe-regex-test": "^1.1.0"
       },
@@ -9903,6 +8174,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -9917,125 +8195,24 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/jackspeak": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.1.tgz",
-      "integrity": "sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "engines": {
-        "node": "20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/jasmine-core": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.10.0.tgz",
-      "integrity": "sha512-MrChbWV5LBo+EaeKwTM1eZ6oYSz1brvFExnRafraEkJkbJ9evbUxABhnIgGQimhpMxhg+BD6QmOvb/e3NXsNdg==",
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-5.13.0.tgz",
+      "integrity": "sha512-vsYjfh7lyqvZX5QgqKc4YH8phs7g96Z8bsdIFNEU3VqXhlHaq+vov/Fgn/sr6MiUczdZkyXRC3TX369Ll4Nzbw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/joomla-cypress": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/joomla-cypress/-/joomla-cypress-1.3.1.tgz",
-      "integrity": "sha512-8ww37fHL2yVTld8f7BwZuIFc5g1Ba0bCgaxlMGZhqBl89BO+iGaiAXR9uKT5pufjaZEJDBVd92ScTJZLaoeRwQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/joomla-cypress/-/joomla-cypress-2.0.0.tgz",
+      "integrity": "sha512-yq6oFQwripFDxWGLWgVKNXfBEG/xfCiwxlrr1pOjlSFBazZGe2q3kuYGd4VXLUdjTt5+lww6x3LR7sjFRtAmyw==",
       "dev": true,
       "license": "GPL-2.0+",
       "dependencies": {
-        "cypress": "^13.16.0",
+        "cypress": ">=15.10.0",
         "cypress-file-upload": "^5.0.8"
       }
     },
-    "node_modules/joomla-cypress/node_modules/commander": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/joomla-cypress/node_modules/cypress": {
-      "version": "13.17.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.17.0.tgz",
-      "integrity": "sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "@cypress/request": "^3.0.6",
-        "@cypress/xvfb": "^1.2.4",
-        "@types/sinonjs__fake-timers": "8.1.1",
-        "@types/sizzle": "^2.3.2",
-        "arch": "^2.2.0",
-        "blob-util": "^2.0.2",
-        "bluebird": "^3.7.2",
-        "buffer": "^5.7.1",
-        "cachedir": "^2.3.0",
-        "chalk": "^4.1.0",
-        "check-more-types": "^2.24.0",
-        "ci-info": "^4.0.0",
-        "cli-cursor": "^3.1.0",
-        "cli-table3": "~0.6.1",
-        "commander": "^6.2.1",
-        "common-tags": "^1.8.0",
-        "dayjs": "^1.10.4",
-        "debug": "^4.3.4",
-        "enquirer": "^2.3.6",
-        "eventemitter2": "6.4.7",
-        "execa": "4.1.0",
-        "executable": "^4.1.1",
-        "extract-zip": "2.0.1",
-        "figures": "^3.2.0",
-        "fs-extra": "^9.1.0",
-        "getos": "^3.2.1",
-        "is-installed-globally": "~0.4.0",
-        "lazy-ass": "^1.6.0",
-        "listr2": "^3.8.3",
-        "lodash": "^4.17.21",
-        "log-symbols": "^4.0.0",
-        "minimist": "^1.2.8",
-        "ospath": "^1.2.2",
-        "pretty-bytes": "^5.6.0",
-        "process": "^0.11.10",
-        "proxy-from-env": "1.0.0",
-        "request-progress": "^3.0.0",
-        "semver": "^7.5.3",
-        "supports-color": "^8.1.1",
-        "tmp": "~0.2.3",
-        "tree-kill": "1.2.2",
-        "untildify": "^4.0.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "cypress": "bin/cypress"
-      },
-      "engines": {
-        "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
-      }
-    },
-    "node_modules/joomla-cypress/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/joomla-ui-custom-elements": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/joomla-ui-custom-elements/-/joomla-ui-custom-elements-0.4.1.tgz",
@@ -10049,9 +8226,9 @@
       "license": "MIT"
     },
     "node_modules/jquery-migrate": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.5.2.tgz",
-      "integrity": "sha512-GGvcVWK3aei2/98r7pA4UkOYvs4xVeCGvquNXADFUp9+Sr6VeOw0ktlQ9z4YlBbEFpsXBlRioAgpH/fLWinj4Q==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-3.6.0.tgz",
+      "integrity": "sha512-2k3GMQXXEellCOkj8tczgCd/Y0KMm7LErz4rE6CkHIZV1JTUDlgs7XFN+GpwGKXDQtw/HsjtJuE+CS8IfEOnPg==",
       "license": "MIT",
       "peerDependencies": {
         "jquery": ">=3 <4"
@@ -10228,16 +8405,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/lazy-ass": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
-      "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "> 0.8"
-      }
-    },
     "node_modules/leac": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/leac/-/leac-0.7.0.tgz",
@@ -10282,23 +8449,6 @@
         "libqp": "2.1.1"
       }
     },
-    "node_modules/libmime/node_modules/iconv-lite": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz",
-      "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
-    },
     "node_modules/libqp": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/libqp/-/libqp-2.1.1.tgz",
@@ -10307,9 +8457,9 @@
       "license": "MIT"
     },
     "node_modules/lightningcss": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.1.tgz",
-      "integrity": "sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
+      "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
       "dev": true,
       "license": "MPL-2.0",
       "dependencies": {
@@ -10323,22 +8473,44 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "lightningcss-darwin-arm64": "1.30.1",
-        "lightningcss-darwin-x64": "1.30.1",
-        "lightningcss-freebsd-x64": "1.30.1",
-        "lightningcss-linux-arm-gnueabihf": "1.30.1",
-        "lightningcss-linux-arm64-gnu": "1.30.1",
-        "lightningcss-linux-arm64-musl": "1.30.1",
-        "lightningcss-linux-x64-gnu": "1.30.1",
-        "lightningcss-linux-x64-musl": "1.30.1",
-        "lightningcss-win32-arm64-msvc": "1.30.1",
-        "lightningcss-win32-x64-msvc": "1.30.1"
+        "lightningcss-android-arm64": "1.32.0",
+        "lightningcss-darwin-arm64": "1.32.0",
+        "lightningcss-darwin-x64": "1.32.0",
+        "lightningcss-freebsd-x64": "1.32.0",
+        "lightningcss-linux-arm-gnueabihf": "1.32.0",
+        "lightningcss-linux-arm64-gnu": "1.32.0",
+        "lightningcss-linux-arm64-musl": "1.32.0",
+        "lightningcss-linux-x64-gnu": "1.32.0",
+        "lightningcss-linux-x64-musl": "1.32.0",
+        "lightningcss-win32-arm64-msvc": "1.32.0",
+        "lightningcss-win32-x64-msvc": "1.32.0"
+      }
+    },
+    "node_modules/lightningcss-android-arm64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz",
+      "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
     "node_modules/lightningcss-darwin-arm64": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.1.tgz",
-      "integrity": "sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz",
+      "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
       "cpu": [
         "arm64"
       ],
@@ -10357,9 +8529,9 @@
       }
     },
     "node_modules/lightningcss-darwin-x64": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.1.tgz",
-      "integrity": "sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
+      "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
       "cpu": [
         "x64"
       ],
@@ -10378,9 +8550,9 @@
       }
     },
     "node_modules/lightningcss-freebsd-x64": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.1.tgz",
-      "integrity": "sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz",
+      "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==",
       "cpu": [
         "x64"
       ],
@@ -10399,9 +8571,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm-gnueabihf": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.1.tgz",
-      "integrity": "sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz",
+      "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==",
       "cpu": [
         "arm"
       ],
@@ -10420,9 +8592,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm64-gnu": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.1.tgz",
-      "integrity": "sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz",
+      "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==",
       "cpu": [
         "arm64"
       ],
@@ -10441,9 +8613,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm64-musl": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.1.tgz",
-      "integrity": "sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz",
+      "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==",
       "cpu": [
         "arm64"
       ],
@@ -10462,9 +8634,9 @@
       }
     },
     "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.1.tgz",
-      "integrity": "sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz",
+      "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==",
       "cpu": [
         "x64"
       ],
@@ -10483,9 +8655,9 @@
       }
     },
     "node_modules/lightningcss-linux-x64-musl": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.1.tgz",
-      "integrity": "sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz",
+      "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==",
       "cpu": [
         "x64"
       ],
@@ -10504,9 +8676,9 @@
       }
     },
     "node_modules/lightningcss-win32-arm64-msvc": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.1.tgz",
-      "integrity": "sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz",
+      "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==",
       "cpu": [
         "arm64"
       ],
@@ -10525,9 +8697,9 @@
       }
     },
     "node_modules/lightningcss-win32-x64-msvc": {
-      "version": "1.30.1",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.1.tgz",
-      "integrity": "sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==",
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz",
+      "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==",
       "cpu": [
         "x64"
       ],
@@ -10573,31 +8745,21 @@
       }
     },
     "node_modules/listr2": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
-      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-9.0.5.tgz",
+      "integrity": "sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.16",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.5.1",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "enquirer": ">= 2.3.0 < 3"
-      },
-      "peerDependenciesMeta": {
-        "enquirer": {
-          "optional": true
-        }
+        "cli-truncate": "^5.0.0",
+        "colorette": "^2.0.20",
+        "eventemitter3": "^5.0.1",
+        "log-update": "^6.1.0",
+        "rfdc": "^1.4.1",
+        "wrap-ansi": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=20.0.0"
       }
     },
     "node_modules/locate-path": {
@@ -10669,55 +8831,98 @@
       }
     },
     "node_modules/log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
+      "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
+        "ansi-escapes": "^7.0.0",
+        "cli-cursor": "^5.0.0",
+        "slice-ansi": "^7.1.0",
+        "strip-ansi": "^7.1.0",
+        "wrap-ansi": "^9.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/is-fullwidth-code-point": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz",
+      "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-east-asian-width": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/log-update/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz",
+      "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.2.1",
+        "is-fullwidth-code-point": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
-    "node_modules/log-update/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+    "node_modules/log-update/node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-regex": "^6.2.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
     "node_modules/long": {
@@ -10738,9 +8943,9 @@
       }
     },
     "node_modules/lru.min": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/lru.min/-/lru.min-1.1.2.tgz",
-      "integrity": "sha512-Nv9KddBcQSlQopmBHXSsZVY5xsdlZkdH/Iey0BlcBYggMd4two7cZnKOK9vmy3nY0O5RGH99z1PCeTpPqszUYg==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lru.min/-/lru.min-1.1.4.tgz",
+      "integrity": "sha512-DqC6n3QQ77zdFpCMASA1a3Jlb64Hv2N2DciFGkO/4L9+q/IpIAuRlKOvCXabtRW6cQf8usbmM6BE/TOPysCdIA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -10754,9 +8959,9 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.19",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.19.tgz",
-      "integrity": "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==",
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.5"
@@ -10781,23 +8986,6 @@
         "tlds": "1.261.0"
       }
     },
-    "node_modules/mailparser/node_modules/iconv-lite": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz",
-      "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
-    },
     "node_modules/mailparser/node_modules/nodemailer": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-9.0.5.tgz",
@@ -10843,9 +9031,9 @@
       "license": "CC0-1.0"
     },
     "node_modules/mediaelement": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/mediaelement/-/mediaelement-5.1.2.tgz",
-      "integrity": "sha512-Rr7WGTD4cSJs7ASHCp6gdF+e2PXecVXCW9T4fpcwkbX5d58I3Mdtg/o2E3vLOaQ8Li/DoHXwo91SVpUINFQ3cQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/mediaelement/-/mediaelement-7.1.0.tgz",
+      "integrity": "sha512-EdvcgY5jXfo5eNfi4TRLxyeyi5CdGYp4CX/rNJUFQ0xsXU+FsAjut0GoupH7H6spXya/8WJolyA+aLGxOJnrYQ==",
       "license": "MIT",
       "dependencies": {
         "global": "^4.3.1",
@@ -10962,9 +9150,9 @@
       }
     },
     "node_modules/min-document": {
-      "version": "2.19.1",
-      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.1.tgz",
-      "integrity": "sha512-8lqe85PkqQJzIcs2iD7xW/WSxcncC3/DPVbTOafKNJDIMXwGfwXS350mH4SJslomntN2iYtFBuC0yNO3CEap6g==",
+      "version": "2.19.2",
+      "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.2.tgz",
+      "integrity": "sha512-8S5I8db/uZN8r9HSLFVWPdJCvYOejMcEC82VIzNUc6Zkklf/d1gg2psfE79/vyhWOj4+J8MtwmoOz3TmvaGu5A==",
       "license": "MIT",
       "dependencies": {
         "dom-walk": "^0.1.0"
@@ -10994,11 +9182,11 @@
       }
     },
     "node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -11011,80 +9199,45 @@
       "license": "MIT"
     },
     "node_modules/mysql2": {
-      "version": "3.15.3",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.15.3.tgz",
-      "integrity": "sha512-FBrGau0IXmuqg4haEZRBfHNWB5mUARw6hNwPDXXGg0XzVJ50mr/9hb267lvpVMnhZ1FON3qNd4Xfcez1rbFwSg==",
+      "version": "3.19.1",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.19.1.tgz",
+      "integrity": "sha512-yn4zh+Uxu5J3Zvi6Ao96lJ7BSBRkspHflWQAmOPND+htbpIKDQw99TTvPzgihKO/QyMickZopO4OsnixnpcUwA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "aws-ssl-profiles": "^1.1.1",
+        "aws-ssl-profiles": "^1.1.2",
         "denque": "^2.1.0",
         "generate-function": "^2.3.1",
-        "iconv-lite": "^0.7.0",
-        "long": "^5.2.1",
-        "lru.min": "^1.0.0",
-        "named-placeholders": "^1.1.3",
-        "seq-queue": "^0.0.5",
-        "sqlstring": "^2.3.2"
+        "iconv-lite": "^0.7.2",
+        "long": "^5.3.2",
+        "lru.min": "^1.1.4",
+        "named-placeholders": "^1.1.6",
+        "sql-escaper": "^1.3.3"
       },
       "engines": {
         "node": ">= 8.0"
-      }
-    },
-    "node_modules/mysql2/node_modules/iconv-lite": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.0.tgz",
-      "integrity": "sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
-    },
-    "node_modules/mysql2/node_modules/sqlstring": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz",
-      "integrity": "sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+      "peerDependencies": {
+        "@types/node": ">= 8"
       }
     },
     "node_modules/named-placeholders": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz",
-      "integrity": "sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.6.tgz",
+      "integrity": "sha512-Tz09sEL2EEuv5fFowm419c1+a/jSMiBjI9gHxVLrVdbUkkNUUfjsVYs9pVZu5oCon/kmRh9TfLEObFtkVxmY0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "lru-cache": "^7.14.1"
+        "lru.min": "^1.1.0"
       },
       "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/named-placeholders/node_modules/lru-cache": {
-      "version": "7.18.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=12"
+        "node": ">=8.0.0"
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.17",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.17.tgz",
-      "integrity": "sha512-xQLf0A3HOMlgHq0n247/LRuAOYmB7dXJ/DvAxGvsSBij45XtBSmQycu+F8ODbHwns/XyFZagyL1+J0Offw1E0g==",
+      "version": "3.3.18",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.18.tgz",
+      "integrity": "sha512-DTg4MJbGMWkfi6VZFdNt2/caMbQy4Ou+Op/hJQvGEWcnVfoA1QA+xzRKAzw9jD6+GVOOeYr/mIcuDSdug6F6+w==",
       "funding": [
         {
           "type": "github",
@@ -11115,9 +9268,9 @@
       "optional": true
     },
     "node_modules/node-releases": {
-      "version": "2.0.21",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.21.tgz",
-      "integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==",
+      "version": "2.0.27",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+      "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
       "dev": true,
       "license": "MIT"
     },
@@ -11365,22 +9518,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/package-json-from-dist": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
@@ -11444,22 +9581,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/path-expression-matcher": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.5.0.tgz",
-      "integrity": "sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -11478,9 +9599,9 @@
       "license": "MIT"
     },
     "node_modules/path-scurry": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
-      "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
@@ -11488,18 +9609,18 @@
         "minipass": "^7.1.2"
       },
       "engines": {
-        "node": "20 || >=22"
+        "node": "18 || 20 || >=22"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "11.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz",
-      "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==",
+      "version": "11.2.6",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.6.tgz",
+      "integrity": "sha512-ESL2CrkS/2wTPfuend7Zhkzo2u0daGJ/A2VucJOgQ/C48S/zB8MMeMHSGKYpXhIjbPxfuezITkaBH1wqv00DDQ==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "engines": {
         "node": "20 || >=22"
       }
@@ -11539,15 +9660,15 @@
       "license": "MIT"
     },
     "node_modules/pg": {
-      "version": "8.16.3",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
-      "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.20.0.tgz",
+      "integrity": "sha512-ldhMxz2r8fl/6QkXnBD3CR9/xg694oT6DZQ2s6c/RI28OjtSOpxnPrUCGOBJ46RCUxcWdx3p6kw/xnDHjKvaRA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pg-connection-string": "^2.9.1",
-        "pg-pool": "^3.10.1",
-        "pg-protocol": "^1.10.3",
+        "pg-connection-string": "^2.12.0",
+        "pg-pool": "^3.13.0",
+        "pg-protocol": "^1.13.0",
         "pg-types": "2.2.0",
         "pgpass": "1.0.5"
       },
@@ -11555,7 +9676,7 @@
         "node": ">= 16.0.0"
       },
       "optionalDependencies": {
-        "pg-cloudflare": "^1.2.7"
+        "pg-cloudflare": "^1.3.0"
       },
       "peerDependencies": {
         "pg-native": ">=3.0.1"
@@ -11567,17 +9688,17 @@
       }
     },
     "node_modules/pg-cloudflare": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz",
-      "integrity": "sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.3.0.tgz",
+      "integrity": "sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ==",
       "dev": true,
       "license": "MIT",
       "optional": true
     },
     "node_modules/pg-connection-string": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz",
-      "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==",
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.12.0.tgz",
+      "integrity": "sha512-U7qg+bpswf3Cs5xLzRqbXbQl85ng0mfSV/J0nnA31MCLgvEaAo7CIhmeyrmJpOr7o+zm0rXK+hNnT5l9RHkCkQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -11592,9 +9713,9 @@
       }
     },
     "node_modules/pg-pool": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.10.1.tgz",
-      "integrity": "sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==",
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.13.0.tgz",
+      "integrity": "sha512-gB+R+Xud1gLFuRD/QgOIgGOBE2KCQPaPwkzBBGC9oG69pHTkhQeIuejVIk3/cnDyX39av2AxomQiyPT13WKHQA==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -11602,9 +9723,9 @@
       }
     },
     "node_modules/pg-protocol": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.10.3.tgz",
-      "integrity": "sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.13.0.tgz",
+      "integrity": "sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==",
       "dev": true,
       "license": "MIT"
     },
@@ -11771,9 +9892,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz",
+      "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11812,9 +9933,9 @@
       }
     },
     "node_modules/postgres-bytea": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
-      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.1.tgz",
+      "integrity": "sha512-5+5HqXnsZPE65IJZSMkZtURARZelel2oXUEO8rH83VS/hxH5vv1uHquPg5wZs8yMAfdv971IU+kcPUczi7NVBQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -11884,9 +10005,9 @@
       "license": "MIT"
     },
     "node_modules/pump": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
-      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.4.tgz",
+      "integrity": "sha512-VS7sjc6KR7e1ukRFhQSY5LM2uBWAUPiOPa/A3mkKmiMwSmRFUITt0xuj+/lesgnCv+dPIEYlkzrcyXgquIHMcA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11913,20 +10034,34 @@
         "node": ">=6"
       }
     },
+    "node_modules/qified": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/qified/-/qified-0.6.0.tgz",
+      "integrity": "sha512-tsSGN1x3h569ZSU1u6diwhltLyfUWDp3YbFHedapTmpBl0B3P6U3+Qptg7xu+v+1io1EwhdPyyRHYbEw0KN2FA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hookified": "^1.14.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
     "node_modules/qrcode-generator": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-1.5.2.tgz",
-      "integrity": "sha512-pItrW0Z9HnDBnFmgiNrY1uxRdri32Uh9EjNYLPVC2zZ3ZRIIEqBoDgm4DkvDwNNDHTK7FNkmr8zAa77BYc9xNw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-2.0.4.tgz",
+      "integrity": "sha512-mZSiP6RnbHl4xL2Ap5HfkjLnmxfKcPWpWe/c+5XxCuetEenqmNFf1FH/ftXPCtFG5/TDobjsjz6sSNL0Sr8Z9g==",
       "license": "MIT"
     },
     "node_modules/qs": {
-      "version": "6.14.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz",
-      "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==",
+      "version": "6.15.3",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz",
+      "integrity": "sha512-O9gl3zCl5h5blw1KGUzQKhA5oUXSl8rwUIM5o0S3nCXMliSvy5Dzx7/DJcI+SwgICv+IneSZwhBh1oSyEHA71A==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
-        "side-channel": "^1.1.0"
+        "es-define-property": "^1.0.1",
+        "side-channel": "^1.1.1"
       },
       "engines": {
         "node": ">=0.6"
@@ -11957,13 +10092,13 @@
       "license": "MIT"
     },
     "node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz",
+      "integrity": "sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 14.18.0"
+        "node": ">= 20.19.0"
       },
       "funding": {
         "type": "individual",
@@ -11983,15 +10118,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/redux": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz",
-      "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.9.2"
-      }
-    },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
@@ -12115,13 +10241,13 @@
       }
     },
     "node_modules/resolve": {
-      "version": "1.22.10",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "version": "1.22.11",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
+      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.16.0",
+        "is-core-module": "^2.16.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -12146,17 +10272,49 @@
       }
     },
     "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
+      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
+        "onetime": "^7.0.0",
+        "signal-exit": "^4.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/onetime": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
+      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-function": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/restore-cursor/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/reusify": {
@@ -12178,14 +10336,14 @@
       "license": "MIT"
     },
     "node_modules/rimraf": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz",
-      "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==",
+      "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.3.tgz",
+      "integrity": "sha512-LKg+Cr2ZF61fkcaK1UdkH2yEBBKnYjTyWzTJT6KNPcSPaiT7HSdhtMXQuN5wkTX0Xu72KQ1l8S42rlmexS2hSA==",
       "dev": true,
-      "license": "ISC",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "glob": "^11.0.0",
-        "package-json-from-dist": "^1.0.0"
+        "glob": "^13.0.3",
+        "package-json-from-dist": "^1.0.1"
       },
       "bin": {
         "rimraf": "dist/esm/bin.mjs"
@@ -12280,6 +10438,20 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/rollup/node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.59.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.59.0.tgz",
+      "integrity": "sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/rtlcss": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-4.3.0.tgz",
@@ -12333,14 +10505,20 @@
         "tslib": "^2.1.0"
       }
     },
+    "node_modules/rxjs/node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "dev": true,
+      "license": "0BSD"
+    },
     "node_modules/sa11y": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/sa11y/-/sa11y-4.2.3.tgz",
-      "integrity": "sha512-laO6NcIZDI/Jv/A4NQQP+w6UO+qp8fmckSKLdOdjbs3iBjucJNic4BhGTeBkql69mcmzYyHpxFxhK1g1Ij2Lrw==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/sa11y/-/sa11y-4.4.1.tgz",
+      "integrity": "sha512-RAMgOjuiFiCcnFB0v5CzBefVrCudmZwppPuhoJpzN7atdwMDnpqflsJO/ZUBgioHqPPP11D1lQPGQpZpzdPhKw==",
       "license": "GPL-2.0-or-later",
       "dependencies": {
-        "apca-w3": "^0.1.9",
-        "tippy.js": "^6.3.7"
+        "tippy.js": "6.3.7"
       }
     },
     "node_modules/safe-array-concat": {
@@ -12363,13 +10541,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safe-array-concat/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -12408,13 +10579,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/safe-push-apply/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/safe-regex-test": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
@@ -12441,15 +10605,15 @@
       "license": "MIT"
     },
     "node_modules/sass": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.93.2.tgz",
-      "integrity": "sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.98.0.tgz",
+      "integrity": "sha512-+4N/u9dZ4PrgzGgPlKnaaRQx64RO0JBKs9sDhQ2pLgN6JQZ25uPQZKQYaBJU48Kd5BxgXoJ4e09Dq7nMcOUW3A==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
         "chokidar": "^4.0.0",
-        "immutable": "^5.0.2",
+        "immutable": "^5.1.5",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -12463,16 +10627,15 @@
       }
     },
     "node_modules/sass-embedded": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.93.2.tgz",
-      "integrity": "sha512-FvQdkn2dZ8DGiLgi0Uf4zsj7r/BsiLImNa5QJ10eZalY6NfZyjrmWGFcuCN5jNwlDlXFJnftauv+UtvBKLvepQ==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.98.0.tgz",
+      "integrity": "sha512-Do7u6iRb6K+lrllcTkB1BXcHwOxcKe3rEfOF/GcCLE2w3WpddakRAosJOHFUR37DpsvimQXEt5abs3NzUjEIqg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@bufbuild/protobuf": "^2.5.0",
-        "buffer-builder": "^0.2.0",
         "colorjs.io": "^0.5.0",
-        "immutable": "^5.0.2",
+        "immutable": "^5.1.5",
         "rxjs": "^7.4.0",
         "supports-color": "^8.1.1",
         "sync-child-process": "^1.0.2",
@@ -12485,30 +10648,30 @@
         "node": ">=16.0.0"
       },
       "optionalDependencies": {
-        "sass-embedded-all-unknown": "1.93.2",
-        "sass-embedded-android-arm": "1.93.2",
-        "sass-embedded-android-arm64": "1.93.2",
-        "sass-embedded-android-riscv64": "1.93.2",
-        "sass-embedded-android-x64": "1.93.2",
-        "sass-embedded-darwin-arm64": "1.93.2",
-        "sass-embedded-darwin-x64": "1.93.2",
-        "sass-embedded-linux-arm": "1.93.2",
-        "sass-embedded-linux-arm64": "1.93.2",
-        "sass-embedded-linux-musl-arm": "1.93.2",
-        "sass-embedded-linux-musl-arm64": "1.93.2",
-        "sass-embedded-linux-musl-riscv64": "1.93.2",
-        "sass-embedded-linux-musl-x64": "1.93.2",
-        "sass-embedded-linux-riscv64": "1.93.2",
-        "sass-embedded-linux-x64": "1.93.2",
-        "sass-embedded-unknown-all": "1.93.2",
-        "sass-embedded-win32-arm64": "1.93.2",
-        "sass-embedded-win32-x64": "1.93.2"
+        "sass-embedded-all-unknown": "1.98.0",
+        "sass-embedded-android-arm": "1.98.0",
+        "sass-embedded-android-arm64": "1.98.0",
+        "sass-embedded-android-riscv64": "1.98.0",
+        "sass-embedded-android-x64": "1.98.0",
+        "sass-embedded-darwin-arm64": "1.98.0",
+        "sass-embedded-darwin-x64": "1.98.0",
+        "sass-embedded-linux-arm": "1.98.0",
+        "sass-embedded-linux-arm64": "1.98.0",
+        "sass-embedded-linux-musl-arm": "1.98.0",
+        "sass-embedded-linux-musl-arm64": "1.98.0",
+        "sass-embedded-linux-musl-riscv64": "1.98.0",
+        "sass-embedded-linux-musl-x64": "1.98.0",
+        "sass-embedded-linux-riscv64": "1.98.0",
+        "sass-embedded-linux-x64": "1.98.0",
+        "sass-embedded-unknown-all": "1.98.0",
+        "sass-embedded-win32-arm64": "1.98.0",
+        "sass-embedded-win32-x64": "1.98.0"
       }
     },
     "node_modules/sass-embedded-all-unknown": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-all-unknown/-/sass-embedded-all-unknown-1.93.2.tgz",
-      "integrity": "sha512-GdEuPXIzmhRS5J7UKAwEvtk8YyHQuFZRcpnEnkA3rwRUI27kwjyXkNeIj38XjUQ3DzrfMe8HcKFaqWGHvblS7Q==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-all-unknown/-/sass-embedded-all-unknown-1.98.0.tgz",
+      "integrity": "sha512-6n4RyK7/1mhdfYvpP3CClS3fGoYqDvRmLClCESS6I7+SAzqjxvGG6u5Fo+cb1nrPNbbilgbM4QKdgcgWHO9NCA==",
       "cpu": [
         "!arm",
         "!arm64",
@@ -12519,13 +10682,13 @@
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "sass": "1.93.2"
+        "sass": "1.98.0"
       }
     },
     "node_modules/sass-embedded-android-arm": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.93.2.tgz",
-      "integrity": "sha512-I8bpO8meZNo5FvFx5FIiE7DGPVOYft0WjuwcCCdeJ6duwfkl6tZdatex1GrSigvTsuz9L0m4ngDcX/Tj/8yMow==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.98.0.tgz",
+      "integrity": "sha512-LjGiMhHgu7VL1n7EJxTCre1x14bUsWd9d3dnkS2rku003IWOI/fxc7OXgaKagoVzok1kv09rzO3vFXJR5ZeONQ==",
       "cpu": [
         "arm"
       ],
@@ -12540,9 +10703,9 @@
       }
     },
     "node_modules/sass-embedded-android-arm64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.93.2.tgz",
-      "integrity": "sha512-346f4iVGAPGcNP6V6IOOFkN5qnArAoXNTPr5eA/rmNpeGwomdb7kJyQ717r9rbJXxOG8OAAUado6J0qLsjnjXQ==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.98.0.tgz",
+      "integrity": "sha512-M9Ra98A6vYJHpwhoC/5EuH1eOshQ9ZyNwC8XifUDSbRl/cGeQceT1NReR9wFj3L7s1pIbmes1vMmaY2np0uAKQ==",
       "cpu": [
         "arm64"
       ],
@@ -12557,9 +10720,9 @@
       }
     },
     "node_modules/sass-embedded-android-riscv64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.93.2.tgz",
-      "integrity": "sha512-hSMW1s4yJf5guT9mrdkumluqrwh7BjbZ4MbBW9tmi1DRDdlw1Wh9Oy1HnnmOG8x9XcI1qkojtPL6LUuEJmsiDg==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.98.0.tgz",
+      "integrity": "sha512-WPe+0NbaJIZE1fq/RfCZANMeIgmy83x4f+SvFOG7LhUthHpZWcOcrPTsCKKmN3xMT3iw+4DXvqTYOCYGRL3hcQ==",
       "cpu": [
         "riscv64"
       ],
@@ -12574,9 +10737,9 @@
       }
     },
     "node_modules/sass-embedded-android-x64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.93.2.tgz",
-      "integrity": "sha512-JqktiHZduvn+ldGBosE40ALgQ//tGCVNAObgcQ6UIZznEJbsHegqStqhRo8UW3x2cgOO2XYJcrInH6cc7wdKbw==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.98.0.tgz",
+      "integrity": "sha512-zrD25dT7OHPEgLWuPEByybnIfx4rnCtfge4clBgjZdZ3lF6E7qNLRBtSBmoFflh6Vg0RlEjJo5VlpnTMBM5MQQ==",
       "cpu": [
         "x64"
       ],
@@ -12591,9 +10754,9 @@
       }
     },
     "node_modules/sass-embedded-darwin-arm64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.93.2.tgz",
-      "integrity": "sha512-qI1X16qKNeBJp+M/5BNW7v/JHCDYWr1/mdoJ7+UMHmP0b5AVudIZtimtK0hnjrLnBECURifd6IkulybR+h+4UA==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.98.0.tgz",
+      "integrity": "sha512-cgr1z9rBnCdMf8K+JabIaYd9Rag2OJi5mjq08XJfbJGMZV/TA6hFJCLGkr5/+ZOn4/geTM5/3aSfQ8z5EIJAOg==",
       "cpu": [
         "arm64"
       ],
@@ -12608,9 +10771,9 @@
       }
     },
     "node_modules/sass-embedded-darwin-x64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.93.2.tgz",
-      "integrity": "sha512-4KeAvlkQ0m0enKUnDGQJZwpovYw99iiMb8CTZRSsQm8Eh7halbJZVmx67f4heFY/zISgVOCcxNg19GrM5NTwtA==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.98.0.tgz",
+      "integrity": "sha512-OLBOCs/NPeiMqTdOrMFbVHBQFj19GS3bSVSxIhcCq16ZyhouUkYJEZjxQgzv9SWA2q6Ki8GCqp4k6jMeUY9dcA==",
       "cpu": [
         "x64"
       ],
@@ -12625,9 +10788,9 @@
       }
     },
     "node_modules/sass-embedded-linux-arm": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.93.2.tgz",
-      "integrity": "sha512-N3+D/ToHtzwLDO+lSH05Wo6/KRxFBPnbjVHASOlHzqJnK+g5cqex7IFAp6ozzlRStySk61Rp6d+YGrqZ6/P0PA==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.98.0.tgz",
+      "integrity": "sha512-03baQZCxVyEp8v1NWBRlzGYrmVT/LK7ZrHlF1piscGiGxwfdxoLXVuxsylx3qn/dD/4i/rh7Bzk7reK1br9jvQ==",
       "cpu": [
         "arm"
       ],
@@ -12642,9 +10805,9 @@
       }
     },
     "node_modules/sass-embedded-linux-arm64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.93.2.tgz",
-      "integrity": "sha512-9ftX6nd5CsShJqJ2WRg+ptaYvUW+spqZfJ88FbcKQBNFQm6L87luj3UI1rB6cP5EWrLwHA754OKxRJyzWiaN6g==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.98.0.tgz",
+      "integrity": "sha512-axOE3t2MTBwCtkUCbrdM++Gj0gC0fdHJPrgzQ+q1WUmY9NoNMGqflBtk5mBZaWUeha2qYO3FawxCB8lctFwCtw==",
       "cpu": [
         "arm64"
       ],
@@ -12659,9 +10822,9 @@
       }
     },
     "node_modules/sass-embedded-linux-musl-arm": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.93.2.tgz",
-      "integrity": "sha512-XBTvx66yRenvEsp3VaJCb3HQSyqCsUh7R+pbxcN5TuzueybZi0LXvn9zneksdXcmjACMlMpIVXi6LyHPQkYc8A==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.98.0.tgz",
+      "integrity": "sha512-OBkjTDPYR4hSaueOGIM6FDpl9nt/VZwbSRpbNu9/eEJcxE8G/vynRugW8KRZmCFjPy8j/jkGBvvS+k9iOqKV3g==",
       "cpu": [
         "arm"
       ],
@@ -12676,9 +10839,9 @@
       }
     },
     "node_modules/sass-embedded-linux-musl-arm64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.93.2.tgz",
-      "integrity": "sha512-+3EHuDPkMiAX5kytsjEC1bKZCawB9J6pm2eBIzzLMPWbf5xdx++vO1DpT7hD4bm4ZGn0eVHgSOKIfP6CVz6tVg==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.98.0.tgz",
+      "integrity": "sha512-LeqNxQA8y4opjhe68CcFvMzCSrBuJqYVFbwElEj9bagHXQHTp9xVPJRn6VcrC+0VLEDq13HVXMv7RslIuU0zmA==",
       "cpu": [
         "arm64"
       ],
@@ -12693,9 +10856,9 @@
       }
     },
     "node_modules/sass-embedded-linux-musl-riscv64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.93.2.tgz",
-      "integrity": "sha512-0sB5kmVZDKTYzmCSlTUnjh6mzOhzmQiW/NNI5g8JS4JiHw2sDNTvt1dsFTuqFkUHyEOY3ESTsfHHBQV8Ip4bEA==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.98.0.tgz",
+      "integrity": "sha512-7w6hSuOHKt8FZsmjRb3iGSxEzM87fO9+M8nt5JIQYMhHTj5C+JY/vcske0v715HCVj5e1xyTnbGXf8FcASeAIw==",
       "cpu": [
         "riscv64"
       ],
@@ -12710,9 +10873,9 @@
       }
     },
     "node_modules/sass-embedded-linux-musl-x64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.93.2.tgz",
-      "integrity": "sha512-t3ejQ+1LEVuHy7JHBI2tWHhoMfhedUNDjGJR2FKaLgrtJntGnyD1RyX0xb3nuqL/UXiEAtmTmZY+Uh3SLUe1Hg==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.98.0.tgz",
+      "integrity": "sha512-QikNyDEJOVqPmxyCFkci8ZdCwEssdItfjQFJB+D+Uy5HFqcS5Lv3d3GxWNX/h1dSb23RPyQdQc267ok5SbEyJw==",
       "cpu": [
         "x64"
       ],
@@ -12727,9 +10890,9 @@
       }
     },
     "node_modules/sass-embedded-linux-riscv64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.93.2.tgz",
-      "integrity": "sha512-e7AndEwAbFtXaLy6on4BfNGTr3wtGZQmypUgYpSNVcYDO+CWxatKVY4cxbehMPhxG9g5ru+eaMfynvhZt7fLaA==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.98.0.tgz",
+      "integrity": "sha512-E7fNytc/v4xFBQKzgzBddV/jretA4ULAPO6XmtBiQu4zZBdBozuSxsQLe2+XXeb0X4S2GIl72V7IPABdqke/vA==",
       "cpu": [
         "riscv64"
       ],
@@ -12744,9 +10907,9 @@
       }
     },
     "node_modules/sass-embedded-linux-x64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.93.2.tgz",
-      "integrity": "sha512-U3EIUZQL11DU0xDDHXexd4PYPHQaSQa2hzc4EzmhHqrAj+TyfYO94htjWOd+DdTPtSwmLp+9cTWwPZBODzC96w==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.98.0.tgz",
+      "integrity": "sha512-VsvP0t/uw00mMNPv3vwyYKUrFbqzxQHnRMO+bHdAMjvLw4NFf6mscpym9Bzf+NXwi1ZNKnB6DtXjmcpcvqFqYg==",
       "cpu": [
         "x64"
       ],
@@ -12761,9 +10924,9 @@
       }
     },
     "node_modules/sass-embedded-unknown-all": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-unknown-all/-/sass-embedded-unknown-all-1.93.2.tgz",
-      "integrity": "sha512-7VnaOmyewcXohiuoFagJ3SK5ddP9yXpU0rzz+pZQmS1/+5O6vzyFCUoEt3HDRaLctH4GT3nUGoK1jg0ae62IfQ==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-unknown-all/-/sass-embedded-unknown-all-1.98.0.tgz",
+      "integrity": "sha512-C4MMzcAo3oEDQnW7L8SBgB9F2Fq5qHPnaYTZRMOH3Mp/7kM4OooBInXpCiiFjLnjY95hzP4KyctVx0uYR6MYlQ==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -12774,13 +10937,13 @@
         "!win32"
       ],
       "dependencies": {
-        "sass": "1.93.2"
+        "sass": "1.98.0"
       }
     },
     "node_modules/sass-embedded-win32-arm64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.93.2.tgz",
-      "integrity": "sha512-Y90DZDbQvtv4Bt0GTXKlcT9pn4pz8AObEjFF8eyul+/boXwyptPZ/A1EyziAeNaIEIfxyy87z78PUgCeGHsx3Q==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.98.0.tgz",
+      "integrity": "sha512-nP/10xbAiPbhQkMr3zQfXE4TuOxPzWRQe1Hgbi90jv2R4TbzbqQTuZVOaJf7KOAN4L2Bo6XCTRjK5XkVnwZuwQ==",
       "cpu": [
         "arm64"
       ],
@@ -12795,9 +10958,9 @@
       }
     },
     "node_modules/sass-embedded-win32-x64": {
-      "version": "1.93.2",
-      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.93.2.tgz",
-      "integrity": "sha512-BbSucRP6PVRZGIwlEBkp+6VQl2GWdkWFMN+9EuOTPrLxCJZoq+yhzmbjspd3PeM8+7WJ7AdFu/uRYdO8tor1iQ==",
+      "version": "1.98.0",
+      "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.98.0.tgz",
+      "integrity": "sha512-/lbrVsfbcbdZQ5SJCWcV0NVPd6YRs+FtAnfedp4WbCkO/ZO7Zt/58MvI4X2BVpRY/Nt5ZBo1/7v2gYcQ+J4svQ==",
       "cpu": [
         "x64"
       ],
@@ -12811,6 +10974,38 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/sass/node_modules/chokidar": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/sass/node_modules/readdirp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">= 14.18.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/selderee": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/selderee/-/selderee-0.12.0.tgz",
@@ -12825,9 +11020,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.7.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -12837,12 +11032,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/seq-queue": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz",
-      "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==",
-      "dev": true
-    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -13041,18 +11230,49 @@
       }
     },
     "node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-8.0.0.tgz",
+      "integrity": "sha512-stxByr12oeeOyY2BlviTNQlYV5xOj47GirPr4yA1hE9JCtxfQN0+tVbkxwCtYDQWhEKWFHsEK48ORg5jrouCAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.2.3",
+        "is-fullwidth-code-point": "^5.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz",
+      "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-east-asian-width": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/smtp-server": {
@@ -13104,6 +11324,22 @@
         "node": ">= 10.x"
       }
     },
+    "node_modules/sql-escaper": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/sql-escaper/-/sql-escaper-1.3.3.tgz",
+      "integrity": "sha512-BsTCV265VpTp8tm1wyIm1xqQCS+Q9NHx2Sr+WcnUrgLrQ6yiDIvHYJV5gHxsj1lMBy2zm5twLaZao8Jd+S8JJw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "bun": ">=1.0.0",
+        "deno": ">=2.0.0",
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/mysqljs/sql-escaper?sponsor=1"
+      }
+    },
     "node_modules/sshpk": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
@@ -13159,22 +11395,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/string-width-cjs": {
-      "name": "string-width",
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/string.prototype.trim": {
       "version": "1.2.10",
       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
@@ -13247,20 +11467,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/strip-ansi-cjs": {
-      "name": "strip-ansi",
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -13294,23 +11500,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/strnum": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.3.tgz",
-      "integrity": "sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT"
-    },
     "node_modules/style-mod": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.2.tgz",
-      "integrity": "sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.3.tgz",
+      "integrity": "sha512-i/n8VsZydrugj3Iuzll8+x/00GH2vnYsk1eomD8QiRrSAeW6ItbCQDtfXCeJHd0iwiNagqjQkvpvREEPtW3IoQ==",
       "license": "MIT"
     },
     "node_modules/style-search": {
@@ -13321,9 +11514,9 @@
       "license": "ISC"
     },
     "node_modules/stylelint": {
-      "version": "16.24.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.24.0.tgz",
-      "integrity": "sha512-7ksgz3zJaSbTUGr/ujMXvLVKdDhLbGl3R/3arNudH7z88+XZZGNLMTepsY28WlnvEFcuOmUe7fg40Q3lfhOfSQ==",
+      "version": "16.26.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-16.26.1.tgz",
+      "integrity": "sha512-v20V59/crfc8sVTAtge0mdafI3AdnzQ2KsWe6v523L4OA1bJO02S7MO2oyXDCS6iWb9ckIPnqAFVItqSBQr7jw==",
       "dev": true,
       "funding": [
         {
@@ -13338,19 +11531,20 @@
       "license": "MIT",
       "dependencies": {
         "@csstools/css-parser-algorithms": "^3.0.5",
+        "@csstools/css-syntax-patches-for-csstree": "^1.0.19",
         "@csstools/css-tokenizer": "^3.0.4",
         "@csstools/media-query-list-parser": "^4.0.3",
         "@csstools/selector-specificity": "^5.0.0",
-        "@dual-bundle/import-meta-resolve": "^4.1.0",
+        "@dual-bundle/import-meta-resolve": "^4.2.1",
         "balanced-match": "^2.0.0",
         "colord": "^2.9.3",
         "cosmiconfig": "^9.0.0",
         "css-functions-list": "^3.2.3",
         "css-tree": "^3.1.0",
-        "debug": "^4.4.1",
+        "debug": "^4.4.3",
         "fast-glob": "^3.3.3",
         "fastest-levenshtein": "^1.0.16",
-        "file-entry-cache": "^10.1.4",
+        "file-entry-cache": "^11.1.1",
         "global-modules": "^2.0.0",
         "globby": "^11.1.0",
         "globjoin": "^0.1.4",
@@ -13407,9 +11601,9 @@
       }
     },
     "node_modules/stylelint-config-standard": {
-      "version": "39.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-39.0.0.tgz",
-      "integrity": "sha512-JabShWORb8Bmc1A47ZyJstran60P3yUdI1zWMpGYPeFiC6xzHXJMkpKAd8EjIhq3HPUplIWWMDJ/xu0AiPd+kA==",
+      "version": "39.0.1",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-39.0.1.tgz",
+      "integrity": "sha512-b7Fja59EYHRNOTa3aXiuWnhUWXFU2Nfg6h61bLfAb5GS5fX3LMUD0U5t4S8N/4tpHQg3Acs2UVPR9jy2l1g/3A==",
       "dev": true,
       "funding": [
         {
@@ -13433,56 +11627,49 @@
       }
     },
     "node_modules/stylelint-order": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-7.0.0.tgz",
-      "integrity": "sha512-rSWxx0KscYfxU02wEskKXES9lkRzuuONMMNkZ7SUc6uiF3tDKm7e+sE0Ax/SBlG4TUf1sp1R6f3/SlsPGmzthg==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-7.0.1.tgz",
+      "integrity": "sha512-GWPei1zBVDDjxM+/BmcSCiOcHNd8rSqW6FUZtqQGlTRpD0Z5nSzspzWD8rtKif5KPdzUG68DApKEV/y/I9VbTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "postcss": "^8.5.3",
+        "postcss": "^8.5.6",
         "postcss-sorting": "^9.1.0"
       },
       "engines": {
         "node": ">=20.19.0"
       },
       "peerDependencies": {
-        "stylelint": "^16.18.0"
+        "stylelint": "^16.18.0 || ^17.0.0"
       }
     },
     "node_modules/stylelint-scss": {
-      "version": "6.12.1",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.12.1.tgz",
-      "integrity": "sha512-UJUfBFIvXfly8WKIgmqfmkGKPilKB4L5j38JfsDd+OCg2GBdU0vGUV08Uw82tsRZzd4TbsUURVVNGeOhJVF7pA==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.14.0.tgz",
+      "integrity": "sha512-ZKmHMZolxeuYsnB+PCYrTpFce0/QWX9i9gh0hPXzp73WjuIMqUpzdQaBCrKoLWh6XtCFSaNDErkMPqdjy1/8aA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "css-tree": "^3.0.1",
         "is-plain-object": "^5.0.0",
-        "known-css-properties": "^0.36.0",
-        "mdn-data": "^2.21.0",
+        "known-css-properties": "^0.37.0",
+        "mdn-data": "^2.25.0",
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.6",
-        "postcss-selector-parser": "^7.1.0",
+        "postcss-selector-parser": "^7.1.1",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
         "node": ">=18.12.0"
       },
       "peerDependencies": {
-        "stylelint": "^16.0.2"
+        "stylelint": "^16.8.2"
       }
     },
-    "node_modules/stylelint-scss/node_modules/known-css-properties": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.36.0.tgz",
-      "integrity": "sha512-A+9jP+IUmuQsNdsLdcg6Yt7voiMF/D4K83ew0OpJtpu+l34ef7LaohWV0Rc6KNvzw6ZDizkqfyB5JznZnzuKQA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/stylelint-scss/node_modules/mdn-data": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.24.0.tgz",
-      "integrity": "sha512-i97fklrJl03tL1tdRVw0ZfLLvuDsdb6wxL+TrJ+PKkCbLrp2PCu2+OYdCKychIUm19nSM/35S6qz7pJpnXttoA==",
+      "version": "2.27.1",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz",
+      "integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==",
       "dev": true,
       "license": "CC0-1.0"
     },
@@ -13494,25 +11681,25 @@
       "license": "MIT"
     },
     "node_modules/stylelint/node_modules/file-entry-cache": {
-      "version": "10.1.4",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-10.1.4.tgz",
-      "integrity": "sha512-5XRUFc0WTtUbjfGzEwXc42tiGxQHBmtbUG1h9L2apu4SulCGN3Hqm//9D6FAolf8MYNL7f/YlJl9vy08pj5JuA==",
+      "version": "11.1.2",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-11.1.2.tgz",
+      "integrity": "sha512-N2WFfK12gmrK1c1GXOqiAJ1tc5YE+R53zvQ+t5P8S5XhnmKYVB5eZEiLNZKDSmoG8wqqbF9EXYBBW/nef19log==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "flat-cache": "^6.1.13"
+        "flat-cache": "^6.1.20"
       }
     },
     "node_modules/stylelint/node_modules/flat-cache": {
-      "version": "6.1.14",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.14.tgz",
-      "integrity": "sha512-ExZSCSV9e7v/Zt7RzCbX57lY2dnPdxzU/h3UE6WJ6NtEMfwBd8jmi1n4otDEUfz+T/R+zxrFDpICFdjhD3H/zw==",
+      "version": "6.1.20",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.20.tgz",
+      "integrity": "sha512-AhHYqwvN62NVLp4lObVXGVluiABTHapoB57EyegZVmazN+hhGhLTn3uZbOofoTw4DSDvVCadzzyChXhOAvy8uQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cacheable": "^2.0.1",
+        "cacheable": "^2.3.2",
         "flatted": "^3.3.3",
-        "hookified": "^1.12.0"
+        "hookified": "^1.15.0"
       }
     },
     "node_modules/stylelint/node_modules/ignore": {
@@ -13623,9 +11810,9 @@
       }
     },
     "node_modules/sync-message-port": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/sync-message-port/-/sync-message-port-1.1.3.tgz",
-      "integrity": "sha512-GTt8rSKje5FilG+wEdfCkOcLL7LWqpMlr2c3LRuKt/YXxcJ52aGSbGBAdI4L3aaqfrBt6y711El53ItyH1NWzg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/sync-message-port/-/sync-message-port-1.2.0.tgz",
+      "integrity": "sha512-gAQ9qrUN/UCypHtGFbbe7Rc/f9bzO88IwrG8TDo/aMKAApKyD6E3W4Cm0EfhfBb6Z6SKt59tTCTfD+n1xmAvMg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -13728,13 +11915,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/ticky": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ticky/-/ticky-1.0.1.tgz",
@@ -13742,10 +11922,16 @@
       "license": "MIT"
     },
     "node_modules/tinymce": {
-      "version": "6.8.6",
-      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-6.8.6.tgz",
-      "integrity": "sha512-++XYEs8lKWvZxDCjrr8Baiw7KiikraZ5JkLMg6EdnUVNKJui0IsrAADj5MsyUeFkcEryfn2jd3p09H7REvewyg==",
-      "license": "MIT"
+      "version": "8.8.2",
+      "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-8.8.2.tgz",
+      "integrity": "sha512-wcUGaaAf4XFrQtbZtClbDN/QCqklXLlPt3+7UWliEoosuhnTOJUkXwf7Fzlq7agPnwkKKp1e4JGOhx3O1gWH3g==",
+      "license": "SEE LICENSE IN license.md"
+    },
+    "node_modules/tinymce-i18n": {
+      "version": "26.8.2",
+      "resolved": "https://registry.npmjs.org/tinymce-i18n/-/tinymce-i18n-26.8.2.tgz",
+      "integrity": "sha512-kV+IC8z+z1PXik5UDBlnbY5f0cKPT8wdJoUn5IQokUqHTaOwXpm3FTfGWh+y65m1ib3hTdv0lChMs3+K+P/JrQ==",
+      "license": "SEE LICENSE IN LICENSE.md"
     },
     "node_modules/tippy.js": {
       "version": "6.3.7",
@@ -13869,9 +12055,10 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true,
       "license": "0BSD"
     },
     "node_modules/tunnel-agent": {
@@ -14022,9 +12209,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz",
-      "integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
+      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
       "dev": true,
       "license": "MIT"
     },
@@ -14093,9 +12280,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
       "dev": true,
       "funding": [
         {
@@ -14140,16 +12327,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/uuid": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "node_modules/varint": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
@@ -14172,24 +12349,17 @@
         "extsprintf": "^1.2.0"
       }
     },
-    "node_modules/verror/node_modules/core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/vue": {
-      "version": "3.5.22",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.22.tgz",
-      "integrity": "sha512-toaZjQ3a/G/mYaLSbV+QsQhIdMo9x5rrqIpYRObsJ6T/J+RyCSFwN2LHNVH9v8uIcljDNa3QzPVdv3Y6b9hAJQ==",
+      "version": "3.5.30",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.30.tgz",
+      "integrity": "sha512-hTHLc6VNZyzzEH/l7PFGjpcTvUgiaPK5mdLkbjrTeWSRcEfxFrv56g/XckIYlE9ckuobsdwqd5mk2g1sBkMewg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.22",
-        "@vue/compiler-sfc": "3.5.22",
-        "@vue/runtime-dom": "3.5.22",
-        "@vue/server-renderer": "3.5.22",
-        "@vue/shared": "3.5.22"
+        "@vue/compiler-dom": "3.5.30",
+        "@vue/compiler-sfc": "3.5.30",
+        "@vue/runtime-dom": "3.5.30",
+        "@vue/server-renderer": "3.5.30",
+        "@vue/shared": "3.5.30"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -14201,17 +12371,17 @@
       }
     },
     "node_modules/vue-eslint-parser": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.2.0.tgz",
-      "integrity": "sha512-CydUvFOQKD928UzZhTp4pr2vWz1L+H99t7Pkln2QSPdvmURT0MoC4wUccfCnuEaihNsu9aYYyk+bep8rlfkUXw==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.4.0.tgz",
+      "integrity": "sha512-Vxi9pJdbN3ZnVGLODVtZ7y4Y2kzAAE2Cm0CZ3ZDRvydVYxZ6VrnBhLikBsRS+dpwj4Jv4UCv21PTEwF5rQ9WXg==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
         "debug": "^4.4.0",
-        "eslint-scope": "^8.2.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
+        "eslint-scope": "^8.2.0 || ^9.0.0",
+        "eslint-visitor-keys": "^4.2.0 || ^5.0.0",
+        "espree": "^10.3.0 || ^11.0.0",
         "esquery": "^1.6.0",
         "semver": "^7.6.3"
       },
@@ -14222,7 +12392,7 @@
         "url": "https://github.com/sponsors/mysticatea"
       },
       "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0"
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0"
       }
     },
     "node_modules/vue-focus-lock": {
@@ -14365,13 +12535,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/which-builtin-type/node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/which-collection": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
@@ -14392,9 +12555,9 @@
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.19",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
-      "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
+      "version": "1.1.20",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz",
+      "integrity": "sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -14424,40 +12587,88 @@
       }
     },
     "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
+      "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs": {
-      "name": "wrap-ansi",
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+    "node_modules/wrap-ansi/node_modules/ansi-regex": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/emoji-regex": {
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
+      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+      "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
     "node_modules/wrappy": {
@@ -14522,14 +12733,16 @@
       "license": "ISC"
     },
     "node_modules/yauzl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz",
+      "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "buffer-crc32": "~0.2.3",
-        "fd-slicer": "~1.1.0"
+        "pend": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
     "node_modules/yocto-queue": {
diff --git a/package.json b/package.json
index 9e94b5871f07d..f9878c64a34df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "joomla",
-  "version": "5.4.8",
+  "version": "6.2.0",
   "description": "Joomla CMS",
   "license": "GPL-2.0-or-later",
   "repository": {
@@ -12,20 +12,17 @@
     "npm": ">=10.1.0"
   },
   "scripts": {
-    "build:js": "node build/build.mjs --compile-js",
-    "build:css": "node build/build.mjs --compile-css",
-    "build:bs5": "node build/build.mjs --compile-bs",
-    "build:com_media": "node --env-file=./build/production.env build/build.mjs --com-media",
-    "build:com_media:dev": "node --env-file=./build/development.env build/build.mjs --com-media",
-    "watch": "node build/build.mjs --watch",
-    "watch:com_media": "node build/build.mjs --watch-com-media",
-    "lint:js": "eslint --config build/eslint.config.mjs --max-warnings 0 build administrator/components/com_media/resources/scripts",
+    "builders-list": "node --env-file=./build/production.env build/build.mjs builders-list",
+    "build": "node --env-file=./build/production.env build/build.mjs build",
+    "build:dev": "node --env-file=./build/development.env build/build.mjs build",
+    "watch": "node --env-file=./build/production.env build/build.mjs watch",
+    "watch:dev": "node --env-file=./build/development.env build/build.mjs watch",
+    "lint:js": "eslint --config build/eslint.config.mjs --max-warnings 0 build/ media_source/",
     "lint:testjs": "eslint --config build/eslint-tests.mjs --max-warnings 0 tests/System",
-    "lint:css": "stylelint --config build/.stylelintrc.json \"administrator/components/com_media/resources/**/*.scss\" \"administrator/templates/**/*.scss\" \"build/media_source/**/*.scss\" \"build/media_source/**/*.css\" \"templates/**/*.scss\" \"installation/template/**/*.scss\"",
-    "install": "node build/build.mjs --prepare",
-    "update": "node build/build.mjs --copy-assets && node build/build.mjs --build-pages && node build/build.mjs --compile-js && node build/build.mjs --compile-css && node build/build.mjs --compile-bs && node --env-file=./build/production.env build/build.mjs --com-media",
-    "gzip": "node build/build.mjs --gzip",
-    "versioning": "node build/build.mjs --versioning",
+    "lint:css": "stylelint --config build/.stylelintrc.json \"administrator/templates/**/*.scss\" \"media_source/**/*.scss\" \"media_source/**/*.css\" \"templates/**/*.scss\" \"installation/template/**/*.scss\"",
+    "install": "node --env-file=./build/production.env build/build.mjs build -a",
+    "update": "node --env-file=./build/production.env build/build.mjs build -a",
+    "gzip": "node build/build.mjs build -a -t gzip",
     "browserlist:update": "npx update-browserslist-db@latest",
     "cypress:install": "cypress install",
     "cypress:open": "cypress open --config-file cypress.config.mjs",
@@ -37,101 +34,108 @@
   ],
   "dependencies": {
     "@claviska/jquery-minicolors": "^2.3.6",
-    "@codemirror/autocomplete": "^6.18.7",
-    "@codemirror/commands": "^6.8.1",
+    "@codemirror/autocomplete": "^6.20.1",
+    "@codemirror/commands": "^6.10.3",
     "@codemirror/lang-css": "^6.3.1",
-    "@codemirror/lang-html": "^6.4.10",
-    "@codemirror/lang-javascript": "^6.2.4",
+    "@codemirror/lang-html": "^6.4.11",
+    "@codemirror/lang-javascript": "^6.2.5",
     "@codemirror/lang-json": "^6.0.2",
-    "@codemirror/lang-markdown": "^6.3.4",
+    "@codemirror/lang-markdown": "^6.5.0",
     "@codemirror/lang-php": "^6.0.2",
     "@codemirror/lang-xml": "^6.1.0",
-    "@codemirror/language": "^6.11.3",
-    "@codemirror/lint": "^6.8.5",
-    "@codemirror/search": "^6.5.11",
-    "@codemirror/state": "^6.5.2",
+    "@codemirror/language": "^6.12.2",
+    "@codemirror/lint": "^6.9.5",
+    "@codemirror/search": "^6.6.0",
+    "@codemirror/state": "^6.6.0",
     "@codemirror/theme-one-dark": "^6.1.3",
-    "@codemirror/view": "^6.38.3",
+    "@codemirror/view": "^6.40.0",
     "@fortawesome/fontawesome-free": "^6.7.2",
     "@popperjs/core": "^2.11.8",
-    "@webcomponents/webcomponentsjs": "^2.8.0",
+    "@vue-flow/background": "^1.3.2",
+    "@vue-flow/controls": "^1.1.3",
+    "@vue-flow/core": "^1.48.2",
+    "@vue-flow/minimap": "^1.5.4",
+    "@vue-flow/node-resizer": "^1.5.1",
     "accessibility": "^3.0.17",
+    "altcha": "^2.3.0",
     "awesomplete": "^1.1.7",
     "bootstrap": "^5.3.8",
-    "choices.js": "^9.1.0",
-    "chosen-js": "^1.8.7",
+    "choices.js": "^11.2.1",
     "cropperjs": "^1.6.2",
-    "diff": "^5.2.2",
-    "dotenv": "^16.6.1",
+    "diff": "^8.0.3",
     "dragula": "^3.7.3",
-    "es-module-shims": "^1.10.1",
+    "es-module-shims": "^2.8.0",
     "focus-visible": "^5.2.1",
     "hotkeys-js": "^3.13.15",
     "joomla-ui-custom-elements": "^0.4.1",
     "jquery": "^3.7.1",
-    "jquery-migrate": "^3.5.2",
+    "jquery-migrate": "^3.6.0",
     "mark.js": "^8.11.1",
-    "mediaelement": "^5.1.2",
+    "mediaelement": "^7.1.0",
     "metismenujs": "^1.4.0",
     "punycode": "^2.3.1",
-    "qrcode-generator": "^1.5.2",
+    "qrcode-generator": "^2.0.4",
     "roboto-fontface": "^0.10.0",
-    "sa11y": "^4.2.3",
+    "sa11y": "^4.4.1",
     "shepherd.js": "^11.2.0",
     "short-and-sweet": "^1.0.4",
     "skipto": "^4.1.7",
-    "tinymce": "^6.8.6",
-    "vue": "^3.5.22",
+    "tinymce": "^8.3.2",
+    "tinymce-i18n": "^26.2.16",
+    "vue": "^3.5.30",
     "vue-focus-lock": "^2.0.7",
     "vuex": "^4.1.0",
     "vuex-persist": "^3.1.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.29.7",
-    "@babel/preset-env": "^7.28.3",
-    "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-commonjs": "^28.0.6",
-    "@rollup/plugin-node-resolve": "^16.0.1",
-    "@rollup/plugin-replace": "^6.0.2",
-    "@stylistic/stylelint-plugin": "^4.0.0",
-    "@vue/compiler-sfc": "^3.5.22",
-    "chokidar": "^4.0.3",
+    "@babel/core": "^7.29.0",
+    "@babel/preset-env": "^7.29.0",
+    "@rollup/plugin-babel": "^6.1.0",
+    "@rollup/plugin-commonjs": "^29.0.2",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-replace": "^6.0.3",
+    "@stylistic/eslint-plugin": "^5.10.0",
+    "@stylistic/stylelint-plugin": "^4.0.1",
+    "@vue/compiler-sfc": "^3.5.30",
+    "chokidar": "^5.0.0",
     "cli-progress": "^3.12.0",
-    "commander": "^14.0.1",
-    "core-js": "^3.45.1",
+    "commander": "^14.0.3",
+    "core-js": "^3.48.0",
     "cypress": "^15.18.0",
-    "esbuild": "^0.25.10",
-    "eslint": "^9.36.0",
+    "dotenv": "^17.3.1",
+    "esbuild": "^0.27.7",
+    "eslint": "^9.39.4",
+    "eslint-plugin-cypress": "^6.4.1",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-vue": "^10.5.0",
-    "fs-extra": "^11.3.2",
-    "ini": "^5.0.0",
-    "jasmine-core": "^5.10.0",
-    "joomla-cypress": "^1.3.1",
-    "lightningcss": "^1.30.1",
-    "mysql2": "^3.15.3",
-    "pg": "^8.16.3",
+    "eslint-plugin-vue": "^10.8.0",
+    "fs-extra": "^11.3.4",
+    "ini": "^6.0.0",
+    "jasmine-core": "^5.13.0",
+    "joomla-cypress": "^2.0.0",
+    "lightningcss": "^1.32.0",
+    "mysql2": "^3.19.1",
+    "pg": "^8.20.0",
     "postcss-scss": "^4.0.9",
     "recursive-readdir": "^2.2.3",
-    "rimraf": "^6.0.1",
+    "rimraf": "^6.1.3",
     "rollup": "^4.59.0",
     "rollup-plugin-vue": "^6.0.0",
     "rtlcss": "^4.3.0",
-    "sass-embedded": "^1.93.2",
-    "semver": "^7.7.2",
+    "sass-embedded": "^1.98.0",
+    "semver": "^7.7.4",
     "smtp-tester": "^2.1.0",
-    "stylelint": "^16.24.0",
-    "stylelint-config-standard": "^39.0.0",
-    "stylelint-order": "^7.0.0",
-    "stylelint-scss": "^6.12.1",
-    "totp-generator": "1.0.0"
+    "stylelint": "^16.26.1",
+    "stylelint-config-standard": "^39.0.1",
+    "stylelint-order": "^7.0.1",
+    "stylelint-scss": "^6.14.0",
+    "totp-generator": "^1.0.0"
   },
   "allowScripts": {
-    "core-js@3.45.1": true,
+    "core-js@3.48.0": true,
     "cypress@15.18.0": true,
-    "cypress@13.17.0": true,
-    "esbuild@0.25.10": true,
+    "esbuild@0.27.7": true,
+    "fsevents@2.3.3": true,
     "vue-demi@0.13.11": true,
-    "fsevents@2.3.3": true
+    "vue-demi@0.14.10": true
   }
 }
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index a5aa125417cec..418dc86a677e4 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,41 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: '''
-				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the language service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_actionlogs/src/Field/LogsdaterangeField.php
-
-		-
-			message: '''
-				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the database service in the DI container
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
-
-		-
-			message: '''
-				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the language service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 2
-			path: administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
-
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
@@ -50,7 +14,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -79,59 +43,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_actionlogs/src/Plugin/ActionLogPlugin.php
 
-		-
-			message: '''
-				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getErrors$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php
-
-		-
-			message: '#^Access to property \$dateRelative on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_actionlogs/tmpl/actionlogs/default.php
-
-		-
-			message: '#^Access to property \$items on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_actionlogs/tmpl/actionlogs/default.php
-
-		-
-			message: '#^Access to property \$pagination on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_actionlogs/tmpl/actionlogs/default.php
-
-		-
-			message: '#^Access to property \$showIpColumn on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_actionlogs/tmpl/actionlogs/default.php
-
-		-
-			message: '#^Access to property \$state on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_actionlogs/tmpl/actionlogs/default.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 5
-			path: administrator/components/com_actionlogs/tmpl/actionlogs/default.php
-
-		-
-			message: '#^Call to method getDocument\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_actionlogs/tmpl/actionlogs/default.php
-
 		-
 			message: '#^Instantiated class JConfig not found\.$#'
 			identifier: class.notFound
@@ -141,7 +52,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -150,25 +61,16 @@ parameters:
 			count: 1
 			path: administrator/components/com_admin/postinstall/languageaccess340.php
 
-		-
-			message: '''
-				#^Call to deprecated method fixFilesystemPermissions\(\) of class JoomlaInstallerScript\:
-				5\.2\.2 will be removed in 6\.0 without replacement$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_admin/script.php
-
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 9
+			count: 6
 			path: administrator/components/com_admin/script.php
 
 		-
@@ -182,29 +84,6 @@ parameters:
 			count: 2
 			path: administrator/components/com_admin/script.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_admin/script.php
-
-		-
-			message: '''
-				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the language service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_admin/src/Model/HelpModel.php
-
 		-
 			message: '#^Instantiated class JConfig not found\.$#'
 			identifier: class.notFound
@@ -214,7 +93,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -226,7 +105,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -238,7 +117,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -250,7 +129,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -262,7 +141,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -271,17 +150,6 @@ parameters:
 			count: 3
 			path: administrator/components/com_associations/src/Helper/AssociationsHelper.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_associations/src/Model/AssociationsModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -323,17 +191,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_banners/src/Controller/BannerController.php
 
-		-
-			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_banners/src/Controller/BannerController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -356,17 +213,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_banners/src/Controller/ClientController.php
 
-		-
-			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_banners/src/Controller/ClientController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -381,7 +227,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -390,17 +236,6 @@ parameters:
 			count: 2
 			path: administrator/components/com_banners/src/Helper/BannersHelper.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_banners/src/Helper/BannersHelper.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -423,17 +258,6 @@ parameters:
 			count: 2
 			path: administrator/components/com_banners/src/Model/BannerModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_banners/src/Model/BannerModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -442,31 +266,9 @@ parameters:
 				             Throw an Exception instead of using setError$#
 			'''
 			identifier: method.deprecated
-			count: 6
+			count: 4
 			path: administrator/components/com_banners/src/Model/BannerModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_banners/src/Model/ClientModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Throw an Exception instead of using setError$#
-			'''
-			identifier: method.deprecated
-			count: 2
-			path: administrator/components/com_banners/src/Model/ClientModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -544,15 +346,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_banners/src/View/Banner/HtmlView.php
 
-		-
-			message: '''
-				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				7\.0$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_banners/src/View/Banners/HtmlView.php
-
 		-
 			message: '''
 				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -602,29 +395,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_banners/src/View/Tracks/RawView.php
 
-		-
-			message: '''
-				#^Call to deprecated method getCache\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the cache controller factory instead
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(CacheControllerFactoryInterface\:\:class\)\-\>createCacheController\(\$handler, \$options\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_cache/src/Model/CacheModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Cache\\Cache\:
-				4\.2 will be removed in 6\.0
-				             Use the cache controller factory instead
-				             Example\: Factory\:\:getContainer\(\)\-\>get\(CacheControllerFactoryInterface\:\:class\)\-\>createCacheController\(\$type, \$options\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_cache/src/Model/CacheModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -648,7 +418,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -659,20 +429,11 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method addIncludePath\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Should not be used anymore as tables are loaded through the MvcFactory$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_categories/src/Controller/AjaxController.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -689,21 +450,10 @@ parameters:
 			count: 1
 			path: administrator/components/com_categories/src/Controller/CategoryController.php
 
-		-
-			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_categories/src/Controller/CategoryController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -715,7 +465,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -724,21 +474,10 @@ parameters:
 			count: 1
 			path: administrator/components/com_categories/src/Helper/CategoriesHelper.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_categories/src/Helper/CategoriesHelper.php
-
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -747,17 +486,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_categories/src/Helper/CategoriesHelper.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_categories/src/Model/CategoriesModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
@@ -769,15 +497,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_categories/src/Model/CategoriesModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method cleanCache\(\) of class Joomla\\Component\\Categories\\Administrator\\Model\\CategoryModel\:
-				4\.3 will be removed in 6\.0$#
-			'''
-			identifier: method.deprecated
-			count: 3
-			path: administrator/components/com_categories/src/Model/CategoryModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -786,24 +505,13 @@ parameters:
 				             Catch thrown Exceptions instead of getError$#
 			'''
 			identifier: method.deprecated
-			count: 18
-			path: administrator/components/com_categories/src/Model/CategoryModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
+			count: 14
 			path: administrator/components/com_categories/src/Model/CategoryModel.php
 
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -831,7 +539,7 @@ parameters:
 				             Throw an Exception instead of using setError$#
 			'''
 			identifier: method.deprecated
-			count: 34
+			count: 27
 			path: administrator/components/com_categories/src/Model/CategoryModel.php
 
 		-
@@ -852,16 +560,6 @@ parameters:
 			count: 2
 			path: administrator/components/com_categories/src/Model/CategoryModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 2
-			path: administrator/components/com_categories/src/Model/CategoryModel.php
-
 		-
 			message: '''
 				#^Instantiation of deprecated class Joomla\\CMS\\UCM\\UCMType\:
@@ -874,7 +572,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -903,24 +601,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_categories/src/View/Category/HtmlView.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\String\\Inflector\:
-				3\.0  Use static methods without a class instance instead\.$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_categories/tmpl/categories/default.php
-
-		-
-			message: '''
-				#^Call to deprecated method toPlural\(\) of class Joomla\\String\\Inflector\:
-				3\.0  Use Doctrine\\Common\\Inflector\\Inflector\:\:pluralize\(\) instead\.$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_categories/tmpl/categories/default.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Categories\\Administrator\\View\\Category\\HtmlView\:\:\$useCoreUI\.$#'
 			identifier: property.notFound
@@ -961,7 +641,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -973,7 +653,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -985,7 +665,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -997,7 +677,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -1008,34 +688,13 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getCache\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the cache controller factory instead
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(CacheControllerFactoryInterface\:\:class\)\-\>createCacheController\(\$handler, \$options\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_config/src/Model/ApplicationModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 4
-			path: administrator/components/com_config/src/Model/ApplicationModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\Database\\DatabaseDriver\:
-				3\.0  Use DatabaseFactory\:\:getDriver\(\) instead$#
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getError$#
 			'''
-			identifier: staticMethod.deprecated
-			count: 1
+			identifier: method.deprecated
+			count: 2
 			path: administrator/components/com_config/src/Model/ApplicationModel.php
 
 		-
@@ -1046,19 +705,19 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getError$#
 			'''
-			identifier: staticMethod.deprecated
-			count: 3
+			identifier: method.deprecated
+			count: 5
 			path: administrator/components/com_config/src/Model/ComponentModel.php
 
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -1067,16 +726,6 @@ parameters:
 			count: 2
 			path: administrator/components/com_config/src/Model/ComponentModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 2
-			path: administrator/components/com_config/src/Model/ComponentModel.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Config\\Administrator\\View\\Application\\HtmlView\:\:\$components\.$#'
 			identifier: property.notFound
@@ -1172,17 +821,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_contact/src/Controller/ContactController.php
 
-		-
-			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_contact/src/Controller/ContactController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -1197,7 +835,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -1217,10 +855,11 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 2
@@ -1248,17 +887,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_contact/src/Model/ContactModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_contact/src/Model/ContactModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -1267,24 +895,13 @@ parameters:
 				             Throw an Exception instead of using setError$#
 			'''
 			identifier: method.deprecated
-			count: 7
+			count: 5
 			path: administrator/components/com_contact/src/Model/ContactModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_contact/src/Model/ContactsModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -1296,7 +913,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -1308,19 +925,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Load the user service from the dependency injection container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_contact/src/Service/HTML/Icon.php
-
-		-
-			message: '''
-				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -1340,26 +945,6 @@ parameters:
 			count: 7
 			path: administrator/components/com_contact/src/Table/ContactTable.php
 
-		-
-			message: '''
-				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getErrors$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_contact/src/View/Contact/HtmlView.php
-
-		-
-			message: '''
-				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				7\.0$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_contact/src/View/Contacts/HtmlView.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Contact\\Administrator\\View\\Contact\\HtmlView\:\:\$useCoreUI\.$#'
 			identifier: property.notFound
@@ -1368,10 +953,11 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -1388,17 +974,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_content/src/Controller/ArticleController.php
 
-		-
-			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_content/src/Controller/ArticleController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -1410,21 +985,10 @@ parameters:
 			count: 1
 			path: administrator/components/com_content/src/Controller/ArticlesController.php
 
-		-
-			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_content/src/Controller/FeaturedController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -1454,10 +1018,11 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 2
@@ -1466,7 +1031,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -1478,7 +1043,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -1487,15 +1052,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_content/src/Helper/ContentHelper.php
 
-		-
-			message: '''
-				#^Call to deprecated method cleanCache\(\) of class Joomla\\Component\\Content\\Administrator\\Model\\ArticleModel\:
-				4\.3 will be removed in 6\.0$#
-			'''
-			identifier: method.deprecated
-			count: 2
-			path: administrator/components/com_content/src/Model/ArticleModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -1518,17 +1074,6 @@ parameters:
 			count: 3
 			path: administrator/components/com_content/src/Model/ArticleModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_content/src/Model/ArticleModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -1537,7 +1082,7 @@ parameters:
 				             Throw an Exception instead of using setError$#
 			'''
 			identifier: method.deprecated
-			count: 12
+			count: 10
 			path: administrator/components/com_content/src/Model/ArticleModel.php
 
 		-
@@ -1568,16 +1113,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_content/src/Model/ArticleModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 2
-			path: administrator/components/com_content/src/Model/ArticleModel.php
-
 		-
 			message: '''
 				#^Instantiation of deprecated class Joomla\\CMS\\UCM\\UCMType\:
@@ -1587,21 +1122,10 @@ parameters:
 			count: 1
 			path: administrator/components/com_content/src/Model/ArticleModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_content/src/Model/ArticlesModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -1621,30 +1145,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_content/src/Model/ArticlesModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the database service in the DI container
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_content/src/Service/HTML/AdministratorService.php
-
-		-
-			message: '''
-				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Load the user service from the dependency injection container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 2
-			path: administrator/components/com_content/src/Service/HTML/Icon.php
-
 		-
 			message: '''
 				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -1652,74 +1152,32 @@ parameters:
 			'''
 			identifier: method.deprecated
 			count: 1
-			path: administrator/components/com_content/src/View/Article/HtmlView.php
+			path: administrator/components/com_content/src/View/Articles/HtmlView.php
 
 		-
-			message: '''
-				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				7\.0$#
-			'''
-			identifier: method.deprecated
+			message: '#^Access to an undefined property Joomla\\Component\\Content\\Administrator\\View\\Article\\HtmlView\:\:\$configFieldsets\.$#'
+			identifier: property.notFound
 			count: 1
-			path: administrator/components/com_content/src/View/Articles/HtmlView.php
+			path: administrator/components/com_content/tmpl/article/edit.php
 
 		-
-			message: '#^Access to an undefined property Joomla\\Component\\Content\\Administrator\\View\\Featured\\HtmlView\:\:\$hits\.$#'
+			message: '#^Access to an undefined property Joomla\\Component\\Content\\Administrator\\View\\Article\\HtmlView\:\:\$hiddenFieldsets\.$#'
 			identifier: property.notFound
 			count: 1
-			path: administrator/components/com_content/src/View/Featured/HtmlView.php
+			path: administrator/components/com_content/tmpl/article/edit.php
 
 		-
-			message: '#^Access to an undefined property Joomla\\Component\\Content\\Administrator\\View\\Featured\\HtmlView\:\:\$vote\.$#'
+			message: '#^Access to an undefined property Joomla\\Component\\Content\\Administrator\\View\\Article\\HtmlView\:\:\$useCoreUI\.$#'
 			identifier: property.notFound
 			count: 1
-			path: administrator/components/com_content/src/View/Featured/HtmlView.php
+			path: administrator/components/com_content/tmpl/article/edit.php
 
 		-
 			message: '''
-				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				7\.0$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_content/src/View/Featured/HtmlView.php
-
-		-
-			message: '#^Access to an undefined property Joomla\\Component\\Content\\Administrator\\View\\Article\\HtmlView\:\:\$configFieldsets\.$#'
-			identifier: property.notFound
-			count: 1
-			path: administrator/components/com_content/tmpl/article/edit.php
-
-		-
-			message: '#^Access to an undefined property Joomla\\Component\\Content\\Administrator\\View\\Article\\HtmlView\:\:\$hiddenFieldsets\.$#'
-			identifier: property.notFound
-			count: 1
-			path: administrator/components/com_content/tmpl/article/edit.php
-
-		-
-			message: '#^Access to an undefined property Joomla\\Component\\Content\\Administrator\\View\\Article\\HtmlView\:\:\$useCoreUI\.$#'
-			identifier: property.notFound
-			count: 1
-			path: administrator/components/com_content/tmpl/article/edit.php
-
-		-
-			message: '#^Access to an undefined property Joomla\\Component\\Content\\Administrator\\View\\Featured\\HtmlView\:\:\$hits\.$#'
-			identifier: property.notFound
-			count: 1
-			path: administrator/components/com_content/tmpl/featured/default.php
-
-		-
-			message: '#^Access to an undefined property Joomla\\Component\\Content\\Administrator\\View\\Featured\\HtmlView\:\:\$vote\.$#'
-			identifier: property.notFound
-			count: 1
-			path: administrator/components/com_content/tmpl/featured/default.php
-
-		-
-			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getError$#
 			'''
 			identifier: method.deprecated
 			count: 1
@@ -1728,30 +1186,19 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
+			count: 2
 			path: administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
 
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -1763,9 +1210,10 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				4\.3 will be removed in 7\.0
+				             Use the MvcFactory instead or instantiate the table class directly\.
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);
+				             \$table \= new \\Joomla\\CMS\\Table\\Content\(\$db\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -1785,7 +1233,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method addIncludePath\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Should not be used anymore as tables are loaded through the MvcFactory$#
 			'''
 			identifier: staticMethod.deprecated
@@ -1817,9 +1265,10 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				4\.3 will be removed in 7\.0
+				             Use the MvcFactory instead or instantiate the table class directly\.
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);
+				             \$table \= new \\Joomla\\CMS\\Table\\Content\(\$db\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -1839,9 +1288,10 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				4\.3 will be removed in 7\.0
+				             Use the MvcFactory instead or instantiate the table class directly\.
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);
+				             \$table \= new \\Joomla\\CMS\\Table\\Content\(\$db\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -1877,7 +1327,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -1889,7 +1339,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -1901,7 +1351,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -1913,7 +1363,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -1925,7 +1375,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -1934,15 +1384,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_fields/src/Helper/FieldsHelper.php
 
-		-
-			message: '''
-				#^Call to deprecated method cleanCache\(\) of class Joomla\\Component\\Fields\\Administrator\\Model\\FieldModel\:
-				4\.3 will be removed in 6\.0$#
-			'''
-			identifier: method.deprecated
-			count: 2
-			path: administrator/components/com_fields/src/Model/FieldModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -1957,7 +1398,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -1989,7 +1430,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -2010,7 +1451,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -2033,7 +1474,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -2124,7 +1565,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ComponentInterface to get the categories
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
@@ -2183,50 +1624,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_finder/src/Controller/IndexController.php
 
-		-
-			message: '''
-				#^Access to property \$batchOffset of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: administrator/components/com_finder/src/Controller/IndexerController.php
-
-		-
-			message: '''
-				#^Access to property \$complete of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 3
-			path: administrator/components/com_finder/src/Controller/IndexerController.php
-
-		-
-			message: '''
-				#^Access to property \$rendered of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: administrator/components/com_finder/src/Controller/IndexerController.php
-
-		-
-			message: '''
-				#^Access to property \$start of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 4
-			path: administrator/components/com_finder/src/Controller/IndexerController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -2241,7 +1638,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -2253,7 +1650,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -2265,7 +1662,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -2274,54 +1671,10 @@ parameters:
 			count: 2
 			path: administrator/components/com_finder/src/Helper/LanguageHelper.php
 
-		-
-			message: '''
-				#^Access to property \$batchOffset of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 4
-			path: administrator/components/com_finder/src/Indexer/Adapter.php
-
-		-
-			message: '''
-				#^Access to property \$batchSize of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 3
-			path: administrator/components/com_finder/src/Indexer/Adapter.php
-
-		-
-			message: '''
-				#^Access to property \$pluginState of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 5
-			path: administrator/components/com_finder/src/Indexer/Adapter.php
-
-		-
-			message: '''
-				#^Access to property \$totalItems of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: administrator/components/com_finder/src/Indexer/Adapter.php
-
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -2340,71 +1693,16 @@ parameters:
 			count: 1
 			path: administrator/components/com_finder/src/Indexer/Adapter.php
 
-		-
-			message: '''
-				#^Access to property \$batchOffset of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 4
-			path: administrator/components/com_finder/src/Indexer/DebugAdapter.php
-
-		-
-			message: '''
-				#^Access to property \$batchSize of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 3
-			path: administrator/components/com_finder/src/Indexer/DebugAdapter.php
-
-		-
-			message: '''
-				#^Access to property \$pluginState of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 5
-			path: administrator/components/com_finder/src/Indexer/DebugAdapter.php
-
-		-
-			message: '''
-				#^Access to property \$totalItems of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: administrator/components/com_finder/src/Indexer/DebugAdapter.php
-
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 2
-			path: administrator/components/com_finder/src/Indexer/Helper.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
+			count: 3
 			path: administrator/components/com_finder/src/Indexer/Helper.php
 
 		-
@@ -2417,50 +1715,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_finder/src/Indexer/Helper.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 1
-			path: administrator/components/com_finder/src/Indexer/Helper.php
-
-		-
-			message: '''
-				#^Access to property \$options of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 5
-			path: administrator/components/com_finder/src/Indexer/Indexer.php
-
-		-
-			message: '''
-				#^Access to property \$weights of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: administrator/components/com_finder/src/Indexer/Indexer.php
-
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 2
-			path: administrator/components/com_finder/src/Indexer/Indexer.php
-
 		-
 			message: '''
 				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
@@ -2474,7 +1728,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -2486,7 +1740,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -2509,7 +1763,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -2519,7 +1773,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -2590,7 +1844,7 @@ parameters:
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
-			count: 4
+			count: 1
 			path: administrator/components/com_finder/src/Model/IndexModel.php
 
 		-
@@ -2626,16 +1880,6 @@ parameters:
 			count: 8
 			path: administrator/components/com_finder/src/Model/MapsModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 3
-			path: administrator/components/com_finder/src/Model/MapsModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -2649,109 +1893,32 @@ parameters:
 
 		-
 			message: '''
-				#^Access to property \$link_count of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
+				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the language service in the DI container or get from the application object
+				             Example\:
+				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
 			'''
-			identifier: property.deprecatedClass
+			identifier: staticMethod.deprecated
 			count: 1
 			path: administrator/components/com_finder/src/Model/StatisticsModel.php
 
 		-
 			message: '''
-				#^Access to property \$taxonomy_branch_count of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
+				#^Call to deprecated method getCache\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the cache controller factory instead
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(CacheControllerFactoryInterface\:\:class\)\-\>createCacheController\(\$handler, \$options\);$#
 			'''
-			identifier: property.deprecatedClass
+			identifier: staticMethod.deprecated
 			count: 1
-			path: administrator/components/com_finder/src/Model/StatisticsModel.php
-
-		-
-			message: '''
-				#^Access to property \$taxonomy_node_count of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: administrator/components/com_finder/src/Model/StatisticsModel.php
-
-		-
-			message: '''
-				#^Access to property \$term_count of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: administrator/components/com_finder/src/Model/StatisticsModel.php
-
-		-
-			message: '''
-				#^Access to property \$type_list of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: administrator/components/com_finder/src/Model/StatisticsModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the language service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_finder/src/Model/StatisticsModel.php
-
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: administrator/components/com_finder/src/Model/StatisticsModel.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: administrator/components/com_finder/src/Model/StatisticsModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getCache\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the cache controller factory instead
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(CacheControllerFactoryInterface\:\:class\)\-\>createCacheController\(\$handler, \$options\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_finder/src/Service/HTML/Filter.php
+			path: administrator/components/com_finder/src/Service/HTML/Filter.php
 
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -2763,7 +1930,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -2775,7 +1942,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -2787,7 +1954,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -2799,7 +1966,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -2822,7 +1989,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -2902,34 +2069,10 @@ parameters:
 			count: 1
 			path: administrator/components/com_finder/tmpl/filter/edit.php
 
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_finder/tmpl/indexer/debug.php
-
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_finder/tmpl/indexer/default.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -2938,61 +2081,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_finder/tmpl/maps/default.php
 
-		-
-			message: '''
-				#^Access to property \$link_count of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: administrator/components/com_finder/tmpl/statistics/default.php
-
-		-
-			message: '''
-				#^Access to property \$taxonomy_branch_count of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: administrator/components/com_finder/tmpl/statistics/default.php
-
-		-
-			message: '''
-				#^Access to property \$taxonomy_node_count of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: administrator/components/com_finder/tmpl/statistics/default.php
-
-		-
-			message: '''
-				#^Access to property \$term_count of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: administrator/components/com_finder/tmpl/statistics/default.php
-
-		-
-			message: '''
-				#^Access to property \$type_list of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: administrator/components/com_finder/tmpl/statistics/default.php
-
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
@@ -3006,7 +2094,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -3015,17 +2103,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_guidedtours/src/Helper/GuidedtoursHelper.php
 
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 1
-			path: administrator/components/com_guidedtours/src/Model/TourModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -3051,7 +2128,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -3069,20 +2146,10 @@ parameters:
 			count: 5
 			path: administrator/components/com_guidedtours/src/Model/TourModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 2
-			path: administrator/components/com_guidedtours/src/Model/TourModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -3094,7 +2161,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -3157,78 +2224,12 @@ parameters:
 			count: 1
 			path: administrator/components/com_guidedtours/tmpl/step/edit.php
 
-		-
-			message: '#^Access to property \$items on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 4
-			path: administrator/components/com_guidedtours/tmpl/steps/default.php
-
-		-
-			message: '#^Access to property \$pagination on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_guidedtours/tmpl/steps/default.php
-
-		-
-			message: '#^Access to property \$state on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 3
-			path: administrator/components/com_guidedtours/tmpl/steps/default.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 6
-			path: administrator/components/com_guidedtours/tmpl/steps/default.php
-
-		-
-			message: '#^Call to method getCurrentUser\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_guidedtours/tmpl/steps/default.php
-
-		-
-			message: '#^Call to method getDocument\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_guidedtours/tmpl/steps/default.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Guidedtours\\Administrator\\View\\Tour\\HtmlView\:\:\$fields\.$#'
 			identifier: property.notFound
 			count: 1
 			path: administrator/components/com_guidedtours/tmpl/tour/edit.php
 
-		-
-			message: '#^Access to property \$items on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 4
-			path: administrator/components/com_guidedtours/tmpl/tours/default.php
-
-		-
-			message: '#^Access to property \$pagination on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_guidedtours/tmpl/tours/default.php
-
-		-
-			message: '#^Access to property \$state on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 4
-			path: administrator/components/com_guidedtours/tmpl/tours/default.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 7
-			path: administrator/components/com_guidedtours/tmpl/tours/default.php
-
-		-
-			message: '#^Call to method getDocument\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_guidedtours/tmpl/tours/default.php
-
 		-
 			message: '''
 				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -3254,7 +2255,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -3263,61 +2264,6 @@ parameters:
 			count: 4
 			path: administrator/components/com_installer/src/Helper/InstallerHelper.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 2
-			path: administrator/components/com_installer/src/Helper/InstallerHelper.php
-
-		-
-			message: '''
-				#^Call to method get\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 7
-			path: administrator/components/com_installer/src/Helper/InstallerHelper.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 2
-			path: administrator/components/com_installer/src/Helper/InstallerHelper.php
-
-		-
-			message: '''
-				#^Parameter \$extension of anonymous function has typehint with deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: parameter.deprecatedClass
-			count: 4
-			path: administrator/components/com_installer/src/Helper/InstallerHelper.php
-
-		-
-			message: '''
-				#^Parameter \$extension of method Joomla\\Component\\Installer\\Administrator\\Helper\\InstallerHelper\:\:getDownloadKey\(\) has typehint with deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: parameter.deprecatedClass
-			count: 1
-			path: administrator/components/com_installer/src/Helper/InstallerHelper.php
-
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
@@ -3331,38 +2277,38 @@ parameters:
 
 		-
 			message: '''
-				#^Call to method get\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Installer\\Installer\:
+				4\.3\.0 will be removed in 7\.0
+				            Create a proper getter function for the property$#
 			'''
-			identifier: method.deprecatedClass
+			identifier: method.deprecated
 			count: 2
 			path: administrator/components/com_installer/src/Model/DiscoverModel.php
 
 		-
 			message: '''
-				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Updater\\Update\:
-				4\.3\.0 will be removed in 6\.0
+				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Installer\\Installer\:
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
-			count: 1
+			count: 3
 			path: administrator/components/com_installer/src/Model/InstallModel.php
 
 		-
 			message: '''
-				#^Call to method get\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Updater\\Update\:
+				4\.3\.0 will be removed in 7\.0
+				            Create a proper getter function for the property$#
 			'''
-			identifier: method.deprecatedClass
-			count: 3
+			identifier: method.deprecated
+			count: 1
 			path: administrator/components/com_installer/src/Model/InstallModel.php
 
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -3385,7 +2331,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Changelog\\Changelog\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -3394,9 +2340,19 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
+				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Installer\\Installer\:
+				4\.3\.0 will be removed in 7\.0
+				            Create a proper getter function for the property$#
+			'''
+			identifier: method.deprecated
+			count: 2
+			path: administrator/components/com_installer/src/Model/ManageModel.php
+
+		-
+			message: '''
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
 				             Catch thrown Exceptions instead of getError$#
 			'''
 			identifier: method.deprecated
@@ -3416,77 +2372,34 @@ parameters:
 
 		-
 			message: '''
-				#^Call to method get\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Installer\\Installer\:
+				4\.3\.0 will be removed in 7\.0
+				            Create a proper getter function for the property$#
 			'''
-			identifier: method.deprecatedClass
+			identifier: method.deprecated
 			count: 2
-			path: administrator/components/com_installer/src/Model/ManageModel.php
+			path: administrator/components/com_installer/src/Model/UpdateModel.php
 
 		-
 			message: '''
 				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Updater\\Update\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
 			count: 3
 			path: administrator/components/com_installer/src/Model/UpdateModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Form\\Form\:
-				4\.3 will be removed in 6\.0
-				             Use the FormFactory service from the container
-				             Example\: Factory\:\:getContainer\(\)\-\>get\(FormFactoryInterface\:\:class\)\-\>createForm\(\$name, \$options\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_installer/src/Model/UpdateModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method set\(\) of class Joomla\\CMS\\Updater\\Update\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper setter function for the property$#
 			'''
 			identifier: method.deprecated
 			count: 2
 			path: administrator/components/com_installer/src/Model/UpdateModel.php
 
-		-
-			message: '''
-				#^Call to method get\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: method.deprecatedClass
-			count: 2
-			path: administrator/components/com_installer/src/Model/UpdateModel.php
-
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: administrator/components/com_installer/src/Model/UpdatesiteModel.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: administrator/components/com_installer/src/Model/UpdatesiteModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -3509,38 +2422,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_installer/src/Model/UpdatesitesModel.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: administrator/components/com_installer/src/Model/UpdatesitesModel.php
-
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 1
-			path: administrator/components/com_installer/src/Model/UpdatesitesModel.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: administrator/components/com_installer/src/Model/UpdatesitesModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -3586,28 +2467,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_installer/src/View/Update/HtmlView.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: administrator/components/com_installer/src/View/Update/HtmlView.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: administrator/components/com_installer/src/View/Update/HtmlView.php
-
 		-
 			message: '''
 				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -3661,29 +2520,29 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getErrors$#
+				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Installer\\Installer\:
+				4\.3\.0 will be removed in 7\.0
+				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
-			count: 4
+			count: 1
 			path: administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
 
 		-
 			message: '''
-				#^Call to method get\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getErrors$#
 			'''
-			identifier: method.deprecatedClass
-			count: 1
+			identifier: method.deprecated
+			count: 4
 			path: administrator/components/com_joomlaupdate/src/Controller/UpdateController.php
 
 		-
 			message: '''
 				#^Access to deprecated static property \$language of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -3695,7 +2554,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Updater\\Update\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -3705,7 +2564,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\MVC\\Model\\BaseDatabaseModel\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use getDatabase\(\) instead
 				             Example\: \$model\-\>getDatabase\(\);$#
 			'''
@@ -3727,7 +2586,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -3749,10 +2608,9 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Throw an Exception instead of using setError$#
+				#^Call to deprecated method set\(\) of class Joomla\\CMS\\Installer\\Installer\:
+				4\.3\.0 will be removed in 7\.0
+				            Create a proper setter function for the property$#
 			'''
 			identifier: method.deprecated
 			count: 1
@@ -3760,21 +2618,12 @@ parameters:
 
 		-
 			message: '''
-				#^Call to method set\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
-
-		-
-			message: '''
-				#^Call to method setAdapter\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Throw an Exception instead of using setError$#
 			'''
-			identifier: method.deprecatedClass
+			identifier: method.deprecated
 			count: 1
 			path: administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
 
@@ -3802,72 +2651,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/noupdate.php
 
-		-
-			message: '#^Access to property \$defaultBackendTemplate on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
-
-		-
-			message: '#^Access to property \$isDefaultBackendTemplate on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
-
-		-
-			message: '#^Access to property \$noVersionCheck on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 3
-			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
-
-		-
-			message: '#^Access to property \$nonCoreCriticalPlugins on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
-
-		-
-			message: '#^Access to property \$nonCoreExtensions on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
-
-		-
-			message: '#^Access to property \$phpOptions on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
-
-		-
-			message: '#^Access to property \$phpSettings on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
-
-		-
-			message: '#^Access to property \$updateInfo on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 7
-			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
-
-		-
-			message: '#^Call to method getCurrentUser\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
-
-		-
-			message: '#^Call to method getDocument\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/preupdatecheck.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Joomlaupdate\\Administrator\\View\\Joomlaupdate\\HtmlView\:\:\$langKey\.$#'
 			identifier: property.notFound
@@ -3892,46 +2675,10 @@ parameters:
 			count: 1
 			path: administrator/components/com_joomlaupdate/tmpl/joomlaupdate/update.php
 
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_joomlaupdate/tmpl/update/default.php
-
-		-
-			message: '#^Access to property \$noBackupCheck on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 3
-			path: administrator/components/com_joomlaupdate/tmpl/upload/default.php
-
-		-
-			message: '#^Access to property \$updateInfo on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 5
-			path: administrator/components/com_joomlaupdate/tmpl/upload/default.php
-
-		-
-			message: '#^Access to property \$warnings on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_joomlaupdate/tmpl/upload/default.php
-
-		-
-			message: '#^Call to method getDocument\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_joomlaupdate/tmpl/upload/default.php
-
 		-
 			message: '''
 				#^Access to deprecated static property \$language of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -3943,7 +2690,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Language\\Language\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language factory instead
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(LanguageFactoryInterface\:\:class\)\-\>createLanguage\(\$lang, \$debug\);$#
 			'''
@@ -3954,7 +2701,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -3988,7 +2735,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -4005,19 +2752,19 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getError$#
 			'''
-			identifier: staticMethod.deprecated
-			count: 1
+			identifier: method.deprecated
+			count: 3
 			path: administrator/components/com_languages/src/Model/InstalledModel.php
 
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -4037,26 +2784,6 @@ parameters:
 			count: 4
 			path: administrator/components/com_languages/src/Model/InstalledModel.php
 
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 1
-			path: administrator/components/com_languages/src/Model/LanguageModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method cleanCache\(\) of class Joomla\\Component\\Languages\\Administrator\\Model\\LanguageModel\:
-				4\.3 will be removed in 6\.0$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_languages/src/Model/LanguageModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -4068,21 +2795,10 @@ parameters:
 			count: 6
 			path: administrator/components/com_languages/src/Model/LanguageModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_languages/src/Model/LanguageModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -4102,34 +2818,15 @@ parameters:
 
 		-
 			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 2
-			path: administrator/components/com_languages/src/Model/LanguageModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method cleanCache\(\) of class Joomla\\Component\\Languages\\Administrator\\Model\\LanguagesModel\:
-				4\.3 will be removed in 6\.0$#
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getError$#
 			'''
 			identifier: method.deprecated
 			count: 1
 			path: administrator/components/com_languages/src/Model/LanguagesModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 2
-			path: administrator/components/com_languages/src/Model/LanguagesModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -4144,7 +2841,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Language\\Language\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language factory instead
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(LanguageFactoryInterface\:\:class\)\-\>createLanguage\(\$lang, \$debug\);$#
 			'''
@@ -4342,7 +3039,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getCache\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the cache controller factory instead
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(CacheControllerFactoryInterface\:\:class\)\-\>createCacheController\(\$handler, \$options\);$#
@@ -4354,7 +3051,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -4366,7 +3063,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -4407,17 +3104,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_mails/src/Helper/MailsHelper.php
 
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 2
-			path: administrator/components/com_mails/src/Model/TemplateModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -4432,7 +3118,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -4450,16 +3136,6 @@ parameters:
 			count: 8
 			path: administrator/components/com_mails/src/Model/TemplateModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 2
-			path: administrator/components/com_mails/src/Model/TemplateModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -4484,43 +3160,10 @@ parameters:
 			count: 1
 			path: administrator/components/com_mails/tmpl/template/edit.php
 
-		-
-			message: '''
-				#^Access to property \$template_id of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: administrator/components/com_mails/tmpl/template/edit.php
-
-		-
-			message: '''
-				#^Call to method get\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 2
-			path: administrator/components/com_media/helpers/media.php
-
-		-
-			message: '''
-				#^Parameter \$mediaObject of method MediaHelper\:\:getContentTypeLink\(\) has typehint with deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: parameter.deprecatedClass
-			count: 1
-			path: administrator/components/com_media/helpers/media.php
-
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -4532,7 +3175,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -4544,7 +3187,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -4553,82 +3196,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_media/layouts/toolbar/upload.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 1
-			path: administrator/components/com_media/src/Controller/PluginController.php
-
-		-
-			message: '''
-				#^Access to property \$adapter of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 8
-			path: administrator/components/com_media/src/Model/ApiModel.php
-
-		-
-			message: '''
-				#^Access to property \$data of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 4
-			path: administrator/components/com_media/src/Model/ApiModel.php
-
-		-
-			message: '''
-				#^Access to property \$extension of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: administrator/components/com_media/src/Model/ApiModel.php
-
-		-
-			message: '''
-				#^Access to property \$name of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 10
-			path: administrator/components/com_media/src/Model/ApiModel.php
-
-		-
-			message: '''
-				#^Access to property \$path of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 8
-			path: administrator/components/com_media/src/Model/ApiModel.php
-
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 4
-			path: administrator/components/com_media/src/Model/ApiModel.php
-
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
@@ -4636,51 +3203,9 @@ parameters:
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
-			count: 3
-			path: administrator/components/com_media/src/Model/ApiModel.php
-
-		-
-			message: '''
-				#^Call to method getError\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 4
-			path: administrator/components/com_media/src/Model/ApiModel.php
-
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 9
-			path: administrator/components/com_media/src/Model/ApiModel.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 4
+			count: 2
 			path: administrator/components/com_media/src/Model/ApiModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 1
-			path: administrator/components/com_media/src/Model/MediaModel.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Media\\Administrator\\View\\File\\HtmlView\:\:\$file\.$#'
 			identifier: property.notFound
@@ -4720,7 +3245,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method addIncludePath\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Should not be used anymore as tables are loaded through the MvcFactory$#
 			'''
 			identifier: staticMethod.deprecated
@@ -4729,10 +3254,11 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -4817,10 +3343,11 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -4829,7 +3356,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -4849,17 +3376,6 @@ parameters:
 			count: 3
 			path: administrator/components/com_menus/src/Helper/MenusHelper.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_menus/src/Helper/MenusHelper.php
-
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
@@ -4870,15 +3386,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_menus/src/Helper/MenusHelper.php
 
-		-
-			message: '''
-				#^Call to deprecated method cleanCache\(\) of class Joomla\\Component\\Menus\\Administrator\\Model\\ItemModel\:
-				4\.3 will be removed in 6\.0$#
-			'''
-			identifier: method.deprecated
-			count: 7
-			path: administrator/components/com_menus/src/Model/ItemModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -4893,7 +3400,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -4905,7 +3412,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -4923,20 +3430,10 @@ parameters:
 			count: 35
 			path: administrator/components/com_menus/src/Model/ItemModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 2
-			path: administrator/components/com_menus/src/Model/ItemModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -4945,26 +3442,6 @@ parameters:
 			count: 2
 			path: administrator/components/com_menus/src/Model/ItemsModel.php
 
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 1
-			path: administrator/components/com_menus/src/Model/MenuModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method cleanCache\(\) of class Joomla\\Component\\Menus\\Administrator\\Model\\MenuModel\:
-				4\.3 will be removed in 6\.0$#
-			'''
-			identifier: method.deprecated
-			count: 2
-			path: administrator/components/com_menus/src/Model/MenuModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -4979,9 +3456,10 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				4\.3 will be removed in 7\.0
+				             Use the MvcFactory instead or instantiate the table class directly\.
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);
+				             \$table \= new \\Joomla\\CMS\\Table\\Content\(\$db\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -4990,7 +3468,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -5008,16 +3486,6 @@ parameters:
 			count: 5
 			path: administrator/components/com_menus/src/Model/MenuModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 4
-			path: administrator/components/com_menus/src/Model/MenuModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -5029,43 +3497,10 @@ parameters:
 			count: 3
 			path: administrator/components/com_menus/src/Model/MenusModel.php
 
-		-
-			message: '''
-				#^Access to property \$description of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 7
-			path: administrator/components/com_menus/src/Model/MenutypesModel.php
-
-		-
-			message: '''
-				#^Access to property \$request of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 8
-			path: administrator/components/com_menus/src/Model/MenutypesModel.php
-
-		-
-			message: '''
-				#^Access to property \$title of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 8
-			path: administrator/components/com_menus/src/Model/MenutypesModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -5074,32 +3509,10 @@ parameters:
 			count: 2
 			path: administrator/components/com_menus/src/Model/MenutypesModel.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 8
-			path: administrator/components/com_menus/src/Model/MenutypesModel.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 8
-			path: administrator/components/com_menus/src/Model/MenutypesModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -5150,84 +3563,18 @@ parameters:
 				             Will be removed without replacement
 				             Catch thrown Exceptions instead of getErrors$#
 			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_menus/src/View/Menu/HtmlView.php
-
-		-
-			message: '''
-				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				7\.0$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_menus/src/View/Menus/HtmlView.php
-
-		-
-			message: '''
-				#^Access to property \$description of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 5
-			path: administrator/components/com_menus/src/View/Menutypes/HtmlView.php
-
-		-
-			message: '''
-				#^Access to property \$request of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 5
-			path: administrator/components/com_menus/src/View/Menutypes/HtmlView.php
-
-		-
-			message: '''
-				#^Access to property \$title of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 5
-			path: administrator/components/com_menus/src/View/Menutypes/HtmlView.php
-
-		-
-			message: '''
-				#^Access to property \$type of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 5
-			path: administrator/components/com_menus/src/View/Menutypes/HtmlView.php
-
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 5
-			path: administrator/components/com_menus/src/View/Menutypes/HtmlView.php
+			identifier: method.deprecated
+			count: 1
+			path: administrator/components/com_menus/src/View/Menu/HtmlView.php
 
 		-
 			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
+				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				7\.0$#
 			'''
-			identifier: new.deprecatedClass
-			count: 5
-			path: administrator/components/com_menus/src/View/Menutypes/HtmlView.php
+			identifier: method.deprecated
+			count: 1
+			path: administrator/components/com_menus/src/View/Menus/HtmlView.php
 
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Menus\\Administrator\\View\\Item\\HtmlView\:\:\$fields\.$#'
@@ -5286,28 +3633,6 @@ parameters:
 			count: 4
 			path: administrator/components/com_messages/src/Model/ConfigModel.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: administrator/components/com_messages/src/Model/ConfigModel.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: administrator/components/com_messages/src/Model/ConfigModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -5322,7 +3647,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Language\\Language\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language factory instead
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(LanguageFactoryInterface\:\:class\)\-\>createLanguage\(\$lang, \$debug\);$#
 			'''
@@ -5330,17 +3655,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_messages/src/Model/MessageModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_messages/src/Model/MessageModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -5355,7 +3669,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -5405,7 +3719,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -5414,10 +3728,33 @@ parameters:
 			count: 1
 			path: administrator/components/com_modules/layouts/joomla/form/field/modulespositionedit.php
 
+		-
+			message: '''
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getError$#
+			'''
+			identifier: method.deprecated
+			count: 1
+			path: administrator/components/com_modules/src/Controller/ModuleController.php
+
+		-
+			message: '''
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
+			'''
+			identifier: staticMethod.deprecated
+			count: 2
+			path: administrator/components/com_modules/src/Helper/AssociationsHelper.php
+
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -5429,7 +3766,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -5438,26 +3775,6 @@ parameters:
 			count: 2
 			path: administrator/components/com_modules/src/Helper/ModulesHelper.php
 
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 1
-			path: administrator/components/com_modules/src/Model/ModuleModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method cleanCache\(\) of class Joomla\\Component\\Modules\\Administrator\\Model\\ModuleModel\:
-				4\.3 will be removed in 6\.0$#
-			'''
-			identifier: method.deprecated
-			count: 5
-			path: administrator/components/com_modules/src/Model/ModuleModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -5466,15 +3783,16 @@ parameters:
 				             Catch thrown Exceptions instead of getError$#
 			'''
 			identifier: method.deprecated
-			count: 11
+			count: 7
 			path: administrator/components/com_modules/src/Model/ModuleModel.php
 
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				4\.3 will be removed in 7\.0
+				             Use the MvcFactory instead or instantiate the table class directly\.
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);
+				             \$table \= new \\Joomla\\CMS\\Table\\Content\(\$db\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -5483,7 +3801,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -5495,7 +3813,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -5510,23 +3828,13 @@ parameters:
 				             Throw an Exception instead of using setError$#
 			'''
 			identifier: method.deprecated
-			count: 14
-			path: administrator/components/com_modules/src/Model/ModuleModel.php
-
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 4
+			count: 10
 			path: administrator/components/com_modules/src/Model/ModuleModel.php
 
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -5538,7 +3846,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -5561,7 +3869,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -5579,27 +3887,12 @@ parameters:
 			count: 1
 			path: administrator/components/com_modules/src/View/Module/HtmlView.php
 
-		-
-			message: '#^Access to an undefined property Joomla\\Component\\Modules\\Administrator\\View\\Modules\\HtmlView\:\:\$clientId\.$#'
-			identifier: property.notFound
-			count: 1
-			path: administrator/components/com_modules/src/View/Modules/HtmlView.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Modules\\Administrator\\View\\Modules\\HtmlView\:\:\$total\.$#'
 			identifier: property.notFound
 			count: 1
 			path: administrator/components/com_modules/src/View/Modules/HtmlView.php
 
-		-
-			message: '''
-				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				7\.0$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_modules/src/View/Modules/HtmlView.php
-
 		-
 			message: '''
 				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -5639,12 +3932,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_modules/tmpl/modules/default.php
 
-		-
-			message: '#^Access to an undefined property Joomla\\Component\\Modules\\Administrator\\View\\Modules\\HtmlView\:\:\$clientId\.$#'
-			identifier: property.notFound
-			count: 3
-			path: administrator/components/com_modules/tmpl/modules/emptystate.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Modules\\Administrator\\View\\Modules\\HtmlView\:\:\$total\.$#'
 			identifier: property.notFound
@@ -5664,21 +3951,11 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_newsfeeds/src/Controller/NewsfeedController.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 2
@@ -5687,7 +3964,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -5707,17 +3984,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -5726,13 +3992,13 @@ parameters:
 				             Throw an Exception instead of using setError$#
 			'''
 			identifier: method.deprecated
-			count: 3
+			count: 1
 			path: administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
 
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -5741,21 +4007,10 @@ parameters:
 			count: 1
 			path: administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_newsfeeds/src/Table/NewsfeedTable.php
-
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -5808,7 +4063,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -5817,45 +4072,13 @@ parameters:
 			count: 2
 			path: administrator/components/com_plugins/src/Helper/PluginsHelper.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: administrator/components/com_plugins/src/Helper/PluginsHelper.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: administrator/components/com_plugins/src/Helper/PluginsHelper.php
-
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 1
-			path: administrator/components/com_plugins/src/Model/PluginModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				4\.3 will be removed in 7\.0
+				             Use the MvcFactory instead or instantiate the table class directly\.
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);
+				             \$table \= new \\Joomla\\CMS\\Table\\Content\(\$db\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -5864,7 +4087,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -5876,7 +4099,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -5886,7 +4109,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -5937,18 +4160,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_plugins/tmpl/plugin/edit.php
 
-		-
-			message: '''
-				#^Call to deprecated method getCache\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the cache controller factory instead
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(CacheControllerFactoryInterface\:\:class\)\-\>createCacheController\(\$handler, \$options\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 6
-			path: administrator/components/com_postinstall/src/Model/MessagesModel.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Postinstall\\Administrator\\View\\Messages\\HtmlView\:\:\$eid\.$#'
 			identifier: property.notFound
@@ -5973,18 +4184,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_postinstall/src/View/Messages/HtmlView.php
 
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_postinstall/src/View/Messages/HtmlView.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Postinstall\\Administrator\\View\\Messages\\HtmlView\:\:\$eid\.$#'
 			identifier: property.notFound
@@ -6046,7 +4245,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -6090,7 +4289,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Language\\Language\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language factory instead
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(LanguageFactoryInterface\:\:class\)\-\>createLanguage\(\$lang, \$debug\);$#
 			'''
@@ -6101,7 +4300,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -6168,7 +4367,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Language\\Language\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language factory instead
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(LanguageFactoryInterface\:\:class\)\-\>createLanguage\(\$lang, \$debug\);$#
 			'''
@@ -6179,7 +4378,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -6246,18 +4445,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_privacy/src/View/Requests/HtmlView.php
 
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 2
-			path: administrator/components/com_privacy/tmpl/requests/default.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -6272,7 +4459,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -6295,7 +4482,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -6346,50 +4533,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_scheduler/src/Controller/TasksController.php
 
-		-
-			message: '''
-				#^Access to property \$execution_rules of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: administrator/components/com_scheduler/src/Model/TaskModel.php
-
-		-
-			message: '''
-				#^Access to property \$id of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: administrator/components/com_scheduler/src/Model/TaskModel.php
-
-		-
-			message: '''
-				#^Access to property \$last_execution of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 6
-			path: administrator/components/com_scheduler/src/Model/TaskModel.php
-
-		-
-			message: '''
-				#^Access to property \$next_execution of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 6
-			path: administrator/components/com_scheduler/src/Model/TaskModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -6422,32 +4565,10 @@ parameters:
 			count: 2
 			path: administrator/components/com_scheduler/src/Model/TaskModel.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: administrator/components/com_scheduler/src/Model/TasksModel.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: administrator/components/com_scheduler/src/Model/TasksModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -6467,18 +4588,6 @@ parameters:
 			count: 3
 			path: administrator/components/com_scheduler/src/Table/TaskTable.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Toolbar\\Toolbar\:
-				4\.0 will be removed in 6\.0
-				             Use the ToolbarFactoryInterface instead
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(ToolbarFactoryInterface\:\:class\)\-\>createToolbar\(\$name\)$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_scheduler/src/View/Logs/HtmlView.php
-
 		-
 			message: '''
 				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -6504,110 +4613,20 @@ parameters:
 			path: administrator/components/com_scheduler/src/View/Tasks/HtmlView.php
 
 		-
-			message: '#^Access to property \$app on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_scheduler/tmpl/select/default.php
-
-		-
-			message: '#^Access to property \$items on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_scheduler/tmpl/select/default.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_scheduler/tmpl/select/default.php
-
-		-
-			message: '#^Call to method getDocument\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_scheduler/tmpl/select/default.php
-
-		-
-			message: '#^Access to property \$app on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_scheduler/tmpl/task/edit.php
-
-		-
-			message: '#^Access to property \$canDo on an unknown class HtmlView\.$#'
-			identifier: class.notFound
+			message: '#^Access to an undefined property Joomla\\Component\\Scheduler\\Administrator\\View\\Task\\HtmlView\:\:\$fieldset\.$#'
+			identifier: property.notFound
 			count: 1
 			path: administrator/components/com_scheduler/tmpl/task/edit.php
 
 		-
-			message: '#^Access to property \$fieldset on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_scheduler/tmpl/task/edit.php
-
-		-
-			message: '#^Access to property \$form on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 10
-			path: administrator/components/com_scheduler/tmpl/task/edit.php
-
-		-
-			message: '#^Access to property \$ignore_fieldsets on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 4
-			path: administrator/components/com_scheduler/tmpl/task/edit.php
-
-		-
-			message: '#^Access to property \$item on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 5
-			path: administrator/components/com_scheduler/tmpl/task/edit.php
-
-		-
-			message: '#^Access to property \$useCoreUI on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_scheduler/tmpl/task/edit.php
-
-		-
-			message: '#^Call to method getDocument\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
+			message: '#^Access to an undefined property Joomla\\Component\\Scheduler\\Administrator\\View\\Task\\HtmlView\:\:\$useCoreUI\.$#'
+			identifier: property.notFound
 			count: 1
 			path: administrator/components/com_scheduler/tmpl/task/edit.php
 
 		-
-			message: '#^Access to property \$hasDueTasks on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_scheduler/tmpl/tasks/default.php
-
-		-
-			message: '#^Access to property \$items on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 4
-			path: administrator/components/com_scheduler/tmpl/tasks/default.php
-
-		-
-			message: '#^Access to property \$pagination on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_scheduler/tmpl/tasks/default.php
-
-		-
-			message: '#^Access to property \$state on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_scheduler/tmpl/tasks/default.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 7
-			path: administrator/components/com_scheduler/tmpl/tasks/default.php
-
-		-
-			message: '#^Call to method getDocument\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
+			message: '#^Access to an undefined property Joomla\\Component\\Scheduler\\Administrator\\View\\Tasks\\HtmlView\:\:\$hasDueTasks\.$#'
+			identifier: property.notFound
 			count: 1
 			path: administrator/components/com_scheduler/tmpl/tasks/default.php
 
@@ -6630,29 +4649,7 @@ parameters:
 				             Catch thrown Exceptions instead of getError$#
 			'''
 			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_tags/src/Controller/TagController.php
-
-		-
-			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
-			'''
-			identifier: method.deprecated
-			count: 8
-			path: administrator/components/com_tags/src/Model/TagModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
+			count: 20
 			path: administrator/components/com_tags/src/Model/TagModel.php
 
 		-
@@ -6663,23 +4660,13 @@ parameters:
 				             Throw an Exception instead of using setError$#
 			'''
 			identifier: method.deprecated
-			count: 11
-			path: administrator/components/com_tags/src/Model/TagModel.php
-
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 2
+			count: 30
 			path: administrator/components/com_tags/src/Model/TagModel.php
 
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -6729,24 +4716,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_tags/tmpl/tag/edit.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\String\\Inflector\:
-				3\.0  Use static methods without a class instance instead\.$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_tags/tmpl/tags/default.php
-
-		-
-			message: '''
-				#^Call to deprecated method toPlural\(\) of class Joomla\\String\\Inflector\:
-				3\.0  Use Doctrine\\Common\\Inflector\\Inflector\:\:pluralize\(\) instead\.$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_tags/tmpl/tags/default.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -6794,7 +4763,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -6803,37 +4772,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_templates/src/Helper/TemplatesHelper.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: administrator/components/com_templates/src/Helper/TemplatesHelper.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: administrator/components/com_templates/src/Helper/TemplatesHelper.php
-
-		-
-			message: '''
-				#^Call to deprecated method cleanCache\(\) of class Joomla\\Component\\Templates\\Administrator\\Model\\StyleModel\:
-				4\.3 will be removed in 6\.0$#
-			'''
-			identifier: method.deprecated
-			count: 5
-			path: administrator/components/com_templates/src/Model/StyleModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -6845,17 +4783,6 @@ parameters:
 			count: 8
 			path: administrator/components/com_templates/src/Model/StyleModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 2
-			path: administrator/components/com_templates/src/Model/StyleModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -6867,20 +4794,10 @@ parameters:
 			count: 6
 			path: administrator/components/com_templates/src/Model/StyleModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 6
-			path: administrator/components/com_templates/src/Model/StyleModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -7028,7 +4945,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -7134,17 +5051,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_users/src/Controller/NoteController.php
 
-		-
-			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/components/com_users/src/Controller/NoteController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -7168,7 +5074,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -7180,7 +5086,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -7192,7 +5098,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -7214,7 +5120,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -7244,17 +5150,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_users/src/Model/DebuggroupModel.php
 
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 1
-			path: administrator/components/com_users/src/Model/GroupModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -7280,9 +5175,10 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				4\.3 will be removed in 7\.0
+				             Use the MvcFactory instead or instantiate the table class directly\.
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);
+				             \$table \= new \\Joomla\\CMS\\Table\\Content\(\$db\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -7291,7 +5187,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -7323,9 +5219,10 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				4\.3 will be removed in 7\.0
+				             Use the MvcFactory instead or instantiate the table class directly\.
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);
+				             \$table \= new \\Joomla\\CMS\\Table\\Content\(\$db\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -7344,38 +5241,15 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 2
-			path: administrator/components/com_users/src/Model/LevelsModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
 				3\.1\.4 will be removed in 7\.0
 				             Will be removed without replacement
-				             Throw an Exception instead of using setError$#
+				             Catch thrown Exceptions instead of getError$#
 			'''
 			identifier: method.deprecated
-			count: 3
+			count: 2
 			path: administrator/components/com_users/src/Model/LevelsModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the language service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_users/src/Model/MailModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -7383,30 +5257,21 @@ parameters:
 				             Will be removed without replacement
 				             Throw an Exception instead of using setError$#
 			'''
-			identifier: method.deprecated
-			count: 5
-			path: administrator/components/com_users/src/Model/MailModel.php
-
-		-
-			message: '''
-				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 1
-			path: administrator/components/com_users/src/Model/MethodModel.php
+			identifier: method.deprecated
+			count: 3
+			path: administrator/components/com_users/src/Model/LevelsModel.php
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the language service in the DI container or get from the application object
+				             Example\:
+				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
-			path: administrator/components/com_users/src/Model/NoteModel.php
+			path: administrator/components/com_users/src/Model/MailModel.php
 
 		-
 			message: '''
@@ -7416,18 +5281,18 @@ parameters:
 				             Throw an Exception instead of using setError$#
 			'''
 			identifier: method.deprecated
-			count: 2
-			path: administrator/components/com_users/src/Model/NoteModel.php
+			count: 5
+			path: administrator/components/com_users/src/Model/MailModel.php
 
 		-
 			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
+				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
 				4\.3 will be removed in 7\.0
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
 			count: 1
-			path: administrator/components/com_users/src/Model/NoteModel.php
+			path: administrator/components/com_users/src/Model/MethodModel.php
 
 		-
 			message: '''
@@ -7465,9 +5330,10 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				4\.3 will be removed in 7\.0
+				             Use the MvcFactory instead or instantiate the table class directly\.
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);
+				             \$table \= new \\Joomla\\CMS\\Table\\Content\(\$db\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -7476,7 +5342,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -7494,16 +5360,6 @@ parameters:
 			count: 28
 			path: administrator/components/com_users/src/Model/UserModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 6
-			path: administrator/components/com_users/src/Model/UserModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -7518,7 +5374,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -7530,7 +5386,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -7542,7 +5398,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -7565,7 +5421,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -7692,29 +5548,6 @@ parameters:
 			count: 1
 			path: administrator/components/com_users/src/View/User/HtmlView.php
 
-		-
-			message: '''
-				#^Access to deprecated property \$db of class Joomla\\Component\\Users\\Administrator\\View\\Users\\HtmlView\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement use database from the container instead
-				             Example\: Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: property.deprecated
-			count: 1
-			path: administrator/components/com_users/src/View/Users/HtmlView.php
-
-		-
-			message: '''
-				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the database service in the DI container
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/components/com_users/src/View/Users/HtmlView.php
-
 		-
 			message: '''
 				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -7724,264 +5557,18 @@ parameters:
 			count: 1
 			path: administrator/components/com_users/src/View/Users/HtmlView.php
 
-		-
-			message: '#^Access to property \$allowEntryBatching on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_users/tmpl/captive/select.php
-
-		-
-			message: '#^Access to property \$mfaMethods on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 3
-			path: administrator/components/com_users/tmpl/captive/select.php
-
-		-
-			message: '#^Access to property \$records on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/captive/select.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_users/tmpl/captive/select.php
-
-		-
-			message: '#^Call to method getModel\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_users/tmpl/captive/select.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Users\\Administrator\\View\\Group\\HtmlView\:\:\$useCoreUI\.$#'
 			identifier: property.notFound
 			count: 1
 			path: administrator/components/com_users/tmpl/group/edit.php
 
-		-
-			message: '#^Access to property \$backupCodes on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 5
-			path: administrator/components/com_users/tmpl/method/backupcodes.php
-
-		-
-			message: '#^Access to property \$record on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/method/backupcodes.php
-
-		-
-			message: '#^Access to property \$returnURL on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 4
-			path: administrator/components/com_users/tmpl/method/backupcodes.php
-
-		-
-			message: '#^Access to property \$user on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_users/tmpl/method/backupcodes.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/method/backupcodes.php
-
-		-
-			message: '#^Access to property \$isEditExisting on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Access to property \$record on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 4
-			path: administrator/components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Access to property \$renderOptions on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 26
-			path: administrator/components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Access to property \$returnURL on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 4
-			path: administrator/components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Access to property \$title on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Access to property \$user on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 8
-			path: administrator/components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Call to method getModel\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Access to property \$isMandatoryMFASetup on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Access to property \$methods on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Access to property \$mfaActive on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Access to property \$returnURL on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Access to property \$user on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Call to method loadTemplate\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Call to method setLayout\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Access to property \$isAdmin on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/firsttime.php
-
-		-
-			message: '#^Access to property \$returnURL on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_users/tmpl/methods/firsttime.php
-
-		-
-			message: '#^Access to property \$user on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/firsttime.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/firsttime.php
-
-		-
-			message: '#^Call to method loadTemplate\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/firsttime.php
-
-		-
-			message: '#^Call to method setLayout\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/firsttime.php
-
-		-
-			message: '#^Access to property \$defaultMethod on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: administrator/components/com_users/tmpl/methods/list.php
-
-		-
-			message: '#^Access to property \$methods on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/list.php
-
-		-
-			message: '#^Access to property \$returnURL on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 8
-			path: administrator/components/com_users/tmpl/methods/list.php
-
-		-
-			message: '#^Access to property \$user on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 6
-			path: administrator/components/com_users/tmpl/methods/list.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 13
-			path: administrator/components/com_users/tmpl/methods/list.php
-
-		-
-			message: '#^Call to method getDocument\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/list.php
-
-		-
-			message: '#^Call to method getModel\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/methods/list.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Users\\Administrator\\View\\User\\HtmlView\:\:\$useCoreUI\.$#'
 			identifier: property.notFound
 			count: 1
 			path: administrator/components/com_users/tmpl/user/edit.php
 
-		-
-			message: '#^Access to property \$groups on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: administrator/components/com_users/tmpl/user/edit_groups.php
-
-		-
-			message: '#^Call to method pluralize\(\) of deprecated class Doctrine\\Common\\Inflector\\Inflector\.$#'
-			identifier: staticMethod.deprecatedClass
-			count: 1
-			path: administrator/components/com_workflow/src/Controller/DisplayController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -7993,21 +5580,10 @@ parameters:
 			count: 1
 			path: administrator/components/com_workflow/src/Controller/StagesController.php
 
-		-
-			message: '''
-				#^Access to property \$created_by of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: administrator/components/com_workflow/src/Controller/TransitionController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\MVC\\Model\\BaseDatabaseModel\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use getDatabase\(\) instead
 				             Example\: \$model\-\>getDatabase\(\);$#
 			'''
@@ -8029,7 +5605,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -8052,28 +5628,17 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
 			count: 1
 			path: administrator/components/com_workflow/src/Model/StagesModel.php
 
-		-
-			message: '''
-				#^Access to property \$workflow_id of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: administrator/components/com_workflow/src/Model/TransitionModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -8083,7 +5648,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -8115,7 +5680,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -8228,39 +5793,16 @@ parameters:
 			message: '#^Access to protected property Joomla\\Module\\Menu\\Administrator\\Menu\\CssMenu\:\:\$params\.$#'
 			identifier: property.protected
 			count: 1
-			path: administrator/modules/mod_menu/tmpl/default_submenu.php
-
-		-
-			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: administrator/modules/mod_popular/src/Helper/PopularHelper.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
-				             Use the ComponentInterface to get the categories
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/modules/mod_popular/src/Helper/PopularHelper.php
+			path: administrator/modules/mod_menu/tmpl/default_submenu.php
 
 		-
 			message: '''
-				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Load the user service from the dependency injection container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getError$#
 			'''
-			identifier: staticMethod.deprecated
+			identifier: method.deprecated
 			count: 1
 			path: administrator/modules/mod_popular/src/Helper/PopularHelper.php
 
@@ -8274,16 +5816,6 @@ parameters:
 			count: 1
 			path: administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 1
-			path: administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php
-
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
@@ -8315,18 +5847,6 @@ parameters:
 			count: 1
 			path: administrator/modules/mod_submenu/src/Menu/Menu.php
 
-		-
-			message: '''
-				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Load the user service from the dependency injection container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: administrator/templates/atum/error.php
-
 		-
 			message: '#^Access to protected property Joomla\\CMS\\Document\\ErrorDocument\:\:\$_error\.$#'
 			identifier: property.protected
@@ -8342,7 +5862,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -8354,7 +5874,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -8366,7 +5886,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -8378,7 +5898,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -8390,7 +5910,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -8407,10 +5927,11 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 2
@@ -8419,7 +5940,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -8439,22 +5960,10 @@ parameters:
 			count: 2
 			path: components/com_ajax/ajax.php
 
-		-
-			message: '''
-				#^Call to deprecated method getCache\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the cache controller factory instead
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(CacheControllerFactoryInterface\:\:class\)\-\>createCacheController\(\$handler, \$options\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: components/com_banners/src/Model/BannerModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -8477,7 +5986,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Form\\Form\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the FormFactory service from the container
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(FormFactoryInterface\:\:class\)\-\>createForm\(\$name, \$options\);$#
 			'''
@@ -8485,20 +5994,10 @@ parameters:
 			count: 1
 			path: components/com_config/src/Model/FormModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 2
-			path: components/com_config/src/Model/FormModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -8510,7 +6009,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -8522,7 +6021,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -8546,7 +6045,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$document of class Joomla\\CMS\\MVC\\View\\AbstractView\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be made private in 7\.0
 				            Use \$this\-\>getDocument\(\) instead$#
 			'''
 			identifier: property.deprecated
@@ -8564,17 +6063,6 @@ parameters:
 			count: 3
 			path: components/com_contact/src/Controller/ContactController.php
 
-		-
-			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: components/com_contact/src/Controller/ContactController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -8586,22 +6074,10 @@ parameters:
 			count: 1
 			path: components/com_contact/src/Controller/ContactController.php
 
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: components/com_contact/src/Controller/ContactController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ComponentInterface to get the categories
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
@@ -8612,7 +6088,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ComponentInterface to get the categories
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
@@ -8620,21 +6096,10 @@ parameters:
 			count: 1
 			path: components/com_contact/src/Model/CategoryModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: components/com_contact/src/Model/CategoryModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Form\\Form\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the FormFactory service from the container
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(FormFactoryInterface\:\:class\)\-\>createForm\(\$name, \$options\);$#
 			'''
@@ -8645,7 +6110,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -8665,20 +6130,10 @@ parameters:
 			count: 1
 			path: components/com_contact/src/Model/ContactModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 2
-			path: components/com_contact/src/Model/ContactModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -8687,21 +6142,10 @@ parameters:
 			count: 1
 			path: components/com_contact/src/Model/FeaturedModel.php
 
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 1
-			path: components/com_contact/src/Model/FormModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getRouter\(\) of class Joomla\\CMS\\Application\\CMSApplication\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Inject the router or load it from the dependency injection container
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(\$name\);$#
 			'''
@@ -8741,7 +6185,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ComponentInterface to get the categories
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
@@ -8749,16 +6193,6 @@ parameters:
 			count: 1
 			path: components/com_contact/src/View/Contact/HtmlView.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 5
-			path: components/com_contact/src/View/Contact/HtmlView.php
-
 		-
 			message: '''
 				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -8892,21 +6326,10 @@ parameters:
 			count: 1
 			path: components/com_content/src/Controller/ArticleController.php
 
-		-
-			message: '''
-				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getError$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: components/com_content/src/Controller/ArticleController.php
-
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -8918,7 +6341,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -8930,7 +6353,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -8942,7 +6365,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -8951,30 +6374,10 @@ parameters:
 			count: 1
 			path: components/com_content/src/Helper/QueryHelper.php
 
-		-
-			message: '''
-				#^Call to deprecated method cleanCache\(\) of class Joomla\\Component\\Content\\Site\\Model\\ArticleModel\:
-				4\.3 will be removed in 6\.0$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: components/com_content/src/Model/ArticleModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: components/com_content/src/Model/ArticleModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -8997,7 +6400,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ComponentInterface to get the categories
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
@@ -9008,7 +6411,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ComponentInterface to get the categories
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
@@ -9016,17 +6419,6 @@ parameters:
 			count: 1
 			path: components/com_content/src/Model/CategoryModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: components/com_content/src/Model/CategoryModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -9038,17 +6430,6 @@ parameters:
 			count: 1
 			path: components/com_content/src/Model/CategoryModel.php
 
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 1
-			path: components/com_content/src/Model/FormModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -9063,7 +6444,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -9084,7 +6465,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getRouter\(\) of class Joomla\\CMS\\Application\\CMSApplication\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Inject the router or load it from the dependency injection container
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(\$name\);$#
 			'''
@@ -9103,16 +6484,6 @@ parameters:
 			count: 1
 			path: components/com_content/src/View/Archive/HtmlView.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 4
-			path: components/com_content/src/View/Archive/HtmlView.php
-
 		-
 			message: '''
 				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -9127,7 +6498,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ComponentInterface to get the categories
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
@@ -9153,20 +6524,10 @@ parameters:
 			count: 1
 			path: components/com_content/src/View/Category/HtmlView.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 4
-			path: components/com_content/src/View/Category/HtmlView.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ComponentInterface to get the categories
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
@@ -9174,29 +6535,6 @@ parameters:
 			count: 1
 			path: components/com_content/src/View/Featured/FeedView.php
 
-		-
-			message: '''
-				#^Access to deprecated property \$db of class Joomla\\Component\\Content\\Site\\View\\Featured\\HtmlView\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement use database from the container instead
-				             Example\: Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: property.deprecated
-			count: 1
-			path: components/com_content/src/View/Featured/HtmlView.php
-
-		-
-			message: '''
-				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the database service in the DI container
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: components/com_content/src/View/Featured/HtmlView.php
-
 		-
 			message: '''
 				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -9208,16 +6546,6 @@ parameters:
 			count: 1
 			path: components/com_content/src/View/Featured/HtmlView.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 4
-			path: components/com_content/src/View/Featured/HtmlView.php
-
 		-
 			message: '''
 				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -9247,16 +6575,6 @@ parameters:
 			count: 1
 			path: components/com_content/tmpl/category/blog.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 4
-			path: components/com_content/tmpl/category/blog.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Component\\Content\\Site\\View\\Category\\HtmlView\:\:\$maxLevel\.$#'
 			identifier: property.notFound
@@ -9326,7 +6644,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -9338,7 +6656,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -9360,7 +6678,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -9431,31 +6749,20 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
-				             Use the ComponentInterface to get the categories
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: components/com_newsfeeds/src/Model/CategoriesModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ComponentInterface to get the categories
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
-			path: components/com_newsfeeds/src/Model/CategoryModel.php
+			path: components/com_newsfeeds/src/Model/CategoriesModel.php
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
+				4\.0 will be removed in 7\.0
+				             Use the ComponentInterface to get the categories
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -9475,7 +6782,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getRouter\(\) of class Joomla\\CMS\\Application\\CMSApplication\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Inject the router or load it from the dependency injection container
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(\$name\);$#
 			'''
@@ -9521,7 +6828,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ComponentInterface to get the categories
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
@@ -9644,7 +6951,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Menu\\AbstractMenu\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the MenuFactoryInterface from the container instead
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(MenuFactoryInterface\:\:class\)\-\>createMenu\(\$client, \$options\)$#
 			'''
@@ -9663,21 +6970,10 @@ parameters:
 			count: 1
 			path: components/com_tags/src/Helper/RouteHelper.php
 
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 1
-			path: components/com_tags/src/Model/TagModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -9698,7 +6994,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$sefparams of class Joomla\\Component\\Tags\\Site\\Service\\Router\:
-				5\.2\.0 will be removed in 6\.0
+				5\.2\.0 will be removed in 7\.0
 				             without replacement$#
 			'''
 			identifier: property.deprecated
@@ -9727,16 +7023,6 @@ parameters:
 			count: 1
 			path: components/com_tags/src/View/Tag/HtmlView.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 4
-			path: components/com_tags/src/View/Tag/HtmlView.php
-
 		-
 			message: '''
 				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -9861,7 +7147,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -9881,16 +7167,6 @@ parameters:
 			count: 8
 			path: components/com_users/src/Model/RegistrationModel.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 1
-			path: components/com_users/src/Model/RegistrationModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -9922,350 +7198,77 @@ parameters:
 			'''
 			identifier: method.deprecated
 			count: 15
-			path: components/com_users/src/Model/ResetModel.php
-
-		-
-			message: '''
-				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 4
-			path: components/com_users/src/Model/ResetModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getErrors$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: components/com_users/src/View/Login/HtmlView.php
-
-		-
-			message: '''
-				#^Access to deprecated property \$db of class Joomla\\Component\\Users\\Site\\View\\Profile\\HtmlView\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement use database from the container instead
-				             Example\: Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: property.deprecated
-			count: 1
-			path: components/com_users/src/View/Profile/HtmlView.php
-
-		-
-			message: '''
-				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the database service in the DI container
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: components/com_users/src/View/Profile/HtmlView.php
-
-		-
-			message: '''
-				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getErrors$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: components/com_users/src/View/Profile/HtmlView.php
-
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 1
-			path: components/com_users/src/View/Profile/HtmlView.php
-
-		-
-			message: '''
-				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getErrors$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: components/com_users/src/View/Registration/HtmlView.php
-
-		-
-			message: '''
-				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getErrors$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: components/com_users/src/View/Remind/HtmlView.php
-
-		-
-			message: '''
-				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getErrors$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: components/com_users/src/View/Reset/HtmlView.php
-
-		-
-			message: '#^Access to property \$allowEntryBatching on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: components/com_users/tmpl/captive/select.php
-
-		-
-			message: '#^Access to property \$mfaMethods on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 3
-			path: components/com_users/tmpl/captive/select.php
-
-		-
-			message: '#^Access to property \$records on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/captive/select.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: components/com_users/tmpl/captive/select.php
-
-		-
-			message: '#^Call to method getModel\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: components/com_users/tmpl/captive/select.php
-
-		-
-			message: '#^Access to property \$backupCodes on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 5
-			path: components/com_users/tmpl/method/backupcodes.php
-
-		-
-			message: '#^Access to property \$record on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/method/backupcodes.php
-
-		-
-			message: '#^Access to property \$returnURL on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 4
-			path: components/com_users/tmpl/method/backupcodes.php
-
-		-
-			message: '#^Access to property \$user on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: components/com_users/tmpl/method/backupcodes.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/method/backupcodes.php
-
-		-
-			message: '#^Access to property \$isEditExisting on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Access to property \$record on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 4
-			path: components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Access to property \$renderOptions on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 26
-			path: components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Access to property \$returnURL on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 4
-			path: components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Access to property \$title on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Access to property \$user on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 8
-			path: components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Call to method getModel\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/method/edit.php
-
-		-
-			message: '#^Access to property \$isMandatoryMFASetup on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Access to property \$methods on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Access to property \$mfaActive on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Access to property \$returnURL on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Access to property \$user on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Call to method get\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Call to method loadTemplate\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Call to method setLayout\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/methods/default.php
-
-		-
-			message: '#^Access to property \$isAdmin on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/methods/firsttime.php
-
-		-
-			message: '#^Access to property \$returnURL on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: components/com_users/tmpl/methods/firsttime.php
-
-		-
-			message: '#^Access to property \$user on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/methods/firsttime.php
-
-		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/methods/firsttime.php
+			path: components/com_users/src/Model/ResetModel.php
 
 		-
-			message: '#^Call to method loadTemplate\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 1
-			path: components/com_users/tmpl/methods/firsttime.php
+			message: '''
+				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
+				4\.3 will be removed in 7\.0
+				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
+			'''
+			identifier: method.deprecatedInterface
+			count: 4
+			path: components/com_users/src/Model/ResetModel.php
 
 		-
-			message: '#^Call to method setLayout\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
+			message: '''
+				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getErrors$#
+			'''
+			identifier: method.deprecated
 			count: 1
-			path: components/com_users/tmpl/methods/firsttime.php
-
-		-
-			message: '#^Access to property \$defaultMethod on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 2
-			path: components/com_users/tmpl/methods/list.php
+			path: components/com_users/src/View/Login/HtmlView.php
 
 		-
-			message: '#^Access to property \$methods on an unknown class HtmlView\.$#'
-			identifier: class.notFound
+			message: '''
+				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getErrors$#
+			'''
+			identifier: method.deprecated
 			count: 1
-			path: components/com_users/tmpl/methods/list.php
-
-		-
-			message: '#^Access to property \$returnURL on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 8
-			path: components/com_users/tmpl/methods/list.php
-
-		-
-			message: '#^Access to property \$user on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 6
-			path: components/com_users/tmpl/methods/list.php
+			path: components/com_users/src/View/Profile/HtmlView.php
 
 		-
-			message: '#^Call to method escape\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
-			count: 13
-			path: components/com_users/tmpl/methods/list.php
+			message: '''
+				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getErrors$#
+			'''
+			identifier: method.deprecated
+			count: 1
+			path: components/com_users/src/View/Registration/HtmlView.php
 
 		-
-			message: '#^Call to method getDocument\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
+			message: '''
+				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getErrors$#
+			'''
+			identifier: method.deprecated
 			count: 1
-			path: components/com_users/tmpl/methods/list.php
+			path: components/com_users/src/View/Remind/HtmlView.php
 
 		-
-			message: '#^Call to method getModel\(\) on an unknown class HtmlView\.$#'
-			identifier: class.notFound
+			message: '''
+				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getErrors$#
+			'''
+			identifier: method.deprecated
 			count: 1
-			path: components/com_users/tmpl/methods/list.php
+			path: components/com_users/src/View/Reset/HtmlView.php
 
 		-
 			message: '''
 				#^Access to deprecated static property \$config of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the configuration object within the application
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getConfig\(\);$#
@@ -10277,7 +7280,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated static property \$language of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -10300,7 +7303,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated static property \$config of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the configuration object within the application
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getConfig\(\);$#
@@ -10312,7 +7315,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated static property \$document of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				              Use the document service in the DI container or get from the application object
 				              Example\:
 				              Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -10324,7 +7327,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated static property \$language of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -10336,7 +7339,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -10356,20 +7359,10 @@ parameters:
 			count: 1
 			path: installation/src/Application/InstallationApplication.php
 
-		-
-			message: '''
-				#^Parameter \$input of method Joomla\\CMS\\Installation\\Application\\InstallationApplication\:\:__construct\(\) has typehint with deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: parameter.deprecatedClass
-			count: 1
-			path: installation/src/Application/InstallationApplication.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -10381,7 +7374,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated static property \$language of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -10393,7 +7386,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Language\\Language\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language factory instead
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(LanguageFactoryInterface\:\:class\)\-\>createLanguage\(\$lang, \$debug\);$#
 			'''
@@ -10404,7 +7397,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -10413,55 +7406,10 @@ parameters:
 			count: 1
 			path: installation/src/Form/Field/Installation/LanguageField.php
 
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: installation/src/Form/Field/Installation/PrefixField.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\Database\\DatabaseDriver\:
-				3\.0  Use DatabaseFactory\:\:getDriver\(\) instead$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: installation/src/Helper/DatabaseHelper.php
-
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 9
-			path: installation/src/Helper/DatabaseHelper.php
-
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: installation/src/Model/BaseInstallationModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Form\\Form\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the FormFactory service from the container
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(FormFactoryInterface\:\:class\)\-\>createForm\(\$name, \$options\);$#
 			'''
@@ -10469,31 +7417,10 @@ parameters:
 			count: 1
 			path: installation/src/Model/ChecksModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 3
-			path: installation/src/Model/ConfigurationModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\Database\\DatabaseDriver\:
-				3\.0  Use DatabaseFactory\:\:getDriver\(\) instead$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: installation/src/Model/DatabaseModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -10504,20 +7431,19 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getError$#
 			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: installation/src/Model/DatabaseModel.php
+			identifier: method.deprecated
+			count: 3
+			path: installation/src/Model/LanguagesModel.php
 
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Form\\Form\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the FormFactory service from the container
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(FormFactoryInterface\:\:class\)\-\>createForm\(\$name, \$options\);$#
 			'''
@@ -10525,17 +7451,6 @@ parameters:
 			count: 1
 			path: installation/src/Model/LanguagesModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 3
-			path: installation/src/Model/LanguagesModel.php
-
 		-
 			message: '#^Instantiated class JConfig not found\.$#'
 			identifier: class.notFound
@@ -10545,7 +7460,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Form\\Form\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the FormFactory service from the container
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(FormFactoryInterface\:\:class\)\-\>createForm\(\$name, \$options\);$#
 			'''
@@ -10556,7 +7471,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -10565,22 +7480,10 @@ parameters:
 			count: 2
 			path: installation/src/Model/SetupModel.php
 
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: installation/src/Model/SetupModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -10589,16 +7492,6 @@ parameters:
 			count: 1
 			path: installation/src/Response/JsonResponse.php
 
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 1
-			path: installation/src/Service/Provider/Application.php
-
 		-
 			message: '#^Access to protected property Joomla\\CMS\\Document\\ErrorDocument\:\:\$_error\.$#'
 			identifier: property.protected
@@ -10638,7 +7531,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -10656,7 +7549,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -10665,10 +7558,16 @@ parameters:
 			count: 1
 			path: installation/tmpl/setup/default.php
 
+		-
+			message: '#^Call to protected method getDocument\(\) of class Joomla\\CMS\\MVC\\View\\AbstractView\.$#'
+			identifier: method.protected
+			count: 1
+			path: installation/tmpl/setup/default.php
+
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -10680,7 +7579,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\User\\User\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or via \$app\-\>getIdentity\(\)
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(UserFactoryInterface\:\:class\)\-\>loadUserById\(\$id\)$#
 			'''
@@ -10688,32 +7587,10 @@ parameters:
 			count: 1
 			path: libraries/src/Access/Access.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: libraries/src/Access/Rules.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: libraries/src/Access/Rules.php
-
 		-
 			message: '''
 				#^Call to deprecated method __construct\(\) of class Joomla\\CMS\\Encrypt\\Aes\:
-				4\.3 \$strength will be removed in 6\.0$#
+				4\.3 \$strength will be removed in 7\.0$#
 			'''
 			identifier: method.deprecated
 			count: 1
@@ -10722,7 +7599,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -10731,42 +7608,20 @@ parameters:
 			count: 1
 			path: libraries/src/Application/AdministratorApplication.php
 
-		-
-			message: '''
-				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Load the user service from the dependency injection container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Application/AdministratorApplication.php
-
 		-
 			message: '''
 				#^Call to deprecated method route\(\) of class Joomla\\CMS\\Application\\AdministratorApplication\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Implement the route functionality in the extending class, this here will be removed without replacement$#
 			'''
 			identifier: method.deprecated
 			count: 1
 			path: libraries/src/Application/AdministratorApplication.php
 
-		-
-			message: '''
-				#^Parameter \$input of method Joomla\\CMS\\Application\\AdministratorApplication\:\:__construct\(\) has typehint with deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: parameter.deprecatedClass
-			count: 1
-			path: libraries/src/Application/AdministratorApplication.php
-
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -10778,23 +7633,17 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method route\(\) of class Joomla\\CMS\\Application\\ApiApplication\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Implement the route functionality in the extending class, this here will be removed without replacement$#
 			'''
 			identifier: method.deprecated
 			count: 1
 			path: libraries/src/Application/ApiApplication.php
 
-		-
-			message: '#^Property Joomla\\CMS\\Application\\BaseApplication\:\:\$input is not writable\.$#'
-			identifier: assign.propertyReadOnly
-			count: 1
-			path: libraries/src/Application/BaseApplication.php
-
 		-
 			message: '''
 				#^Access to deprecated static property \$instances of class Joomla\\CMS\\Menu\\AbstractMenu\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the MenuFactoryInterface from the container instead
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(MenuFactoryInterface\:\:class\)\-\>createMenu\(\$client, \$options\)$#
 			'''
@@ -10805,7 +7654,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated static property \$language of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -10817,7 +7666,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -10837,16 +7686,6 @@ parameters:
 			count: 1
 			path: libraries/src/Application/CMSApplication.php
 
-		-
-			message: '''
-				#^Parameter \$input of method Joomla\\CMS\\Application\\CMSApplication\:\:__construct\(\) has typehint with deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: parameter.deprecatedClass
-			count: 1
-			path: libraries/src/Application/CMSApplication.php
-
 		-
 			message: '''
 				#^Interface Joomla\\CMS\\Application\\CMSApplicationInterface extends deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
@@ -10866,7 +7705,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method __construct\(\) of class Joomla\\CMS\\Console\\CheckJoomlaUpdatesCommand\:
-				5\.1\.0 will be removed in 6\.0
+				5\.1\.0 will be removed in 7\.0
 				            Use core\:update\:check instead of core\:check\-updates$#
 			'''
 			identifier: method.deprecated
@@ -10887,7 +7726,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Input\\Cli\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the `joomla/console` package instead$#
 			'''
 			identifier: method.deprecatedClass
@@ -10897,7 +7736,7 @@ parameters:
 		-
 			message: '''
 				#^Instantiation of deprecated class Joomla\\CMS\\Input\\Cli\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the `joomla/console` package instead$#
 			'''
 			identifier: new.deprecatedClass
@@ -10907,7 +7746,7 @@ parameters:
 		-
 			message: '''
 				#^Access to constant on deprecated class Joomla\\CMS\\Application\\CliApplication\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ConsoleApplication instead$#
 			'''
 			identifier: classConstant.deprecatedClass
@@ -10917,7 +7756,7 @@ parameters:
 		-
 			message: '''
 				#^Access to property \$input of deprecated class Joomla\\CMS\\Application\\CliApplication\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ConsoleApplication instead$#
 			'''
 			identifier: property.deprecatedClass
@@ -10927,7 +7766,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Application\\CliApplication\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ConsoleApplication instead$#
 			'''
 			identifier: method.deprecatedClass
@@ -10937,7 +7776,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getContainer\(\) of deprecated class Joomla\\CMS\\Application\\CliApplication\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ConsoleApplication instead$#
 			'''
 			identifier: method.deprecatedClass
@@ -10947,7 +7786,7 @@ parameters:
 		-
 			message: '''
 				#^Class Joomla\\CMS\\Application\\DaemonApplication extends deprecated class Joomla\\CMS\\Application\\CliApplication\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ConsoleApplication instead$#
 			'''
 			identifier: class.extendsDeprecatedClass
@@ -10957,7 +7796,7 @@ parameters:
 		-
 			message: '''
 				#^Parameter \$input of method Joomla\\CMS\\Application\\DaemonApplication\:\:__construct\(\) has typehint with deprecated class Joomla\\CMS\\Input\\Cli\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the `joomla/console` package instead$#
 			'''
 			identifier: parameter.deprecatedClass
@@ -10973,7 +7812,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated static property \$document of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				              Use the document service in the DI container or get from the application object
 				              Example\:
 				              Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -10985,48 +7824,26 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method __construct\(\) of class Joomla\\CMS\\Encrypt\\Aes\:
-				4\.3 \$strength will be removed in 6\.0$#
+				4\.3 \$strength will be removed in 7\.0$#
 			'''
 			identifier: method.deprecated
 			count: 1
 			path: libraries/src/Application/SiteApplication.php
 
-		-
-			message: '''
-				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Load the user service from the dependency injection container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 3
-			path: libraries/src/Application/SiteApplication.php
-
 		-
 			message: '''
 				#^Call to deprecated method route\(\) of class Joomla\\CMS\\Application\\SiteApplication\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Implement the route functionality in the extending class, this here will be removed without replacement$#
 			'''
-			identifier: method.deprecated
-			count: 1
-			path: libraries/src/Application/SiteApplication.php
-
-		-
-			message: '''
-				#^Parameter \$input of method Joomla\\CMS\\Application\\SiteApplication\:\:__construct\(\) has typehint with deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: parameter.deprecatedClass
+			identifier: method.deprecated
 			count: 1
 			path: libraries/src/Application/SiteApplication.php
 
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -11038,7 +7855,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -11047,36 +7864,6 @@ parameters:
 			count: 1
 			path: libraries/src/Application/WebApplication.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: libraries/src/Application/WebApplication.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: libraries/src/Application/WebApplication.php
-
-		-
-			message: '''
-				#^Parameter \$input of method Joomla\\CMS\\Application\\WebApplication\:\:__construct\(\) has typehint with deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: parameter.deprecatedClass
-			count: 1
-			path: libraries/src/Application/WebApplication.php
-
 		-
 			message: '#^Call to an undefined method Joomla\\CMS\\Association\\AssociationExtensionHelper\:\:getAssociations\(\)\.$#'
 			identifier: method.notFound
@@ -11098,7 +7885,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -11110,7 +7897,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -11122,7 +7909,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -11134,7 +7921,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -11157,7 +7944,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -11188,7 +7975,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -11200,7 +7987,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -11212,7 +7999,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ComponentInterface to get the categories
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
@@ -11223,7 +8010,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -11232,21 +8019,10 @@ parameters:
 			count: 2
 			path: libraries/src/Categories/CategoryNode.php
 
-		-
-			message: '''
-				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyErrorHandlingTrait in class Joomla\\CMS\\Categories\\CategoryNode\:
-				4\.3 will be removed in 7\.0
-				             Will be removed without replacement
-				             Throw an Exception instead of setError$#
-			'''
-			identifier: traitUse.deprecatedTrait
-			count: 1
-			path: libraries/src/Categories/CategoryNode.php
-
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyPropertyManagementTrait in class Joomla\\CMS\\Categories\\CategoryNode\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				             Will be removed without replacement
 				             Create proper setter functions for the individual properties or use a \\Joomla\\Registry\\Registry$#
 			'''
@@ -11254,21 +8030,10 @@ parameters:
 			count: 1
 			path: libraries/src/Categories/CategoryNode.php
 
-		-
-			message: '''
-				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyErrorHandlingTrait in class Joomla\\CMS\\Changelog\\Changelog\:
-				4\.3 will be removed in 7\.0
-				             Will be removed without replacement
-				             Throw an Exception instead of setError$#
-			'''
-			identifier: traitUse.deprecatedTrait
-			count: 1
-			path: libraries/src/Changelog/Changelog.php
-
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyPropertyManagementTrait in class Joomla\\CMS\\Changelog\\Changelog\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				             Will be removed without replacement
 				             Create proper setter functions for the individual properties or use a \\Joomla\\Registry\\Registry$#
 			'''
@@ -11276,18 +8041,6 @@ parameters:
 			count: 1
 			path: libraries/src/Changelog/Changelog.php
 
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 3
-			path: libraries/src/Client/ClientHelper.php
-
 		-
 			message: '#^Unsafe usage of new static\(\)\.$#'
 			identifier: new.static
@@ -11297,7 +8050,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -11309,7 +8062,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -11321,7 +8074,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -11333,7 +8086,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$sefparams of class Joomla\\CMS\\Component\\Router\\Rules\\MenuRules\:
-				5\.2\.0 will be removed in 6\.0
+				5\.2\.0 will be removed in 7\.0
 				             without replacement$#
 			'''
 			identifier: property.deprecated
@@ -11354,7 +8107,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\User\\User\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or via \$app\-\>getIdentity\(\)
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(UserFactoryInterface\:\:class\)\-\>loadUserById\(\$id\)$#
 			'''
@@ -11365,7 +8118,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\User\\User\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or via \$app\-\>getIdentity\(\)
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(UserFactoryInterface\:\:class\)\-\>loadUserById\(\$id\)$#
 			'''
@@ -11387,7 +8140,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\User\\User\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or via \$app\-\>getIdentity\(\)
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(UserFactoryInterface\:\:class\)\-\>loadUserById\(\$id\)$#
 			'''
@@ -11395,21 +8148,10 @@ parameters:
 			count: 1
 			path: libraries/src/Console/ChangeUserPasswordCommand.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Console/CoreUpdateChannelCommand.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\User\\User\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or via \$app\-\>getIdentity\(\)
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(UserFactoryInterface\:\:class\)\-\>loadUserById\(\$id\)$#
 			'''
@@ -11420,7 +8162,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -11429,43 +8171,10 @@ parameters:
 			count: 1
 			path: libraries/src/Console/ExtensionRemoveCommand.php
 
-		-
-			message: '''
-				#^Access to property \$batchOffset of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: libraries/src/Console/FinderIndexCommand.php
-
-		-
-			message: '''
-				#^Access to property \$batchSize of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: libraries/src/Console/FinderIndexCommand.php
-
-		-
-			message: '''
-				#^Access to property \$totalItems of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: libraries/src/Console/FinderIndexCommand.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -11474,16 +8183,6 @@ parameters:
 			count: 1
 			path: libraries/src/Console/FinderIndexCommand.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 1
-			path: libraries/src/Console/FinderIndexCommand.php
-
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
@@ -11498,7 +8197,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\User\\User\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or via \$app\-\>getIdentity\(\)
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(UserFactoryInterface\:\:class\)\-\>loadUserById\(\$id\)$#
 			'''
@@ -11506,19 +8205,10 @@ parameters:
 			count: 1
 			path: libraries/src/Console/RemoveUserFromGroupCommand.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\Database\\DatabaseDriver\:
-				3\.0  Use DatabaseFactory\:\:getDriver\(\) instead$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Console/SetConfigurationCommand.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -11536,7 +8226,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -11545,38 +8235,6 @@ parameters:
 			count: 2
 			path: libraries/src/Console/UpdateCoreCommand.php
 
-		-
-			message: '''
-				#^Access to deprecated static property \$gmt of class Joomla\\CMS\\Date\\Date\:
-				4\.0 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: staticProperty.deprecated
-			count: 2
-			path: libraries/src/Date/Date.php
-
-		-
-			message: '''
-				#^Access to deprecated static property \$stz of class Joomla\\CMS\\Date\\Date\:
-				4\.0 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: staticProperty.deprecated
-			count: 2
-			path: libraries/src/Date/Date.php
-
-		-
-			message: '''
-				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the database service in the DI container
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Date/Date.php
-
 		-
 			message: '#^Unsafe usage of new static\(\)\.$#'
 			identifier: new.static
@@ -11678,7 +8336,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -11690,7 +8348,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -11752,7 +8410,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getProperties\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
 				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
 			'''
@@ -11787,7 +8445,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method isSupported\(\) of deprecated class Joomla\\CMS\\Encrypt\\AES\\Mcrypt\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: method.deprecatedClass
@@ -11797,7 +8455,7 @@ parameters:
 		-
 			message: '''
 				#^Instantiation of deprecated class Joomla\\CMS\\Encrypt\\AES\\Mcrypt\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: new.deprecatedClass
@@ -11813,7 +8471,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated static property \$language of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -11825,7 +8483,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13155,7 +9813,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated static property \$document of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				              Use the document service in the DI container or get from the application object
 				              Example\:
 				              Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -13177,7 +9835,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -13231,7 +9889,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13243,7 +9901,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Filesystem\\Stream\:
-				4\.4 will be removed in 6\.0
+				4\.4 will be removed in 7\.0
 				             Use Joomla\\Filesystem\\Stream instead\.$#
 			'''
 			identifier: method.deprecatedClass
@@ -13253,7 +9911,7 @@ parameters:
 		-
 			message: '''
 				#^Instantiation of deprecated class Joomla\\CMS\\Filesystem\\Stream\:
-				4\.4 will be removed in 6\.0
+				4\.4 will be removed in 7\.0
 				             Use Joomla\\Filesystem\\Stream instead\.$#
 			'''
 			identifier: new.deprecatedClass
@@ -13266,32 +9924,10 @@ parameters:
 			count: 1
 			path: libraries/src/Feed/FeedParser.php
 
-		-
-			message: '#^Unsafe usage of new static\(\)\.$#'
-			identifier: new.static
-			count: 1
-			path: libraries/src/Filesystem/Patcher.php
-
-		-
-			message: '''
-				#^Call to static method clean\(\) on deprecated class Joomla\\CMS\\Filesystem\\Path\:
-				4\.4 will be removed in 6\.0
-				             Use Joomla\\Filesystem\\Path instead\.$#
-			'''
-			identifier: staticMethod.deprecatedClass
-			count: 1
-			path: libraries/src/Filesystem/Path.php
-
-		-
-			message: '#^Static call to instance method Joomla\\CMS\\Filesystem\\Support\\StringController\:\:getRef\(\)\.$#'
-			identifier: method.staticCall
-			count: 2
-			path: libraries/src/Filesystem/Streams/StreamString.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Language\\Language\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language factory instead
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(LanguageFactoryInterface\:\:class\)\-\>createLanguage\(\$lang, \$debug\);$#
 			'''
@@ -13302,7 +9938,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13314,7 +9950,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13326,7 +9962,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -13338,7 +9974,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13350,7 +9986,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13362,7 +9998,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13374,7 +10010,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13386,7 +10022,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13398,7 +10034,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13410,7 +10046,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13433,7 +10069,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -13445,7 +10081,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13457,7 +10093,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13469,7 +10105,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13481,7 +10117,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Form\\Form\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the FormFactory service from the container
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(FormFactoryInterface\:\:class\)\-\>createForm\(\$name, \$options\);$#
 			'''
@@ -13492,7 +10128,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13504,7 +10140,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13516,7 +10152,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\User\\User\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or via \$app\-\>getIdentity\(\)
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(UserFactoryInterface\:\:class\)\-\>loadUserById\(\$id\)$#
 			'''
@@ -13527,7 +10163,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13539,7 +10175,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13551,7 +10187,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -13563,7 +10199,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getProperties\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
 				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
 			'''
@@ -13574,7 +10210,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -13586,7 +10222,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated static property \$includePaths of class Joomla\\CMS\\HTML\\HTMLHelper\:
-				4\.0 will be removed in 6\.0$#
+				4\.0 will be removed in 7\.0$#
 			'''
 			identifier: staticProperty.deprecated
 			count: 1
@@ -13595,7 +10231,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated static property \$registry of class Joomla\\CMS\\HTML\\HTMLHelper\:
-				4\.0 will be removed in 6\.0$#
+				4\.0 will be removed in 7\.0$#
 			'''
 			identifier: staticProperty.deprecated
 			count: 3
@@ -13610,7 +10246,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method extract\(\) of class Joomla\\CMS\\HTML\\HTMLHelper\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the service registry instead
 				             HTMLHelper\:\:getServiceRegistry\(\)\-\>getService\(\$file\);$#
 			'''
@@ -13621,7 +10257,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -13633,7 +10269,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13656,7 +10292,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class Joomla\\CMS\\HTML\\HTMLHelper\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the service registry instead
 				             HTMLHelper\:\:getServiceRegistry\(\)\-\>register\(\$key, \$function\);$#
 			'''
@@ -13667,7 +10303,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -13679,7 +10315,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -13691,7 +10327,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -13700,32 +10336,10 @@ parameters:
 			count: 1
 			path: libraries/src/HTML/Helpers/ActionsDropdown.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: libraries/src/HTML/Helpers/AdminLanguage.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: libraries/src/HTML/Helpers/AdminLanguage.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -13737,7 +10351,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -13749,31 +10363,31 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 2
+			count: 1
 			path: libraries/src/HTML/Helpers/Category.php
 
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 2
+			count: 1
 			path: libraries/src/HTML/Helpers/Category.php
 
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -13782,32 +10396,10 @@ parameters:
 			count: 1
 			path: libraries/src/HTML/Helpers/ContentLanguage.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: libraries/src/HTML/Helpers/ContentLanguage.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: libraries/src/HTML/Helpers/ContentLanguage.php
-
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -13830,7 +10422,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -13842,7 +10434,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -13854,7 +10446,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -13866,7 +10458,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -13878,7 +10470,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -13890,7 +10482,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -13902,7 +10494,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -13914,7 +10506,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -13937,7 +10529,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method framework\(\) of class Joomla\\CMS\\HTML\\Helpers\\Jquery\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use webasset manager instead
 				             Example\:
 				             \$wa \= Factory\:\:getApplication\(\)\-\>getDocument\(\)\-\>getWebAssetManager\(\);
@@ -13952,7 +10544,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -13964,7 +10556,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -13976,7 +10568,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -13988,7 +10580,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -14000,7 +10592,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -14012,7 +10604,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -14024,7 +10616,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -14036,7 +10628,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -14048,7 +10640,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -14060,7 +10652,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -14072,7 +10664,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -14084,7 +10676,7 @@ parameters:
 		-
 			message: '''
 				#^Access to constant on deprecated class Joomla\\CMS\\HTML\\Helpers\\FormBehavior\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Will be removed without replacement
 				             Use choice\.js instead
 				             Example\:
@@ -14098,7 +10690,7 @@ parameters:
 		-
 			message: '''
 				#^Access to constant on deprecated class Joomla\\CMS\\HTML\\Helpers\\SortableList\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Sortable List will be deprecated in favour of a new dragula script in 4\.0$#
 			'''
 			identifier: classConstant.deprecatedClass
@@ -14108,7 +10700,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -14130,7 +10722,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -14142,7 +10734,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -14154,7 +10746,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -14184,7 +10776,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -14196,7 +10788,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -14208,7 +10800,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -14230,7 +10822,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Categories\\Categories\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ComponentInterface to get the categories
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\(\$component\)\-\>getCategory\(\$options, \$section\);$#
 			'''
@@ -14247,30 +10839,19 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 10
-			path: libraries/src/Helper/TagsHelper.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
+			count: 13
 			path: libraries/src/Helper/TagsHelper.php
 
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -14279,10 +10860,16 @@ parameters:
 			count: 4
 			path: libraries/src/Helper/TagsHelper.php
 
+		-
+			message: '#^Method Joomla\\CMS\\Helper\\TagsHelper\:\:postStoreProcess\(\) should return bool but return statement is missing\.$#'
+			identifier: return.missing
+			count: 1
+			path: libraries/src/Helper/TagsHelper.php
+
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -14291,66 +10878,6 @@ parameters:
 			count: 3
 			path: libraries/src/Helper/UserGroupsHelper.php
 
-		-
-			message: '''
-				#^Class Joomla\\CMS\\Http\\Transport\\CurlTransport implements deprecated interface Joomla\\CMS\\Http\\TransportInterface\:
-				4\.0 will be removed in 6\.0
-				             Implement Joomla\\Http\\TransportInterface instead$#
-			'''
-			identifier: class.implementsDeprecatedInterface
-			count: 1
-			path: libraries/src/Http/Transport/CurlTransport.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Http\\Response\:
-				4\.0 will be removed in 6\.0
-				             Use Joomla\\Http\\Response instead$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: libraries/src/Http/Transport/CurlTransport.php
-
-		-
-			message: '''
-				#^Class Joomla\\CMS\\Http\\Transport\\SocketTransport implements deprecated interface Joomla\\CMS\\Http\\TransportInterface\:
-				4\.0 will be removed in 6\.0
-				             Implement Joomla\\Http\\TransportInterface instead$#
-			'''
-			identifier: class.implementsDeprecatedInterface
-			count: 1
-			path: libraries/src/Http/Transport/SocketTransport.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Http\\Response\:
-				4\.0 will be removed in 6\.0
-				             Use Joomla\\Http\\Response instead$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: libraries/src/Http/Transport/SocketTransport.php
-
-		-
-			message: '''
-				#^Class Joomla\\CMS\\Http\\Transport\\StreamTransport implements deprecated interface Joomla\\CMS\\Http\\TransportInterface\:
-				4\.0 will be removed in 6\.0
-				             Implement Joomla\\Http\\TransportInterface instead$#
-			'''
-			identifier: class.implementsDeprecatedInterface
-			count: 1
-			path: libraries/src/Http/Transport/StreamTransport.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Http\\Response\:
-				4\.0 will be removed in 6\.0
-				             Use Joomla\\Http\\Response instead$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: libraries/src/Http/Transport/StreamTransport.php
-
 		-
 			message: '#^Unsafe usage of new static\(\)\.$#'
 			identifier: new.static
@@ -14368,17 +10895,6 @@ parameters:
 			count: 5
 			path: libraries/src/Installer/Adapter/ComponentAdapter.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 13
-			path: libraries/src/Installer/Adapter/ComponentAdapter.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -14392,45 +10908,22 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 2
-			path: libraries/src/Installer/Adapter/FileAdapter.php
-
-		-
-			message: '''
-				#^Call to deprecated method getCache\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the cache controller factory instead
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(CacheControllerFactoryInterface\:\:class\)\-\>createCacheController\(\$handler, \$options\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 4
-			path: libraries/src/Installer/Adapter/LanguageAdapter.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
+				3\.1\.4 will be removed in 7\.0
+				             Will be removed without replacement
+				             Catch thrown Exceptions instead of getError$#
 			'''
-			identifier: staticMethod.deprecated
-			count: 7
+			identifier: method.deprecated
+			count: 3
 			path: libraries/src/Installer/Adapter/LanguageAdapter.php
 
 		-
 			message: '''
-				#^Call to method set\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Call to deprecated method set\(\) of class Joomla\\CMS\\Installer\\Installer\:
+				4\.3\.0 will be removed in 7\.0
+				            Create a proper setter function for the property$#
 			'''
-			identifier: method.deprecatedClass
+			identifier: method.deprecated
 			count: 3
 			path: libraries/src/Installer/Adapter/LanguageAdapter.php
 
@@ -14445,17 +10938,6 @@ parameters:
 			count: 1
 			path: libraries/src/Installer/Adapter/LibraryAdapter.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 4
-			path: libraries/src/Installer/Adapter/LibraryAdapter.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -14467,17 +10949,6 @@ parameters:
 			count: 3
 			path: libraries/src/Installer/Adapter/ModuleAdapter.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 5
-			path: libraries/src/Installer/Adapter/ModuleAdapter.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -14491,13 +10962,12 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method set\(\) of class Joomla\\CMS\\Installer\\Installer\:
+				4\.3\.0 will be removed in 7\.0
+				            Create a proper setter function for the property$#
 			'''
-			identifier: staticMethod.deprecated
-			count: 2
+			identifier: method.deprecated
+			count: 1
 			path: libraries/src/Installer/Adapter/PackageAdapter.php
 
 		-
@@ -14510,16 +10980,6 @@ parameters:
 			count: 1
 			path: libraries/src/Installer/Adapter/PackageAdapter.php
 
-		-
-			message: '''
-				#^Call to method set\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: libraries/src/Installer/Adapter/PackageAdapter.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -14531,17 +10991,6 @@ parameters:
 			count: 1
 			path: libraries/src/Installer/Adapter/PluginAdapter.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 3
-			path: libraries/src/Installer/Adapter/PluginAdapter.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -14553,21 +11002,10 @@ parameters:
 			count: 1
 			path: libraries/src/Installer/Adapter/TemplateAdapter.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 4
-			path: libraries/src/Installer/Adapter/TemplateAdapter.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -14576,62 +11014,13 @@ parameters:
 			count: 1
 			path: libraries/src/Installer/Adapter/TemplateAdapter.php
 
-		-
-			message: '''
-				#^Access to property \$_adapterfolder of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: libraries/src/Installer/Installer.php
-
-		-
-			message: '''
-				#^Access to property \$_adapters of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: property.deprecatedClass
-			count: 3
-			path: libraries/src/Installer/Installer.php
-
-		-
-			message: '''
-				#^Access to property \$_basepath of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: libraries/src/Installer/Installer.php
-
-		-
-			message: '''
-				#^Access to property \$_classprefix of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: property.deprecatedClass
-			count: 5
-			path: libraries/src/Installer/Installer.php
-
-		-
-			message: '''
-				#^Access to property \$_db of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: libraries/src/Installer/Installer.php
-
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				4\.3 will be removed in 7\.0
+				             Use the MvcFactory instead or instantiate the table class directly\.
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);
+				             \$table \= new \\Joomla\\CMS\\Table\\Content\(\$db\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -14650,55 +11039,70 @@ parameters:
 
 		-
 			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
+				4\.3 will be removed in 7\.0
+				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
-			identifier: method.deprecatedClass
+			identifier: method.deprecatedInterface
+			count: 4
+			path: libraries/src/Installer/Installer.php
+
+		-
+			message: '#^Unsafe usage of new static\(\)\.$#'
+			identifier: new.static
 			count: 1
 			path: libraries/src/Installer/Installer.php
 
 		-
 			message: '''
-				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
+				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyErrorHandlingTrait in class Joomla\\CMS\\Installer\\Installer\:
 				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
+				             Will be removed without replacement
+				             Throw an Exception instead of setError$#
 			'''
-			identifier: method.deprecatedInterface
-			count: 4
+			identifier: traitUse.deprecatedTrait
+			count: 1
 			path: libraries/src/Installer/Installer.php
 
 		-
 			message: '''
-				#^Class Joomla\\CMS\\Installer\\Installer extends deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyPropertyManagementTrait in class Joomla\\CMS\\Installer\\Installer\:
+				4\.3\.0 will be removed in 7\.0
+				             Will be removed without replacement
+				             Create proper setter functions for the individual properties or use a \\Joomla\\Registry\\Registry$#
 			'''
-			identifier: class.extendsDeprecatedClass
+			identifier: traitUse.deprecatedTrait
 			count: 1
 			path: libraries/src/Installer/Installer.php
 
 		-
-			message: '#^Unsafe usage of new static\(\)\.$#'
-			identifier: new.static
+			message: '''
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
+			'''
+			identifier: staticMethod.deprecated
 			count: 1
-			path: libraries/src/Installer/Installer.php
+			path: libraries/src/Installer/InstallerAdapter.php
 
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				4\.3 will be removed in 7\.0
+				             Use the MvcFactory instead or instantiate the table class directly\.
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);
+				             \$table \= new \\Joomla\\CMS\\Table\\Content\(\$db\);$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 2
+			count: 1
 			path: libraries/src/Installer/InstallerAdapter.php
 
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -14720,11 +11124,11 @@ parameters:
 
 		-
 			message: '''
-				#^Call to method set\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Call to deprecated method set\(\) of class Joomla\\CMS\\Installer\\Installer\:
+				4\.3\.0 will be removed in 7\.0
+				            Create a proper setter function for the property$#
 			'''
-			identifier: method.deprecatedClass
+			identifier: method.deprecated
 			count: 1
 			path: libraries/src/Installer/InstallerAdapter.php
 
@@ -14742,7 +11146,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyPropertyManagementTrait in class Joomla\\CMS\\Installer\\InstallerExtension\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				             Will be removed without replacement
 				             Create proper setter functions for the individual properties or use a \\Joomla\\Registry\\Registry$#
 			'''
@@ -14753,7 +11157,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Updater\\Update\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -14773,7 +11177,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -14796,7 +11200,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -14808,7 +11212,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$ignoredSearchWordsCallback of class Joomla\\CMS\\Language\\Language\:
-				4\.4 will be removed in 6\.0 without replacement$#
+				4\.4 will be removed in 7\.0 without replacement$#
 			'''
 			identifier: property.deprecated
 			count: 1
@@ -14817,7 +11221,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$lowerLimitSearchWordCallback of class Joomla\\CMS\\Language\\Language\:
-				4\.4 will be removed in 6\.0 without replacement$#
+				4\.4 will be removed in 7\.0 without replacement$#
 			'''
 			identifier: property.deprecated
 			count: 1
@@ -14826,7 +11230,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$searchDisplayedCharactersNumberCallback of class Joomla\\CMS\\Language\\Language\:
-				4\.4 will be removed in 6\.0 without replacement$#
+				4\.4 will be removed in 7\.0 without replacement$#
 			'''
 			identifier: property.deprecated
 			count: 1
@@ -14835,7 +11239,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$upperLimitSearchWordCallback of class Joomla\\CMS\\Language\\Language\:
-				4\.4 will be removed in 6\.0 without replacement$#
+				4\.4 will be removed in 7\.0 without replacement$#
 			'''
 			identifier: property.deprecated
 			count: 1
@@ -14844,7 +11248,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -14856,31 +11260,19 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 2
-			path: libraries/src/Language/Multilanguage.php
-
-		-
-			message: '''
-				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the document service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
-			'''
-			identifier: staticMethod.deprecated
 			count: 1
-			path: libraries/src/Language/Text.php
+			path: libraries/src/Language/Multilanguage.php
 
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -14892,7 +11284,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -14916,7 +11308,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -14925,15 +11317,6 @@ parameters:
 			count: 1
 			path: libraries/src/Log/Logger/DatabaseLogger.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\Database\\DatabaseDriver\:
-				3\.0  Use DatabaseFactory\:\:getDriver\(\) instead$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Log/Logger/DatabaseLogger.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -14953,66 +11336,19 @@ parameters:
 				             Catch thrown Exceptions instead of getError$#
 			'''
 			identifier: method.deprecated
-			count: 6
-			path: libraries/src/MVC/Controller/ApiController.php
-
-		-
-			message: '''
-				#^Call to deprecated method getErrors\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				3\.1\.4 will be removed in 7\.0
-				             Will be removed without replacement
-				             Catch thrown Exceptions instead of getErrors$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: libraries/src/MVC/Controller/ApiController.php
-
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\MVC\\Model\\State\:
-				5\.0\.0 will be removed in 7\.0, use the Registry directly$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: libraries/src/MVC/Controller/ApiController.php
-
-		-
-			message: '#^Call to method singularize\(\) of deprecated class Doctrine\\Common\\Inflector\\Inflector\.$#'
-			identifier: staticMethod.deprecatedClass
-			count: 4
-			path: libraries/src/MVC/Controller/ApiController.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\MVC\\Model\\State\:
-				5\.0\.0 will be removed in 7\.0, use the Registry directly$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
+			count: 2
 			path: libraries/src/MVC/Controller/ApiController.php
 
 		-
 			message: '''
 				#^Call to deprecated method addModelPath\(\) of class Joomla\\CMS\\MVC\\Controller\\BaseController\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement\. Get the model through the MVCFactory instead$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 2
 			path: libraries/src/MVC/Controller/BaseController.php
 
-		-
-			message: '''
-				#^Call to deprecated method getCache\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the cache controller factory instead
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(CacheControllerFactoryInterface\:\:class\)\-\>createCacheController\(\$handler, \$options\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/MVC/Controller/BaseController.php
-
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
@@ -15031,7 +11367,7 @@ parameters:
 				             Catch thrown Exceptions instead of getError$#
 			'''
 			identifier: method.deprecated
-			count: 7
+			count: 5
 			path: libraries/src/MVC/Controller/FormController.php
 
 		-
@@ -15048,7 +11384,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement\. Get the model through the MVCFactory instead
 				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('com_xxx'\)\-\>getMVCFactory\(\)\-\>createModel\(\$type, \$prefix, \$config\);$#
 			'''
@@ -15059,9 +11395,10 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				4\.3 will be removed in 7\.0
+				             Use the MvcFactory instead or instantiate the table class directly\.
+				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);
+				             \$table \= new \\Joomla\\CMS\\Table\\Content\(\$db\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -15078,17 +11415,6 @@ parameters:
 			count: 1
 			path: libraries/src/MVC/Factory/LegacyFactory.php
 
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 1
-			path: libraries/src/MVC/Model/AdminModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -15097,7 +11423,7 @@ parameters:
 				             Catch thrown Exceptions instead of getError$#
 			'''
 			identifier: method.deprecated
-			count: 1
+			count: 2
 			path: libraries/src/MVC/Model/AdminModel.php
 
 		-
@@ -15108,28 +11434,7 @@ parameters:
 				             Catch thrown Exceptions instead of getError$#
 			'''
 			identifier: method.deprecated
-			count: 26
-			path: libraries/src/MVC/Model/AdminModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/MVC/Model/AdminModel.php
-
-		-
-			message: '''
-				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
-				            Create a proper getter function for the property$#
-			'''
-			identifier: method.deprecated
-			count: 1
+			count: 27
 			path: libraries/src/MVC/Model/AdminModel.php
 
 		-
@@ -15140,7 +11445,7 @@ parameters:
 				             Throw an Exception instead of using setError$#
 			'''
 			identifier: method.deprecated
-			count: 38
+			count: 41
 			path: libraries/src/MVC/Model/AdminModel.php
 
 		-
@@ -15182,7 +11487,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method addTablePath\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement\. Get the model through the MVCFactory instead$#
 			'''
 			identifier: staticMethod.deprecated
@@ -15192,7 +11497,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -15204,7 +11509,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -15216,7 +11521,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method setDbo\(\) of class Joomla\\CMS\\MVC\\Model\\BaseDatabaseModel\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use setDatabase\(\) instead
 				             Example\: \$model\-\>setDatabase\(\$db\);$#
 			'''
@@ -15254,7 +11559,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\MVC\\Model\\LegacyModelLoaderTrait in class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Will be removed without replacement$#
 			'''
 			identifier: traitUse.deprecatedTrait
@@ -15275,7 +11580,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyPropertyManagementTrait in class Joomla\\CMS\\MVC\\Model\\BaseModel\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				             Will be removed without replacement
 				             Create proper setter functions for the individual properties or use a \\Joomla\\Registry\\Registry$#
 			'''
@@ -15305,26 +11610,6 @@ parameters:
 			count: 9
 			path: libraries/src/MVC/Model/FormModel.php
 
-		-
-			message: '''
-				#^Access to deprecated property \$filterBlacklist of class Joomla\\CMS\\MVC\\Model\\ListModel\:
-				4\.0 will be removed in 6\.0
-				             Use \$filterForbiddenList instead$#
-			'''
-			identifier: property.deprecated
-			count: 2
-			path: libraries/src/MVC/Model/ListModel.php
-
-		-
-			message: '''
-				#^Access to deprecated property \$listBlacklist of class Joomla\\CMS\\MVC\\Model\\ListModel\:
-				4\.0 will be removed in 6\.0
-				             Use \$listForbiddenList instead$#
-			'''
-			identifier: property.deprecated
-			count: 2
-			path: libraries/src/MVC/Model/ListModel.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -15339,7 +11624,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$document of class Joomla\\CMS\\MVC\\View\\AbstractView\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be made private in 7\.0
 				            Use \$this\-\>getDocument\(\) instead$#
 			'''
 			identifier: property.deprecated
@@ -15360,7 +11645,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyPropertyManagementTrait in class Joomla\\CMS\\MVC\\View\\AbstractView\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				             Will be removed without replacement
 				             Create proper setter functions for the individual properties or use a \\Joomla\\Registry\\Registry$#
 			'''
@@ -15411,7 +11696,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -15469,23 +11754,11 @@ parameters:
 
 		-
 			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 4
-			path: libraries/src/MVC/View/CategoryView.php
-
-		-
-			message: '''
-				#^Call to deprecated method get\(\) of class Joomla\\CMS\\MVC\\View\\AbstractView\:
-				5\.3\.0 will be removed in 7\.0\.
-				             Retrieve the model with \$model \= \$this\-\>getModel\(\); and call the methods
-				             to the model directly, e\.g\. \$model\-\>getItems\(\) instead of \$this\-\>get\('Items'\)\.$#
+				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				7\.0$#
 			'''
 			identifier: method.deprecated
-			count: 5
+			count: 1
 			path: libraries/src/MVC/View/FormView.php
 
 		-
@@ -15532,7 +11805,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -15578,17 +11851,6 @@ parameters:
 			count: 2
 			path: libraries/src/MVC/View/JsonApiView.php
 
-		-
-			message: '''
-				#^Call to deprecated method get\(\) of class Joomla\\CMS\\MVC\\View\\AbstractView\:
-				5\.3\.0 will be removed in 7\.0\.
-				             Retrieve the model with \$model \= \$this\-\>getModel\(\); and call the methods
-				             to the model directly, e\.g\. \$model\-\>getItems\(\) instead of \$this\-\>get\('Items'\)\.$#
-			'''
-			identifier: method.deprecated
-			count: 6
-			path: libraries/src/MVC/View/ListView.php
-
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class JLoader\:
@@ -15600,6 +11862,15 @@ parameters:
 			count: 1
 			path: libraries/src/MVC/View/ListView.php
 
+		-
+			message: '''
+				#^Call to deprecated method setUseExceptions\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
+				7\.0$#
+			'''
+			identifier: method.deprecated
+			count: 1
+			path: libraries/src/MVC/View/ListView.php
+
 		-
 			message: '''
 				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\MVC\\View\\CanDo\:
@@ -15618,22 +11889,10 @@ parameters:
 			count: 1
 			path: libraries/src/MVC/View/ListView.php
 
-		-
-			message: '''
-				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the database service in the DI container
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 4
-			path: libraries/src/Mail/MailTemplate.php
-
 		-
 			message: '''
 				#^Call to deprecated method getMailer\(\) of class Joomla\\CMS\\Factory\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				             Use the mailer service in the DI container and create a mailer from there
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(MailerFactoryInterface\:\:class\)\-\>createMailer\(\);$#
@@ -15655,7 +11914,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -15667,19 +11926,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the language service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 2
-			path: libraries/src/Menu/SiteMenu.php
-
-		-
-			message: '''
-				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -15691,7 +11938,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -15700,18 +11947,6 @@ parameters:
 			count: 1
 			path: libraries/src/Plugin/CMSPlugin.php
 
-		-
-			message: '''
-				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the language service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Plugin/CMSPlugin.php
-
 		-
 			message: '''
 				#^Call to deprecated method setDispatcher\(\) of class Joomla\\CMS\\Plugin\\CMSPlugin\:
@@ -15732,10 +11967,20 @@ parameters:
 			count: 1
 			path: libraries/src/Plugin/CMSPlugin.php
 
+		-
+			message: '''
+				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
+				4\.3 will be removed in 7\.0
+				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
+			'''
+			identifier: method.deprecatedInterface
+			count: 1
+			path: libraries/src/Plugin/CMSPlugin.php
+
 		-
 			message: '''
 				#^Call to deprecated method getCache\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the cache controller factory instead
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(CacheControllerFactoryInterface\:\:class\)\-\>createCacheController\(\$handler, \$options\);$#
@@ -15747,7 +11992,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -15759,7 +12004,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -15848,7 +12093,7 @@ parameters:
 		-
 			message: '''
 				#^Call to method getProperties\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
 				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
 			'''
@@ -15856,20 +12101,10 @@ parameters:
 			count: 1
 			path: libraries/src/Serializer/JoomlaSerializer.php
 
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 2
-			path: libraries/src/Service/Provider/Application.php
-
 		-
 			message: '''
 				#^Access to constant on deprecated class Joomla\\CMS\\Authentication\\Password\\MD5Handler\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Support for MD5 hashed passwords will be removed without replacement$#
 			'''
 			identifier: classConstant.deprecatedClass
@@ -15879,7 +12114,7 @@ parameters:
 		-
 			message: '''
 				#^Access to constant on deprecated class Joomla\\CMS\\Authentication\\Password\\PHPassHandler\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Support for PHPass hashed passwords will be removed without replacement$#
 			'''
 			identifier: classConstant.deprecatedClass
@@ -15889,7 +12124,7 @@ parameters:
 		-
 			message: '''
 				#^Instantiation of deprecated class Joomla\\CMS\\Authentication\\Password\\MD5Handler\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Support for MD5 hashed passwords will be removed without replacement$#
 			'''
 			identifier: new.deprecatedClass
@@ -15899,7 +12134,7 @@ parameters:
 		-
 			message: '''
 				#^Instantiation of deprecated class Joomla\\CMS\\Authentication\\Password\\PHPassHandler\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Support for PHPass hashed passwords will be removed without replacement$#
 			'''
 			identifier: new.deprecatedClass
@@ -15920,66 +12155,17 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method __construct\(\) of class Joomla\\CMS\\Console\\CheckJoomlaUpdatesCommand\:
-				5\.1\.0 will be removed in 6\.0
+				5\.1\.0 will be removed in 7\.0
 				            Use core\:update\:check instead of core\:check\-updates$#
 			'''
 			identifier: method.deprecated
-			count: 1
-			path: libraries/src/Service/Provider/Console.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\Database\\DatabaseDriver\:
-				3\.0  Use DatabaseFactory\:\:getDriver\(\) instead$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Service/Provider/Database.php
-
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 1
-			path: libraries/src/Service/Provider/Input.php
-
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: libraries/src/Service/Provider/Input.php
-
-		-
-			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: libraries/src/Service/Provider/Input.php
-
-		-
-			message: '''
-				#^Access to constant on deprecated class Joomla\\CMS\\Input\\Input\:
-				4\.3 will be removed in 6\.0\.
-				              Use Joomla\\Input\\Input instead$#
-			'''
-			identifier: classConstant.deprecatedClass
-			count: 3
-			path: libraries/src/Service/Provider/Session.php
+			count: 1
+			path: libraries/src/Service/Provider/Console.php
 
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -16002,7 +12188,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -16025,7 +12211,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -16048,7 +12234,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -16057,6 +12243,17 @@ parameters:
 			count: 1
 			path: libraries/src/Table/ContentHistory.php
 
+		-
+			message: '''
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Table\\Table\:
+				5\.4\.0 will be removed in 7\.0
+				              Use getDatabase\(\) instead
+				              Example\: \$this\-\>getDatabase\(\);$#
+			'''
+			identifier: method.deprecated
+			count: 1
+			path: libraries/src/Table/ContentType.php
+
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\Table\\Table\:
@@ -16071,7 +12268,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -16126,19 +12323,19 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Table\\Table\:
+				5\.4\.0 will be removed in 7\.0
+				              Use getDatabase\(\) instead
+				              Example\: \$this\-\>getDatabase\(\);$#
 			'''
-			identifier: staticMethod.deprecated
+			identifier: method.deprecated
 			count: 1
 			path: libraries/src/Table/MenuType.php
 
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -16211,7 +12408,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated property \$_errors of class Joomla\\CMS\\Table\\Table\:
-				3\.1\.4  JError has been deprecated$#
+				3\.7\.0  JError has been deprecated$#
 			'''
 			identifier: property.deprecated
 			count: 1
@@ -16220,7 +12417,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -16254,7 +12451,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -16296,7 +12493,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyPropertyManagementTrait in class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				             Will be removed without replacement
 				             Create proper setter functions for the individual properties or use a \\Joomla\\Registry\\Registry$#
 			'''
@@ -16373,7 +12570,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDocument\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the document service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getDocument\(\);$#
@@ -16385,7 +12582,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getButtonPath\(\) of class Joomla\\CMS\\Toolbar\\Toolbar\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             ToolbarButton buttons should be autoloaded via namespaces$#
 			'''
 			identifier: method.deprecated
@@ -16395,7 +12592,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -16413,7 +12610,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method fetchButton\(\) of class Joomla\\CMS\\Toolbar\\ToolbarButton\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use render\(\) instead\.$#
 			'''
 			identifier: method.deprecated
@@ -16422,10 +12619,11 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
@@ -16434,7 +12632,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Toolbar\\Toolbar\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the ToolbarFactoryInterface instead
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(ToolbarFactoryInterface\:\:class\)\-\>createToolbar\(\$name\)$#
@@ -16446,7 +12644,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -16455,65 +12653,10 @@ parameters:
 			count: 2
 			path: libraries/src/Toolbar/ToolbarHelper.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Updater/Adapter/CollectionAdapter.php
-
-		-
-			message: '''
-				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the database service in the DI container
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Updater/Adapter/ExtensionAdapter.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Updater/Adapter/ExtensionAdapter.php
-
-		-
-			message: '''
-				#^Access to property \$db of deprecated class Joomla\\CMS\\Adapter\\AdapterInstance\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: libraries/src/Updater/Adapter/TufAdapter.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/Updater/Adapter/TufAdapter.php
-
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -16525,7 +12668,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -16548,7 +12691,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyPropertyManagementTrait in class Joomla\\CMS\\Updater\\Update\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				             Will be removed without replacement
 				             Create proper setter functions for the individual properties or use a \\Joomla\\Registry\\Registry$#
 			'''
@@ -16558,22 +12701,14 @@ parameters:
 
 		-
 			message: '''
-				#^Access to property \$parent of deprecated class Joomla\\CMS\\Adapter\\AdapterInstance\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: libraries/src/Updater/UpdateAdapter.php
-
-		-
-			message: '''
-				#^Call to method getDbo\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
-			identifier: method.deprecatedClass
-			count: 2
+			identifier: staticMethod.deprecated
+			count: 1
 			path: libraries/src/Updater/UpdateAdapter.php
 
 		-
@@ -16588,78 +12723,52 @@ parameters:
 
 		-
 			message: '''
-				#^Class Joomla\\CMS\\Updater\\UpdateAdapter extends deprecated class Joomla\\CMS\\Adapter\\AdapterInstance\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyPropertyManagementTrait in class Joomla\\CMS\\Updater\\UpdateAdapter\:
+				4\.3\.0 will be removed in 7\.0
+				             Will be removed without replacement
+				             Create proper setter functions for the individual properties or use a \\Joomla\\Registry\\Registry$#
 			'''
-			identifier: class.extendsDeprecatedClass
+			identifier: traitUse.deprecatedTrait
 			count: 1
 			path: libraries/src/Updater/UpdateAdapter.php
 
 		-
 			message: '''
-				#^Access to property \$_adapters of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: property.deprecatedClass
-			count: 2
-			path: libraries/src/Updater/Updater.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
+				             Example\:
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 2
-			path: libraries/src/Updater/Updater.php
-
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: method.deprecatedClass
 			count: 1
 			path: libraries/src/Updater/Updater.php
 
 		-
 			message: '''
-				#^Call to method getDbo\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Call to deprecated method register\(\) of class JLoader\:
+				4\.3 will be removed in 7\.0
+				             Classes should be autoloaded\. Use JLoader\:\:registerPrefix\(\) or JLoader\:\:registerNamespace\(\) to
+				             register an autoloader for your files\.$#
 			'''
-			identifier: method.deprecatedClass
-			count: 4
+			identifier: staticMethod.deprecated
+			count: 1
 			path: libraries/src/Updater/Updater.php
 
 		-
-			message: '''
-				#^Call to method setAdapter\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: method.deprecatedClass
+			message: '#^Unsafe usage of new static\(\)\.$#'
+			identifier: new.static
 			count: 1
 			path: libraries/src/Updater/Updater.php
 
 		-
 			message: '''
-				#^Class Joomla\\CMS\\Updater\\Updater extends deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
+				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyPropertyManagementTrait in class Joomla\\CMS\\Updater\\Updater\:
+				4\.3\.0 will be removed in 7\.0
+				             Will be removed without replacement
+				             Create proper setter functions for the individual properties or use a \\Joomla\\Registry\\Registry$#
 			'''
-			identifier: class.extendsDeprecatedClass
-			count: 1
-			path: libraries/src/Updater/Updater.php
-
-		-
-			message: '#^Unsafe usage of new static\(\)\.$#'
-			identifier: new.static
+			identifier: traitUse.deprecatedTrait
 			count: 1
 			path: libraries/src/Updater/Updater.php
 
@@ -16672,13 +12781,13 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 1
+			count: 2
 			path: libraries/src/User/User.php
 
 		-
@@ -16703,21 +12812,10 @@ parameters:
 			count: 2
 			path: libraries/src/User/User.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: libraries/src/User/User.php
-
 		-
 			message: '''
 				#^Call to deprecated method getProperties\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -16727,7 +12825,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -16736,16 +12834,6 @@ parameters:
 			count: 1
 			path: libraries/src/User/User.php
 
-		-
-			message: '''
-				#^Call to deprecated method isCli\(\) of interface Joomla\\CMS\\Application\\CMSApplicationInterface\:
-				4\.0 will be removed in 6\.0
-				             Will be removed without replacement\. CLI will be handled by the joomla/console package instead$#
-			'''
-			identifier: method.deprecated
-			count: 1
-			path: libraries/src/User/User.php
-
 		-
 			message: '''
 				#^Call to deprecated method setError\(\) of class Joomla\\CMS\\User\\User\:
@@ -16781,7 +12869,7 @@ parameters:
 		-
 			message: '''
 				#^Usage of deprecated trait Joomla\\CMS\\Object\\LegacyPropertyManagementTrait in class Joomla\\CMS\\User\\User\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				             Will be removed without replacement
 				             Create proper setter functions for the individual properties or use a \\Joomla\\Registry\\Registry$#
 			'''
@@ -16792,7 +12880,7 @@ parameters:
 		-
 			message: '''
 				#^Access to constant on deprecated class Joomla\\CMS\\Authentication\\Password\\MD5Handler\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Support for MD5 hashed passwords will be removed without replacement$#
 			'''
 			identifier: classConstant.deprecatedClass
@@ -16802,28 +12890,17 @@ parameters:
 		-
 			message: '''
 				#^Access to constant on deprecated class Joomla\\CMS\\Authentication\\Password\\PHPassHandler\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Support for PHPass hashed passwords will be removed without replacement$#
 			'''
 			identifier: classConstant.deprecatedClass
 			count: 2
 			path: libraries/src/User/UserHelper.php
 
-		-
-			message: '''
-				#^Access to property \$id of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: libraries/src/User/UserHelper.php
-
 		-
 			message: '''
 				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the database service in the DI container
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
@@ -16846,7 +12923,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\User\\User\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or via \$app\-\>getIdentity\(\)
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(UserFactoryInterface\:\:class\)\-\>loadUserById\(\$id\)$#
 			'''
@@ -16854,22 +12931,10 @@ parameters:
 			count: 5
 			path: libraries/src/User/UserHelper.php
 
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 3
-			path: libraries/src/User/UserHelper.php
-
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -16878,41 +12943,20 @@ parameters:
 			count: 6
 			path: libraries/src/User/UserHelper.php
 
-		-
-			message: '''
-				#^Call to method __construct\(\) of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: method.deprecatedClass
-			count: 1
-			path: libraries/src/User/UserHelper.php
-
 		-
 			message: '''
 				#^Call to method checkIfRehashNeeded\(\) of deprecated class Joomla\\CMS\\Authentication\\Password\\PHPassHandler\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Support for PHPass hashed passwords will be removed without replacement$#
 			'''
 			identifier: method.deprecatedClass
 			count: 1
 			path: libraries/src/User/UserHelper.php
 
-		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 1
-			path: libraries/src/User/UserHelper.php
-
 		-
 			message: '''
 				#^Call to method validatePassword\(\) of deprecated class Joomla\\CMS\\Authentication\\Password\\PHPassHandler\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Support for PHPass hashed passwords will be removed without replacement$#
 			'''
 			identifier: method.deprecatedClass
@@ -16922,7 +12966,7 @@ parameters:
 		-
 			message: '''
 				#^Fetching deprecated class constant HASH_ARGON2ID_BC of class Joomla\\CMS\\User\\UserHelper\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use UserHelper\:\:HASH_ARGON2ID instead$#
 			'''
 			identifier: classConstant.deprecated
@@ -16932,7 +12976,7 @@ parameters:
 		-
 			message: '''
 				#^Fetching deprecated class constant HASH_ARGON2I_BC of class Joomla\\CMS\\User\\UserHelper\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use UserHelper\:\:HASH_ARGON2I instead$#
 			'''
 			identifier: classConstant.deprecated
@@ -16942,7 +12986,7 @@ parameters:
 		-
 			message: '''
 				#^Fetching deprecated class constant HASH_BCRYPT_BC of class Joomla\\CMS\\User\\UserHelper\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use UserHelper\:\:HASH_BCRYPT instead$#
 			'''
 			identifier: classConstant.deprecated
@@ -16952,7 +12996,7 @@ parameters:
 		-
 			message: '''
 				#^Fetching deprecated class constant HASH_MD5 of class Joomla\\CMS\\User\\UserHelper\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Support for MD5 hashed passwords will be removed use any of the other hashing methods$#
 			'''
 			identifier: classConstant.deprecated
@@ -16962,7 +13006,7 @@ parameters:
 		-
 			message: '''
 				#^Fetching deprecated class constant HASH_PHPASS of class Joomla\\CMS\\User\\UserHelper\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Support for PHPass hashed passwords will be removed use any of the other hashing methods$#
 			'''
 			identifier: classConstant.deprecated
@@ -16971,37 +13015,15 @@ parameters:
 
 		-
 			message: '''
-				#^Instantiation of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: new.deprecatedClass
-			count: 1
-			path: libraries/src/User/UserHelper.php
-
-		-
-			message: '''
-				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the database service in the DI container
+				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 2
-			path: libraries/src/Versioning/Versioning.php
-
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
+				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
 			'''
 			identifier: staticMethod.deprecated
-			count: 2
-			path: libraries/src/Versioning/Versioning.php
+			count: 1
+			path: libraries/src/WebAsset/AssetItem/KeepaliveAssetItem.php
 
 		-
 			message: '''
@@ -17010,62 +13032,61 @@ parameters:
 				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
 			'''
 			identifier: method.deprecatedInterface
-			count: 1
-			path: libraries/src/Versioning/Versioning.php
+			count: 2
+			path: libraries/src/Workflow/Workflow.php
 
 		-
 			message: '''
-				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Load the user service from the dependency injection container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
+				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Installer\\Installer\:
+				4\.3\.0 will be removed in 7\.0
+				            Create a proper getter function for the property$#
 			'''
-			identifier: staticMethod.deprecated
+			identifier: method.deprecated
+			count: 3
+			path: plugins/actionlog/joomla/src/Extension/Joomla.php
+
+		-
+			message: '#^Access to an undefined property Joomla\\CMS\\Application\\BaseApplication\:\:\$input\.$#'
+			identifier: property.notFound
 			count: 1
-			path: libraries/src/WebAsset/AssetItem/KeepaliveAssetItem.php
+			path: plugins/behaviour/compat6/classes/Application/BaseApplication.php
 
 		-
-			message: '''
-				#^Access to deprecated property \$tokenBindingHandler of class Joomla\\CMS\\WebAuthn\\Server\:
-				6\.0 Will be removed when we upgrade to WebAuthn library 5\.0 or later$#
-			'''
-			identifier: property.deprecated
-			count: 2
-			path: libraries/src/WebAuthn/Server.php
+			message: '#^Unsafe usage of new static\(\)\.$#'
+			identifier: new.static
+			count: 1
+			path: plugins/behaviour/compat6/classes/Filesystem/Patcher.php
 
 		-
 			message: '''
-				#^Instantiation of deprecated class Webauthn\\TokenBinding\\IgnoreTokenBindingHandler\:
-				Since 4\.3\.0 and will be removed in 5\.0\.0$#
+				#^Call to static method clean\(\) on deprecated class Joomla\\CMS\\Filesystem\\Path\:
+				4\.4 will be removed in 7\.0
+				             Use Joomla\\Filesystem\\Path instead\.$#
 			'''
-			identifier: new.deprecatedClass
+			identifier: staticMethod.deprecatedClass
 			count: 1
-			path: libraries/src/WebAuthn/Server.php
+			path: plugins/behaviour/compat6/classes/Filesystem/Path.php
 
 		-
-			message: '''
-				#^Call to method get\(\) of deprecated class Joomla\\CMS\\Adapter\\Adapter\:
-				4\.3 will be removed in 6\.0
-				             Will be removed without replacement$#
-			'''
-			identifier: method.deprecatedClass
-			count: 3
-			path: plugins/actionlog/joomla/src/Extension/Joomla.php
+			message: '#^Static call to instance method Joomla\\CMS\\Filesystem\\Support\\StringController\:\:getRef\(\)\.$#'
+			identifier: method.staticCall
+			count: 2
+			path: plugins/behaviour/compat6/classes/Filesystem/Streams/StreamString.php
 
 		-
 			message: '''
-				#^Call to deprecated method postStoreProcess\(\) of class Joomla\\CMS\\Helper\\TagsHelper\:
-				5\.3 will be removed in 7\.0$#
+				#^Call to method delete\(\) of deprecated class Joomla\\CMS\\Versioning\\Versioning\:
+				6\.0\.0  will be removed in 8\.0 without direct replacement,
+				             use the new versioning concept \(LINK TO DOCUMENTATION\)$#
 			'''
-			identifier: method.deprecated
-			count: 3
-			path: plugins/behaviour/taggable/src/Extension/Taggable.php
+			identifier: staticMethod.deprecatedClass
+			count: 1
+			path: plugins/behaviour/versionable/src/Extension/Versionable.php
 
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -17096,27 +13117,20 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Language\\Language\:
-				4\.3 will be removed in 6\.0
-				             Use the language factory instead
-				             Example\: Factory\:\:getContainer\(\)\-\>get\(LanguageFactoryInterface\:\:class\)\-\>createLanguage\(\$lang, \$debug\);$#
+				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Plugin\\CMSPlugin\:
+				5\.2 will be removed in 7\.0
+				             Plugin should use the language from Application, and only after the app is initialised\.$#
 			'''
-			identifier: staticMethod.deprecated
+			identifier: method.deprecated
 			count: 1
 			path: plugins/content/joomla/src/Extension/Joomla.php
 
 		-
-			message: '#^Access to property \$list on an unknown class PageBreak\.$#'
-			identifier: class.notFound
+			message: '#^Access to protected property Joomla\\Plugin\\Content\\PageBreak\\Extension\\PageBreak\:\:\$list\.$#'
+			identifier: property.protected
 			count: 2
 			path: plugins/content/pagebreak/tmpl/navigation.php
 
-		-
-			message: '#^Call to method getApplication\(\) on an unknown class PageBreak\.$#'
-			identifier: class.notFound
-			count: 1
-			path: plugins/content/pagebreak/tmpl/navigation.php
-
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Plugin\\CMSPlugin\:
@@ -17130,7 +13144,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method onDisplay\(\) of class Joomla\\Plugin\\EditorsXtd\\Article\\Extension\\Article\:
-				5\.0 Use onEditorButtonsSetup event$#
+				5\.0 Use onEditorButtonsSetup event instead, will be removed in 7\.0$#
 			'''
 			identifier: method.deprecated
 			count: 1
@@ -17139,7 +13153,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method onDisplay\(\) of class Joomla\\Plugin\\EditorsXtd\\Contact\\Extension\\Contact\:
-				5\.0 Use onEditorButtonsSetup event$#
+				5\.0 Use onEditorButtonsSetup event instead, will be removed in 7\.0$#
 			'''
 			identifier: method.deprecated
 			count: 1
@@ -17148,7 +13162,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method onDisplay\(\) of class Joomla\\Plugin\\EditorsXtd\\Menu\\Extension\\Menu\:
-				5\.0 Use onEditorButtonsSetup event$#
+				5\.0 Use onEditorButtonsSetup event instead, will be removed in 7\.0$#
 			'''
 			identifier: method.deprecated
 			count: 1
@@ -17157,7 +13171,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method onDisplay\(\) of class Joomla\\Plugin\\EditorsXtd\\Module\\Extension\\Module\:
-				5\.0 Use onEditorButtonsSetup event$#
+				5\.0 Use onEditorButtonsSetup event instead, will be removed in 7\.0$#
 			'''
 			identifier: method.deprecated
 			count: 1
@@ -17166,7 +13180,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method onDisplay\(\) of class Joomla\\Plugin\\EditorsXtd\\PageBreak\\Extension\\PageBreak\:
-				5\.0 Use onEditorButtonsSetup event$#
+				5\.0 Use onEditorButtonsSetup event instead, will be removed in 7\.0$#
 			'''
 			identifier: method.deprecated
 			count: 1
@@ -17175,18 +13189,12 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method onDisplay\(\) of class Joomla\\Plugin\\EditorsXtd\\ReadMore\\Extension\\ReadMore\:
-				5\.0 Use onEditorButtonsSetup event$#
+				5\.0 Use onEditorButtonsSetup event instead, will be removed in 7\.0$#
 			'''
 			identifier: method.deprecated
 			count: 1
 			path: plugins/editors-xtd/readmore/src/Extension/ReadMore.php
 
-		-
-			message: '#^Call to method escape\(\) on an unknown class FileLayout\.$#'
-			identifier: class.notFound
-			count: 2
-			path: plugins/editors/codemirror/layouts/editors/codemirror/codemirror.php
-
 		-
 			message: '''
 				#^Call to deprecated method setDispatcher\(\) of class Joomla\\Plugin\\Editors\\CodeMirror\\Extension\\Codemirror\:
@@ -17250,7 +13258,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Form\\Form\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the FormFactory service from the container
 				             Example\: Factory\:\:getContainer\(\)\-\>get\(FormFactoryInterface\:\:class\)\-\>createForm\(\$name, \$options\);$#
 			'''
@@ -17261,7 +13269,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -17277,55 +13285,15 @@ parameters:
 			path: plugins/editors/tinymce/src/Provider/TinyMCEProvider.php
 
 		-
-			message: '''
-				#^Call to method triggerEvent\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
-				4\.3 will be removed in 7\.0
-				             This interface will be removed without replacement as the Joomla 3\.x compatibility layer will be removed$#
-			'''
-			identifier: method.deprecatedInterface
-			count: 1
-			path: plugins/editors/tinymce/src/Provider/TinyMCEProvider.php
-
-		-
-			message: '#^Call to an undefined method Joomla\\CMS\\Layout\\FileLayout\:\:getOptionsFromField\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: plugins/fields/checkboxes/tmpl/checkboxes.php
-
-		-
-			message: '#^Call to an undefined method Joomla\\CMS\\Layout\\FileLayout\:\:getOptionsFromField\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: plugins/fields/list/tmpl/list.php
-
-		-
-			message: '#^Call to an undefined method Joomla\\CMS\\Layout\\FileLayout\:\:getOptionsFromField\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: plugins/fields/radio/tmpl/radio.php
-
-		-
-			message: '''
-				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the database service in the DI container
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: plugins/fields/sql/tmpl/sql.php
-
-		-
-			message: '#^Call to an undefined method Joomla\\CMS\\Layout\\FileLayout\:\:getUserFactory\(\)\.$#'
-			identifier: method.notFound
+			message: '#^Call to protected method getUserFactory\(\) of class Joomla\\Plugin\\Fields\\User\\Extension\\User\.$#'
+			identifier: method.protected
 			count: 1
 			path: plugins/fields/user/tmpl/user.php
 
 		-
 			message: '''
 				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Load the user service from the dependency injection container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
@@ -17348,7 +13316,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Updater\\Update\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
@@ -17364,7 +13332,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getMailer\(\) of class Joomla\\CMS\\Factory\:
-				4\.4\.0 will be removed in 6\.0
+				4\.4\.0 will be removed in 7\.0
 				             Use the mailer service in the DI container and create a mailer from there
 				             Example\:
 				             Factory\:\:getContainer\(\)\-\>get\(MailerFactoryInterface\:\:class\)\-\>createMailer\(\);$#
@@ -17373,18 +13341,6 @@ parameters:
 			count: 1
 			path: plugins/multifactorauth/email/src/Extension/Email.php
 
-		-
-			message: '#^Class Joomla\\CMS\\WebAuthn\\Server constructor invoked with 2 parameters, 3 required\.$#'
-			identifier: arguments.count
-			count: 1
-			path: plugins/multifactorauth/webauthn/src/Helper/Credentials.php
-
-		-
-			message: '#^Class Webauthn\\AuthenticatorSelectionCriteria does not have a constructor and must be instantiated without any parameters\.$#'
-			identifier: new.noConstructor
-			count: 1
-			path: plugins/multifactorauth/webauthn/src/Helper/Credentials.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -17410,24 +13366,13 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method get\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3\.0 will be removed in 6\.0
+				4\.3\.0 will be removed in 7\.0
 				            Create a proper getter function for the property$#
 			'''
 			identifier: method.deprecated
 			count: 1
 			path: plugins/sampledata/multilang/src/Extension/MultiLanguage.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 3
-			path: plugins/sampledata/multilang/src/Extension/MultiLanguage.php
-
 		-
 			message: '''
 				#^Call to deprecated method getError\(\) of class Joomla\\CMS\\MVC\\Model\\BaseModel\:
@@ -17442,7 +13387,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class Joomla\\CMS\\HTML\\HTMLHelper\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the service registry instead
 				             HTMLHelper\:\:getServiceRegistry\(\)\-\>register\(\$key, \$function\);$#
 			'''
@@ -17473,7 +13418,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -17485,7 +13430,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -17497,7 +13442,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -17508,119 +13453,29 @@ parameters:
 
 		-
 			message: '''
-				#^Call to deprecated method getUser\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Load the user service from the dependency injection container or get from the application object
+				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
+				4\.3 will be removed in 7\.0
+				             Use the database service in the DI container
 				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getIdentity\(\);$#
+				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
 			'''
 			identifier: staticMethod.deprecated
 			count: 1
-			path: plugins/system/debug/src/Storage/FileStorage.php
-
-		-
-			message: '''
-				#^Access to property \$access of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: plugins/system/guidedtours/src/Extension/GuidedTours.php
-
-		-
-			message: '''
-				#^Access to property \$autostart of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: plugins/system/guidedtours/src/Extension/GuidedTours.php
-
-		-
-			message: '''
-				#^Access to property \$description of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: plugins/system/guidedtours/src/Extension/GuidedTours.php
-
-		-
-			message: '''
-				#^Access to property \$id of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 3
-			path: plugins/system/guidedtours/src/Extension/GuidedTours.php
-
-		-
-			message: '''
-				#^Access to property \$published of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: plugins/system/guidedtours/src/Extension/GuidedTours.php
-
-		-
-			message: '''
-				#^Access to property \$title of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: plugins/system/guidedtours/src/Extension/GuidedTours.php
-
-		-
-			message: '''
-				#^Access to property \$uid of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: plugins/system/guidedtours/src/Extension/GuidedTours.php
-
-		-
-			message: '''
-				#^Access to property \$url of deprecated class Joomla\\CMS\\Object\\CMSObject\:
-				4\.3 will be removed in 6\.0
-				             Use \\stdClass or \\Joomla\\Registry\\Registry instead\.
-				             Example\: new \\Joomla\\Registry\\Registry\(\);$#
-			'''
-			identifier: property.deprecatedClass
-			count: 1
-			path: plugins/system/guidedtours/src/Extension/GuidedTours.php
+			path: plugins/system/httpheaders/postinstall/introduction.php
 
 		-
 			message: '''
-				#^Call to deprecated method getDbo\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the database service in the DI container
-				             Example\:
-				             Factory\:\:getContainer\(\)\-\>get\(DatabaseInterface\:\:class\);$#
+				#^Call to deprecated method setDispatcher\(\) of class Joomla\\Plugin\\System\\Jooa11y\\Extension\\Jooa11y\:
+				5\.2 will be removed in 7\.0
+				             Plugin should implement DispatcherAwareInterface on its own, when it is needed\.$#
 			'''
-			identifier: staticMethod.deprecated
+			identifier: method.deprecated
 			count: 1
-			path: plugins/system/httpheaders/postinstall/introduction.php
+			path: plugins/system/jooa11y/services/provider.php
 
 		-
 			message: '''
-				#^Call to deprecated method getDispatcher\(\) of class Joomla\\CMS\\Plugin\\CMSPlugin\:
+				#^Call to deprecated method getDispatcher\(\) of class Joomla\\Plugin\\System\\Jooa11y\\Extension\\Jooa11y\:
 				5\.2 will be removed in 7\.0
 				             Plugin should implement DispatcherAwareInterface on its own, when it is needed\.$#
 			'''
@@ -17643,7 +13498,7 @@ parameters:
 		-
 			message: '''
 				#^Access to deprecated static property \$language of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -17703,17 +13558,6 @@ parameters:
 			count: 1
 			path: plugins/system/shortcut/src/Extension/Shortcut.php
 
-		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Cache\\Cache\:
-				4\.2 will be removed in 6\.0
-				             Use the cache controller factory instead
-				             Example\: Factory\:\:getContainer\(\)\-\>get\(CacheControllerFactoryInterface\:\:class\)\-\>createCacheController\(\$type, \$options\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: plugins/system/stats/src/Extension/Stats.php
-
 		-
 			message: '''
 				#^Call to method getDispatcher\(\) of deprecated interface Joomla\\CMS\\Application\\EventAwareInterface\:
@@ -17724,16 +13568,10 @@ parameters:
 			count: 1
 			path: plugins/system/stats/src/Field/DataField.php
 
-		-
-			message: '#^Class Webauthn\\AuthenticatorSelectionCriteria does not have a constructor and must be instantiated without any parameters\.$#'
-			identifier: new.noConstructor
-			count: 1
-			path: plugins/system/webauthn/src/Authentication.php
-
 		-
 			message: '''
 				#^Call to deprecated method __construct\(\) of class Joomla\\CMS\\Encrypt\\Aes\:
-				4\.3 \$strength will be removed in 6\.0$#
+				4\.3 \$strength will be removed in 7\.0$#
 			'''
 			identifier: method.deprecated
 			count: 2
@@ -17742,7 +13580,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class Joomla\\CMS\\HTML\\HTMLHelper\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the service registry instead
 				             HTMLHelper\:\:getServiceRegistry\(\)\-\>register\(\$key, \$function\);$#
 			'''
@@ -17751,13 +13589,40 @@ parameters:
 			path: plugins/system/webauthn/src/Extension/Webauthn.php
 
 		-
-			message: '''
-				#^Call to deprecated method forUnsecuredSigner\(\) of class Lcobucci\\JWT\\Configuration\:
-				Deprecated since v4\.3$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: plugins/system/webauthn/src/MetadataRepository.php
+			message: '#^Access to an undefined property Joomla\\Plugin\\Task\\Checkfiles\\Extension\\Checkfiles\:\:\$app\.$#'
+			identifier: property.notFound
+			count: 2
+			path: plugins/task/checkfiles/src/Extension/Checkfiles.php
+
+		-
+			message: '#^Access to an undefined property Joomla\\Plugin\\Task\\DeleteActionLogs\\Extension\\DeleteActionLogs\:\:\$app\.$#'
+			identifier: property.notFound
+			count: 2
+			path: plugins/task/deleteactionlogs/src/Extension/DeleteActionLogs.php
+
+		-
+			message: '#^Access to an undefined property Joomla\\Plugin\\Task\\PrivacyConsent\\Extension\\PrivacyConsent\:\:\$app\.$#'
+			identifier: property.notFound
+			count: 2
+			path: plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
+
+		-
+			message: '#^Access to an undefined property Joomla\\Plugin\\Task\\Requests\\Extension\\Requests\:\:\$app\.$#'
+			identifier: property.notFound
+			count: 2
+			path: plugins/task/requests/src/Extension/Requests.php
+
+		-
+			message: '#^Access to an undefined property Joomla\\Plugin\\Task\\RotateLogs\\Extension\\RotateLogs\:\:\$app\.$#'
+			identifier: property.notFound
+			count: 2
+			path: plugins/task/rotatelogs/src/Extension/RotateLogs.php
+
+		-
+			message: '#^Access to an undefined property Joomla\\Plugin\\Task\\SessionGC\\Extension\\SessionGC\:\:\$app\.$#'
+			identifier: property.notFound
+			count: 2
+			path: plugins/task/sessiongc/src/Extension/SessionGC.php
 
 		-
 			message: '#^Instantiated class JConfig not found\.$#'
@@ -17766,20 +13631,21 @@ parameters:
 			path: plugins/task/sitestatus/services/provider.php
 
 		-
-			message: '''
-				#^Call to deprecated method getInstance\(\) of class Joomla\\CMS\\Table\\Table\:
-				4\.3 will be removed in 6\.0
-				             Use the MvcFactory instead
-				             Example\: Factory\:\:getApplication\(\)\-\>bootComponent\('\.\.\.'\)\-\>getMVCFactory\(\)\-\>createTable\(\$name, \$prefix, \$config\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
+			message: '#^Access to an undefined property Joomla\\Plugin\\Task\\SiteStatus\\Extension\\SiteStatus\:\:\$app\.$#'
+			identifier: property.notFound
+			count: 2
+			path: plugins/task/sitestatus/src/Extension/SiteStatus.php
+
+		-
+			message: '#^Access to an undefined property Joomla\\Plugin\\Task\\UpdateNotification\\Extension\\UpdateNotification\:\:\$app\.$#'
+			identifier: property.notFound
+			count: 2
 			path: plugins/task/updatenotification/src/Extension/UpdateNotification.php
 
 		-
 			message: '''
 				#^Access to deprecated static property \$language of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -17788,22 +13654,10 @@ parameters:
 			count: 3
 			path: plugins/user/joomla/src/Extension/Joomla.php
 
-		-
-			message: '''
-				#^Call to deprecated method getSession\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
-				             Use the session service in the DI container or get from the application object
-				             Example\:
-				             Factory\:\:getApplication\(\)\-\>getSession\(\);$#
-			'''
-			identifier: staticMethod.deprecated
-			count: 1
-			path: plugins/user/joomla/src/Extension/Joomla.php
-
 		-
 			message: '''
 				#^Call to deprecated method register\(\) of class Joomla\\CMS\\HTML\\HTMLHelper\:
-				4\.0 will be removed in 6\.0
+				4\.0 will be removed in 7\.0
 				             Use the service registry instead
 				             HTMLHelper\:\:getServiceRegistry\(\)\-\>register\(\$key, \$function\);$#
 			'''
@@ -17814,7 +13668,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -17826,7 +13680,7 @@ parameters:
 		-
 			message: '''
 				#^Call to deprecated method getLanguage\(\) of class Joomla\\CMS\\Factory\:
-				4\.3 will be removed in 6\.0
+				4\.3 will be removed in 7\.0
 				             Use the language service in the DI container or get from the application object
 				             Example\:
 				             Factory\:\:getApplication\(\)\-\>getLanguage\(\);$#
@@ -17841,12 +13695,6 @@ parameters:
 			count: 2
 			path: plugins/workflow/featuring/src/Extension/Featuring.php
 
-		-
-			message: '#^Call to method singularize\(\) of deprecated class Doctrine\\Common\\Inflector\\Inflector\.$#'
-			identifier: staticMethod.deprecatedClass
-			count: 1
-			path: plugins/workflow/featuring/src/Extension/Featuring.php
-
 		-
 			message: '#^Access to an undefined property Joomla\\Plugin\\Workflow\\Notification\\Extension\\Notification\:\:\$app\.$#'
 			identifier: property.notFound
@@ -17858,9 +13706,3 @@ parameters:
 			identifier: property.notFound
 			count: 2
 			path: plugins/workflow/publishing/src/Extension/Publishing.php
-
-		-
-			message: '#^Call to method singularize\(\) of deprecated class Doctrine\\Common\\Inflector\\Inflector\.$#'
-			identifier: staticMethod.deprecatedClass
-			count: 1
-			path: plugins/workflow/publishing/src/Extension/Publishing.php
diff --git a/phpstan.neon b/phpstan.neon
index d46cae6d53e7d..303accb8a228e 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -6,7 +6,7 @@ includes:
 
 parameters:
 	level: 0
-	phpVersion: 80100
+	phpVersion: 80300
 	reportUnmatchedIgnoredErrors: false
 	scanDirectories:
 		- libraries/php-encryption
@@ -45,13 +45,3 @@ parameters:
 				- plugins/*
 		-
 			message: '#Call to deprecated method \_\(\) of class Joomla\\CMS\\Language\\Language.*#'
-
-		# PrepareableInterface and LimitableInterface will be removed and be part of the QueryInterface.
-		# Since we don't use these interfaces directly, we can ignore these errors.
-		# It is already fixed in joomla 6.0 with database framework version 4.
-		-
-			message: '#Call to method bind\(\) of deprecated interface Joomla\\Database\\Query\\PreparableInterface.*#'
-		-
-			message: '#Call to method getBounded\(\) of deprecated interface Joomla\\Database\\Query\\PreparableInterface.*#'
-		-
-			message: '#Call to method setLimit\(\) of deprecated interface Joomla\\Database\\Query\\LimitableInterface.*#'
diff --git a/plugins/actionlog/joomla/services/provider.php b/plugins/actionlog/joomla/services/provider.php
index de8f527bef365..cb8297a79ac27 100644
--- a/plugins/actionlog/joomla/services/provider.php
+++ b/plugins/actionlog/joomla/services/provider.php
@@ -33,7 +33,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Joomla::class, function (Container $container) {
                 $plugin = new Joomla(
                     (array) PluginHelper::getPlugin('actionlog', 'joomla')
                 );
@@ -42,7 +42,7 @@ function (Container $container) {
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/api-authentication/basic/services/provider.php b/plugins/api-authentication/basic/services/provider.php
index d91e83ca2b636..34bf0f2cf6501 100644
--- a/plugins/api-authentication/basic/services/provider.php
+++ b/plugins/api-authentication/basic/services/provider.php
@@ -33,7 +33,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Basic::class, function (Container $container) {
                 $plugin     = new Basic(
                     (array) PluginHelper::getPlugin('api-authentication', 'basic'),
                 );
@@ -42,7 +42,7 @@ function (Container $container) {
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/api-authentication/basic/src/Extension/Basic.php b/plugins/api-authentication/basic/src/Extension/Basic.php
index 8ba09c79310be..06337e7c9c2bd 100644
--- a/plugins/api-authentication/basic/src/Extension/Basic.php
+++ b/plugins/api-authentication/basic/src/Extension/Basic.php
@@ -70,7 +70,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'password']))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :username')
diff --git a/plugins/api-authentication/token/services/provider.php b/plugins/api-authentication/token/services/provider.php
index d0dcf44cdb6dd..147d5a8947f44 100644
--- a/plugins/api-authentication/token/services/provider.php
+++ b/plugins/api-authentication/token/services/provider.php
@@ -34,7 +34,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Token::class, function (Container $container) {
                 $plugin = new Token(
                     (array) PluginHelper::getPlugin('api-authentication', 'token'),
                     new InputFilter()
@@ -44,7 +44,7 @@ function (Container $container) {
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/api-authentication/token/src/Extension/Token.php b/plugins/api-authentication/token/src/Extension/Token.php
index 4073e73ab870c..34ee82ef59460 100644
--- a/plugins/api-authentication/token/src/Extension/Token.php
+++ b/plugins/api-authentication/token/src/Extension/Token.php
@@ -11,7 +11,6 @@
 namespace Joomla\Plugin\ApiAuthentication\Token\Extension;
 
 use Joomla\CMS\Authentication\Authentication;
-use Joomla\CMS\Crypt\Crypt;
 use Joomla\CMS\Event\User\AuthenticationEvent;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\User\UserFactoryAwareTrait;
@@ -207,7 +206,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
         $enabled = $this->isTokenEnabledForUser($userId);
 
         // Do the tokens match? Use a timing safe string comparison to prevent timing attacks.
-        $hashesMatch = Crypt::timingSafeCompare($referenceHMAC, $tokenHMAC);
+        $hashesMatch = hash_equals($referenceHMAC, $tokenHMAC);
 
         // Is the user in the allowed user groups?
         $inAllowedUserGroups = $this->isInAllowedUserGroup($userId);
@@ -280,7 +279,7 @@ private function getTokenSeedForUser(int $userId): ?string
     {
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('profile_value'))
                 ->from($db->quoteName('#__user_profiles'))
                 ->where($db->quoteName('profile_key') . ' = :profileKey')
@@ -309,7 +308,7 @@ private function isTokenEnabledForUser(int $userId): bool
     {
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('profile_value'))
                 ->from($db->quoteName('#__user_profiles'))
                 ->where($db->quoteName('profile_key') . ' = :profileKey')
diff --git a/plugins/authentication/cookie/services/provider.php b/plugins/authentication/cookie/services/provider.php
index 0515874f251ba..891ffd82ce201 100644
--- a/plugins/authentication/cookie/services/provider.php
+++ b/plugins/authentication/cookie/services/provider.php
@@ -33,7 +33,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Cookie::class, function (Container $container) {
                 $plugin = new Cookie(
                     (array) PluginHelper::getPlugin('authentication', 'cookie')
                 );
@@ -42,7 +42,7 @@ function (Container $container) {
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/authentication/cookie/src/Extension/Cookie.php b/plugins/authentication/cookie/src/Extension/Cookie.php
index 398615161cd46..8ae1d1510a321 100644
--- a/plugins/authentication/cookie/src/Extension/Cookie.php
+++ b/plugins/authentication/cookie/src/Extension/Cookie.php
@@ -138,7 +138,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
 
         // Remove expired tokens
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__user_keys'))
             ->where($db->quoteName('time') . ' < :now')
             ->bind(':now', $now);
@@ -150,7 +150,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
         }
 
         // Find the matching record if it exists.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['user_id', 'token', 'series', 'time']))
             ->from($db->quoteName('#__user_keys'))
             ->where($db->quoteName('series') . ' = :series')
@@ -190,7 +190,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
              * Either the series was guessed correctly or a cookie was stolen and used twice (once by attacker and once by victim).
              * Delete all tokens for this user!
              */
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__user_keys'))
                 ->where($db->quoteName('user_id') . ' = :userid')
                 ->bind(':userid', $results[0]->user_id);
@@ -225,7 +225,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
         }
 
         // Make sure there really is a user with this name and get the data for the session.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'username', 'password']))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :userid')
@@ -325,7 +325,7 @@ public function onUserAfterLogin(AfterLoginEvent $event): void
 
             do {
                 $series = UserHelper::genRandomPassword(20);
-                $query  = $db->getQuery(true)
+                $query  = $db->createQuery()
                     ->select($db->quoteName('series'))
                     ->from($db->quoteName('#__user_keys'))
                     ->where($db->quoteName('series') . ' = :series')
@@ -371,7 +371,7 @@ public function onUserAfterLogin(AfterLoginEvent $event): void
             ]
         );
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         if (!empty($options['remember'])) {
             $future = (time() + $lifetime);
@@ -445,7 +445,7 @@ public function onUserAfterLogout(AfterLogoutEvent $event): void
 
         // Remove the record from the database
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__user_keys'))
             ->where($db->quoteName('series') . ' = :series')
             ->bind(':series', $series);
diff --git a/plugins/authentication/joomla/services/provider.php b/plugins/authentication/joomla/services/provider.php
index fd5fbaa3f62d4..38e87f1986241 100644
--- a/plugins/authentication/joomla/services/provider.php
+++ b/plugins/authentication/joomla/services/provider.php
@@ -33,7 +33,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Joomla::class, function (Container $container) {
                 $plugin = new Joomla(
                     (array) PluginHelper::getPlugin('authentication', 'joomla')
                 );
@@ -42,7 +42,7 @@ function (Container $container) {
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/authentication/joomla/src/Extension/Joomla.php b/plugins/authentication/joomla/src/Extension/Joomla.php
index 71975d2a40900..aa7efe40d2bd5 100644
--- a/plugins/authentication/joomla/src/Extension/Joomla.php
+++ b/plugins/authentication/joomla/src/Extension/Joomla.php
@@ -69,7 +69,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'password']))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :username')
diff --git a/plugins/authentication/ldap/services/provider.php b/plugins/authentication/ldap/services/provider.php
index f8e9361e9ac3e..56925e4ce0582 100644
--- a/plugins/authentication/ldap/services/provider.php
+++ b/plugins/authentication/ldap/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Ldap::class, function (Container $container) {
                 $plugin = new Ldap(
                     new LdapFactory(),
                     (array) PluginHelper::getPlugin('authentication', 'ldap')
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/behaviour/compat/compat.xml b/plugins/behaviour/compat/compat.xml
deleted file mode 100644
index 18be372ba8497..0000000000000
--- a/plugins/behaviour/compat/compat.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<extension type="plugin" group="behaviour" method="upgrade">
-	<name>plg_behaviour_compat</name>
-	<author>Joomla! Project</author>
-	<creationDate>2023-09</creationDate>
-	<copyright>(C) 2023 Open Source Matters, Inc.</copyright>
-	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<authorEmail>admin@joomla.org</authorEmail>
-	<authorUrl>www.joomla.org</authorUrl>
-	<version>5.0.0</version>
-	<description>PLG_COMPAT_XML_DESCRIPTION</description>
-	<namespace path="src">Joomla\Plugin\Behaviour\Compat</namespace>
-	<files>
-		<folder plugin="compat">services</folder>
-		<folder>src</folder>
-	</files>
-	<languages>
-		<language tag="en-GB">language/en-GB/plg_behaviour_compat.ini</language>
-		<language tag="en-GB">language/en-GB/plg_behaviour_compat.sys.ini</language>
-	</languages>
-	<config>
-		<fields name="params">
-			<fieldset name="basic">
-				<field
-					name="classes_aliases"
-					type="radio"
-					layout="joomla.form.field.radio.switcher"
-					label="PLG_COMPAT_FIELD_CLASSES_ALIASES_LABEL"
-					description="PLG_COMPAT_FIELD_CLASSES_ALIASES_DESCRIPTION"
-					default="1"
-					filter="integer"
-					>
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-				<field
-					name="es5_assets"
-					type="radio"
-					label="PLG_COMPAT_FIELD_ES5_ASSETS_LABEL"
-					description="PLG_COMPAT_FIELD_ES5_ASSETS_DESCRIPTION"
-					layout="joomla.form.field.radio.switcher"
-					default="1"
-					filter="integer"
-					>
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-				<field
-					name="removed_asset"
-					type="radio"
-					label="PLG_COMPAT_FIELD_REMOVED_ASSETS_LABEL"
-					description="PLG_COMPAT_FIELD_REMOVED_ASSETS_DESCRIPTION"
-					layout="joomla.form.field.radio.switcher"
-					default="1"
-					filter="integer"
-					>
-					<option value="0">JNO</option>
-					<option value="1">JYES</option>
-				</field>
-			</fieldset>
-		</fields>
-	</config>
-</extension>
diff --git a/plugins/behaviour/compat/src/Extension/Compat.php b/plugins/behaviour/compat/src/Extension/Compat.php
deleted file mode 100644
index 8e9b5545436d7..0000000000000
--- a/plugins/behaviour/compat/src/Extension/Compat.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * @package     Joomla.Plugin
- * @subpackage  Behaviour.compat
- *
- * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-namespace Joomla\Plugin\Behaviour\Compat\Extension;
-
-use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent;
-use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\Event\Priority;
-use Joomla\Event\SubscriberInterface;
-
-// phpcs:disable PSR1.Files.SideEffects
-\defined('_JEXEC') or die;
-// phpcs:enable PSR1.Files.SideEffects
-
-/**
- * Joomla! Compat Plugin.
- *
- * @since  4.4.0
- */
-final class Compat extends CMSPlugin implements SubscriberInterface
-{
-    /**
-     * Returns an array of CMS events this plugin will listen to and the respective handlers.
-     *
-     * @return  array
-     *
-     * @since  4.4.0
-     */
-    public static function getSubscribedEvents(): array
-    {
-        /**
-         * Note that onAfterInitialise must be the first handlers to run for this
-         * plugin to operate as expected. These handlers load compatibility code which
-         * might be needed by other plugins
-         */
-        return [
-            'onAfterInitialiseDocument' => ['onAfterInitialiseDocument', Priority::HIGH],
-        ];
-    }
-
-    /**
-     * Constructor
-     *
-     * @param   array                $config      An optional associative array of configuration settings.
-     *                                            Recognized key values include 'name', 'group', 'params', 'language'
-     *                                            (this list is not meant to be comprehensive).
-     *
-     * @since   1.5
-     */
-    public function __construct(array $config = [])
-    {
-        parent::__construct($config);
-
-        /**
-         * Normally we should never use the constructor to execute any logic which would
-         * affect other parts of the cms, but since we need to load class aliases as
-         * early as possible we load the class aliases in the constructor so behaviour and system plugins
-         * which depend on the JPlugin alias for example still are working
-         */
-
-        /**
-         * Load class names which are deprecated in joomla 4.0 and which will
-         * likely be removed in Joomla 6.0
-         */
-        if ($this->params->get('classes_aliases', '1')) {
-            require_once \dirname(__DIR__) . '/classmap/classmap.php';
-        }
-    }
-
-    /**
-     * We run as early as possible, this should be the first event
-     *
-     * @param  AfterInitialiseDocumentEvent $event
-     * @return void
-     *
-     * @since  5.0.0
-     */
-    public function onAfterInitialiseDocument(AfterInitialiseDocumentEvent $event)
-    {
-        /**
-         * Load the es5 assets stubs, they are needed if an extension
-         * directly uses a core es5 asset which has no function in Joomla 5+
-         * and only provides an empty asset to not throw an exception
-         */
-        if ($this->params->get('es5_assets', '1')) {
-            $event->getDocument()
-                ->getWebAssetManager()
-                ->getRegistry()
-                ->addRegistryFile('media/plg_behaviour_compat/es5.asset.json');
-        }
-        /**
-         * Load the removed assets stubs, they are needed if an extension
-         * directly uses a core asset from Joomla 4 which is not present in Joomla 5+
-         * and only provides an empty asset to not throw an exception
-         */
-        if ($this->params->get('removed_asset', '1')) {
-            $event->getDocument()
-                ->getWebAssetManager()
-                ->getRegistry()
-                ->addRegistryFile('media/plg_behaviour_compat/removed.asset.json');
-        }
-    }
-}
diff --git a/libraries/src/Application/BaseApplication.php b/plugins/behaviour/compat6/classes/Application/BaseApplication.php
similarity index 93%
rename from libraries/src/Application/BaseApplication.php
rename to plugins/behaviour/compat6/classes/Application/BaseApplication.php
index 655952c2b3b06..90399824c4e40 100644
--- a/libraries/src/Application/BaseApplication.php
+++ b/plugins/behaviour/compat6/classes/Application/BaseApplication.php
@@ -10,7 +10,7 @@
 namespace Joomla\CMS\Application;
 
 use Joomla\Application\AbstractApplication;
-use Joomla\CMS\Input\Input;
+use Joomla\Input\Input;
 use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -24,7 +24,7 @@
  *
  * @since       3.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Application classes should directly be based on \Joomla\Application\AbstractApplication
  *              don't use this class anymore
  */
@@ -37,7 +37,7 @@ abstract class BaseApplication extends AbstractApplication
      * Class constructor.
      *
      * @param   ?Input     $input   An optional argument to provide dependency injection for the application's
-     *                              input object.  If the argument is a \JInput object that object will become
+     *                              input object.  If the argument is a Input object that object will become
      *                              the application's input object, otherwise a default input object is created.
      * @param   ?Registry  $config  An optional argument to provide dependency injection for the application's
      *                              config object.  If the argument is a Registry object that object will become
diff --git a/libraries/src/Application/CLI/CliInput.php b/plugins/behaviour/compat6/classes/Application/CLI/CliInput.php
similarity index 94%
rename from libraries/src/Application/CLI/CliInput.php
rename to plugins/behaviour/compat6/classes/Application/CLI/CliInput.php
index c704982ae3b8d..253e69cfebcdd 100644
--- a/libraries/src/Application/CLI/CliInput.php
+++ b/plugins/behaviour/compat6/classes/Application/CLI/CliInput.php
@@ -18,7 +18,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 class CliInput
diff --git a/libraries/src/Application/CLI/CliOutput.php b/plugins/behaviour/compat6/classes/Application/CLI/CliOutput.php
similarity index 97%
rename from libraries/src/Application/CLI/CliOutput.php
rename to plugins/behaviour/compat6/classes/Application/CLI/CliOutput.php
index f0126c0e0b838..3512447bef6a3 100644
--- a/libraries/src/Application/CLI/CliOutput.php
+++ b/plugins/behaviour/compat6/classes/Application/CLI/CliOutput.php
@@ -20,7 +20,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 abstract class CliOutput
diff --git a/libraries/src/Application/CLI/ColorStyle.php b/plugins/behaviour/compat6/classes/Application/CLI/ColorStyle.php
similarity index 99%
rename from libraries/src/Application/CLI/ColorStyle.php
rename to plugins/behaviour/compat6/classes/Application/CLI/ColorStyle.php
index 76166bfd5a0eb..22d7784fc718d 100644
--- a/libraries/src/Application/CLI/ColorStyle.php
+++ b/plugins/behaviour/compat6/classes/Application/CLI/ColorStyle.php
@@ -18,7 +18,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 final class ColorStyle
diff --git a/libraries/src/Application/CLI/Output/Processor/ColorProcessor.php b/plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ColorProcessor.php
similarity index 99%
rename from libraries/src/Application/CLI/Output/Processor/ColorProcessor.php
rename to plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ColorProcessor.php
index 559038925af4b..62060b97689d3 100644
--- a/libraries/src/Application/CLI/Output/Processor/ColorProcessor.php
+++ b/plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ColorProcessor.php
@@ -20,7 +20,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 class ColorProcessor implements ProcessorInterface
diff --git a/libraries/src/Application/CLI/Output/Processor/ProcessorInterface.php b/plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ProcessorInterface.php
similarity index 94%
rename from libraries/src/Application/CLI/Output/Processor/ProcessorInterface.php
rename to plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ProcessorInterface.php
index 2c7e0bdbcd47a..8cb71f8b1d65d 100644
--- a/libraries/src/Application/CLI/Output/Processor/ProcessorInterface.php
+++ b/plugins/behaviour/compat6/classes/Application/CLI/Output/Processor/ProcessorInterface.php
@@ -18,7 +18,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 interface ProcessorInterface
diff --git a/libraries/src/Application/CLI/Output/Stdout.php b/plugins/behaviour/compat6/classes/Application/CLI/Output/Stdout.php
similarity index 96%
rename from libraries/src/Application/CLI/Output/Stdout.php
rename to plugins/behaviour/compat6/classes/Application/CLI/Output/Stdout.php
index ccae44b56ffa9..373f6d748ba5c 100644
--- a/libraries/src/Application/CLI/Output/Stdout.php
+++ b/plugins/behaviour/compat6/classes/Application/CLI/Output/Stdout.php
@@ -20,7 +20,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 class Stdout extends CliOutput
diff --git a/libraries/src/Application/CLI/Output/Xml.php b/plugins/behaviour/compat6/classes/Application/CLI/Output/Xml.php
similarity index 96%
rename from libraries/src/Application/CLI/Output/Xml.php
rename to plugins/behaviour/compat6/classes/Application/CLI/Output/Xml.php
index 36ab151db6441..12265cd906c65 100644
--- a/libraries/src/Application/CLI/Output/Xml.php
+++ b/plugins/behaviour/compat6/classes/Application/CLI/Output/Xml.php
@@ -20,7 +20,7 @@
  *
  * @since       4.0.0
  *
- * @deprecated  4.3 will be removed in 6.0
+ * @deprecated  4.3 will be removed in 7.0
  *              Use the `joomla/console` package instead
  */
 class Xml extends CliOutput
diff --git a/libraries/src/Application/CliApplication.php b/plugins/behaviour/compat6/classes/Application/CliApplication.php
similarity index 98%
rename from libraries/src/Application/CliApplication.php
rename to plugins/behaviour/compat6/classes/Application/CliApplication.php
index 9acaae1fc84ab..a85b26271a687 100644
--- a/libraries/src/Application/CliApplication.php
+++ b/plugins/behaviour/compat6/classes/Application/CliApplication.php
@@ -34,7 +34,7 @@
  *
  * @since       2.5.0
  *
- * @deprecated  4.0 will be removed in 6.0
+ * @deprecated  4.0 will be removed in 7.0
  *              Use the ConsoleApplication instead
  */
 abstract class CliApplication extends AbstractApplication implements CMSApplicationInterface
@@ -160,7 +160,7 @@ public function __construct(
      *
      * @since       4.0.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              This is a B/C proxy for deprecated read accesses
      *              Example: Factory::getApplication()->getInput();
      */
@@ -224,7 +224,7 @@ public function getLanguage()
      *
      * @since       1.7.0
      *
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Load the app through the container or via the Factory
      *              Example: Factory::getContainer()->get(CliApplication::class)
      *
@@ -418,7 +418,7 @@ public function getConfig()
      * @return  boolean
      *
      * @since       4.0.0
-     * @deprecated  4.0 will be removed in 6.0
+     * @deprecated  4.0 will be removed in 7.0
      *              Will be removed without replacements
      */
     public function isCli()
diff --git a/libraries/src/Filesystem/File.php b/plugins/behaviour/compat6/classes/Filesystem/File.php
similarity index 97%
rename from libraries/src/Filesystem/File.php
rename to plugins/behaviour/compat6/classes/Filesystem/File.php
index 871dee011aa24..2a7076b0ff82c 100644
--- a/libraries/src/Filesystem/File.php
+++ b/plugins/behaviour/compat6/classes/Filesystem/File.php
@@ -24,7 +24,7 @@
  * A File handling class
  *
  * @since  1.7.0
- * @deprecated  4.4 will be removed in 6.0
+ * @deprecated  4.4 will be removed in 7.0
  *              Use Joomla\Filesystem\File instead.
  */
 class File
@@ -71,7 +71,7 @@ public static function getExt($file)
      * @return  string  The file name without the extension
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\File::stripExt() instead.
      */
     public static function stripExt($file)
@@ -87,7 +87,7 @@ public static function stripExt($file)
      * @return  string  The sanitised string
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\File::makeSafe() instead.
      */
     public static function makeSafe($file)
@@ -117,7 +117,7 @@ public static function makeSafe($file)
      * @return  boolean  True on success
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\File::copy() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -192,7 +192,7 @@ public static function copy($src, $dest, $path = null, $useStreams = false)
      *                 FALSE from opcache_invalidate (like file not found).
      *
      * @since 4.0.1
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\File::invalidateFileCache() instead.
      */
     public static function invalidateFileCache($filepath, $force = true)
@@ -217,7 +217,7 @@ public static function invalidateFileCache($filepath, $force = true)
      * @return boolean TRUE if we can proceed to use opcache_invalidate to flush a file from the OPCache
      *
      * @since 4.0.1
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\File::invalidateFileCache() instead.
      *              This method will be removed without replacement.
      */
@@ -248,7 +248,7 @@ public static function canFlushFileCache()
      * @return  boolean  True on success
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\File::delete() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -324,7 +324,7 @@ public static function delete($file)
      * @return  boolean  True on success
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\File::move() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -398,7 +398,7 @@ public static function move($src, $dest, $path = '', $useStreams = false)
      * @return  boolean  True on success
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\File::write() instead.
      */
     public static function write($file, $buffer, $useStreams = false)
@@ -522,7 +522,7 @@ public static function append($file, $buffer, $useStreams = false)
      * @return  boolean  True on success
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\File::upload() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -614,7 +614,7 @@ public static function upload($src, $dest, $useStreams = false, $allowUnsafe = f
      * @return  boolean  True if path is a file
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use is_file() instead.
      */
     public static function exists($file)
diff --git a/libraries/src/Filesystem/FilesystemHelper.php b/plugins/behaviour/compat6/classes/Filesystem/FilesystemHelper.php
similarity index 95%
rename from libraries/src/Filesystem/FilesystemHelper.php
rename to plugins/behaviour/compat6/classes/Filesystem/FilesystemHelper.php
index e5486d0f41b7b..b47cae608eb2f 100644
--- a/libraries/src/Filesystem/FilesystemHelper.php
+++ b/plugins/behaviour/compat6/classes/Filesystem/FilesystemHelper.php
@@ -19,7 +19,7 @@
  * Holds support functions for the filesystem, particularly the stream
  *
  * @since  1.7.0
- * @deprecated  4.4 will be removed in 6.0
+ * @deprecated  4.4 will be removed in 7.0
  *              Use Joomla\Filesystem\Helper instead.
  */
 class FilesystemHelper
@@ -33,7 +33,7 @@ class FilesystemHelper
      *
      * @link    https://www.php.net/manual/en/function.filesize.php
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Helper::remotefsize() instead.
      */
     public static function remotefsize($url)
@@ -118,7 +118,7 @@ public static function remotefsize($url)
      *
      * @link    https://www.php.net/manual/en/function.ftp-chmod.php
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Helper::ftpChmod() instead.
      */
     public static function ftpChmod($url, $mode)
@@ -183,7 +183,7 @@ public static function ftpChmod($url, $mode)
      * @return  array
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Helper::getWriteModes() instead.
      */
     public static function getWriteModes()
@@ -200,7 +200,7 @@ public static function getWriteModes()
      * @return  array  Streams
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Helper::getSupported() instead.
      */
     public static function getSupported()
@@ -221,7 +221,7 @@ public static function getSupported()
      * @return  array
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Helper::getTransports() instead.
      */
     public static function getTransports()
@@ -236,7 +236,7 @@ public static function getTransports()
      * @return  array
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Helper::getFilters() instead.
      */
     public static function getFilters()
@@ -252,7 +252,7 @@ public static function getFilters()
      * @return  array
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Helper::getJStreams() instead.
      */
     public static function getJStreams()
@@ -284,7 +284,7 @@ public static function getJStreams()
      * @return  boolean  True for a Joomla Stream
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Helper::isJoomlaStream() instead.
      */
     public static function isJoomlaStream($streamname)
diff --git a/libraries/src/Filesystem/Folder.php b/plugins/behaviour/compat6/classes/Filesystem/Folder.php
similarity index 97%
rename from libraries/src/Filesystem/Folder.php
rename to plugins/behaviour/compat6/classes/Filesystem/Folder.php
index f5b2d0ebc70d3..ff3d1e6b4468b 100644
--- a/libraries/src/Filesystem/Folder.php
+++ b/plugins/behaviour/compat6/classes/Filesystem/Folder.php
@@ -23,7 +23,7 @@
  * A Folder handling class
  *
  * @since  1.7.0
- * @deprecated  4.4 will be removed in 6.0
+ * @deprecated  4.4 will be removed in 7.0
  *              Use Joomla\Filesystem\Folder instead.
  */
 abstract class Folder
@@ -41,7 +41,7 @@ abstract class Folder
      *
      * @since   1.7.0
      * @throws  \RuntimeException
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Folder::copy() instead.
      */
     public static function copy($src, $dest, $path = '', $force = false, $useStreams = false)
@@ -165,7 +165,7 @@ public static function copy($src, $dest, $path = '', $force = false, $useStreams
      * @return  boolean  True if successful.
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Folder::create() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -281,7 +281,7 @@ public static function create($path = '', $mode = 0755)
      * @return  boolean  True on success.
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Folder::delete() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -371,7 +371,7 @@ public static function delete($path)
      * @return  mixed  Error message on false or boolean true on success.
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Folder::move() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -435,7 +435,7 @@ public static function move($src, $dest, $path = '', $useStreams = false)
      * @return  boolean  True if path is a folder
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use is_dir() instead.
      */
     public static function exists($path)
@@ -457,7 +457,7 @@ public static function exists($path)
      * @return  array|boolean  Files in the given folder.
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Folder::files() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -513,7 +513,7 @@ public static function files(
      * @return  array  Folders in the given folder.
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Folder::folders() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -565,7 +565,7 @@ public static function folders(
      * @return  array  Files.
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Folder::_items() instead.
      */
     protected static function _items($path, $filter, $recurse, $full, $exclude, $excludeFilterString, $findFiles)
@@ -632,7 +632,7 @@ protected static function _items($path, $filter, $recurse, $full, $exclude, $exc
      * @return  array  Folders in the given folder.
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Folder::listFolderTree() instead.
      */
     public static function listFolderTree($path, $filter, $maxLevel = 3, $level = 0, $parent = 0)
@@ -673,7 +673,7 @@ public static function listFolderTree($path, $filter, $maxLevel = 3, $level = 0,
      * @return  string  The sanitised string.
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Folder::makeSafe() instead.
      */
     public static function makeSafe($path)
diff --git a/libraries/src/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini b/plugins/behaviour/compat6/classes/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
similarity index 100%
rename from libraries/src/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
rename to plugins/behaviour/compat6/classes/Filesystem/Meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
diff --git a/libraries/src/Filesystem/Patcher.php b/plugins/behaviour/compat6/classes/Filesystem/Patcher.php
similarity index 96%
rename from libraries/src/Filesystem/Patcher.php
rename to plugins/behaviour/compat6/classes/Filesystem/Patcher.php
index 566b173b91617..b599b453ddde4 100644
--- a/libraries/src/Filesystem/Patcher.php
+++ b/plugins/behaviour/compat6/classes/Filesystem/Patcher.php
@@ -20,7 +20,7 @@
  *
  * @link   http://sourceforge.net/projects/phppatcher/ This has been derived from the PhpPatcher version 0.1.1 written by Giuseppe Mazzotta
  * @since  3.0.0
- * @deprecated  4.4 will be removed in 6.0
+ * @deprecated  4.4 will be removed in 7.0
  *              Use Joomla\Filesystem\Patcher instead.
  */
 class Patcher
@@ -81,7 +81,7 @@ class Patcher
      * The constructor is protected to force the use of FilesystemPatcher::getInstance()
      *
      * @since   3.0.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Patcher::__construct() instead.
      */
     protected function __construct()
@@ -94,7 +94,7 @@ protected function __construct()
      * @return  Patcher  an instance of the patcher
      *
      * @since   3.0.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Patcher::getInstance() instead.
      */
     public static function getInstance()
@@ -112,7 +112,7 @@ public static function getInstance()
      * @return  Patcher  This object for chaining
      *
      * @since   3.0.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Patcher::reset() instead.
      */
     public function reset()
@@ -132,7 +132,7 @@ public function reset()
      *
      * @since   3.0.0
      * @throws  \RuntimeException
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Patcher::apply() instead.
      */
     public function apply()
@@ -218,7 +218,7 @@ public function apply()
      * @return  Patcher  $this for chaining
      *
      * @since   3.0.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Patcher::addFile() instead.
      */
     public function addFile($filename, $root = JPATH_BASE, $strip = 0)
@@ -236,7 +236,7 @@ public function addFile($filename, $root = JPATH_BASE, $strip = 0)
      * @return  Patcher  $this for chaining
      *
      * @since   3.0.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Patcher::add() instead.
      */
     public function add($udiff, $root = JPATH_BASE, $strip = 0)
@@ -258,7 +258,7 @@ public function add($udiff, $root = JPATH_BASE, $strip = 0)
      * @return  array  The lines of the inputdestination file
      *
      * @since   3.0.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Patcher::splitLines() instead.
      */
     protected static function splitLines($data)
@@ -279,7 +279,7 @@ protected static function splitLines($data)
      *
      * @since   3.0.0
      * @throws  \RuntimeException
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Patcher::findHeader() instead.
      */
     protected static function findHeader(&$lines, &$src, &$dst)
@@ -338,7 +338,7 @@ protected static function findHeader(&$lines, &$src, &$dst)
      *
      * @since   3.0.0
      * @throws  \RuntimeException
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Patcher::findHunk() instead.
      */
     protected static function findHunk(&$lines, &$srcLine, &$srcSize, &$dstLine, &$dstSize)
@@ -387,7 +387,7 @@ protected static function findHunk(&$lines, &$srcLine, &$srcSize, &$dstLine, &$d
      *
      * @since   3.0.0
      * @throws  \RuntimeException
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Patcher::applyHunk() instead.
      */
     protected function applyHunk(&$lines, $src, $dst, $srcLine, $srcSize, $dstLine, $dstSize)
@@ -490,7 +490,7 @@ protected function applyHunk(&$lines, $src, $dst, $srcLine, $srcSize, $dstLine,
      * @return  array  The lines of the source file
      *
      * @since   3.0.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Patcher::getSource() instead.
      */
     protected function &getSource($src)
@@ -515,7 +515,7 @@ protected function &getSource($src)
      * @return  array  The lines of the destination file
      *
      * @since   3.0.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Patcher::getDestination() instead.
      */
     protected function &getDestination($dst, $src)
diff --git a/libraries/src/Filesystem/Path.php b/plugins/behaviour/compat6/classes/Filesystem/Path.php
similarity index 94%
rename from libraries/src/Filesystem/Path.php
rename to plugins/behaviour/compat6/classes/Filesystem/Path.php
index 365028bb4c92b..a4fee8ceb4fa4 100644
--- a/libraries/src/Filesystem/Path.php
+++ b/plugins/behaviour/compat6/classes/Filesystem/Path.php
@@ -22,7 +22,7 @@
  * A Path handling class
  *
  * @since  1.7.0
- * @deprecated  4.4 will be removed in 6.0
+ * @deprecated  4.4 will be removed in 7.0
  *              Use Joomla\Filesystem\Path instead.
  */
 class Path extends FilesystemPath
@@ -36,7 +36,7 @@ class Path extends FilesystemPath
      *
      * @throws  \Exception
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Path::check() instead.
      */
     public static function check($path, $basePath = '')
@@ -56,7 +56,7 @@ public static function check($path, $basePath = '')
      * @return  boolean  True if the php script owns the path passed.
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Path::isOwner() instead.
      */
     public static function isOwner($path)
diff --git a/libraries/src/Filesystem/Stream.php b/plugins/behaviour/compat6/classes/Filesystem/Stream.php
similarity index 96%
rename from libraries/src/Filesystem/Stream.php
rename to plugins/behaviour/compat6/classes/Filesystem/Stream.php
index a0d57fe1c3856..3f52ae117fa59 100644
--- a/libraries/src/Filesystem/Stream.php
+++ b/plugins/behaviour/compat6/classes/Filesystem/Stream.php
@@ -31,7 +31,7 @@
  * @link   https://www.php.net/manual/en/filters.php Stream Filters
  * @link   https://www.php.net/manual/en/transports.php Socket Transports (used by some options, particularly HTTP proxy)
  * @since  1.7.0
- * @deprecated  4.4 will be removed in 6.0
+ * @deprecated  4.4 will be removed in 7.0
  *              Use Joomla\Filesystem\Stream instead.
  */
 class Stream
@@ -152,7 +152,7 @@ class Stream
      * @param   array   $context      The context options (optional).
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::__construct() instead.
      */
     public function __construct($writeprefix = '', $readprefix = '', $context = [])
@@ -167,7 +167,7 @@ public function __construct($writeprefix = '', $readprefix = '', $context = [])
      * Destructor
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::__destruct() instead.
      */
     public function __destruct()
@@ -195,7 +195,7 @@ public function __destruct()
      * @return  boolean
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::open() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -308,7 +308,7 @@ public function open(
      * @return  boolean
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::close() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -368,7 +368,7 @@ public function close()
      * @return  boolean
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::eof() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -414,7 +414,7 @@ public function eof()
      * @return  mixed
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::filesize() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -477,7 +477,7 @@ public function filesize()
      * @return  mixed
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::gets() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -532,7 +532,7 @@ public function gets($length = 0)
      *
      * @link    https://www.php.net/manual/en/function.fread.php
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::read() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -623,7 +623,7 @@ public function read($length = 0)
      *
      * @link    https://www.php.net/manual/en/function.fseek.php
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::seek() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -674,7 +674,7 @@ public function seek($offset, $whence = SEEK_SET)
      * @return  mixed
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::tell() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -734,7 +734,7 @@ public function tell()
      *
      * @link    https://www.php.net/manual/en/function.fwrite.php
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::write() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -803,7 +803,7 @@ public function write(&$string, $length = 0, $chunk = 0)
      * @return  boolean
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::chmod() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -865,7 +865,7 @@ public function chmod($filename = '', $mode = 0)
      *
      * @link    https://www.php.net/manual/en/function.stream-get-meta-data.php
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::get_meta_data() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -887,7 +887,7 @@ public function get_meta_data()
      * @return  void
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::_buildContext() instead.
      */
     public function _buildContext()
@@ -911,7 +911,7 @@ public function _buildContext()
      *
      * @link    https://www.php.net/stream_context_create
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::setContextOptions() instead.
      */
     public function setContextOptions($context)
@@ -932,7 +932,7 @@ public function setContextOptions($context)
      * @link    https://www.php.net/stream_context_create Stream Context Creation
      * @link    https://www.php.net/manual/en/context.php Context Options for various streams
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::addContextEntry() instead.
      */
     public function addContextEntry($wrapper, $name, $value)
@@ -951,7 +951,7 @@ public function addContextEntry($wrapper, $name, $value)
      *
      * @link    https://www.php.net/stream_context_create
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::deleteContextEntry() instead.
      */
     public function deleteContextEntry($wrapper, $name)
@@ -983,7 +983,7 @@ public function deleteContextEntry($wrapper, $name)
      * @return  mixed
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::applyContextToStream() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -1021,7 +1021,7 @@ public function applyContextToStream()
      *
      * @link    https://www.php.net/manual/en/function.stream-filter-append.php
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::appendFilter() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -1061,7 +1061,7 @@ public function appendFilter($filterName, $readWrite = STREAM_FILTER_READ, $para
      *
      * @link    https://www.php.net/manual/en/function.stream-filter-prepend.php
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::prependFilter() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -1101,7 +1101,7 @@ public function prependFilter($filterName, $readWrite = STREAM_FILTER_READ, $par
      * @return  boolean   Result of operation
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::removeFilter() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -1140,7 +1140,7 @@ public function removeFilter(&$resource, $byindex = false)
      * @return  mixed
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::copy() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -1193,7 +1193,7 @@ public function copy($src, $dest, $context = null, $usePrefix = true, $relative
      * @return  mixed
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::move() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -1241,7 +1241,7 @@ public function move($src, $dest, $context = null, $usePrefix = true, $relative
      * @return  mixed
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::delete() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -1287,7 +1287,7 @@ public function delete($filename, $context = null, $usePrefix = true, $relative
      * @return  mixed
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::upload() instead.
      *              The framework class throws Exceptions in case of error which you have to catch.
      */
@@ -1312,7 +1312,7 @@ public function upload($src, $dest, $context = null, $usePrefix = true, $relativ
      * @return  boolean
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::writeFile() instead.
      */
     public function writeFile($filename, &$buffer)
@@ -1339,7 +1339,7 @@ public function writeFile($filename, &$buffer)
      * @return  string
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::_getFilename() instead.
      */
     public function _getFilename($filename, $mode, $usePrefix, $relative)
@@ -1374,7 +1374,7 @@ public function _getFilename($filename, $mode, $usePrefix, $relative)
      * @return  resource  File handler
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream::getFileHandle() instead.
      */
     public function getFileHandle()
diff --git a/libraries/src/Filesystem/Streams/StreamString.php b/plugins/behaviour/compat6/classes/Filesystem/Streams/StreamString.php
similarity index 93%
rename from libraries/src/Filesystem/Streams/StreamString.php
rename to plugins/behaviour/compat6/classes/Filesystem/Streams/StreamString.php
index 78c1883161b29..94504ebd10b62 100644
--- a/libraries/src/Filesystem/Streams/StreamString.php
+++ b/plugins/behaviour/compat6/classes/Filesystem/Streams/StreamString.php
@@ -20,7 +20,7 @@
  * you would normally use a regular stream wrapper
  *
  * @since  1.7.0
- * @deprecated  4.4 will be removed in 6.0
+ * @deprecated  4.4 will be removed in 7.0
  *              Use Joomla\Filesystem\Stream\StringWrapper instead.
  */
 class StreamString
@@ -102,7 +102,7 @@ class StreamString
      * @return  boolean
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream\StringWrapper::stream_open() instead.
      */
     public function stream_open($path, $mode, $options, &$openedPath)
@@ -127,7 +127,7 @@ public function stream_open($path, $mode, $options, &$openedPath)
      *
      * @link    https://www.php.net/manual/en/streamwrapper.stream-stat.php
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream\StringWrapper::stream_stat instead.
      */
     public function stream_stat()
@@ -145,7 +145,7 @@ public function stream_stat()
      *
      * @link    https://www.php.net/manual/en/streamwrapper.url-stat.php
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream\StringWrapper::url_stat() instead.
      */
     public function url_stat($path, $flags = 0)
@@ -182,7 +182,7 @@ public function url_stat($path, $flags = 0)
      *
      * @link    https://www.php.net/manual/en/streamwrapper.stream-read.php
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream\StringWrapper::stream_read() instead.
  */
     public function stream_read($count)
@@ -202,7 +202,7 @@ public function stream_read($count)
      *
      * @since   1.7.0
      * @note    Updating the string is not supported.
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream\StringWrapper::stream_write() instead.
      */
     public function stream_write($data)
@@ -217,7 +217,7 @@ public function stream_write($data)
      * @return  integer  The position
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream\StringWrapper::stream_tell() instead.
      */
     public function stream_tell()
@@ -231,7 +231,7 @@ public function stream_tell()
      * @return  boolean  True if at end of field.
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream\StringWrapper::stream_eof() instead.
      */
     public function stream_eof()
@@ -252,7 +252,7 @@ public function stream_eof()
      * @return  boolean  True on success.
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream\StringWrapper::stream_seek() instead.
      */
     public function stream_seek($offset, $whence)
@@ -291,7 +291,7 @@ public function stream_seek($offset, $whence)
      *
      * @since   1.7.0
      * @note    Data storage is not supported
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Stream\StringWrapper::stream_flush() instead.
      */
     public function stream_flush()
diff --git a/libraries/src/Filesystem/Support/StringController.php b/plugins/behaviour/compat6/classes/Filesystem/Support/StringController.php
similarity index 90%
rename from libraries/src/Filesystem/Support/StringController.php
rename to plugins/behaviour/compat6/classes/Filesystem/Support/StringController.php
index ab1c50f2ec07b..f730b69f6a4d4 100644
--- a/libraries/src/Filesystem/Support/StringController.php
+++ b/plugins/behaviour/compat6/classes/Filesystem/Support/StringController.php
@@ -17,7 +17,7 @@
  * String Controller
  *
  * @since  1.7.0
- * @deprecated  4.4 will be removed in 6.0
+ * @deprecated  4.4 will be removed in 7.0
  *              Use Joomla\Filesystem\Support\StringController instead.
  */
 class StringController
@@ -28,7 +28,7 @@ class StringController
      * @return  array
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Support\StringController::getArray() instead.
      */
     public function _getArray()
@@ -47,7 +47,7 @@ public function _getArray()
      * @return  void
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Support\StringController::createRef() instead.
      */
     public function createRef($reference, &$string)
@@ -64,7 +64,7 @@ public function createRef($reference, &$string)
      * @return  mixed  False if not set, reference if it exists
      *
      * @since   1.7.0
-     * @deprecated  4.4 will be removed in 6.0
+     * @deprecated  4.4 will be removed in 7.0
      *              Use Joomla\Filesystem\Support\StringController::getRef() instead.
      */
     public function getRef($reference)
diff --git a/libraries/src/Input/Cookie.php b/plugins/behaviour/compat6/classes/Input/Cookie.php
similarity index 94%
rename from libraries/src/Input/Cookie.php
rename to plugins/behaviour/compat6/classes/Input/Cookie.php
index 07804c649be22..db17c991364cb 100644
--- a/libraries/src/Input/Cookie.php
+++ b/plugins/behaviour/compat6/classes/Input/Cookie.php
@@ -20,7 +20,7 @@
  *
  * @since       1.7.0
  *
- * @deprecated   4.3 will be removed in 6.0.
+ * @deprecated   4.3 will be removed in 7.0.
  *               Use Joomla\Input\Cookie instead
  */
 class Cookie extends Input
@@ -28,12 +28,12 @@ class Cookie extends Input
     /**
      * Constructor.
      *
-     * @param   ?array  $source   Ignored.
-     * @param   array   $options  Array of configuration parameters (Optional)
+     * @param   array  $source   Ignored.
+     * @param   array  $options  Array of configuration parameters (Optional)
      *
      * @since   1.7.0
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Cookie instead
      */
     public function __construct(?array $source = null, array $options = [])
@@ -45,7 +45,7 @@ public function __construct(?array $source = null, array $options = [])
         }
 
         // Set the data source.
-        $this->data = $_COOKIE;
+        $this->data = &$_COOKIE;
 
         // Set the options for the class.
         $this->options = $options;
@@ -70,7 +70,7 @@ public function __construct(?array $source = null, array $options = [])
      * @see     setcookie()
      * @since   1.7.0
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Cookie instead
      */
     public function set($name, $value, $options = [])
diff --git a/libraries/src/Input/Files.php b/plugins/behaviour/compat6/classes/Input/Files.php
similarity index 87%
rename from libraries/src/Input/Files.php
rename to plugins/behaviour/compat6/classes/Input/Files.php
index 09f57e6b7a943..2fdae242b04b6 100644
--- a/libraries/src/Input/Files.php
+++ b/plugins/behaviour/compat6/classes/Input/Files.php
@@ -20,7 +20,7 @@
  *
  * @since       1.7.0
  *
- * @deprecated   4.3 will be removed in 6.0.
+ * @deprecated   4.3 will be removed in 7.0.
  *               Use Joomla\Input\Files instead
  */
 class Files extends Input
@@ -31,7 +31,7 @@ class Files extends Input
      * @var    array
      * @since  1.7.0
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Files instead
      */
     protected $decodedData = [];
@@ -39,13 +39,13 @@ class Files extends Input
     /**
      * The class constructor.
      *
-     * @param   ?array  $source   The source argument is ignored. $_FILES is always used.
-     * @param   array   $options  An optional array of configuration options:
-     *                            filter : a custom InputFilter object.
+     * @param   array  $source   The source argument is ignored. $_FILES is always used.
+     * @param   array  $options  An optional array of configuration options:
+     *                           filter : a custom InputFilter object.
      *
      * @since   3.0.0
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Files instead
      */
     public function __construct(?array $source = null, array $options = [])
@@ -75,7 +75,7 @@ public function __construct(?array $source = null, array $options = [])
      * @see     InputFilter::clean()
      * @since   1.7.0
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Files instead
      */
     public function get($name, $default = null, $filter = 'cmd')
@@ -115,7 +115,7 @@ public function get($name, $default = null, $filter = 'cmd')
      *
      * @since   1.7.0
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Files instead
      */
     protected function decodeData(array $data)
@@ -143,7 +143,7 @@ protected function decodeData(array $data)
      *
      * @since   1.7.0
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Files instead
      */
     public function set($name, $value)
diff --git a/libraries/src/Input/Input.php b/plugins/behaviour/compat6/classes/Input/Input.php
similarity index 93%
rename from libraries/src/Input/Input.php
rename to plugins/behaviour/compat6/classes/Input/Input.php
index edead02752de0..f4cf94412ef67 100644
--- a/libraries/src/Input/Input.php
+++ b/plugins/behaviour/compat6/classes/Input/Input.php
@@ -22,7 +22,7 @@
  *
  * @since       1.7.0
  *
- * @deprecated   4.3 will be removed in 6.0.
+ * @deprecated   4.3 will be removed in 7.0.
  *               Use Joomla\Input\Input instead
  *
  * @property-read   Input   $get
@@ -42,7 +42,7 @@ class Input extends \Joomla\Input\Input
      * @var    array
      * @since  3.8.9
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Input instead
      */
     private static $allowedGlobals = ['REQUEST', 'GET', 'POST', 'FILES', 'SERVER', 'ENV'];
@@ -53,7 +53,7 @@ class Input extends \Joomla\Input\Input
      * @var    Input[]
      * @since  1.7.0
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Input instead
      */
     protected $inputs = [];
@@ -66,7 +66,7 @@ class Input extends \Joomla\Input\Input
      *
      * @since   1.7.0
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Input instead
      */
     public function __construct($source = null, array $options = [])
@@ -87,7 +87,7 @@ public function __construct($source = null, array $options = [])
      *
      * @since   1.7.0
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Input instead
      */
     public function __get($name)
@@ -132,7 +132,7 @@ public function __get($name)
      *
      * @since   1.7.0
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Input instead
      */
     public function getArray(array $vars = [], $datasource = null, $defaultFilter = 'unknown')
@@ -157,7 +157,7 @@ public function getArray(array $vars = [], $datasource = null, $defaultFilter =
      *
      * @since   3.4.2
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Input instead
      */
     protected function getArrayRecursive(array $vars = [], $datasource = null, $defaultFilter = 'unknown', $recursion = false)
@@ -204,13 +204,13 @@ protected function getArrayRecursive(array $vars = [], $datasource = null, $defa
      *
      * @since   3.0.0
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Input instead
      */
     public function unserialize($input)
     {
         // Unserialize the options, data, and inputs.
-        [$this->options, $this->data, $this->inputs] = unserialize($input);
+        list($this->options, $this->data, $this->inputs) = unserialize($input);
 
         // Load the filter.
         if (isset($this->options['filter'])) {
diff --git a/libraries/src/Input/Json.php b/plugins/behaviour/compat6/classes/Input/Json.php
similarity index 82%
rename from libraries/src/Input/Json.php
rename to plugins/behaviour/compat6/classes/Input/Json.php
index 55a526e3b3ee7..cd5a8e762bc33 100644
--- a/libraries/src/Input/Json.php
+++ b/plugins/behaviour/compat6/classes/Input/Json.php
@@ -23,7 +23,7 @@
  *
  * @since       3.0.1
  *
- * @deprecated   4.3 will be removed in 6.0.
+ * @deprecated   4.3 will be removed in 7.0.
  *               Use Joomla\Input\Json instead
  */
 class Json extends Input
@@ -32,20 +32,21 @@ class Json extends Input
      * @var    string  The raw JSON string from the request.
      * @since  3.0.1
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Json instead
      */
+    // phpcs:ignore
     private $_raw;
 
     /**
      * Constructor.
      *
-     * @param   ?array  $source   Source data (Optional, default is the raw HTTP input decoded from JSON)
-     * @param   array   $options  Array of configuration parameters (Optional)
+     * @param   array  $source   Source data (Optional, default is the raw HTTP input decoded from JSON)
+     * @param   array  $options  Array of configuration parameters (Optional)
      *
      * @since   3.0.1
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Json instead
      */
     public function __construct(?array $source = null, array $options = [])
@@ -77,7 +78,7 @@ public function __construct(?array $source = null, array $options = [])
      *
      * @since   3.0.1
      *
-     * @deprecated   4.3 will be removed in 6.0.
+     * @deprecated   4.3 will be removed in 7.0.
      *               Use Joomla\Input\Json instead
      */
     public function getRaw()
diff --git a/plugins/behaviour/compat6/compat6.xml b/plugins/behaviour/compat6/compat6.xml
index 793dbd5a761b3..0ab8cadab9620 100644
--- a/plugins/behaviour/compat6/compat6.xml
+++ b/plugins/behaviour/compat6/compat6.xml
@@ -7,10 +7,11 @@
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<version>5.4.0</version>
+	<version>6.0.0</version>
 	<description>PLG_COMPAT6_XML_DESCRIPTION</description>
 	<namespace path="src">Joomla\Plugin\Behaviour\Compat6</namespace>
 	<files>
+		<folder>classes</folder>
 		<folder plugin="compat6">services</folder>
 		<folder>src</folder>
 	</files>
@@ -18,4 +19,35 @@
 		<language tag="en-GB">language/en-GB/plg_behaviour_compat6.ini</language>
 		<language tag="en-GB">language/en-GB/plg_behaviour_compat6.sys.ini</language>
 	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="classes_aliases"
+					type="radio"
+					label="PLG_COMPAT6_FIELD_CLASSES_ALIASES_LABEL"
+					description="PLG_COMPAT6_FIELD_CLASSES_ALIASES_DESCRIPTION"
+					layout="joomla.form.field.radio.switcher"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+				<field
+					name="legacy_classes"
+					type="radio"
+					label="PLG_COMPAT6_FIELD_LEGACY_CLASSES_LABEL"
+					description="PLG_COMPAT6_FIELD_LEGACY_CLASSES_DESCRIPTION"
+					layout="joomla.form.field.radio.switcher"
+					default="1"
+					filter="integer"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+
+			</fieldset>
+		</fields>
+	</config>
 </extension>
diff --git a/plugins/behaviour/compat6/services/provider.php b/plugins/behaviour/compat6/services/provider.php
index ca691df3a40f5..13e8429119e42 100644
--- a/plugins/behaviour/compat6/services/provider.php
+++ b/plugins/behaviour/compat6/services/provider.php
@@ -28,6 +28,8 @@
      */
     public function register(Container $container)
     {
+        // The compatibility plugin is a special case which does not use the lazy loading because it
+        // uses the constructor to load b/c code, the constructor might not be initialized when lazy loading is used.
         $container->set(
             PluginInterface::class,
             function (Container $container) {
diff --git a/plugins/behaviour/compat6/src/Extension/Compat6.php b/plugins/behaviour/compat6/src/Extension/Compat6.php
index b4ad8bf437862..1834b53ca3080 100644
--- a/plugins/behaviour/compat6/src/Extension/Compat6.php
+++ b/plugins/behaviour/compat6/src/Extension/Compat6.php
@@ -10,7 +10,9 @@
 
 namespace Joomla\Plugin\Behaviour\Compat6\Extension;
 
+use Joomla\CMS\Event\Application\AfterInitialiseDocumentEvent;
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Event\Priority;
 use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -34,8 +36,77 @@ final class Compat6 extends CMSPlugin implements SubscriberInterface
     public static function getSubscribedEvents(): array
     {
         /**
-         * This plugin does not listen to any events.
+         * Note that onAfterInitialise must be the first handlers to run for this
+         * plugin to operate as expected. These handlers load compatibility code which
+         * might be needed by other plugins
          */
-        return [];
+        return [
+            'onAfterInitialiseDocument' => ['onAfterInitialiseDocument', Priority::HIGH],
+        ];
+    }
+
+    /**
+     * Constructor
+     *
+     * @param   array  $config  An optional associative array of configuration settings.
+     *                          Recognized key values include 'name', 'group', 'params', 'language'
+     *                          (this list is not meant to be comprehensive).
+     *
+     * @since   5.4.0
+     */
+    public function __construct(array $config = [])
+    {
+        parent::__construct($config);
+
+        /**
+         * Normally we should never use the constructor to execute any logic which would
+         * affect other parts of the cms, but since we need to load class aliases as
+         * early as possible we load the class aliases in the constructor so behaviour and system plugins
+         * which depend on the JPlugin alias for example still are working
+         */
+
+        /**
+         * Load class names which are deprecated since joomla 4.0 and which will
+         * likely be removed in Joomla 7.0
+         */
+        if ($this->params->get('classes_aliases', '0')) {
+            require_once \dirname(__DIR__) . '/classmap/classmap.php';
+        }
+
+        /**
+         * Include classes which will likely be removed in 7.0
+         */
+        if ($this->params->get('legacy_classes', '1')) {
+            \JLoader::registerNamespace('\\Joomla\\CMS', JPATH_PLUGINS . '/behaviour/compat6/classes');
+        }
+
+        /**
+         * Load the constant early as it is used in class files before the class itself is loaded.
+         * @deprecated 4.4.0 will be removed in 7.0
+         */
+        \defined('JPATH_PLATFORM') or \define('JPATH_PLATFORM', __DIR__);
+    }
+
+    /**
+     * We run as early as possible, this should be the first event
+     *
+     * @param  AfterInitialiseDocumentEvent $event
+     * @return void
+     *
+     * @since  5.4.0
+     */
+    public function onAfterInitialiseDocument(AfterInitialiseDocumentEvent $event)
+    {
+        /**
+         * Load the removed assets stubs, they are needed if an extension
+         * directly uses a core asset from Joomla 5 which is not present in Joomla 6
+         * and only provides an empty asset to not throw an exception
+         */
+        if ($this->params->get('removed_asset', '1')) {
+            $event->getDocument()
+                ->getWebAssetManager()
+                ->getRegistry()
+                ->addRegistryFile('media/plg_behaviour_compat6/removed.asset.json');
+        }
     }
 }
diff --git a/plugins/behaviour/compat/src/classmap/classmap.php b/plugins/behaviour/compat6/src/classmap/classmap.php
similarity index 99%
rename from plugins/behaviour/compat/src/classmap/classmap.php
rename to plugins/behaviour/compat6/src/classmap/classmap.php
index 03c7ebb795f1f..e0bd37e1e80e4 100644
--- a/plugins/behaviour/compat/src/classmap/classmap.php
+++ b/plugins/behaviour/compat6/src/classmap/classmap.php
@@ -496,9 +496,6 @@
 
 JLoader::registerAlias('JFormFilterInt_Array', '\\Joomla\\CMS\\Form\\Filter\\IntarrayFilter', '6.0');
 
-JLoader::registerAlias('JAdapter', '\\Joomla\\CMS\\Adapter\\Adapter', '6.0');
-JLoader::registerAlias('JAdapterInstance', '\\Joomla\\CMS\\Adapter\\AdapterInstance', '6.0');
-
 JLoader::registerAlias('JHtmlAccess', '\\Joomla\\CMS\\HTML\\Helpers\\Access', '6.0');
 JLoader::registerAlias('JHtmlActionsDropdown', '\\Joomla\\CMS\\HTML\\Helpers\\ActionsDropdown', '6.0');
 JLoader::registerAlias('JHtmlAdminLanguage', '\\Joomla\\CMS\\HTML\\Helpers\\AdminLanguage', '6.0');
diff --git a/plugins/behaviour/compat/src/classmap/extensions.classmap.php b/plugins/behaviour/compat6/src/classmap/extensions.classmap.php
similarity index 100%
rename from plugins/behaviour/compat/src/classmap/extensions.classmap.php
rename to plugins/behaviour/compat6/src/classmap/extensions.classmap.php
diff --git a/plugins/behaviour/taggable/services/provider.php b/plugins/behaviour/taggable/services/provider.php
index 507c7c0b0da6e..817ea4fe7959d 100644
--- a/plugins/behaviour/taggable/services/provider.php
+++ b/plugins/behaviour/taggable/services/provider.php
@@ -30,13 +30,13 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Taggable::class, function (Container $container) {
                 $plugin     = new Taggable(
                     (array) PluginHelper::getPlugin('behaviour', 'taggable')
                 );
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/behaviour/taggable/src/Extension/Taggable.php b/plugins/behaviour/taggable/src/Extension/Taggable.php
index 4359c3c17df1e..10ae043228481 100644
--- a/plugins/behaviour/taggable/src/Extension/Taggable.php
+++ b/plugins/behaviour/taggable/src/Extension/Taggable.php
@@ -171,7 +171,7 @@ public function onTableAfterStore(AfterStoreEvent $event)
         $newTags = $table->newTags ?? [];
 
         if (empty($newTags)) {
-            $result = $tagsHelper->postStoreProcess($table);
+            $result = $tagsHelper->postStore($table);
         } else {
             if (\is_string($newTags) && (str_contains($newTags, ','))) {
                 $newTags = explode(',', $newTags);
@@ -179,7 +179,7 @@ public function onTableAfterStore(AfterStoreEvent $event)
                 $newTags = (array) $newTags;
             }
 
-            $result = $tagsHelper->postStoreProcess($table, $newTags);
+            $result = $tagsHelper->postStore($table, $newTags);
         }
     }
 
@@ -231,6 +231,7 @@ public function onTableSetNewTags(SetNewTagsEvent $event)
         $table       = $event['subject'];
         $newTags     = $event['newTags'];
         $replaceTags = $event['replaceTags'];
+        $removeTags  = $event['removeTags'];
 
         // If the tags table doesn't implement the interface bail
         if (!($table instanceof TaggableTableInterface)) {
@@ -247,7 +248,7 @@ public function onTableSetNewTags(SetNewTagsEvent $event)
         $tagsHelper            = $table->getTagsHelper();
         $tagsHelper->typeAlias = $table->getTypeAlias();
 
-        if (!$tagsHelper->postStoreProcess($table, $newTags, $replaceTags)) {
+        if (!$tagsHelper->postStore($table, $newTags, $replaceTags, $removeTags)) {
             throw new \RuntimeException($table->getError());
         }
     }
diff --git a/plugins/behaviour/versionable/services/provider.php b/plugins/behaviour/versionable/services/provider.php
index a94f53cfadf9a..780944721e7fd 100644
--- a/plugins/behaviour/versionable/services/provider.php
+++ b/plugins/behaviour/versionable/services/provider.php
@@ -33,7 +33,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Versionable::class, function (Container $container) {
                 $plugin     = new Versionable(
                     (array) PluginHelper::getPlugin('behaviour', 'versionable'),
                     new InputFilter(),
@@ -42,7 +42,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/behaviour/versionable/src/Extension/Versionable.php b/plugins/behaviour/versionable/src/Extension/Versionable.php
index 0f4b57d59b1e0..c25eb0327f516 100644
--- a/plugins/behaviour/versionable/src/Extension/Versionable.php
+++ b/plugins/behaviour/versionable/src/Extension/Versionable.php
@@ -89,27 +89,32 @@ public function __construct(array $config, InputFilter $filter, CMSHelper $helpe
      * @return  void
      *
      * @since   4.0.0
+     *
+     * @deprecated  6.0.0  will be removed in 8.0 without direct replacement,
+     *              use the new versioning concept (LINK TO DOCUMENTATION)
      */
     public function onTableAfterStore(AfterStoreEvent $event)
     {
         // Extract arguments
         /** @var VersionableTableInterface $table */
         $table  = $event['subject'];
-        $result = $event['result'];
 
-        if (!$result) {
+        // We need to check this first because getTypeAlias is only available when VersionableTableInterface is implemented
+        if (!$table instanceof VersionableTableInterface) {
             return;
         }
 
-        if (!(\is_object($table) && $table instanceof VersionableTableInterface)) {
+        $result = $event['result'];
+
+        if (!$result) {
             return;
         }
 
-        // Get the Tags helper and assign the parsed alias
-        $typeAlias  = $table->getTypeAlias();
-        $aliasParts = explode('.', $typeAlias);
+        $typeAlias = $table->getTypeAlias();
+        $component = strtok($typeAlias, '.');
 
-        if ($aliasParts[0] === '' || !ComponentHelper::getParams($aliasParts[0])->get('save_history', 0)) {
+        // Do not store version if version history is not enabled for the component
+        if ($component === '' || !ComponentHelper::getParams($component)->get('save_history', 0)) {
             return;
         }
 
diff --git a/plugins/captcha/powcaptcha/powcaptcha.xml b/plugins/captcha/powcaptcha/powcaptcha.xml
new file mode 100644
index 0000000000000..5d94db414dde9
--- /dev/null
+++ b/plugins/captcha/powcaptcha/powcaptcha.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="captcha" method="upgrade">
+	<name>plg_captcha_powcaptcha</name>
+	<version>6.1.0</version>
+	<creationDate>2025-12</creationDate>
+	<author>Joomla! Project</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<copyright>(C) 2025 Open Source Matters, Inc.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<description>PLG_CAPTCHA_POWCAPTCHA_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Captcha\POWCaptcha</namespace>
+	<files>
+		<folder plugin="powcaptcha">services</folder>
+		<folder>src</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_captcha_powcaptcha.ini</language>
+		<language tag="en-GB">language/en-GB/plg_captcha_powcaptcha.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="difficulty"
+					type="list"
+					label="PLG_CAPTCHA_POWCAPTCHA_DIFFICULTY_LABEL"
+					description="PLG_CAPTCHA_POWCAPTCHA_DIFFICULTY_DESC"
+					default="MODERATE"
+					validate="options"
+					>
+					<option value="easy">PLG_CAPTCHA_POWCAPTCHA_DIFFICULTY_EASY</option>
+					<option value="moderate">PLG_CAPTCHA_POWCAPTCHA_DIFFICULTY_MODERATE</option>
+					<option value="hard">PLG_CAPTCHA_POWCAPTCHA_DIFFICULTY_HARD</option>
+					<option value="custom">PLG_CAPTCHA_POWCAPTCHA_DIFFICULTY_CUSTOM</option>
+				</field>
+
+				<field
+					name="maxnumber"
+					type="number"
+					label="PLG_CAPTCHA_POWCAPTCHA_MAXNUMBER_LABEL"
+					description="PLG_CAPTCHA_POWCAPTCHA_MAXNUMBER_DESC"
+					min="10000"
+					max="1000000"
+					default="250000"
+					showon="difficulty:custom"
+				/>
+
+				<field
+					name="autosolve"
+					type="list"
+					label="PLG_CAPTCHA_POWCAPTCHA_AUTOSOLVE_LABEL"
+					description="PLG_CAPTCHA_POWCAPTCHA_AUTOSOLVE_DESC"
+					default="onfocus"
+					validate="options"
+				>
+					<option value="off">PLG_CAPTCHA_POWCAPTCHA_AUTOSOLVE_OFF</option>
+					<option value="onfocus">PLG_CAPTCHA_POWCAPTCHA_AUTOSOLVE_ONFOCUS</option>
+					<option value="onload">PLG_CAPTCHA_POWCAPTCHA_AUTOSOLVE_ONLOAD</option>
+					<option value="onsubmit">PLG_CAPTCHA_POWCAPTCHA_AUTOSOLVE_ONSUBMIT</option>
+				</field>
+
+				<field
+					name="expiration"
+					type="list"
+					label="PLG_CAPTCHA_POWCAPTCHA_EXPIRATION_LABEL"
+					description="PLG_CAPTCHA_POWCAPTCHA_EXPIRATION_DESC"
+					default="300"
+					validate="options"
+				>
+					<option value="60">PLG_CAPTCHA_POWCAPTCHA_EXPIRATION_1MIN</option>
+					<option value="300">PLG_CAPTCHA_POWCAPTCHA_EXPIRATION_5MIN</option>
+					<option value="600">PLG_CAPTCHA_POWCAPTCHA_EXPIRATION_10MIN</option>
+					<option value="3600">PLG_CAPTCHA_POWCAPTCHA_EXPIRATION_1HOUR</option>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/captcha/powcaptcha/services/provider.php b/plugins/captcha/powcaptcha/services/provider.php
new file mode 100644
index 0000000000000..c9941c9126305
--- /dev/null
+++ b/plugins/captcha/powcaptcha/services/provider.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Captcha.POWCaptcha
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+\defined('_JEXEC') or die;
+
+use Joomla\CMS\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Plugin\Captcha\POWCaptcha\Extension\POWCaptcha;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since 6.1.0
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            $container->lazy(POWCaptcha::class, function (Container $container) {
+                $plugin = new POWCaptcha(
+                    (array) PluginHelper::getPlugin('captcha', 'powcaptcha')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            })
+        );
+    }
+};
diff --git a/plugins/captcha/powcaptcha/src/Extension/POWCaptcha.php b/plugins/captcha/powcaptcha/src/Extension/POWCaptcha.php
new file mode 100644
index 0000000000000..689eac9d6207c
--- /dev/null
+++ b/plugins/captcha/powcaptcha/src/Extension/POWCaptcha.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Captcha.POWCaptcha
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Plugin\Captcha\POWCaptcha\Extension;
+
+use Joomla\CMS\Event\Captcha\CaptchaSetupEvent;
+use Joomla\CMS\Event\Plugin\AjaxEvent;
+use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Session\Session;
+use Joomla\Event\SubscriberInterface;
+use Joomla\Plugin\Captcha\POWCaptcha\Provider\POWCaptchaProvider;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Proof of work captcha Plugin
+ * Based on the ALTCHA captcha library
+ *
+ * @since 6.1.0
+ */
+final class POWCaptcha extends CMSPlugin implements SubscriberInterface
+{
+    /**
+     * Load the language file on instantiation.
+     *
+     * @var    boolean
+     * @since 6.1.0
+     */
+    protected $autoloadLanguage = true;
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            'onAjaxPowcaptcha' => 'handleAjaxRequest',
+            'onCaptchaSetup'   => 'setupCaptcha',
+        ];
+    }
+
+    /**
+     * Register Captcha instance
+     *
+     * @param CaptchaSetupEvent $event
+     *
+     * @return void
+     */
+    public function setupCaptcha(CaptchaSetupEvent $event)
+    {
+        $event->getCaptchaRegistry()->add($this->getProvider());
+    }
+
+    /**
+     * Handles the ajax request triggered by altcha to fetch the challenge code
+     *
+     * @param AjaxEvent $event
+     */
+    public function handleAjaxRequest(AjaxEvent $event)
+    {
+        // CRSF Token check
+        if (!Session::checkToken('get')) {
+            $event->updateEventResult(json_encode([]));
+
+            return;
+        }
+
+        $event->updateEventResult(
+            json_encode(
+                $this->getProvider()->getChallenge()
+            )
+        );
+    }
+
+    /**
+     * Returns the actual captcha provider instance
+     *
+     * @return POWCaptchaProvider
+     */
+    protected function getProvider(): POWCaptchaProvider
+    {
+        return new POWCaptchaProvider(
+            $this->params,
+            $this->getApplication()
+        );
+    }
+}
diff --git a/plugins/captcha/powcaptcha/src/Provider/POWCaptchaProvider.php b/plugins/captcha/powcaptcha/src/Provider/POWCaptchaProvider.php
new file mode 100644
index 0000000000000..caf7d774e7a70
--- /dev/null
+++ b/plugins/captcha/powcaptcha/src/Provider/POWCaptchaProvider.php
@@ -0,0 +1,229 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Captcha.POWCaptcha
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Plugin\Captcha\POWCaptcha\Provider;
+
+use AltchaOrg\Altcha\Altcha;
+use AltchaOrg\Altcha\Challenge;
+use AltchaOrg\Altcha\ChallengeOptions;
+use AltchaOrg\Altcha\Hasher\Algorithm;
+use Joomla\CMS\Application\CMSWebApplicationInterface;
+use Joomla\CMS\Captcha\CaptchaProviderInterface;
+use Joomla\CMS\Date\Date;
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\Session\Session;
+use Joomla\Registry\Registry;
+use Joomla\Utilities\ArrayHelper;
+
+/**
+ * Class POWCaptchaProvider
+ *
+ * @package  Joomla\Plugin\Captcha\POWCaptcha\Provider
+ *
+ * @since 6.1.0
+ */
+final class POWCaptchaProvider implements CaptchaProviderInterface
+{
+    protected const int MAXNUMBER_EASY     = 50000;
+    protected const int MAXNUMBER_MODERATE = 100000;
+    protected const int MAXNUMBER_HARD     = 200000;
+
+    public function __construct(
+        protected Registry $params,
+        protected CMSWebApplicationInterface|null $application
+    ) {
+    }
+
+    /**
+     * Return Captcha name, CMD string.
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return 'powcaptcha';
+    }
+
+    /**
+     * Gets the challenge HTML
+     *
+     * @param   string  $name        The name of the field. Not Used.
+     * @param   array   $attributes  The id of the field.
+     *
+     * @return  string  The HTML to be embedded in the form.
+     */
+    public function display(string $name = '', array $attributes = []): string
+    {
+        if (!$this->application instanceof CMSWebApplicationInterface) {
+            return '';
+        }
+
+        // Load assets
+        $this->application->getDocument()->getWebAssetManager()->usePreset('altcha');
+
+        // Prepare markup
+        $htmlAttributes = [
+            'name'       => $name,
+            'id'         => $attributes['id'] ?? '',
+            'class'      => $attributes['class'] ?? '',
+            'hidefooter' => true,
+            'hidelogo'   => true,
+            'auto'       => $this->params->get('autosolve', 'onfocus'),
+            'strings'    => htmlentities(
+                json_encode(
+                    [
+                        'ariaLinkLabel' => Text::_('PLG_CAPTCHA_POWCAPTCHA_ARIALINKLABEL'),
+                        'error'         => Text::_('PLG_CAPTCHA_POWCAPTCHA_ERROR'),
+                        'expired'       => Text::_('PLG_CAPTCHA_POWCAPTCHA_EXPIRED'),
+                        'footer'        => Text::_('PLG_CAPTCHA_POWCAPTCHA_FOOTER'),
+                        'label'         => Text::_('PLG_CAPTCHA_POWCAPTCHA_LABEL'),
+                        'verified'      => Text::_('PLG_CAPTCHA_POWCAPTCHA_VERIFIED'),
+                        'verifying'     => Text::_('PLG_CAPTCHA_POWCAPTCHA_VERIFYING'),
+                        'waitAlert'     => Text::_('PLG_CAPTCHA_POWCAPTCHA_WAITALERT'),
+                    ]
+                ),
+                ENT_QUOTES,
+                'UTF-8'
+            ),
+            'challengeurl' => Route::_(
+                \sprintf(
+                    "index.php?option=com_ajax&plugin=powcaptcha&group=captcha&format=raw&%s=1",
+                    Session::getFormToken()
+                ),
+                false,
+                false,
+                true
+            ),
+        ];
+
+        return \sprintf(
+            '<altcha-widget %s></altcha-widget>',
+            ArrayHelper::toString($htmlAttributes)
+        );
+    }
+
+    /**
+     * Verify the users answer
+     *
+     * @param   null|string  $code  Answer provided by user. Not needed for the Recaptcha implementation
+     *
+     * @return  bool  True if the answer is correct, false otherwise
+     *
+     * @throws  \RuntimeException
+     */
+    public function checkAnswer(?string $code = null): bool
+    {
+        if (!$this->application instanceof CMSWebApplicationInterface) {
+            return false;
+        }
+
+        // Before we verify the actual solution, let's first verify our challenge key
+        $decoded = base64_decode($code, true);
+
+        // Check for base64 decode errors
+        if (!$decoded) {
+            return false;
+        }
+
+        // Check for json Errors
+        try {
+            $data = json_decode($decoded, true, 2, \JSON_THROW_ON_ERROR);
+        } catch (\JsonException | \ValueError) {
+            return false;
+        }
+
+        // Check for data errors
+        if (!\is_array($data) || empty($data)) {
+            return false;
+        }
+
+        // Invalid salt format
+        if (empty($data['salt']) || !str_contains($data['salt'], 'challengeKey=')) {
+            return false;
+        }
+
+        // Extract challengeKey
+        parse_str(explode("?", $data['salt'])[1], $challengeParams);
+
+        // Check if challengeKey is valid
+        $session = $this->application->getSession();
+
+        if (!$session->get('plg_captcha_powcaptcha.' . $challengeParams['challengeKey'], false)) {
+            // Key is invalid, return
+            return false;
+        }
+
+        // Key is valid, check for solution
+        if (!(new Altcha($this->application->get('secret')))->verifySolution((string) $code)) {
+            return false;
+        }
+
+        // Solution was valid, invalidate key
+        $session->set('plg_captcha_powcaptcha.' . $challengeParams['challengeKey'], false);
+
+        // It's valid!
+        return true;
+    }
+
+    /**
+     * Method to generate the actual altcha challenge
+     *
+     * @return Challenge
+     */
+    public function getChallenge(): Challenge
+    {
+        // Determine the max number - to be updated in future releases
+        $maxNumber = match ($this->params->get('difficulty', 'moderate')) {
+            "easy"     => self::MAXNUMBER_EASY,
+            "moderate" => self::MAXNUMBER_MODERATE,
+            "hard"     => self::MAXNUMBER_HARD,
+            "custom"   => $this->params->get('maxnumber', 250000)
+        };
+
+        // Calculate expiration time
+        $expiration = Date::getInstance()->add(new \DateInterval('PT' . $this->params->get('expiration', 300) . 'S'));
+
+        // Generate a random key for the challenge to prevent replay attacks.
+        // That key is stored in the session and will be checked and invalidated for re-use during the verification process.
+        $challengeKey = md5(random_bytes(16));
+
+        // Store the challenge key in the session
+        $this->application->getSession()->set('plg_captcha_powcaptcha.' . $challengeKey, true);
+
+        $options = new ChallengeOptions(
+            Algorithm::SHA512,
+            $maxNumber,
+            $expiration,
+            [
+                "challengeKey" => $challengeKey,
+            ]
+        );
+
+        // Generate the challenge
+        return (new Altcha($this->application->get('secret')))->createChallenge($options);
+    }
+
+    /**
+     * Method to react on the setup of a captcha field. Gives the possibility
+     * to change the field and/or the XML element for the field.
+     *
+     * @param   FormField         $field    Captcha field instance
+     * @param   \SimpleXMLElement  $element  XML form definition
+     *
+     * @return void
+     *
+     * @throws  \RuntimeException
+     */
+    public function setupField(FormField $field, \SimpleXMLElement $element): void
+    {
+    }
+}
diff --git a/plugins/content/confirmconsent/services/provider.php b/plugins/content/confirmconsent/services/provider.php
index e7826f7f8051a..2cd614e40c36c 100644
--- a/plugins/content/confirmconsent/services/provider.php
+++ b/plugins/content/confirmconsent/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(ConfirmConsent::class, function (Container $container) {
                 $plugin     = new ConfirmConsent(
                     (array) PluginHelper::getPlugin('content', 'confirmconsent')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/content/confirmconsent/src/Field/ConsentBoxField.php b/plugins/content/confirmconsent/src/Field/ConsentBoxField.php
index 01e322e7667a6..3f45d7059bd34 100644
--- a/plugins/content/confirmconsent/src/Field/ConsentBoxField.php
+++ b/plugins/content/confirmconsent/src/Field/ConsentBoxField.php
@@ -242,7 +242,7 @@ private function getAssignedArticleUrl()
         $db = $this->getDatabase();
 
         // Get the info from the article
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'catid', 'language']))
             ->from($db->quoteName('#__content'))
             ->where($db->quoteName('id') . ' = ' . (int) $this->articleid);
@@ -320,7 +320,7 @@ private function getAssignedMenuItemUrl()
 
             if (Multilanguage::isEnabled()) {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName(['id', 'language']))
                     ->from($db->quoteName('#__menu'))
                     ->where($db->quoteName('id') . ' = :id')
diff --git a/plugins/content/contact/services/provider.php b/plugins/content/contact/services/provider.php
index bec48f2e46c03..65a119e2be269 100644
--- a/plugins/content/contact/services/provider.php
+++ b/plugins/content/contact/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Contact::class, function (Container $container) {
                 $plugin     = new Contact(
                     (array) PluginHelper::getPlugin('content', 'contact')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/content/contact/src/Extension/Contact.php b/plugins/content/contact/src/Extension/Contact.php
index 1c00ee894f9f0..f4626b0b79d3e 100644
--- a/plugins/content/contact/src/Extension/Contact.php
+++ b/plugins/content/contact/src/Extension/Contact.php
@@ -119,7 +119,7 @@ private function getContactData($userId)
         }
 
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $userId = (int) $userId;
 
         $query->select($db->quoteName('contact.id', 'contactid'))
diff --git a/plugins/content/emailcloak/services/provider.php b/plugins/content/emailcloak/services/provider.php
index 18408035f6073..cebf73168d647 100644
--- a/plugins/content/emailcloak/services/provider.php
+++ b/plugins/content/emailcloak/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(EmailCloak::class, function (Container $container) {
                 $plugin     = new EmailCloak(
                     (array) PluginHelper::getPlugin('content', 'emailcloak')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/content/fields/services/provider.php b/plugins/content/fields/services/provider.php
index 2e1d55bf734a0..2bf0b9ca16e9a 100644
--- a/plugins/content/fields/services/provider.php
+++ b/plugins/content/fields/services/provider.php
@@ -30,13 +30,13 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Fields::class, function (Container $container) {
                 $plugin     = new Fields(
                     (array) PluginHelper::getPlugin('content', 'fields')
                 );
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/content/finder/services/provider.php b/plugins/content/finder/services/provider.php
index cbe8d01ba857c..e39e9d5a4b9d7 100644
--- a/plugins/content/finder/services/provider.php
+++ b/plugins/content/finder/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Finder::class, function (Container $container) {
                 $plugin     = new Finder(
                     (array) PluginHelper::getPlugin('content', 'finder')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/content/joomla/services/provider.php b/plugins/content/joomla/services/provider.php
index 8e4eb33cdabd8..285b3bb053db4 100644
--- a/plugins/content/joomla/services/provider.php
+++ b/plugins/content/joomla/services/provider.php
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageFactoryInterface;
+use Joomla\CMS\Mail\MailerFactoryInterface;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Database\DatabaseInterface;
@@ -33,16 +35,18 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Joomla::class, function (Container $container) {
                 $plugin     = new Joomla(
                     (array) PluginHelper::getPlugin('content', 'joomla')
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+                $plugin->setMailerFactory($container->get(MailerFactoryInterface::class));
+                $plugin->setLanguageFactory($container->get(LanguageFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/content/joomla/src/Extension/Joomla.php b/plugins/content/joomla/src/Extension/Joomla.php
index 766806a6974c8..b45764c4f91a7 100644
--- a/plugins/content/joomla/src/Extension/Joomla.php
+++ b/plugins/content/joomla/src/Extension/Joomla.php
@@ -11,7 +11,6 @@
 namespace Joomla\Plugin\Content\Joomla\Extension;
 
 use Joomla\CMS\Cache\CacheControllerFactory;
-use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Event\Model\AfterChangeStateEvent;
 use Joomla\CMS\Event\Model\AfterSaveEvent;
 use Joomla\CMS\Event\Model\BeforeChangeStateEvent;
@@ -20,9 +19,15 @@
 use Joomla\CMS\Event\Plugin\System\Schemaorg\BeforeCompileHeadEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Language\Language;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Log\Log;
+use Joomla\CMS\Mail\Exception\MailDisabledException;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
+use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Router\Route;
+use Joomla\CMS\String\PunycodeHelper;
 use Joomla\CMS\Table\CoreContent;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\UserFactoryAwareTrait;
@@ -34,6 +39,7 @@
 use Joomla\Event\SubscriberInterface;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
+use PHPMailer\PHPMailer\Exception as phpMailerException;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -48,6 +54,8 @@ final class Joomla extends CMSPlugin implements SubscriberInterface
 {
     use DatabaseAwareTrait;
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * Returns an array of events this subscriber will listen to.
@@ -150,7 +158,7 @@ public function onContentAfterSave(AfterSaveEvent $event): void
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('sendEmail') . ' = 1')
@@ -163,26 +171,50 @@ public function onContentAfterSave(AfterSaveEvent $event): void
         }
 
         $user = $this->getApplication()->getIdentity();
+        $this->loadLanguage();
 
-        // Messaging for new items
-
-        $default_language = ComponentHelper::getParams('com_languages')->get('administrator');
-        $debug            = $this->getApplication()->get('debug_lang');
-
+        // Emailing for new items
         foreach ($users as $user_id) {
             if ($user_id != $user->id) {
-                // Load language for messaging
-                $receiver = $this->getUserFactory()->loadUserById($user_id);
-                $lang     = Language::getInstance($receiver->getParam('admin_language', $default_language), $debug);
-                $lang->load('com_content');
-                $message = [
-                    'user_id_to' => $user_id,
-                    'subject'    => $lang->_('COM_CONTENT_NEW_ARTICLE'),
-                    'message'    => \sprintf($lang->_('COM_CONTENT_ON_NEW_CONTENT'), $user->name, $article->title),
+                $receiver     = $this->getUserFactory()->loadUserById($user_id);
+                $linkMode     = $this->getApplication()->get('force_ssl', 0) == 2 ? Route::TLS_FORCE : Route::TLS_IGNORE;
+                $templateData = [
+                    'sitename' => $this->getApplication()->get('sitename'),
+                    'name'     => $user->name,
+                    'email'    => PunycodeHelper::emailToPunycode($user->email),
+                    'title'    => $article->title,
                 ];
-                $model_message = $this->getApplication()->bootComponent('com_messages')->getMVCFactory()
-                    ->createModel('Message', 'Administrator');
-                $model_message->save($message);
+
+                if ($receiver->authorise('core.login.admin') && $receiver->authorise('core.manage', 'com_content')) {
+                    $templateData['url'] = Route::link('administrator', 'index.php?option=com_content&view=articles&filter[search]=id:' . $article->id, false, $linkMode, true);
+                } elseif ($article->state === 1 && \in_array($article->access, $receiver->getAuthorisedViewLevels())) {
+                    $templateData['url'] = Route::link('site', 'index.php?option=com_content&view=article&id=' . $article->id, false, $linkMode, true);
+                } elseif ($article->state !== 1 && $receiver->authorise('core.edit', 'com_content.article.' . $article->id)) {
+                    $templateData['url'] = Route::link('site', 'index.php?option=com_content&view=article&id=' . $article->id, false, $linkMode, true);
+                } elseif ($article->state !== 1) {
+                    $templateData['url'] = Text::_('JNOTPUBLISHEDYET');
+                } else {
+                    $templateData['url'] = Text::_('JERROR_ALERTNOAUTHOR');
+                }
+                // Send email
+                try {
+                    $mailer = new MailTemplate(
+                        'plg_content_joomla.newarticle',
+                        $receiver->getParam('admin_language', $this->getLanguage()->getTag()),
+                        $this->getMailerFactory()->createMailer(),
+                        $this->getLanguageFactory()
+                    );
+                    $mailer->addTemplateData($templateData);
+                    $mailer->addRecipient($receiver->email, $receiver->name);
+
+                    $mailer->send();
+                } catch (MailDisabledException | phpMailerException $exception) {
+                    try {
+                        Log::add(Text::_($exception->getMessage()), Log::WARNING, 'jerror');
+                    } catch (\RuntimeException $exception) {
+                        $this->getApplication()->enqueueMessage(Text::_($exception->errorMessage()), 'warning');
+                    }
+                }
             }
         }
     }
@@ -379,7 +411,7 @@ private function injectContentSchema(string $context, Registry $schema)
                     $aContext = 'com_content.article';
 
                     // Load the schema data from the database
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select('*')
                         ->from($db->quoteName('#__schemaorg'))
                         ->whereIn($db->quoteName('itemId'), $articleIds)
@@ -556,9 +588,13 @@ private function injectContactSchema(string $context, Registry $schema)
         $cache = Factory::getContainer()->get(CacheControllerFactory::class)
             ->createCacheController('Callback', ['lifetime' => $app->get('cachetime'), 'caching' => $enableCache, 'defaultgroup' => 'schemaorg']);
 
+        // The schema is emitted on every response, so it has to respect the view levels of the current user
+        $viewLevels = $app->getIdentity()->getAuthorisedViewLevels();
+
         // Add contact data
         if ($view == 'contact' && $id > 0) {
-            $additionalSchema = $cache->get(function ($id) use ($component, $baseId) {
+            // $viewLevels is passed as an argument so that it becomes part of the cache key
+            $additionalSchema = $cache->get(function ($id, $viewLevels) use ($component, $baseId) {
                 $model = $component->createModel('Contact', 'Site');
 
                 $contact = $model->getItem($id);
@@ -567,16 +603,23 @@ private function injectContactSchema(string $context, Registry $schema)
                     return;
                 }
 
+                // Do not expose contacts the current user is not allowed to see
+                if (!\in_array($contact->access, $viewLevels) || !\in_array($contact->category_access, $viewLevels)) {
+                    return;
+                }
+
                 $contactSchema = $this->createContactSchema($contact);
 
                 $contactSchema['isPartOf'] = ['@id' => $baseId . 'WebPage/base'];
 
                 return $contactSchema;
-            }, [$id]);
+            }, [$id, $viewLevels]);
 
-            $mySchema['@graph'][] = $additionalSchema;
+            if (!empty($additionalSchema)) {
+                $mySchema['@graph'][] = $additionalSchema;
+            }
         } elseif ($view === 'featured') {
-            $additionalSchemas = $cache->get(function ($graph) use ($component, $baseId) {
+            $additionalSchemas = $cache->get(function ($graph, $viewLevels) use ($component, $baseId) {
                 $model = $component->createModel('Featured', 'Site');
 
                 $contacts = $model->getItems();
@@ -584,6 +627,11 @@ private function injectContactSchema(string $context, Registry $schema)
                 $allSchemas = [];
 
                 foreach ($contacts as $contact) {
+                    // Do not expose contacts the current user is not allowed to see
+                    if (!\in_array($contact->access, $viewLevels)) {
+                        continue;
+                    }
+
                     foreach ($graph as $entry) {
                         $schemaId = $baseId . 'com_contact/contact/' . (int) $contact->id;
 
@@ -601,9 +649,9 @@ private function injectContactSchema(string $context, Registry $schema)
                 }
 
                 return $allSchemas;
-            }, [$mySchema['@graph']]);
+            }, [$mySchema['@graph'], $viewLevels]);
 
-            foreach ($additionalSchemas as $additionalSchema) {
+            foreach ($additionalSchemas ?: [] as $additionalSchema) {
                 $mySchema['@graph'][] = $additionalSchema;
             }
         }
@@ -871,7 +919,7 @@ private function stageNotUsed($pk)
     private function countItemsInCategory($table, $catid)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Count the items in this category
         $query->select('COUNT(' . $db->quoteName('id') . ')')
@@ -924,7 +972,7 @@ private function countItemsInStage(array $stageIds, string $extension): bool
             return false;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select('COUNT(' . $db->quoteName('b.id') . ')')
             ->from($db->quoteName('#__workflow_associations', 'wa'))
@@ -972,7 +1020,7 @@ private function countItemsInChildren($table, $catid, $data)
         // Make sure we only do the query if we have some categories to look in
         if (\count($childCategoryIds)) {
             // Count the items in this category
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName('id') . ')')
                 ->from($db->quoteName($table))
                 ->whereIn($db->quoteName('catid'), $childCategoryIds);
@@ -1022,7 +1070,7 @@ public function onContentChangeState(AfterChangeStateEvent $event)
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('core_content_id'))
             ->from($db->quoteName('#__ucm_content'))
             ->where($db->quoteName('core_type_alias') . ' = :context')
diff --git a/plugins/content/loadmodule/services/provider.php b/plugins/content/loadmodule/services/provider.php
index 043544d6f705d..bdc399b474d41 100644
--- a/plugins/content/loadmodule/services/provider.php
+++ b/plugins/content/loadmodule/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(LoadModule::class, function (Container $container) {
                 $plugin     = new LoadModule(
                     (array) PluginHelper::getPlugin('content', 'loadmodule')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/content/loadmodule/src/Extension/LoadModule.php b/plugins/content/loadmodule/src/Extension/LoadModule.php
index 0385017e1a4ad..d54e6f0cebf43 100644
--- a/plugins/content/loadmodule/src/Extension/LoadModule.php
+++ b/plugins/content/loadmodule/src/Extension/LoadModule.php
@@ -58,6 +58,11 @@ public static function getSubscribedEvents(): array
      */
     public function onContentPrepare(ContentPrepareEvent $event)
     {
+        if ($this->getApplication()->isClient('api')) {
+            // Skip processing loadmodule/loadmoduleid tags for API
+            return;
+        }
+
         $context = $event->getContext();
         $article = $event->getItem();
 
diff --git a/plugins/content/pagebreak/services/provider.php b/plugins/content/pagebreak/services/provider.php
index 572be7829f318..65159daf43292 100644
--- a/plugins/content/pagebreak/services/provider.php
+++ b/plugins/content/pagebreak/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(PageBreak::class, function (Container $container) {
                 $plugin     = new PageBreak(
                     (array) PluginHelper::getPlugin('content', 'pagebreak')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/content/pagebreak/tmpl/navigation.php b/plugins/content/pagebreak/tmpl/navigation.php
index 1b26c8c67082c..f17df90a3513e 100644
--- a/plugins/content/pagebreak/tmpl/navigation.php
+++ b/plugins/content/pagebreak/tmpl/navigation.php
@@ -12,12 +12,11 @@
 
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
-use Joomla\Plugin\Content\PageBreak\Extension\PageBreak;
 
 /**
- * @var PageBreak  $this
- * @var array      $links  Array with keys 'previous' and 'next' with non-SEO links to the previous and next pages
- * @var integer    $page   The page number
+ * @var \Joomla\Plugin\Content\PageBreak\Extension\PageBreak  $this
+ * @var array                                                 $links  Array with keys 'previous' and 'next' with non-SEO links to the previous and next pages
+ * @var integer                                               $page   The page number
  */
 
 $lang = $this->getApplication()->getLanguage();
diff --git a/plugins/content/pagenavigation/services/provider.php b/plugins/content/pagenavigation/services/provider.php
index 868b90a5fcb87..f14dd925382b9 100644
--- a/plugins/content/pagenavigation/services/provider.php
+++ b/plugins/content/pagenavigation/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(PageNavigation::class, function (Container $container) {
                 $plugin     = new PageNavigation(
                     (array) PluginHelper::getPlugin('content', 'pagenavigation')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/content/pagenavigation/src/Extension/PageNavigation.php b/plugins/content/pagenavigation/src/Extension/PageNavigation.php
index 0bf7bce6abdac..b3af8719659c3 100644
--- a/plugins/content/pagenavigation/src/Extension/PageNavigation.php
+++ b/plugins/content/pagenavigation/src/Extension/PageNavigation.php
@@ -75,7 +75,7 @@ public function onContentBeforeDisplay(BeforeDisplayEvent $event)
             $user       = $app->getIdentity();
             $lang       = $app->getLanguage();
             $now        = Factory::getDate()->toSql();
-            $query      = $db->getQuery(true);
+            $query      = $db->createQuery();
             $uid        = $row->id;
             $option     = 'com_content';
             $canPublish = $user->authorise('core.edit.state', $option . '.article.' . $row->id);
diff --git a/plugins/content/vote/services/provider.php b/plugins/content/vote/services/provider.php
index 7220ed3455f5d..529e4c98d4f8c 100644
--- a/plugins/content/vote/services/provider.php
+++ b/plugins/content/vote/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Vote::class, function (Container $container) {
                 $plugin     = new Vote(
                     (array) PluginHelper::getPlugin('content', 'vote')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/content/vote/src/Extension/Vote.php b/plugins/content/vote/src/Extension/Vote.php
index 8c6f2e8b993ef..0b5ffcfb3af81 100644
--- a/plugins/content/vote/src/Extension/Vote.php
+++ b/plugins/content/vote/src/Extension/Vote.php
@@ -29,16 +29,6 @@
  */
 final class Vote extends CMSPlugin implements SubscriberInterface
 {
-    /**
-     * @var    \Joomla\CMS\Application\CMSApplication
-     *
-     * @since  3.7.0
-     *
-     * @deprecated 4.4.0 will be removed in 6.0 as it is there only for layout overrides
-     *             Use getApplication() instead
-     */
-    protected $app;
-
     /**
      * Returns an array of events this subscriber will listen to.
      *
diff --git a/plugins/editors-xtd/article/services/provider.php b/plugins/editors-xtd/article/services/provider.php
index 0d21165e8714b..3e6cbabafa554 100644
--- a/plugins/editors-xtd/article/services/provider.php
+++ b/plugins/editors-xtd/article/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Article::class, function (Container $container) {
                 $plugin     = new Article(
                     (array) PluginHelper::getPlugin('editors-xtd', 'article')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/editors-xtd/article/src/Extension/Article.php b/plugins/editors-xtd/article/src/Extension/Article.php
index 49b341a002300..767771d753fe3 100644
--- a/plugins/editors-xtd/article/src/Extension/Article.php
+++ b/plugins/editors-xtd/article/src/Extension/Article.php
@@ -73,7 +73,7 @@ public function onEditorButtonsSetup(EditorButtonsSetupEvent $event): void
      *
      * @since   1.5
      *
-     * @deprecated  5.0 Use onEditorButtonsSetup event
+     * @deprecated  5.0 Use onEditorButtonsSetup event instead, will be removed in 7.0
      */
     public function onDisplay($name)
     {
@@ -110,6 +110,16 @@ public function onDisplay($name)
             ]
         );
 
+        // Register as a link source for editors that offer a link picker (e.g. TinyMCE)
+        $this->getApplication()->getDocument()->addScriptOptions('editor-link-providers', [
+            $this->_name => [
+                'title'  => Text::_('PLG_ARTICLE_BUTTON_ARTICLE'),
+                'icon'   => 'file-add',
+                'src'    => 'index.php?option=com_content&view=articles&layout=modal&tmpl=component',
+                'select' => 'content',
+            ],
+        ], true);
+
         return $button;
     }
 }
diff --git a/plugins/editors-xtd/contact/services/provider.php b/plugins/editors-xtd/contact/services/provider.php
index 705a373bcb77c..1151d094dc833 100644
--- a/plugins/editors-xtd/contact/services/provider.php
+++ b/plugins/editors-xtd/contact/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Contact::class, function (Container $container) {
                 $plugin     = new Contact(
                     (array) PluginHelper::getPlugin('editors-xtd', 'contact')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/editors-xtd/contact/src/Extension/Contact.php b/plugins/editors-xtd/contact/src/Extension/Contact.php
index f1bba6fc8449b..85586e45f1347 100644
--- a/plugins/editors-xtd/contact/src/Extension/Contact.php
+++ b/plugins/editors-xtd/contact/src/Extension/Contact.php
@@ -71,7 +71,7 @@ public function onEditorButtonsSetup(EditorButtonsSetupEvent $event): void
      *
      * @since   3.7.0
      *
-     * @deprecated  5.0 Use onEditorButtonsSetup event
+     * @deprecated  5.0 Use onEditorButtonsSetup event instead, will be removed in 7.0
      */
     public function onDisplay($name)
     {
@@ -106,6 +106,16 @@ public function onDisplay($name)
                 ]
             );
 
+            // Register as a link source for editors that offer a link picker (e.g. TinyMCE)
+            $this->getApplication()->getDocument()->addScriptOptions('editor-link-providers', [
+                $this->_name => [
+                    'title'  => Text::_('PLG_EDITORS-XTD_CONTACT_BUTTON_CONTACT'),
+                    'icon'   => 'address',
+                    'src'    => 'index.php?option=com_contact&view=contacts&layout=modal&tmpl=component',
+                    'select' => 'content',
+                ],
+            ], true);
+
             return $button;
         }
     }
diff --git a/plugins/editors-xtd/fields/services/provider.php b/plugins/editors-xtd/fields/services/provider.php
index efde3bcb44d54..f361ff85eab0f 100644
--- a/plugins/editors-xtd/fields/services/provider.php
+++ b/plugins/editors-xtd/fields/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Fields::class, function (Container $container) {
                 $plugin     = new Fields(
                     (array) PluginHelper::getPlugin('editors-xtd', 'fields')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/editors-xtd/image/services/provider.php b/plugins/editors-xtd/image/services/provider.php
index 7577f695e1dc3..6b4947c15e500 100644
--- a/plugins/editors-xtd/image/services/provider.php
+++ b/plugins/editors-xtd/image/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Image::class, function (Container $container) {
                 $plugin     = new Image(
                     (array) PluginHelper::getPlugin('editors-xtd', 'image')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/editors-xtd/image/src/Extension/Image.php b/plugins/editors-xtd/image/src/Extension/Image.php
index 662a07268aa67..6045770e0a374 100644
--- a/plugins/editors-xtd/image/src/Extension/Image.php
+++ b/plugins/editors-xtd/image/src/Extension/Image.php
@@ -103,12 +103,21 @@ public function onDisplay($name, $asset, $author)
             // Register the button assets
             if (!$wa->assetExists('script', 'editor-button.image')) {
                 $wa->registerStyle('editor-button.image', '', [], [], ['webcomponent.media-select']);
+
+                // Helper that lets editors (e.g. TinyMCE's file picker) open the Media Manager and resolve a URL
+                $wa->registerScript(
+                    'editor-button.image-filepicker',
+                    'plg_editors-xtd_image/media-filepicker.js',
+                    [],
+                    ['type' => 'module'],
+                    ['webcomponent.media-select', 'joomla.dialog']
+                );
                 $wa->registerScript(
                     'editor-button.image',
                     'plg_editors-xtd_image/button-image.js',
                     [],
                     ['type' => 'module'],
-                    ['webcomponent.media-select', 'editors', 'joomla.dialog']
+                    ['webcomponent.media-select', 'editors', 'joomla.dialog', 'editor-button.image-filepicker']
                 );
             }
 
@@ -165,6 +174,7 @@ public function onDisplay($name, $asset, $author)
             }
 
             Text::script('JCLOSE');
+            Text::script('JSELECT');
             Text::script('JFIELD_MEDIA_ALT_CHECK_DESC_LABEL');
             Text::script('JFIELD_MEDIA_ALT_CHECK_LABEL');
             Text::script('JFIELD_MEDIA_ALT_LABEL');
@@ -182,6 +192,7 @@ public function onDisplay($name, $asset, $author)
             Text::script('JFIELD_MEDIA_TITLE_LABEL');
             Text::script('JFIELD_MEDIA_UNSUPPORTED');
             Text::script('JFIELD_MEDIA_WIDTH_LABEL');
+            Text::script('PLG_IMAGE_BUTTON_IMAGE');
             Text::script('PLG_IMAGE_BUTTON_INSERT');
 
             $link = 'index.php?option=com_media&view=media&tmpl=component&e_name=' . $name . '&asset=' . $asset . '&mediatypes=0,1,2,3' . '&author=' . $author;
diff --git a/plugins/editors-xtd/menu/services/provider.php b/plugins/editors-xtd/menu/services/provider.php
index ef88e920ea38e..4538024e85fd9 100644
--- a/plugins/editors-xtd/menu/services/provider.php
+++ b/plugins/editors-xtd/menu/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Menu::class, function (Container $container) {
                 $plugin     = new Menu(
                     (array) PluginHelper::getPlugin('editors-xtd', 'menu')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/editors-xtd/menu/src/Extension/Menu.php b/plugins/editors-xtd/menu/src/Extension/Menu.php
index ec45c60affb85..53c91d20bbb5c 100644
--- a/plugins/editors-xtd/menu/src/Extension/Menu.php
+++ b/plugins/editors-xtd/menu/src/Extension/Menu.php
@@ -71,7 +71,7 @@ public function onEditorButtonsSetup(EditorButtonsSetupEvent $event): void
      *
      * @since  3.7.0
      *
-     * @deprecated  5.0 Use onEditorButtonsSetup event
+     * @deprecated  5.0 Use onEditorButtonsSetup event instead, will be removed in 7.0
      */
     public function onDisplay($name)
     {
@@ -104,6 +104,16 @@ public function onDisplay($name)
                 ]
             );
 
+            // Register as a link source for editors that offer a link picker (e.g. TinyMCE)
+            $this->getApplication()->getDocument()->addScriptOptions('editor-link-providers', [
+                $this->_name => [
+                    'title'  => Text::_('PLG_EDITORS-XTD_MENU_BUTTON_MENU'),
+                    'icon'   => 'list',
+                    'src'    => 'index.php?option=com_menus&view=items&layout=modal&tmpl=component',
+                    'select' => 'content',
+                ],
+            ], true);
+
             return $button;
         }
     }
diff --git a/plugins/editors-xtd/module/services/provider.php b/plugins/editors-xtd/module/services/provider.php
index c70ca868478c9..f076e67f84858 100644
--- a/plugins/editors-xtd/module/services/provider.php
+++ b/plugins/editors-xtd/module/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Module::class, function (Container $container) {
                 $plugin     = new Module(
                     (array) PluginHelper::getPlugin('editors-xtd', 'module')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/editors-xtd/module/src/Extension/Module.php b/plugins/editors-xtd/module/src/Extension/Module.php
index 394bfe42fab0b..251e2a3802617 100644
--- a/plugins/editors-xtd/module/src/Extension/Module.php
+++ b/plugins/editors-xtd/module/src/Extension/Module.php
@@ -71,7 +71,7 @@ public function onEditorButtonsSetup(EditorButtonsSetupEvent $event): void
      *
      * @since   3.5
      *
-     * @deprecated  5.0 Use onEditorButtonsSetup event
+     * @deprecated  5.0 Use onEditorButtonsSetup event instead, will be removed in 7.0
      */
     public function onDisplay($name)
     {
diff --git a/plugins/editors-xtd/pagebreak/services/provider.php b/plugins/editors-xtd/pagebreak/services/provider.php
index ed8cbdabfb92b..c742bae455b5d 100644
--- a/plugins/editors-xtd/pagebreak/services/provider.php
+++ b/plugins/editors-xtd/pagebreak/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(PageBreak::class, function (Container $container) {
                 $plugin     = new PageBreak(
                     (array) PluginHelper::getPlugin('editors-xtd', 'pagebreak')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/editors-xtd/pagebreak/src/Extension/PageBreak.php b/plugins/editors-xtd/pagebreak/src/Extension/PageBreak.php
index ca0f2297556a6..ee9dd1bf96995 100644
--- a/plugins/editors-xtd/pagebreak/src/Extension/PageBreak.php
+++ b/plugins/editors-xtd/pagebreak/src/Extension/PageBreak.php
@@ -79,7 +79,7 @@ public function onEditorButtonsSetup(EditorButtonsSetupEvent $event): void
      *
      * @since   1.5
      *
-     * @deprecated  5.0 Use onEditorButtonsSetup event
+     * @deprecated  5.0 Use onEditorButtonsSetup event instead, will be removed in 7.0
      */
     public function onDisplay($name)
     {
diff --git a/plugins/editors-xtd/readmore/services/provider.php b/plugins/editors-xtd/readmore/services/provider.php
index 22b77dd280aa8..cae84f8505ea4 100644
--- a/plugins/editors-xtd/readmore/services/provider.php
+++ b/plugins/editors-xtd/readmore/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(ReadMore::class, function (Container $container) {
                 $plugin     = new ReadMore(
                     (array) PluginHelper::getPlugin('editors-xtd', 'readmore')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/editors-xtd/readmore/src/Extension/ReadMore.php b/plugins/editors-xtd/readmore/src/Extension/ReadMore.php
index b65a337d8465a..3f596fe1572b8 100644
--- a/plugins/editors-xtd/readmore/src/Extension/ReadMore.php
+++ b/plugins/editors-xtd/readmore/src/Extension/ReadMore.php
@@ -67,7 +67,7 @@ public function onEditorButtonsSetup(EditorButtonsSetupEvent $event): void
      *
      * @since   1.5
      *
-     * @deprecated  5.0 Use onEditorButtonsSetup event
+     * @deprecated  5.0 Use onEditorButtonsSetup event instead, will be removed in 7.0
      */
     public function onDisplay($name)
     {
diff --git a/plugins/editors/codemirror/layouts/editors/codemirror/codemirror.php b/plugins/editors/codemirror/layouts/editors/codemirror/codemirror.php
index b5adf7a75ca3f..b0a759ab7488a 100644
--- a/plugins/editors/codemirror/layouts/editors/codemirror/codemirror.php
+++ b/plugins/editors/codemirror/layouts/editors/codemirror/codemirror.php
@@ -13,7 +13,6 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\FileLayout;
 use Joomla\Registry\Registry;
 
 extract($displayData);
@@ -21,15 +20,15 @@
 /**
  * Layout variables
  *
- * @var   FileLayout $this
- * @var   object     $options     JS options for editor
- * @var   Registry   $params      Plugin parameters
- * @var   string     $id          The id of the input
- * @var   string     $name        The name of the input
- * @var   integer    $cols        Textarea cols attribute
- * @var   integer    $rows        Textarea rows attribute
- * @var   string     $content     The value
- * @var   string     $buttons     Editor XTD buttons
+ * @var   \Joomla\CMS\Layout\FileLayout $this
+ * @var   object                        $options     JS options for editor
+ * @var   Registry                      $params      Plugin parameters
+ * @var   string                        $id          The id of the input
+ * @var   string                        $name        The name of the input
+ * @var   integer                       $cols        Textarea cols attribute
+ * @var   integer                       $rows        Textarea rows attribute
+ * @var   string                        $content     The value
+ * @var   string                        $buttons     Editor XTD buttons
  */
 
 $option  = ' options="' . $this->escape(json_encode($options)) . '"';
diff --git a/plugins/editors/codemirror/services/provider.php b/plugins/editors/codemirror/services/provider.php
index e3d55f98bb181..4ad7cc4ca77fd 100644
--- a/plugins/editors/codemirror/services/provider.php
+++ b/plugins/editors/codemirror/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Codemirror::class, function (Container $container) {
                 $plugin     = new Codemirror(
                     (array) PluginHelper::getPlugin('editors', 'codemirror')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/editors/codemirror/src/Provider/CodeMirrorProvider.php b/plugins/editors/codemirror/src/Provider/CodeMirrorProvider.php
index eefcf408c4fae..7e9d84070e355 100644
--- a/plugins/editors/codemirror/src/Provider/CodeMirrorProvider.php
+++ b/plugins/editors/codemirror/src/Provider/CodeMirrorProvider.php
@@ -91,6 +91,14 @@ public function display(string $name, string $content = '', array $attributes =
         $asset   = $params['asset'] ?? 0;
         $author  = $params['author'] ?? 0;
 
+        if (!$width && !$col) {
+            $width = '100%';
+        }
+
+        if (!$height && !$row) {
+            $height = '500px';
+        }
+
         // Must pass the field id to the buttons in this editor.
         $buttonsStr = $this->displayButtons($buttons, ['asset' => $asset, 'author' => $author, 'editorId' => $id]);
 
diff --git a/plugins/editors/none/services/provider.php b/plugins/editors/none/services/provider.php
index 6e5663ee93702..f31e48c866168 100644
--- a/plugins/editors/none/services/provider.php
+++ b/plugins/editors/none/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(None::class, function (Container $container) {
                 $plugin     = new None(
                     (array) PluginHelper::getPlugin('editors', 'none')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/editors/none/src/Provider/EditorNoneProvider.php b/plugins/editors/none/src/Provider/EditorNoneProvider.php
index 69ca239de8088..0c01654dab8f6 100644
--- a/plugins/editors/none/src/Provider/EditorNoneProvider.php
+++ b/plugins/editors/none/src/Provider/EditorNoneProvider.php
@@ -90,6 +90,14 @@ public function display(string $name, string $content = '', array $attributes =
         $author   = $params['author'] ?? 0;
         $readonly = !empty($params['readonly']) ? ' readonly disabled' : '';
 
+        if (!$width && !$col) {
+            $width = '100%';
+        }
+
+        if (!$height && !$row) {
+            $height = '500px';
+        }
+
         if (!$id) {
             $id = $name;
         }
diff --git a/plugins/editors/tinymce/forms/setoptions.xml b/plugins/editors/tinymce/forms/setoptions.xml
index 914528ea6f707..1543502a21035 100644
--- a/plugins/editors/tinymce/forms/setoptions.xml
+++ b/plugins/editors/tinymce/forms/setoptions.xml
@@ -192,7 +192,7 @@
 			label="PLG_TINY_CONFIG_TEXTFILTER_ACL_LABEL"
 			description="PLG_TINY_CONFIG_TEXTFILTER_ACL_DESC"
 			layout="joomla.form.field.radio.switcher"
-			default="0"
+			default="1"
 			>
 			<option value="0">JOFF</option>
 			<option value="1">JON</option>
@@ -233,6 +233,24 @@
 			<option value="1">JON</option>
 		</field>
 
+		<field
+			name="sandbox_iframes_exclusions"
+			type="subform"
+			label="PLG_TINY_FIELD_SANDBOX_IFRAMES_EXCLUSIONS_LIST_LABEL"
+			description="PLG_TINY_FIELD_SANDBOX_IFRAMES_EXCLUSIONS_LIST_DESC"
+			multiple="true"
+			showon="sandbox_iframes:1"
+			>
+			<form>
+				<field
+					name="exclusion_domain"
+					type="text"
+					label="PLG_TINY_FIELD_SANDBOX_IFRAMES_EXCLUSION_DOMAIN_LABEL"
+					required="true"
+				/>
+			</form>
+		</field>
+
 		<!-- Extra plugins -->
 		<field
 			name="resizing"
@@ -439,5 +457,34 @@
 				/>
 			</form>
 		</field>
+
+		<field
+			name="img_classes_list"
+			type="subform"
+			label="PLG_TINY_FIELD_IMG_CLASSES_LIST_LABEL"
+			description="PLG_TINY_FIELD_IMG_CLASSES_LIST_DESC"
+			layout="joomla.form.field.subform.repeatable-table"
+			required="false"
+			multiple="true">
+			<form>
+				<field
+					name="img_class_name"
+					type="text"
+					label="PLG_TINY_FIELD_IMG_CLASS_NAME_LABEL"
+					required="true"
+					filter="string"
+					default=""
+				/>
+				<field
+					name="img_class_list"
+					type="text"
+					label="PLG_TINY_FIELD_IMG_CLASS_LIST_LABEL"
+					required="true"
+					filter="string"
+					validate="CssIdentifier"
+					default=""
+				/>
+			</form>
+		</field>
 	</fieldset>
 </form>
diff --git a/plugins/editors/tinymce/services/provider.php b/plugins/editors/tinymce/services/provider.php
index 564028247624b..dff10ddf39d1b 100644
--- a/plugins/editors/tinymce/services/provider.php
+++ b/plugins/editors/tinymce/services/provider.php
@@ -33,7 +33,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(TinyMCE::class, function (Container $container) {
                 $plugin     = new TinyMCE(
                     (array) PluginHelper::getPlugin('editors', 'tinymce')
                 );
@@ -42,7 +42,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/editors/tinymce/src/PluginTraits/ActiveSiteTemplate.php b/plugins/editors/tinymce/src/PluginTraits/ActiveSiteTemplate.php
index 64f19c61a275c..340fd2a444f6d 100644
--- a/plugins/editors/tinymce/src/PluginTraits/ActiveSiteTemplate.php
+++ b/plugins/editors/tinymce/src/PluginTraits/ActiveSiteTemplate.php
@@ -33,7 +33,7 @@ trait ActiveSiteTemplate
     protected function getActiveSiteTemplate()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__template_styles'))
             ->where(
diff --git a/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php b/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php
index 851f43b5865af..e0d0458674d43 100644
--- a/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php
+++ b/plugins/editors/tinymce/src/PluginTraits/DisplayTrait.php
@@ -61,10 +61,12 @@ public function display(string $name, string $content = '', array $attributes =
         $csrf            = Session::getFormToken();
 
         // Editor variables
+        $defaultWidth    = $this->params->get('html_width', '100%');
+        $defaultHeight   = $this->params->get('html_height', '550px');
         $col             = $attributes['col'] ?? '';
         $row             = $attributes['row'] ?? '';
-        $width           = $attributes['width'] ?? '';
-        $height          = $attributes['height'] ?? '';
+        $width           = ($attributes['width'] ?? '') ?: $defaultWidth;
+        $height          = ($attributes['height'] ?? '') ?: $defaultHeight;
         $id              = $attributes['id'] ?? $name;
         $id              = preg_replace('/(\s|[^A-Za-z0-9_])+/', '_', $id);
         $nameGroup       = explode('[', preg_replace('/\[\]|\]/', '', $name));
@@ -102,13 +104,13 @@ public function display(string $name, string $content = '', array $attributes =
             $options['tinyMCE'][$fieldName] = [];
         }
 
-        // Width and height
+        // Add editor Width and height to options if not already set
         if ($width && empty($options['tinyMCE'][$fieldName]['width'])) {
-            $options['tinyMCE'][$fieldName]['width'] = $width;
+            $options['tinyMCE'][$fieldName]['width'] = $textarea->width;
         }
 
         if ($height && empty($options['tinyMCE'][$fieldName]['height'])) {
-            $options['tinyMCE'][$fieldName]['height'] = $height;
+            $options['tinyMCE'][$fieldName]['height'] = $textarea->height;
         }
 
         // Set editor to readonly mode
@@ -218,7 +220,7 @@ public function display(string $name, string $content = '', array $attributes =
         $ignore_filter = false;
 
         // Text filtering
-        if ($levelParams->get('use_config_textfilters', 0)) {
+        if ($levelParams->get('use_config_textfilters', 1)) {
             // Use filters from com_config
             $filter            = static::getGlobalFilters($user);
             $ignore_filter     = $filter === false;
@@ -255,8 +257,20 @@ public function display(string $name, string $content = '', array $attributes =
             'importcss',
             'quickbars',
             'jxtdbuttons',
+            'jfilepicker',
         ];
         $wa->useScript('plg_editors_tinymce.jxtdbuttons');
+        $wa->useScript('plg_editors_tinymce.jfilepicker');
+
+        // The link picker for the native Link dialog (registers the 'file' picker)
+        $wa->useStyle('plg_editors_tinymce.linkpicker');
+        $wa->useScript('plg_editors_tinymce.linkpicker');
+
+        // UI strings for the link picker
+        Text::script('PLG_TINY_LINK_PICKER_TITLE');
+        Text::script('PLG_TINY_LINK_MEDIA');
+        Text::script('JSELECT');
+        Text::script('JCLOSE');
 
         // Allowed elements
         $elements = [
@@ -386,7 +400,7 @@ public function prepareTinyMCEUploadPath(string $path): string
             }
         }
 
-        // Should load the template plugin?
+        // Load the template plugin?
         if (!empty($allButtons['jtemplate'])) {
             $wa->useScript('plg_editors_tinymce.jtemplate');
             $plugins[] = 'jtemplate';
@@ -395,6 +409,27 @@ public function prepareTinyMCEUploadPath(string $path): string
                 . $levelParams->get('content_template_path') . '&' . $csrf . '=1';
         }
 
+        // Load the abbreviation plugin?
+        if (!empty($allButtons['abbr'])) {
+            $wa->useScript('plg_editors_tinymce.abbr');
+            $plugins[] = 'abbr';
+            Text::script('PLG_TINY_ABBREVIATION_DESCRIPTION_LABEL');
+            Text::script('PLG_TINY_ABBREVIATION_EDIT');
+            Text::script('PLG_TINY_ABBREVIATION_INSERT');
+            Text::script('PLG_TINY_ABBREVIATION_WARNING_NO_DESCRIPTION');
+            Text::script('PLG_TINY_ABBREVIATION_WARNING_NO_SELECTION');
+            Text::script('PLG_TINY_ABBREVIATION_WARNING_REMOVE');
+            Text::script('PLG_TINY_TOOLBAR_BUTTON_ABBREVIATION');
+            Text::script('PLG_TINY_TOOLBAR_BUTTON_REMOVE_ABBREVIATION');
+        }
+
+        // Load the readmore plugin?
+        if (!empty($allButtons['readmore'])) {
+            $wa->useScript('plg_editors_tinymce.readmore');
+            $plugins[] = 'readmore';
+            Text::script('PLG_TINY_TOOLBAR_BUTTON_READMORE');
+        }
+
         // User custom plugins and buttons
         $custom_plugin = trim($levelParams->get('custom_plugin', ''));
         $custom_button = trim($levelParams->get('custom_button', ''));
@@ -427,6 +462,42 @@ public function prepareTinyMCEUploadPath(string $path): string
             }
         }
 
+        // Set the default classes for the image class dropdown
+        $imgClasses = [
+            ['title' => TEXT::_('PLG_TINY_FIELD_IMG_CLASS_NO_CLASS'), 'value' => ''],
+            ['title' => 'None', 'value' => 'float-none'],
+            ['title' => 'Left', 'value' => 'float-start'],
+            ['title' => 'Right', 'value' => 'float-end'],
+            ['title' => 'Center', 'value' => 'mx-auto d-block'],
+        ];
+
+        // Load the image classes list
+        if (isset($extraOptions->img_classes_list) && $extraOptions->img_classes_list) {
+            $imgClassesList = $extraOptions->img_classes_list;
+
+            if ($imgClassesList) {
+                // Create an array for the image classes
+                foreach ($imgClassesList as $imgClassList) {
+                    array_push($imgClasses, ['title' => $imgClassList->img_class_name, 'value' => $imgClassList->img_class_list]);
+                }
+            }
+        }
+
+        // Add the current domain to the sandbox_iframes_exclusions list
+        $sandboxIframesExclusions = Uri::getInstance()->getHost();
+
+        // Build the list of additional domains to add to the sandbox_iframes_exclusions list
+        if (isset($extraOptions->sandbox_iframes_exclusions) && $extraOptions->sandbox_iframes_exclusions) {
+            $exclusionsArray = [];
+            foreach ($extraOptions->sandbox_iframes_exclusions as $value) {
+                if (isset($value->exclusion_domain)) {
+                    $exclusionsArray[] = $value->exclusion_domain;
+                }
+            }
+            // Join the URLs into a comma-separated string and add to the sandbox_iframes_exclusions list
+            $sandboxIframesExclusions .= ', ' . implode(', ', $exclusionsArray);
+        }
+
         // Build the final options set
         $scriptOptions   = array_merge(
             $scriptOptions,
@@ -480,8 +551,8 @@ public function prepareTinyMCEUploadPath(string $path): string
                 'document_base_url' => Uri::root(true) . '/',
                 'image_caption'     => true,
                 'importcss_append'  => true,
-                'height'            => $this->params->get('html_height', '550px'),
-                'width'             => $this->params->get('html_width', ''),
+                'height'            => $defaultHeight,
+                'width'             => $defaultWidth,
                 'elementpath'       => (bool) $levelParams->get('element_path', true),
                 'resize'            => $resizing,
                 'external_plugins'  => empty($externalPlugins) ? null : $externalPlugins,
@@ -493,12 +564,7 @@ public function prepareTinyMCEUploadPath(string $path): string
                 'a11y_advanced_options' => true,
                 'image_advtab'          => (bool) $levelParams->get('image_advtab', false),
                 'image_title'           => true,
-                'image_class_list'      => [
-                    ['title' => 'None', 'value' => 'float-none'],
-                    ['title' => 'Left', 'value' => 'float-start'],
-                    ['title' => 'Right', 'value' => 'float-end'],
-                    ['title' => 'Center', 'value' => 'mx-auto d-block'],
-                ],
+                'image_class_list'      => $imgClasses,
 
                 // Drag and drop specific
                 'dndEnabled' => $dragdrop,
@@ -507,10 +573,13 @@ public function prepareTinyMCEUploadPath(string $path): string
                 'branding'  => false,
                 'promotion' => false,
 
+                // Set License
+                'license_key' => 'gpl',
+
                 // Hardened security
-                // @todo enable with TinyMCE 7 using https://www.tiny.cloud/docs/tinymce/latest/content-filtering/#sandbox-iframes-exclusions otherwise all embed PDFs are broken
-                'sandbox_iframes'       => (bool) $levelParams->get('sandbox_iframes', true),
-                'convert_unsafe_embeds' => true,
+                'sandbox_iframes'            => (bool) $levelParams->get('sandbox_iframes', true),
+                'sandbox_iframes_exclusions' => $sandboxIframesExclusions,
+                'convert_unsafe_embeds'      => true,
 
                 // Specify the attributes to be used when previewing a style. This prevents white text on a white background making the preview invisible.
                 'preview_styles' => 'font-family font-size font-weight font-style text-decoration text-transform background-color border border-radius outline text-shadow',
diff --git a/plugins/editors/tinymce/src/PluginTraits/KnownButtons.php b/plugins/editors/tinymce/src/PluginTraits/KnownButtons.php
index 7cadb4257e96d..e5c133fcce305 100644
--- a/plugins/editors/tinymce/src/PluginTraits/KnownButtons.php
+++ b/plugins/editors/tinymce/src/PluginTraits/KnownButtons.php
@@ -81,9 +81,12 @@ public static function getKnownButtons()
             'language' => ['label' => 'Language'],
 
             // Buttons from the plugins
+            'abbr'           => ['label' => Text::_('PLG_TINY_TOOLBAR_BUTTON_ABBREVIATION'), 'plugin' => 'abbr'],
+            'abbr_remove'    => ['label' => Text::_('PLG_TINY_TOOLBAR_BUTTON_REMOVE_ABBREVIATION'), 'plugin' => 'abbr'],
             'accordion'      => ['label' => 'Accordion', 'plugin' => 'accordion'],
             'anchor'         => ['label' => 'Anchor', 'plugin' => 'anchor'],
             'hr'             => ['label' => 'Horizontal line'],
+            'readmore'       => ['label' => Text::_('PLG_TINY_TOOLBAR_BUTTON_READMORE'), 'plugin' => 'readmore'],
             'ltr'            => ['label' => 'Left to right', 'plugin' => 'directionality'],
             'rtl'            => ['label' => 'Right to left', 'plugin' => 'directionality'],
             'code'           => ['label' => 'Source code', 'plugin' => 'code'],
@@ -96,7 +99,6 @@ public static function getKnownButtons()
             'emoticons'      => ['label' => 'Emoticons', 'plugin' => 'emoticons'],
             'media'          => ['label' => 'Insert/edit video', 'plugin' => 'media'],
             'image'          => ['label' => 'Insert/edit image', 'plugin' => 'image'],
-            'pagebreak'      => ['label' => 'Page break', 'plugin' => 'pagebreak'],
             'print'          => ['label' => 'Print'],
             'preview'        => ['label' => 'Preview', 'plugin' => 'preview'],
             'fullscreen'     => ['label' => 'Fullscreen', 'plugin' => 'fullscreen'],
@@ -104,6 +106,7 @@ public static function getKnownButtons()
             'searchreplace'  => ['label' => 'Find and replace', 'plugin' => 'searchreplace'],
             'insertdatetime' => ['label' => 'Insert date/time', 'plugin' => 'insertdatetime'],
             'help'           => ['label' => 'Help', 'plugin' => 'help'],
-        ];
+
+            ];
     }
 }
diff --git a/plugins/editors/tinymce/src/PluginTraits/ToolbarPresets.php b/plugins/editors/tinymce/src/PluginTraits/ToolbarPresets.php
index 3ded6e73cae6f..4c1ae823a51f8 100644
--- a/plugins/editors/tinymce/src/PluginTraits/ToolbarPresets.php
+++ b/plugins/editors/tinymce/src/PluginTraits/ToolbarPresets.php
@@ -35,7 +35,7 @@ public static function getToolbarPreset()
                 'menu'     => [],
                 'toolbar1' => [
                     'bold', 'underline', 'strikethrough', '|',
-                    'undo', 'redo', '|',
+                    'readmore', '|', 'undo', 'redo', '|',
                     'bullist', 'numlist', '|',
                     'pastetext', 'jxtdbuttons',
                 ],
@@ -46,7 +46,7 @@ public static function getToolbarPreset()
                 'toolbar1' => [
                     'bold', 'italic', 'underline', 'strikethrough', '|',
                     'alignleft', 'aligncenter', 'alignright', 'alignjustify', '|',
-                    'blocks', '|',
+                    'readmore', '|', 'blocks', '|',
                     'bullist', 'numlist', '|',
                     'outdent', 'indent', '|',
                     'undo', 'redo', '|',
@@ -62,7 +62,7 @@ public static function getToolbarPreset()
                 'toolbar1' => [
                     'bold', 'italic', 'underline', 'strikethrough', '|',
                     'alignleft', 'aligncenter', 'alignright', 'alignjustify', '|',
-                    'lineheight', '|',
+                    'readmore', '|', 'lineheight', '|',
                     'styles', '|',
                     'blocks', 'fontfamily', 'fontsize', '|',
                     'searchreplace', '|',
@@ -79,7 +79,7 @@ public static function getToolbarPreset()
                     'cut', 'copy', 'paste', 'pastetext', '|',
                     'visualchars', 'visualblocks', 'nonbreaking', 'blockquote', 'jtemplate', '|',
                     'print', 'preview', 'codesample', 'insertdatetime', 'removeformat', 'jxtdbuttons',
-                    'language',
+                    'language','abbr', 'abbr_remove',
                 ],
                 'toolbar2' => [],
             ],
diff --git a/plugins/editors/tinymce/tinymce.xml b/plugins/editors/tinymce/tinymce.xml
index 6bca2090fb643..8b9f22bb10638 100644
--- a/plugins/editors/tinymce/tinymce.xml
+++ b/plugins/editors/tinymce/tinymce.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension type="plugin" group="editors" method="upgrade">
 	<name>plg_editors_tinymce</name>
-	<version>6.8.6</version>
+	<version>8.8.2</version>
 	<creationDate>2005-08</creationDate>
 	<author>Tiny Technologies, Inc</author>
 	<authorEmail>N/A</authorEmail>
@@ -48,6 +48,7 @@
 					name="html_height"
 					type="text"
 					label="PLG_TINY_FIELD_HTMLHEIGHT_LABEL"
+					description="PLG_TINY_FIELD_HTMLHEIGHT_DESC"
 					default="550px"
 				/>
 
@@ -55,7 +56,8 @@
 					name="html_width"
 					type="text"
 					label="PLG_TINY_FIELD_HTMLWIDTH_LABEL"
-					default=""
+					description="PLG_TINY_FIELD_HTMLWIDTH_DESC"
+					default="100%"
 				/>
 			</fieldset>
 		</fields>
diff --git a/plugins/extension/finder/services/provider.php b/plugins/extension/finder/services/provider.php
index a6290c7215aa2..bdb024bb7638d 100644
--- a/plugins/extension/finder/services/provider.php
+++ b/plugins/extension/finder/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Finder::class, function (Container $container) {
                 $plugin     = new Finder(
                     (array) PluginHelper::getPlugin('extension', 'finder')
                 );
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/extension/finder/src/Extension/Finder.php b/plugins/extension/finder/src/Extension/Finder.php
index 2b5332f6ffd86..969e49252e2eb 100644
--- a/plugins/extension/finder/src/Extension/Finder.php
+++ b/plugins/extension/finder/src/Extension/Finder.php
@@ -68,7 +68,7 @@ public function onExtensionAfterInstall(AbstractExtensionEvent $event): void
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['element', 'client_id']))
             ->from($db->quoteName('#__extensions'))
             ->where(
@@ -161,7 +161,7 @@ function ($word) {
         $words = array_filter(array_map('trim', $words));
         $words = array_unique($words);
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $lang = Helper::getPrimaryLanguage($extension->element);
 
@@ -196,7 +196,7 @@ protected function removeCommonWords($extension)
         $db   = $this->getDatabase();
         $lang = Helper::getPrimaryLanguage($extension->element);
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->delete($db->quoteName('#__finder_terms_common'))
             ->where(
                 [
diff --git a/plugins/extension/joomla/services/provider.php b/plugins/extension/joomla/services/provider.php
index 90afe8e07c70d..be35e209a77d2 100644
--- a/plugins/extension/joomla/services/provider.php
+++ b/plugins/extension/joomla/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Joomla::class, function (Container $container) {
                 $plugin     = new Joomla(
                     (array) PluginHelper::getPlugin('extension', 'joomla')
                 );
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/extension/joomla/src/Extension/Joomla.php b/plugins/extension/joomla/src/Extension/Joomla.php
index 88e5fed196346..8f68d3c9dc5a8 100644
--- a/plugins/extension/joomla/src/Extension/Joomla.php
+++ b/plugins/extension/joomla/src/Extension/Joomla.php
@@ -90,7 +90,7 @@ private function addUpdateSite($name, $type, $location, $enabled, $extraQuery =
     {
         // Look if the location is used already; doesn't matter what type you can't have two types at the same address, doesn't make sense
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('update_site_id'))
             ->from($db->quoteName('#__update_sites'))
@@ -221,7 +221,7 @@ public function onExtensionAfterUninstall(AfterUninstallEvent $event): void
         // update sites for it
         if ($eid && $removed) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $eid   = (int) $eid;
 
             $query->delete($db->quoteName('#__update_sites_extensions'))
@@ -241,10 +241,10 @@ public function onExtensionAfterUninstall(AfterUninstallEvent $event): void
 
             if (\is_array($results)) {
                 // So we need to delete the update sites and their associated updates
-                $updatesite_delete = $db->getQuery(true);
+                $updatesite_delete = $db->createQuery();
                 $updatesite_delete->delete($db->quoteName('#__update_sites'));
 
-                $updatesite_query = $db->getQuery(true);
+                $updatesite_query = $db->createQuery();
                 $updatesite_query->select($db->quoteName('update_site_id'))
                     ->from($db->quoteName('#__update_sites'));
 
diff --git a/plugins/extension/joomlaupdate/services/provider.php b/plugins/extension/joomlaupdate/services/provider.php
index ec62480c48d07..7ea062c5c1c0f 100644
--- a/plugins/extension/joomlaupdate/services/provider.php
+++ b/plugins/extension/joomlaupdate/services/provider.php
@@ -31,7 +31,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Joomlaupdate::class, function (Container $container) {
                 $plugin = new Joomlaupdate(
                     (array) PluginHelper::getPlugin('extension', 'joomlaupdate')
                 );
@@ -39,7 +39,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/extension/namespacemap/services/provider.php b/plugins/extension/namespacemap/services/provider.php
index c38ce38bcb864..311d4c7b142ff 100644
--- a/plugins/extension/namespacemap/services/provider.php
+++ b/plugins/extension/namespacemap/services/provider.php
@@ -30,14 +30,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(NamespaceMap::class, function (Container $container) {
                 $plugin     = new NamespaceMap(
                     new JNamespacePsr4Map(),
                     (array) PluginHelper::getPlugin('extension', 'namespacemap')
                 );
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/calendar/services/provider.php b/plugins/fields/calendar/services/provider.php
index f105481348fa9..992c421b4b04f 100644
--- a/plugins/fields/calendar/services/provider.php
+++ b/plugins/fields/calendar/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Calendar::class, function (Container $container) {
                 $plugin     = new Calendar(
                     (array) PluginHelper::getPlugin('fields', 'calendar')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/checkboxes/services/provider.php b/plugins/fields/checkboxes/services/provider.php
index a2a0d531fb1b1..cf2e71684ec55 100644
--- a/plugins/fields/checkboxes/services/provider.php
+++ b/plugins/fields/checkboxes/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Checkboxes::class, function (Container $container) {
                 $plugin     = new Checkboxes(
                     (array) PluginHelper::getPlugin('fields', 'checkboxes')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/checkboxes/tmpl/checkboxes.php b/plugins/fields/checkboxes/tmpl/checkboxes.php
index 8527b66a8d451..9b995b718f25e 100644
--- a/plugins/fields/checkboxes/tmpl/checkboxes.php
+++ b/plugins/fields/checkboxes/tmpl/checkboxes.php
@@ -12,7 +12,7 @@
 
 use Joomla\CMS\Language\Text;
 
-/** @var \Joomla\CMS\Layout\FileLayout $this */
+/** @var \Joomla\Plugin\Fields\Checkboxes\Extension\Checkboxes $this */
 $fieldValue = $field->value;
 
 if ($fieldValue === '' || $fieldValue === null) {
diff --git a/plugins/fields/color/services/provider.php b/plugins/fields/color/services/provider.php
index fc57bbf5da905..1edb6a08b2c94 100644
--- a/plugins/fields/color/services/provider.php
+++ b/plugins/fields/color/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Color::class, function (Container $container) {
                 $plugin     = new Color(
                     (array) PluginHelper::getPlugin('fields', 'color')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/editor/services/provider.php b/plugins/fields/editor/services/provider.php
index bdea266365567..03b54b0340193 100644
--- a/plugins/fields/editor/services/provider.php
+++ b/plugins/fields/editor/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Editor::class, function (Container $container) {
                 $plugin     = new Editor(
                     (array) PluginHelper::getPlugin('fields', 'editor')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/imagelist/services/provider.php b/plugins/fields/imagelist/services/provider.php
index 3d9161d36c39b..6d6f60e90be43 100644
--- a/plugins/fields/imagelist/services/provider.php
+++ b/plugins/fields/imagelist/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Imagelist::class, function (Container $container) {
                 $plugin     = new Imagelist(
                     (array) PluginHelper::getPlugin('fields', 'imagelist')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/integer/services/provider.php b/plugins/fields/integer/services/provider.php
index 037b1d9b10391..35c9b0868bc29 100644
--- a/plugins/fields/integer/services/provider.php
+++ b/plugins/fields/integer/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Integer::class, function (Container $container) {
                 $plugin     = new Integer(
                     (array) PluginHelper::getPlugin('fields', 'integer')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/list/params/list.xml b/plugins/fields/list/params/list.xml
index 4e21dcdef3aa3..ae1f6b45c8974 100644
--- a/plugins/fields/list/params/list.xml
+++ b/plugins/fields/list/params/list.xml
@@ -26,11 +26,11 @@
 				name="options"
 				type="subform"
 				label="PLG_FIELDS_LIST_PARAMS_OPTIONS_LABEL"
-				layout="joomla.form.field.subform.repeatable-table"
+				layout="joomla.form.field.subform.repeatable-grid"
 				icon="list"
 				multiple="true"
 				>
-				<form hidden="true" name="list_templates_modal" repeat="true">
+				<form>
 					<field
 						name="name"
 						type="text"
diff --git a/plugins/fields/list/services/provider.php b/plugins/fields/list/services/provider.php
index 8742cb6419ca9..8e0567a450194 100644
--- a/plugins/fields/list/services/provider.php
+++ b/plugins/fields/list/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(ListPlugin::class, function (Container $container) {
                 $plugin     = new ListPlugin(
                     (array) PluginHelper::getPlugin('fields', 'list')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/list/tmpl/list.php b/plugins/fields/list/tmpl/list.php
index e253ebc7cc0da..ce4b6d33228b0 100644
--- a/plugins/fields/list/tmpl/list.php
+++ b/plugins/fields/list/tmpl/list.php
@@ -12,7 +12,7 @@
 
 use Joomla\CMS\Language\Text;
 
-/** @var \Joomla\CMS\Layout\FileLayout $this */
+/** @var \Joomla\Plugin\Fields\ListField\Extension\ListPlugin $this */
 $fieldValue = $field->value;
 
 if ($fieldValue == '') {
diff --git a/plugins/fields/media/params/audio.xml b/plugins/fields/media/params/audio.xml
new file mode 100644
index 0000000000000..1ca4cc733a804
--- /dev/null
+++ b/plugins/fields/media/params/audio.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="directory"
+				type="media"
+				label="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL"
+				preview="false"
+				types="directories"
+			/>
+
+			<field
+				name="preview"
+				type="list"
+				label="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL"
+				validate="options"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="true">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE</option>
+				<option value="false">JNO</option>
+			</field>
+
+			<field
+				name="css_class"
+				type="textarea"
+				label="PLG_FIELDS_MEDIA_PARAMS_CSS_CLASS_LABEL"
+				validate="CssIdentifier"
+			/>
+
+			<field name="spacer" type="spacer" hr="true"/>
+
+			<field
+				type="hidden"
+				name="types"
+				default="audios"
+			/>
+
+			<field
+				type="radio"
+				name="controls"
+				label="PLG_FIELDS_MEDIA_PARAMS_CONTROLS_LABEL"
+				layout="joomla.form.field.radio.switcher"
+				default="1"
+				filter="integer"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				type="radio"
+				name="autoplay"
+				label="PLG_FIELDS_MEDIA_PARAMS_AUTOPLAY_LABEL"
+				layout="joomla.form.field.radio.switcher"
+				default="0"
+				filter="integer"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				type="radio"
+				name="loop"
+				label="PLG_FIELDS_MEDIA_PARAMS_LOOP_LABEL"
+				layout="joomla.form.field.radio.switcher"
+				default="0"
+				filter="integer"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				type="radio"
+				name="muted"
+				label="PLG_FIELDS_MEDIA_PARAMS_MUTED_LABEL"
+				layout="joomla.form.field.radio.switcher"
+				default="0"
+				filter="integer"
+				showon="autoplay:1"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				type="list"
+				name="preload"
+				label="PLG_FIELDS_MEDIA_PARAMS_PRELOAD_LABEL"
+				validate="options"
+				default="auto"
+				showon="autoplay:0"
+				>
+				<option value="auto">PLG_FIELDS_MEDIA_PARAMS_PRELOAD_AUTO</option>
+				<option value="none">PLG_FIELDS_MEDIA_PARAMS_PRELOAD_NONE</option>
+				<option value="metadata">PLG_FIELDS_MEDIA_PARAMS_PRELOAD_METADATA</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/fields/media/params/document.xml b/plugins/fields/media/params/document.xml
new file mode 100644
index 0000000000000..2d6f78cf2ce9b
--- /dev/null
+++ b/plugins/fields/media/params/document.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="directory"
+				type="media"
+				label="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL"
+				preview="false"
+				types="directories"
+			/>
+
+			<field
+				name="preview"
+				type="list"
+				label="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL"
+				validate="options"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="true">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE</option>
+				<option value="false">JNO</option>
+			</field>
+
+			<field
+				name="css_class"
+				type="textarea"
+				label="PLG_FIELDS_MEDIA_PARAMS_CSS_CLASS_LABEL"
+				validate="CssIdentifier"
+			/>
+
+			<field
+				type="hidden"
+				name="types"
+				default="documents"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/fields/media/params/media.xml b/plugins/fields/media/params/media.xml
index 8096f6cd07a03..1f8d70d43a955 100644
--- a/plugins/fields/media/params/media.xml
+++ b/plugins/fields/media/params/media.xml
@@ -27,6 +27,12 @@
 				label="PLG_FIELDS_MEDIA_PARAMS_IMAGE_CLASS_LABEL"
 				validate="CssIdentifier"
 			/>
+
+			<field
+				type="hidden"
+				name="types"
+				default="images"
+			/>
 		</fieldset>
 	</fields>
 </form>
diff --git a/plugins/fields/media/params/video.xml b/plugins/fields/media/params/video.xml
new file mode 100644
index 0000000000000..d41628ead0bd4
--- /dev/null
+++ b/plugins/fields/media/params/video.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="directory"
+				type="media"
+				label="PLG_FIELDS_MEDIA_PARAMS_DIRECTORY_LABEL"
+				preview="false"
+				types="directories"
+			/>
+
+			<field
+				name="preview"
+				type="list"
+				label="PLG_FIELDS_MEDIA_PARAMS_PREVIEW_LABEL"
+				validate="options"
+				>
+				<option value="">COM_FIELDS_FIELD_USE_GLOBAL</option>
+				<option value="true">PLG_FIELDS_MEDIA_PARAMS_PREVIEW_INLINE</option>
+				<option value="false">JNO</option>
+			</field>
+
+			<field
+				name="css_class"
+				type="textarea"
+				label="PLG_FIELDS_MEDIA_PARAMS_CSS_CLASS_LABEL"
+				validate="CssIdentifier"
+			/>
+			<field name="spacer" type="spacer" hr="true" />
+
+			<field
+				type="hidden"
+				name="types"
+				default="videos"
+			/>
+
+			<field
+				type="radio"
+				name="video_poster"
+				label="PLG_FIELDS_MEDIA_PARAMS_VIDEO_POSTER_LABEL"
+				layout="joomla.form.field.radio.switcher"
+				default="1"
+				filter="integer"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				type="radio"
+				name="controls"
+				label="PLG_FIELDS_MEDIA_PARAMS_CONTROLS_LABEL"
+				layout="joomla.form.field.radio.switcher"
+				default="1"
+				filter="integer"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				type="radio"
+				name="autoplay"
+				label="PLG_FIELDS_MEDIA_PARAMS_AUTOPLAY_LABEL"
+				layout="joomla.form.field.radio.switcher"
+				default="0"
+				filter="integer"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				type="radio"
+				name="muted"
+				label="PLG_FIELDS_MEDIA_PARAMS_MUTED_LABEL"
+				layout="joomla.form.field.radio.switcher"
+				default="1"
+				filter="integer"
+				showon="autoplay:1"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				type="radio"
+				name="loop"
+				label="PLG_FIELDS_MEDIA_PARAMS_LOOP_LABEL"
+				layout="joomla.form.field.radio.switcher"
+				default="0"
+				filter="integer"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				type="radio"
+				name="video_playsinline"
+				label="PLG_FIELDS_MEDIA_PARAMS_VIDEO_PLAYSINLINE_LABEL"
+				layout="joomla.form.field.radio.switcher"
+				default="1"
+				filter="integer"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				type="list"
+				name="preload"
+				label="PLG_FIELDS_MEDIA_PARAMS_PRELOAD_LABEL"
+				validate="options"
+				default="auto"
+				showon="autoplay:0"
+				>
+				<option value="auto">PLG_FIELDS_MEDIA_PARAMS_PRELOAD_AUTO</option>
+				<option value="none">PLG_FIELDS_MEDIA_PARAMS_PRELOAD_NONE</option>
+				<option value="metadata">PLG_FIELDS_MEDIA_PARAMS_PRELOAD_METADATA</option>
+			</field>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/fields/media/services/provider.php b/plugins/fields/media/services/provider.php
index 2ac6bdb752fe4..9705b57926e38 100644
--- a/plugins/fields/media/services/provider.php
+++ b/plugins/fields/media/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Media::class, function (Container $container) {
                 $plugin     = new Media(
                     (array) PluginHelper::getPlugin('fields', 'media')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/media/src/Extension/Media.php b/plugins/fields/media/src/Extension/Media.php
index 7c04a0f793869..986a680044656 100644
--- a/plugins/fields/media/src/Extension/Media.php
+++ b/plugins/fields/media/src/Extension/Media.php
@@ -11,6 +11,7 @@
 namespace Joomla\Plugin\Fields\Media\Extension;
 
 use Joomla\CMS\Event\CustomFields\BeforePrepareFieldEvent;
+use Joomla\CMS\Event\Model\PrepareDataEvent;
 use Joomla\CMS\Form\Form;
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
 use Joomla\Event\SubscriberInterface;
@@ -36,10 +37,42 @@ final class Media extends FieldsPlugin implements SubscriberInterface
     public static function getSubscribedEvents(): array
     {
         return array_merge(parent::getSubscribedEvents(), [
+            'onContentPrepareData'             => 'prepareContentData',
             'onCustomFieldsBeforePrepareField' => 'beforePrepareField',
         ]);
     }
 
+    /**
+     * Unset the fieldparams[types] parameter because the default value from the
+     * XML form get not overridden on field reload
+     *
+     * @param   PrepareDataEvent $event  The event instance.
+     *
+     * @return  void
+     * @since  6.1.0
+     */
+    public function prepareContentData(PrepareDataEvent $event)
+    {
+        $context = $event->getContext();
+        $data    = $event->getData();
+
+        if ($context !== 'com_fields.field') {
+            return;
+        }
+
+        if (!empty($data->type) && $data->type !== 'media') {
+            return;
+        }
+
+        if (\is_array($data)) {
+            unset($data['fieldparams']['types']);
+        } elseif (\is_object($data)) {
+            unset($data->fieldparams['types']);
+        }
+
+        $event->updateData($data);
+    }
+
     /**
      * Transforms the field into a DOM XML element and appends it as a child on the given parent.
      *
diff --git a/plugins/fields/media/tmpl/audio.php b/plugins/fields/media/tmpl/audio.php
new file mode 100644
index 0000000000000..1ba5bf54b7ff2
--- /dev/null
+++ b/plugins/fields/media/tmpl/audio.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Media
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Layout\LayoutHelper;
+
+if (empty($field->value) || empty($field->value['file'])) {
+    return;
+}
+
+$displayData = [
+    'src' => $field->value['file'],
+];
+
+if ($class = (string) $fieldParams->get('css_class', '')) {
+    $displayData['class'] = $class;
+}
+
+if ($fieldParams->get('controls', 1) === 1) {
+    $displayData['controls'] = 'controls';
+}
+
+if ($fieldParams->get('autoplay', 0) === 1) {
+    $displayData['autoplay'] = 'autoplay';
+}
+
+if ($fieldParams->get('loop', 0) === 1) {
+    $displayData['loop'] = 'loop';
+}
+
+if ($fieldParams->get('muted', 0) === 1) {
+    $displayData['muted'] = 'muted';
+}
+
+$displayData['preload'] = $fieldParams->get('preload', 'auto');
+
+echo LayoutHelper::render('joomla.html.audio', $displayData);
diff --git a/plugins/fields/media/tmpl/document.php b/plugins/fields/media/tmpl/document.php
new file mode 100644
index 0000000000000..0dbcb25487c39
--- /dev/null
+++ b/plugins/fields/media/tmpl/document.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Media
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Helper\MediaHelper;
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\Uri\Uri;
+
+if (empty($file = $field->value) || empty($field->value['file'])) {
+    return;
+}
+$fileUrl = MediaHelper::getCleanMediaFieldValue($field->value['file']);
+// detect local file path
+$isLocalFile = false;
+if (empty((new Uri($fileUrl))->getHost())) {
+    $fileUrl     = JPATH_SITE . DIRECTORY_SEPARATOR . $fileUrl;
+    $isLocalFile = true;
+}
+if ($isLocalFile && !\is_file($fileUrl)) {
+    return;
+}
+
+$class   = $fieldParams->get('css_class');
+$options = [];
+
+if ($class) {
+    $options['class'] = $class;
+}
+$linkText = $field->value['linktext'] ?? Text::_('JLIB_FORM_FIELD_PARAM_ACCESSIBLEMEDIA_PARAMS_LINKTEXT_DEFAULT_VALUE');
+$fileUrl  = $isLocalFile ? $field->value['file'] : $fileUrl;
+if (str_contains($linkText, '{filename}')) {
+    $linkText = str_replace('{filename}', basename($fileUrl), $linkText);
+}
+echo HTMLHelper::link($fileUrl, $linkText, $options);
diff --git a/plugins/fields/media/tmpl/video.php b/plugins/fields/media/tmpl/video.php
new file mode 100644
index 0000000000000..beaf6d0bddc37
--- /dev/null
+++ b/plugins/fields/media/tmpl/video.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Media
+ *
+ * @copyright   (C) 2026 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+\defined('_JEXEC') or die;
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Layout\LayoutHelper;
+
+if (empty($field->value) || empty($field->value['file'])) {
+    return;
+}
+
+$displayData = [
+    'src' => $field->value['file'],
+];
+
+
+if (!empty($class = (string) $fieldParams->get('css_class', ''))) {
+    $displayData['class'] = $class;
+}
+
+if ((int) $fieldParams->get('video_poster', 1) && !empty($poster = $field->value['poster'])) {
+    $displayData['poster'] = (HTMLHelper::cleanImageURL($poster))->url;
+}
+
+if ($fieldParams->get('controls', 1)) {
+    $displayData['controls'] = 'controls';
+}
+
+if ($fieldParams->get('autoplay', 0)) {
+    $displayData['autoplay'] = 'autoplay';
+}
+
+if ($fieldParams->get('loop', 0)) {
+    $displayData['loop'] = 'loop';
+}
+
+if ($fieldParams->get('muted', 0)) {
+    $displayData['muted'] = 'muted';
+}
+
+if ($fieldParams->get('video_playsinline', 1)) {
+    $displayData['playsinline'] = 'playsinline';
+}
+
+$displayData['preload'] = $fieldParams->get('preload', 'auto');
+
+echo LayoutHelper::render('joomla.html.video', $displayData);
diff --git a/plugins/fields/note/note.xml b/plugins/fields/note/note.xml
new file mode 100644
index 0000000000000..f5ea656192978
--- /dev/null
+++ b/plugins/fields/note/note.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="fields" method="upgrade">
+	<name>plg_fields_note</name>
+	<author>Joomla! Project</author>
+	<creationDate>2025-03</creationDate>
+	<copyright>(C) 2025 Open Source Matters, Inc.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>6.0.0</version>
+	<description>PLG_FIELDS_NOTE_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Fields\Note</namespace>
+	<files>
+		<folder>params</folder>
+		<folder plugin="note">services</folder>
+		<folder>src</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_fields_note.ini</language>
+		<language tag="en-GB">language/en-GB/plg_fields_note.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="label"
+					type="text"
+					label="PLG_FIELDS_NOTE_PARAMS_LABEL_LABEL"
+				/>
+
+				<field
+					name="description"
+					type="editor"
+					label="PLG_FIELDS_NOTE_PARAMS_DESCRIPTION_LABEL"
+					filter="\Joomla\CMS\Component\ComponentHelper::filterText"
+					buttons="false"
+				/>
+
+				<field
+					name="class"
+					type="text"
+					label="PLG_FIELDS_NOTE_PARAMS_CLASS_LABEL"
+					description="PLG_FIELDS_NOTE_PARAMS_CLASS_DESC"
+					default="alert alert-info"
+				/>
+
+				<field
+					name="heading"
+					type="list"
+					label="PLG_FIELDS_NOTE_PARAMS_HEADING_LABEL"
+					default="h4"
+					>
+					<option value="h1">JH1</option>
+					<option value="h2">JH2</option>
+					<option value="h3">JH3</option>
+					<option value="h4">JH4</option>
+					<option value="h5">JH5</option>
+					<option value="h6">JH6</option>
+				</field>
+
+				<field
+					name="close"
+					type="text"
+					label="PLG_FIELDS_NOTE_PARAMS_CLOSE_LABEL"
+					description="PLG_FIELDS_NOTE_PARAMS_CLOSE_DESC"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/fields/note/params/note.xml b/plugins/fields/note/params/note.xml
new file mode 100644
index 0000000000000..25405d9665262
--- /dev/null
+++ b/plugins/fields/note/params/note.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<field
+		name="default_value"
+		type="hidden"
+		filter="unset"
+	/>
+	<fields name="params" label="COM_FIELDS_FIELD_BASIC_LABEL">
+		<fieldset name="renderoptions">
+			<field
+				name="display_frontend"
+				type="radio"
+				label="PLG_FIELDS_NOTE_PARAMS_DISPLAY_FRONTEND_LABEL"
+				layout="joomla.form.field.radio.switcher"
+				default="0"
+				filter="integer"
+			>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+		</fieldset>
+	</fields>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="label"
+				type="text"
+				label="PLG_FIELDS_NOTE_PARAMS_LABEL_LABEL"
+			/>
+
+			<field
+				name="description"
+				type="editor"
+				label="PLG_FIELDS_NOTE_PARAMS_DESCRIPTION_LABEL"
+				filter="\Joomla\CMS\Component\ComponentHelper::filterText"
+				buttons="false"
+			/>
+
+			<field
+				name="class"
+				type="text"
+				label="PLG_FIELDS_NOTE_PARAMS_CLASS_LABEL"
+				description="PLG_FIELDS_NOTE_PARAMS_CLASS_DESC"
+				default="alert alert-info"
+			/>
+
+			<field
+				name="heading"
+				type="list"
+				label="PLG_FIELDS_NOTE_PARAMS_HEADING_LABEL"
+				default="h4"
+				>
+				<option value="h1">JH1</option>
+				<option value="h2">JH2</option>
+				<option value="h3">JH3</option>
+				<option value="h4">JH4</option>
+				<option value="h5">JH5</option>
+				<option value="h6">JH6</option>
+			</field>
+
+			<field
+				name="close"
+				type="text"
+				label="PLG_FIELDS_NOTE_PARAMS_CLOSE_LABEL"
+				description="PLG_FIELDS_NOTE_PARAMS_CLOSE_DESC"
+				default="true"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/behaviour/compat/services/provider.php b/plugins/fields/note/services/provider.php
similarity index 67%
rename from plugins/behaviour/compat/services/provider.php
rename to plugins/fields/note/services/provider.php
index 50eee2a0739da..43382d6f44932 100644
--- a/plugins/behaviour/compat/services/provider.php
+++ b/plugins/fields/note/services/provider.php
@@ -2,9 +2,9 @@
 
 /**
  * @package     Joomla.Plugin
- * @subpackage  Behaviour.compat
+ * @subpackage  Fields.note
  *
- * @copyright   (C) 2023 Open Source Matters, Inc. <https://www.joomla.org>
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,7 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
-use Joomla\Plugin\Behaviour\Compat\Extension\Compat;
+use Joomla\Plugin\Fields\Note\Extension\Note;
 
 return new class () implements ServiceProviderInterface {
     /**
@@ -24,18 +24,21 @@
      * @param   Container  $container  The DI container.
      *
      * @return  void
-     * @since   4.4.0
+     *
+     * @since   6.0.0
      */
     public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
-                $plugin = new Compat((array) PluginHelper::getPlugin('behaviour', 'compat'));
+            $container->lazy(Note::class, function (Container $container) {
+                $plugin = new Note(
+                    (array) PluginHelper::getPlugin('fields', 'note')
+                );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/note/src/Extension/Note.php b/plugins/fields/note/src/Extension/Note.php
new file mode 100644
index 0000000000000..3f2f228ee37f2
--- /dev/null
+++ b/plugins/fields/note/src/Extension/Note.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.note
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Plugin\Fields\Note\Extension;
+
+use Joomla\CMS\Event\Model\PrepareFormEvent;
+use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\SubscriberInterface;
+use Joomla\Utilities\ArrayHelper;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Fields Note Plugin
+ *
+ * @since  6.0.0
+ */
+final class Note extends FieldsPlugin implements SubscriberInterface
+{
+    /**
+     * The form event. Load additional parameters when available into the field form.
+     * Only when the type of the form is of interest.
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    public function prepareForm(PrepareFormEvent $event)
+    {
+        parent::prepareForm($event);
+
+        $form = $event->getForm();
+        $data = $event->getData();
+
+        $type = ArrayHelper::getValue((array) $data, 'type');
+
+        if (!$this->getApplication()->isClient('administrator') || $form->getName() !== 'com_fields.field.com_content.article' || $type !== 'note') {
+            return;
+        }
+
+        $form->removeField('required');
+        $form->removeField('hint', 'params');
+        $form->removeField('class', 'params');
+        $form->removeField('label_class', 'params');
+        $form->removeField('showlabel', 'params');
+        $form->removeField('label_render_class', 'params');
+        $form->removeField('render_class', 'params');
+        $form->removeField('value_render_class', 'params');
+        $form->removeField('show_on', 'params');
+        $form->removeField('prefix', 'params');
+        $form->removeField('suffix', 'params');
+        $form->removeField('display_readonly', 'params');
+
+        $xml = $form->getXml();
+
+        foreach ($xml->xpath('//fieldset[@name="smartsearchoptions"]') as $fieldset) {
+            $dom = dom_import_simplexml($fieldset);
+            $dom->parentNode->removeChild($dom);
+        }
+    }
+}
diff --git a/plugins/fields/note/tmpl/note.php b/plugins/fields/note/tmpl/note.php
new file mode 100644
index 0000000000000..7418958fdcc9a
--- /dev/null
+++ b/plugins/fields/note/tmpl/note.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Note
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+
+defined('_JEXEC') or die;
+
+if (empty($field->params->get('display_frontend', 0))) {
+    return;
+}
+
+$html  = [];
+$class = [];
+
+if (!empty($field->fieldparams->get('class', ''))) {
+    $class[] = $field->fieldparams->get('class', '');
+}
+
+if ($close = (string) $field->fieldparams->get('close', '')) {
+    HTMLHelper::_('bootstrap.alert');
+    $close   = $close === 'true' ? 'alert' : $close;
+    $html[]  = '<button type="button" class="btn-close" data-bs-dismiss="' . $close . '"></button>';
+    $class[] = 'alert-dismissible show';
+}
+
+$class       = $class ? ' class="' . implode(' ', $class) . '"' : '';
+$title       = (string) $field->fieldparams->get('label', ($field->label ? : ''));
+$heading     = (string) $field->fieldparams->get('heading', 'h4');
+$description = (string) $field->fieldparams->get('description', '');
+$html[]      = !empty($title) ? '<' . $heading . '>' . Text::_($title) . '</' . $heading . '>' : '';
+$html[]      = !empty($description) ? Text::_($description) : '';
+
+echo '<div ' . $class . '>' . implode('', $html) . '</div>';
diff --git a/plugins/fields/number/number.xml b/plugins/fields/number/number.xml
new file mode 100644
index 0000000000000..bc4cb8b92679e
--- /dev/null
+++ b/plugins/fields/number/number.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="plugin" group="fields" method="upgrade">
+	<name>plg_fields_number</name>
+	<author>Joomla! Project</author>
+	<creationDate>2025-03</creationDate>
+	<copyright>(C) 2025 Open Source Matters, Inc.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>6.0.0</version>
+	<description>PLG_FIELDS_NUMBER_XML_DESCRIPTION</description>
+	<namespace path="src">Joomla\Plugin\Fields\Number</namespace>
+	<files>
+		<folder>params</folder>
+		<folder plugin="number">services</folder>
+		<folder>src</folder>
+		<folder>tmpl</folder>
+	</files>
+	<languages>
+		<language tag="en-GB">language/en-GB/plg_fields_number.ini</language>
+		<language tag="en-GB">language/en-GB/plg_fields_number.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="min"
+					type="number"
+					label="PLG_FIELDS_NUMBER_PARAMS_MIN_LABEL"
+					description="PLG_FIELDS_NUMBER_PARAMS_MIN_DESC"
+					default="1.0"
+					filter="float"
+				/>
+
+				<field
+					name="max"
+					type="number"
+					label="PLG_FIELDS_NUMBER_PARAMS_MAX_LABEL"
+					description="PLG_FIELDS_NUMBER_PARAMS_MAX_DESC"
+					default="100.0"
+					filter="float"
+				/>
+
+				<field
+					name="step"
+					type="number"
+					label="PLG_FIELDS_NUMBER_PARAMS_STEP_LABEL"
+					default="1.0"
+					filter="float"
+				/>
+
+				<field
+					name="currency"
+					type="radio"
+					label="PLG_FIELDS_NUMBER_PARAMS_CURRENCY_LABEL"
+					layout="joomla.form.field.radio.switcher"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+
+				<field
+					name="symbol"
+					type="text"
+					label="PLG_FIELDS_NUMBER_PARAMS_SYMBOL_LABEL"
+					filter="string"
+					showon="currency:1"
+				/>
+
+				<field
+					name="position"
+					type="list"
+					label="PLG_FIELDS_NUMBER_PARAMS_POSITION_LABEL"
+					default="0"
+					filter="integer"
+					showon="currency:1"
+					>
+					<option value="0">PLG_FIELDS_NUMBER_PARAMS_POSITION_OPTION_BEFORE</option>
+					<option value="1">PLG_FIELDS_NUMBER_PARAMS_POSITION_OPTION_AFTER</option>
+				</field>
+
+				<field
+					name="decimals"
+					type="int"
+					label="PLG_FIELDS_NUMBER_PARAMS_DECIMALS_LABEL"
+					min="0"
+					max="10"
+					default="2"
+					filter="int"
+					showon="currency:1"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/fields/number/params/number.xml b/plugins/fields/number/params/number.xml
new file mode 100644
index 0000000000000..4ef945085f5eb
--- /dev/null
+++ b/plugins/fields/number/params/number.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form>
+	<fields name="fieldparams">
+		<fieldset name="fieldparams">
+			<field
+				name="min"
+				type="number"
+				label="PLG_FIELDS_NUMBER_PARAMS_MIN_LABEL"
+				description="PLG_FIELDS_NUMBER_PARAMS_MIN_DESC"
+				filter="float"
+			/>
+
+			<field
+				name="max"
+				type="number"
+				label="PLG_FIELDS_NUMBER_PARAMS_MAX_LABEL"
+				description="PLG_FIELDS_NUMBER_PARAMS_MAX_DESC"
+				filter="float"
+			/>
+
+			<field
+				name="step"
+				type="number"
+				label="PLG_FIELDS_NUMBER_PARAMS_STEP_LABEL"
+				default="1.0"
+				filter="float"
+			/>
+
+			<field
+				name="currency"
+				type="radio"
+				label="PLG_FIELDS_NUMBER_PARAMS_CURRENCY_LABEL"
+				layout="joomla.form.field.radio.switcher"
+				default="0"
+				filter="integer"
+				>
+				<option value="0">JNO</option>
+				<option value="1">JYES</option>
+			</field>
+
+			<field
+				name="symbol"
+				type="text"
+				label="PLG_FIELDS_NUMBER_PARAMS_SYMBOL_LABEL"
+				filter="string"
+				showon="currency:1"
+			/>
+
+			<field
+				name="position"
+				type="list"
+				label="PLG_FIELDS_NUMBER_PARAMS_POSITION_LABEL"
+				default="0"
+				filter="integer"
+				showon="currency:1"
+				>
+				<option value="0">PLG_FIELDS_NUMBER_PARAMS_POSITION_OPTION_BEFORE</option>
+				<option value="1">PLG_FIELDS_NUMBER_PARAMS_POSITION_OPTION_AFTER</option>
+			</field>
+
+			<field
+				name="decimals"
+				type="int"
+				label="PLG_FIELDS_NUMBER_PARAMS_DECIMALS_LABEL"
+				default="2"
+				filter="integer"
+				showon="currency:1"
+				min="0"
+				max="10"
+			/>
+		</fieldset>
+	</fields>
+</form>
diff --git a/plugins/fields/number/services/provider.php b/plugins/fields/number/services/provider.php
new file mode 100644
index 0000000000000..09e696e0180cb
--- /dev/null
+++ b/plugins/fields/number/services/provider.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.number
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+\defined('_JEXEC') or die;
+
+use Joomla\CMS\Extension\PluginInterface;
+use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+use Joomla\Plugin\Fields\Number\Extension\Number;
+
+return new class () implements ServiceProviderInterface {
+    /**
+     * Registers the service provider with a DI container.
+     *
+     * @param   Container  $container  The DI container.
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    public function register(Container $container)
+    {
+        $container->set(
+            PluginInterface::class,
+            $container->lazy(Number::class, function (Container $container) {
+                $plugin     = new Number(
+                    (array) PluginHelper::getPlugin('fields', 'number')
+                );
+                $plugin->setApplication(Factory::getApplication());
+
+                return $plugin;
+            })
+        );
+    }
+};
diff --git a/plugins/fields/number/src/Extension/Number.php b/plugins/fields/number/src/Extension/Number.php
new file mode 100644
index 0000000000000..53cc338aaceab
--- /dev/null
+++ b/plugins/fields/number/src/Extension/Number.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.number
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Plugin\Fields\Number\Extension;
+
+use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\SubscriberInterface;
+
+// phpcs:disable PSR1.Files.SideEffects
+\defined('_JEXEC') or die;
+// phpcs:enable PSR1.Files.SideEffects
+
+/**
+ * Fields Number Plugin
+ *
+ * @since  6.0.0
+ */
+final class Number extends FieldsPlugin implements SubscriberInterface
+{
+}
diff --git a/plugins/fields/number/tmpl/number.php b/plugins/fields/number/tmpl/number.php
new file mode 100644
index 0000000000000..5aa5bae91f907
--- /dev/null
+++ b/plugins/fields/number/tmpl/number.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Fields.Number
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+
+$value    = $field->value;
+$min      = $field->fieldparams->get('min', null);
+$currency = $field->fieldparams->get('currency', 0);
+$decimals = $field->fieldparams->get('decimals', 2);
+$symbol   = $field->fieldparams->get('symbol', '');
+$position = $field->fieldparams->get('position', 0);
+
+if (is_numeric($value)) {
+    $value = (float)$value;
+    if ($currency) {
+        $formattedCurrency = number_format($value, $decimals, Text::_('DECIMALS_SEPARATOR'), Text::_('THOUSANDS_SEPARATOR'));
+        $value = $position ? ($formattedCurrency . $symbol) : ($symbol . $formattedCurrency) ;
+    }
+} else {
+    $value = $min ?? '';
+}
+
+echo $value;
diff --git a/plugins/fields/radio/services/provider.php b/plugins/fields/radio/services/provider.php
index b5128b3835510..41d9a8caee537 100644
--- a/plugins/fields/radio/services/provider.php
+++ b/plugins/fields/radio/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Radio::class, function (Container $container) {
                 $plugin     = new Radio(
                     (array) PluginHelper::getPlugin('fields', 'radio')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/radio/tmpl/radio.php b/plugins/fields/radio/tmpl/radio.php
index 0a85f45968de5..3a3588f118c4b 100644
--- a/plugins/fields/radio/tmpl/radio.php
+++ b/plugins/fields/radio/tmpl/radio.php
@@ -12,7 +12,7 @@
 
 use Joomla\CMS\Language\Text;
 
-/** @var \Joomla\CMS\Layout\FileLayout $this */
+/** @var \Joomla\Plugin\Fields\Radio\Extension\Radio $this */
 $value = $field->value;
 
 if ($value == '') {
diff --git a/plugins/fields/sql/services/provider.php b/plugins/fields/sql/services/provider.php
index afa643bd755de..dd86bc89b98ea 100644
--- a/plugins/fields/sql/services/provider.php
+++ b/plugins/fields/sql/services/provider.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
+use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
 use Joomla\Plugin\Fields\SQL\Extension\SQL;
@@ -31,14 +32,15 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(SQL::class, function (Container $container) {
                 $plugin     = new SQL(
                     (array) PluginHelper::getPlugin('fields', 'sql')
                 );
                 $plugin->setApplication(Factory::getApplication());
+                $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/sql/src/Extension/SQL.php b/plugins/fields/sql/src/Extension/SQL.php
index 8c8795910f3e6..d53929fef3b2f 100644
--- a/plugins/fields/sql/src/Extension/SQL.php
+++ b/plugins/fields/sql/src/Extension/SQL.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Event\Model\BeforeSaveEvent;
 use Joomla\CMS\Form\Form;
 use Joomla\Component\Fields\Administrator\Plugin\FieldsListPlugin;
+use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -27,6 +28,8 @@
  */
 final class SQL extends FieldsListPlugin implements SubscriberInterface
 {
+    use DatabaseAwareTrait;
+
     /**
      * Returns an array of events this subscriber will listen to.
      *
diff --git a/plugins/fields/sql/tmpl/sql.php b/plugins/fields/sql/tmpl/sql.php
index 4206412672262..145ee57a7420a 100644
--- a/plugins/fields/sql/tmpl/sql.php
+++ b/plugins/fields/sql/tmpl/sql.php
@@ -8,9 +8,8 @@
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
-defined('_JEXEC') or die;
+\defined('_JEXEC') or die;
 
-use Joomla\CMS\Factory;
 use Joomla\Database\ParameterType;
 
 $value = $field->value;
@@ -19,9 +18,9 @@
     return;
 }
 
-$db    = Factory::getDbo();
+$db    = $this->getDatabase();
 $value = (array) $value;
-$query = $db->getQuery(true);
+$query = $db->createQuery();
 $sql   = $fieldParams->get('query', '');
 
 $bindNames = $query->bindArray($value, ParameterType::STRING);
diff --git a/plugins/fields/subform/params/subform.xml b/plugins/fields/subform/params/subform.xml
index de8264800355a..6b744c633fc39 100644
--- a/plugins/fields/subform/params/subform.xml
+++ b/plugins/fields/subform/params/subform.xml
@@ -31,7 +31,7 @@
 				type="subform"
 				label="PLG_FIELDS_SUBFORM_PARAMS_OPTIONS_LABEL"
 				icon="list"
-				layout="joomla.form.field.subform.repeatable-table"
+				layout="joomla.form.field.subform.repeatable-grid"
 				min="1"
 				multiple="true"
 				>
@@ -73,8 +73,9 @@
 					showon="repeat:1"
 					>
 					<option value="">JDEFAULT</option>
-					<option value="joomla.form.field.subform.repeatable-table">PLG_FIELDS_SUBFORM_PARAMS_EDIT_LAYOUT_OPTION_REPEATABLE_TABLE_LABEL</option>
 					<option value="joomla.form.field.subform.repeatable">PLG_FIELDS_SUBFORM_PARAMS_EDIT_LAYOUT_OPTION_REPEATABLE_FORM_LABEL</option>
+					<option value="joomla.form.field.subform.repeatable-grid">PLG_FIELDS_SUBFORM_PARAMS_EDIT_LAYOUT_OPTION_REPEATABLE_GRID_LABEL</option>
+					<option value="joomla.form.field.subform.repeatable-table">PLG_FIELDS_SUBFORM_PARAMS_EDIT_LAYOUT_OPTION_REPEATABLE_TABLE_LABEL</option>
 				</field>
 			</fieldset>
 		</fieldset>
diff --git a/plugins/fields/subform/services/provider.php b/plugins/fields/subform/services/provider.php
index 672fd7bbfe6c9..8a5cba4780324 100644
--- a/plugins/fields/subform/services/provider.php
+++ b/plugins/fields/subform/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Subform::class, function (Container $container) {
                 $plugin     = new Subform(
                     (array) PluginHelper::getPlugin('fields', 'subform')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/subform/src/Extension/Subform.php b/plugins/fields/subform/src/Extension/Subform.php
index 68909713d3053..f7ea4358d31c3 100644
--- a/plugins/fields/subform/src/Extension/Subform.php
+++ b/plugins/fields/subform/src/Extension/Subform.php
@@ -11,9 +11,13 @@
 namespace Joomla\Plugin\Fields\Subform\Extension;
 
 use Joomla\CMS\Event\CustomFields\BeforePrepareFieldEvent;
+use Joomla\CMS\Event\CustomFields\PrepareDomEvent;
+use Joomla\CMS\Event\CustomFields\PrepareFieldEvent;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
 use Joomla\Component\Fields\Administrator\Plugin\FieldsPlugin;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Event\SubscriberInterface;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -189,6 +193,8 @@ public function onCustomFieldsPrepareField($context, $item, $field)
             $rows = [$field->value];
         }
 
+        $dispatcher = Factory::getContainer()->get(DispatcherInterface::class);
+
         // Iterate over each row of the data
         foreach ($rows as $row) {
             // Holds all sub fields of this row, incl. their raw and rendered value
@@ -222,10 +228,15 @@ public function onCustomFieldsPrepareField($context, $item, $field)
                         $subfield->value = $this->renderCache[$renderCache_key];
                     } else {
                         // Render this virtual subfield
-                        $subfield->value = $this->getApplication()->triggerEvent(
+                        $subfield->value = $dispatcher->dispatch(
                             'onCustomFieldsPrepareField',
-                            [$context, $item, $subfield]
-                        );
+                            new PrepareFieldEvent('onCustomFieldsPrepareField', [
+                                'context' => $context,
+                                'item'    => $item,
+                                'subject' => $subfield,
+                            ])
+                        )->getArgument('result', []);
+
                         $this->renderCache[$renderCache_key] = $subfield->value;
                     }
                 }
@@ -311,13 +322,19 @@ public function onCustomFieldsPrepareDom($field, \DOMElement $parent, Form $form
             $parent_field->setAttribute('layout', 'joomla.form.field.subform.repeatable');
         }
 
+        $dispatcher = Factory::getContainer()->get(DispatcherInterface::class);
+
         // Iterate over the sub fields to call prepareDom on each of those sub-fields
         foreach ($subfields as $subfield) {
             // Let the relevant plugins do their work and insert the correct
             // DOMElement's into our $parent_fieldset.
-            $this->getApplication()->triggerEvent(
+            $dispatcher->dispatch(
                 'onCustomFieldsPrepareDom',
-                [$subfield, $parent_fieldset, $form]
+                new PrepareDomEvent('onCustomFieldsPrepareDom', [
+                    'subject'  => $subfield,
+                    'fieldset' => $parent_fieldset,
+                    'form'     => $form,
+                ])
             );
         }
 
diff --git a/plugins/fields/text/services/provider.php b/plugins/fields/text/services/provider.php
index 913145a60bf79..03c213f060960 100644
--- a/plugins/fields/text/services/provider.php
+++ b/plugins/fields/text/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Text::class, function (Container $container) {
                 $plugin     = new Text(
                     (array) PluginHelper::getPlugin('fields', 'text')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/textarea/services/provider.php b/plugins/fields/textarea/services/provider.php
index 546250ca1e4d8..38ecd05986ad4 100644
--- a/plugins/fields/textarea/services/provider.php
+++ b/plugins/fields/textarea/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Textarea::class, function (Container $container) {
                 $plugin     = new Textarea(
                     (array) PluginHelper::getPlugin('fields', 'textarea')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/url/services/provider.php b/plugins/fields/url/services/provider.php
index 48762014b9124..541de1c92b5d0 100644
--- a/plugins/fields/url/services/provider.php
+++ b/plugins/fields/url/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Url::class, function (Container $container) {
                 $plugin     = new Url(
                     (array) PluginHelper::getPlugin('fields', 'url')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/user/services/provider.php b/plugins/fields/user/services/provider.php
index 2bc2f919885de..53a390dfb038a 100644
--- a/plugins/fields/user/services/provider.php
+++ b/plugins/fields/user/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(User::class, function (Container $container) {
                 $plugin     = new User(
                     (array) PluginHelper::getPlugin('fields', 'user')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/fields/user/tmpl/user.php b/plugins/fields/user/tmpl/user.php
index 5a71062c8267a..aca079054beb1 100644
--- a/plugins/fields/user/tmpl/user.php
+++ b/plugins/fields/user/tmpl/user.php
@@ -10,7 +10,7 @@
 
 defined('_JEXEC') or die;
 
-/** @var \Joomla\CMS\Layout\FileLayout $this */
+/** @var \Joomla\Plugin\Fields\User\Extension\User $this */
 $value = $field->value;
 
 if ($value == '') {
diff --git a/plugins/fields/usergrouplist/services/provider.php b/plugins/fields/usergrouplist/services/provider.php
index 779769eaf5554..113753487bdf5 100644
--- a/plugins/fields/usergrouplist/services/provider.php
+++ b/plugins/fields/usergrouplist/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(UsergroupList::class, function (Container $container) {
                 $plugin     = new UsergroupList(
                     (array) PluginHelper::getPlugin('fields', 'usergrouplist')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/filesystem/local/services/provider.php b/plugins/filesystem/local/services/provider.php
index cfbeb6fc6cb37..8cd8243fcc276 100644
--- a/plugins/filesystem/local/services/provider.php
+++ b/plugins/filesystem/local/services/provider.php
@@ -31,7 +31,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Local::class, function (Container $container) {
                 $plugin = new Local(
                     (array) PluginHelper::getPlugin('filesystem', 'local'),
                     JPATH_ROOT
@@ -39,7 +39,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/filesystem/local/src/Adapter/LocalAdapter.php b/plugins/filesystem/local/src/Adapter/LocalAdapter.php
index 36a6c7dec219d..aa2bcb86e9220 100644
--- a/plugins/filesystem/local/src/Adapter/LocalAdapter.php
+++ b/plugins/filesystem/local/src/Adapter/LocalAdapter.php
@@ -16,7 +16,6 @@
 use Joomla\CMS\Image\Exception\UnparsableImageException;
 use Joomla\CMS\Image\Image;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\String\PunycodeHelper;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\CurrentUserTrait;
 use Joomla\Component\Media\Administrator\Adapter\AdapterInterface;
@@ -830,9 +829,6 @@ private function getSafeName(string $name): string
             throw new \Exception(Text::_('COM_MEDIA_ERROR_MAKESAFE'));
         }
 
-        // Transform filename to punycode
-        $name = PunycodeHelper::toPunycode($name);
-
         // Get the extension
         $extension = File::getExt($name);
 
@@ -945,7 +941,7 @@ private function getLocalThumbnailPaths(string $path): array
         $path     = str_replace(['\\', '/'], '/', $path);
 
         try {
-            $fs = Path::check(
+            $fs  = Path::check(
                 str_replace($rootPath, JPATH_ROOT . '/media/cache/com_media/thumbs/' . $this->filePath, $path),
                 JPATH_ROOT . '/media/cache/com_media/thumbs/'
             );
diff --git a/plugins/finder/categories/services/provider.php b/plugins/finder/categories/services/provider.php
index ef2a6e05a4463..9814fdaa767d9 100644
--- a/plugins/finder/categories/services/provider.php
+++ b/plugins/finder/categories/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Categories::class, function (Container $container) {
                 $plugin     = new Categories(
                     (array) PluginHelper::getPlugin('finder', 'categories')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/finder/categories/src/Extension/Categories.php b/plugins/finder/categories/src/Extension/Categories.php
index bb1af2ef2500c..390eaff481c01 100644
--- a/plugins/finder/categories/src/Extension/Categories.php
+++ b/plugins/finder/categories/src/Extension/Categories.php
@@ -393,7 +393,7 @@ protected function getListQuery($query = null)
         $db = $this->getDatabase();
 
         // Check if we can use the supplied SQL query.
-        $query = $query instanceof QueryInterface ? $query : $db->getQuery(true);
+        $query = $query instanceof QueryInterface ? $query : $db->createQuery();
 
         $query->select(
             $db->quoteName(
@@ -461,7 +461,7 @@ protected function getListQuery($query = null)
      */
     protected function getStateQuery()
     {
-        $query = $this->getDatabase()->getQuery(true);
+        $query = $this->getDatabase()->createQuery();
 
         $query->select(
             $this->getDatabase()->quoteName(
diff --git a/plugins/finder/contacts/services/provider.php b/plugins/finder/contacts/services/provider.php
index 99d8e72a23a9f..9973e1975c82e 100644
--- a/plugins/finder/contacts/services/provider.php
+++ b/plugins/finder/contacts/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Contacts::class, function (Container $container) {
                 $plugin     = new Contacts(
                     (array) PluginHelper::getPlugin('finder', 'contacts')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/finder/contacts/src/Extension/Contacts.php b/plugins/finder/contacts/src/Extension/Contacts.php
index 767b0bf24c4d2..24c2d73412281 100644
--- a/plugins/finder/contacts/src/Extension/Contacts.php
+++ b/plugins/finder/contacts/src/Extension/Contacts.php
@@ -432,7 +432,7 @@ protected function getListQuery($query = null)
         $db = $this->getDatabase();
 
         // Check if we can use the supplied SQL query.
-        $query = $query instanceof QueryInterface ? $query : $db->getQuery(true)
+        $query = $query instanceof QueryInterface ? $query : $db->createQuery()
             ->select('a.id, a.name AS title, a.alias, a.con_position AS position, a.address, a.created AS start_date')
             ->select('a.created_by_alias, a.modified, a.modified_by')
             ->select('a.metakey, a.metadesc, a.metadata, a.language')
diff --git a/plugins/finder/content/services/provider.php b/plugins/finder/content/services/provider.php
index 3b0511600990c..ae31e74ddad1e 100644
--- a/plugins/finder/content/services/provider.php
+++ b/plugins/finder/content/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Content::class, function (Container $container) {
                 $plugin     = new Content(
                     (array) PluginHelper::getPlugin('finder', 'content')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/finder/content/src/Extension/Content.php b/plugins/finder/content/src/Extension/Content.php
index 9c2af50fa94a6..703a5f73e82e2 100644
--- a/plugins/finder/content/src/Extension/Content.php
+++ b/plugins/finder/content/src/Extension/Content.php
@@ -381,7 +381,7 @@ protected function getListQuery($query = null)
         $db = $this->getDatabase();
 
         // Check if we can use the supplied SQL query.
-        $query = $query instanceof QueryInterface ? $query : $db->getQuery(true)
+        $query = $query instanceof QueryInterface ? $query : $db->createQuery()
             ->select('a.id, a.title, a.alias, a.introtext AS summary, a.fulltext AS body')
             ->select('a.images')
             ->select('a.state, a.catid, a.created AS start_date, a.created_by')
diff --git a/plugins/finder/newsfeeds/services/provider.php b/plugins/finder/newsfeeds/services/provider.php
index bc968f74e5aa0..37368d3a04bf4 100644
--- a/plugins/finder/newsfeeds/services/provider.php
+++ b/plugins/finder/newsfeeds/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Newsfeeds::class, function (Container $container) {
                 $plugin     = new Newsfeeds(
                     (array) PluginHelper::getPlugin('finder', 'newsfeeds')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php b/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php
index cf4a4125aea3a..e6d66b4afe008 100644
--- a/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php
+++ b/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php
@@ -363,7 +363,7 @@ protected function getListQuery($query = null)
         $db = $this->getDatabase();
 
         // Check if we can use the supplied SQL query.
-        $query = $query instanceof QueryInterface ? $query : $db->getQuery(true)
+        $query = $query instanceof QueryInterface ? $query : $db->createQuery()
             ->select('a.id, a.catid, a.name AS title, a.alias, a.link AS link')
             ->select('a.published AS state, a.ordering, a.created AS start_date, a.params, a.access')
             ->select('a.publish_up AS publish_start_date, a.publish_down AS publish_end_date')
diff --git a/plugins/finder/tags/services/provider.php b/plugins/finder/tags/services/provider.php
index d1910e2931d72..7f82de5952349 100644
--- a/plugins/finder/tags/services/provider.php
+++ b/plugins/finder/tags/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Tags::class, function (Container $container) {
                 $plugin     = new Tags(
                     (array) PluginHelper::getPlugin('finder', 'tags')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/finder/tags/src/Extension/Tags.php b/plugins/finder/tags/src/Extension/Tags.php
index 7083e273b389e..d0df94269f3e0 100644
--- a/plugins/finder/tags/src/Extension/Tags.php
+++ b/plugins/finder/tags/src/Extension/Tags.php
@@ -321,7 +321,7 @@ protected function getListQuery($query = null)
         $db = $this->getDatabase();
 
         // Check if we can use the supplied SQL query.
-        $query = $query instanceof QueryInterface ? $query : $db->getQuery(true)
+        $query = $query instanceof QueryInterface ? $query : $db->createQuery()
             ->select('a.id, a.title, a.alias, a.description AS summary')
             ->select('a.created_time AS start_date, a.created_user_id AS created_by')
             ->select('a.metakey, a.metadesc, a.metadata, a.language, a.access')
@@ -358,7 +358,7 @@ protected function getListQuery($query = null)
      */
     protected function getStateQuery()
     {
-        $query = $this->getDatabase()->getQuery(true);
+        $query = $this->getDatabase()->createQuery();
         $query->select($this->getDatabase()->quoteName('a.id'))
             ->select($this->getDatabase()->quoteName('a.' . $this->state_field, 'state') . ', ' . $this->getDatabase()->quoteName('a.access'))
             ->select('NULL AS cat_state, NULL AS cat_access')
@@ -379,7 +379,7 @@ protected function getStateQuery()
     protected function getUpdateQueryByTime($time)
     {
         // Build an SQL query based on the modified time.
-        $query = $this->getDatabase()->getQuery(true)
+        $query = $this->getDatabase()->createQuery()
             ->where('a.date >= ' . $this->getDatabase()->quote($time));
 
         return $query;
diff --git a/plugins/installer/folderinstaller/services/provider.php b/plugins/installer/folderinstaller/services/provider.php
index c86043ea9a4f3..b1e34c69dc95f 100644
--- a/plugins/installer/folderinstaller/services/provider.php
+++ b/plugins/installer/folderinstaller/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(FolderInstaller::class, function (Container $container) {
                 $plugin     = new FolderInstaller(
                     (array) PluginHelper::getPlugin('installer', 'folderinstaller')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/installer/folderinstaller/src/Extension/FolderInstaller.php b/plugins/installer/folderinstaller/src/Extension/FolderInstaller.php
index 0d86513730e0b..158fba326667a 100644
--- a/plugins/installer/folderinstaller/src/Extension/FolderInstaller.php
+++ b/plugins/installer/folderinstaller/src/Extension/FolderInstaller.php
@@ -26,15 +26,6 @@
  */
 final class FolderInstaller extends CMSPlugin implements SubscriberInterface
 {
-    /**
-     * Application object.
-     *
-     * @var    \Joomla\CMS\Application\CMSApplication
-     * @since  4.0.0
-     * @deprecated 6.0 Is needed for template overrides, use getApplication instead
-     */
-    protected $app;
-
     /**
      * Returns an array of events this subscriber will listen to.
      *
diff --git a/plugins/installer/override/services/provider.php b/plugins/installer/override/services/provider.php
index 7b51b5fba7fd5..e6d59c8cbac28 100644
--- a/plugins/installer/override/services/provider.php
+++ b/plugins/installer/override/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Override::class, function (Container $container) {
                 $plugin     = new Override(
                     (array) PluginHelper::getPlugin('installer', 'override')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/installer/override/src/Extension/Override.php b/plugins/installer/override/src/Extension/Override.php
index a1ea7e6782d32..4b5afacbb7562 100644
--- a/plugins/installer/override/src/Extension/Override.php
+++ b/plugins/installer/override/src/Extension/Override.php
@@ -298,7 +298,7 @@ public function load($id, $exid)
         $db = $this->getDatabase();
 
         // Create a new query object.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query
             ->select($db->quoteName('hash_id'))
@@ -345,7 +345,7 @@ private function saveOverrides($pks)
         $db = $this->getDatabase();
 
         // Create an insert query.
-        $insertQuery = $db->getQuery(true)
+        $insertQuery = $db->createQuery()
             ->insert($db->quoteName('#__template_overrides'))
             ->columns($db->quoteName($columns));
 
@@ -360,7 +360,7 @@ private function saveOverrides($pks)
             }
 
             if ($this->load($pk->id, $pk->extension_id)) {
-                $updateQuery = $db->getQuery(true)
+                $updateQuery = $db->createQuery()
                     ->update($db->quoteName('#__template_overrides'))
                     ->set(
                         [
diff --git a/plugins/installer/packageinstaller/services/provider.php b/plugins/installer/packageinstaller/services/provider.php
index 1765d00be5255..e99f2a0444853 100644
--- a/plugins/installer/packageinstaller/services/provider.php
+++ b/plugins/installer/packageinstaller/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(PackageInstaller::class, function (Container $container) {
                 $plugin     = new PackageInstaller(
                     (array) PluginHelper::getPlugin('installer', 'packageinstaller')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/installer/packageinstaller/src/Extension/PackageInstaller.php b/plugins/installer/packageinstaller/src/Extension/PackageInstaller.php
index 26256eeef278a..fb02f49bd375d 100644
--- a/plugins/installer/packageinstaller/src/Extension/PackageInstaller.php
+++ b/plugins/installer/packageinstaller/src/Extension/PackageInstaller.php
@@ -26,15 +26,6 @@
  */
 final class PackageInstaller extends CMSPlugin implements SubscriberInterface
 {
-    /**
-     * Application object
-     *
-     * @var    \Joomla\CMS\Application\CMSApplication
-     * @since  4.0.0
-     * @deprecated 6.0 Is needed for template overrides, use getApplication instead
-     */
-    protected $app;
-
     /**
      * Returns an array of events this subscriber will listen to.
      *
diff --git a/plugins/installer/urlinstaller/services/provider.php b/plugins/installer/urlinstaller/services/provider.php
index 0eb54406d1507..437ff717a2bac 100644
--- a/plugins/installer/urlinstaller/services/provider.php
+++ b/plugins/installer/urlinstaller/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(UrlInstaller::class, function (Container $container) {
                 $plugin     = new UrlInstaller(
                     (array) PluginHelper::getPlugin('installer', 'urlinstaller')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/installer/urlinstaller/src/Extension/UrlInstaller.php b/plugins/installer/urlinstaller/src/Extension/UrlInstaller.php
index c503b0af186bd..6c83a21a01cb6 100644
--- a/plugins/installer/urlinstaller/src/Extension/UrlInstaller.php
+++ b/plugins/installer/urlinstaller/src/Extension/UrlInstaller.php
@@ -26,15 +26,6 @@
  */
 final class UrlInstaller extends CMSPlugin implements SubscriberInterface
 {
-    /**
-     * Application object.
-     *
-     * @var    \Joomla\CMS\Application\CMSApplication
-     * @since  4.0.0
-     * @deprecated 6.0 Is needed for template overrides, use getApplication instead
-     */
-    protected $app;
-
     /**
      * Returns an array of events this subscriber will listen to.
      *
diff --git a/plugins/installer/webinstaller/services/provider.php b/plugins/installer/webinstaller/services/provider.php
index a8e2886996834..a5bd24b7a258a 100644
--- a/plugins/installer/webinstaller/services/provider.php
+++ b/plugins/installer/webinstaller/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(WebInstaller::class, function (Container $container) {
                 $plugin     = new WebInstaller(
                     (array) PluginHelper::getPlugin('installer', 'webinstaller')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/installer/webinstaller/src/Extension/WebInstaller.php b/plugins/installer/webinstaller/src/Extension/WebInstaller.php
index 1923c89fe2a29..8e084eb11ea76 100644
--- a/plugins/installer/webinstaller/src/Extension/WebInstaller.php
+++ b/plugins/installer/webinstaller/src/Extension/WebInstaller.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\Installer\Web\Extension;
 
-use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Event\Installer\AddInstallationTabEvent;
 use Joomla\CMS\Form\Rule\UrlRule;
 use Joomla\CMS\Language\Text;
@@ -40,15 +39,6 @@ final class WebInstaller extends CMSPlugin implements SubscriberInterface
      */
     public const REMOTE_URL = 'https://appscdn.joomla.org/webapps/';
 
-    /**
-     * The application object.
-     *
-     * @var    CMSApplication
-     * @since  4.0.0
-     * @deprecated 6.0 Is needed for template overrides, use getApplication instead
-     */
-    protected $app;
-
     /**
      * The URL to install from
      *
diff --git a/plugins/media-action/crop/crop.xml b/plugins/media-action/crop/crop.xml
index 4b914e679a0aa..88708674ab74b 100644
--- a/plugins/media-action/crop/crop.xml
+++ b/plugins/media-action/crop/crop.xml
@@ -19,4 +19,54 @@
 		<language tag="en-GB">language/en-GB/plg_media-action_crop.ini</language>
 		<language tag="en-GB">language/en-GB/plg_media-action_crop.sys.ini</language>
 	</languages>
+	<config>
+		<fields name="params">
+			<fieldset name="basic">
+				<field
+					name="aspect_ratios"
+					type="subform"
+					label="PLG_MEDIA-ACTION_CROP_ASPECT_RATIOS_LABEL"
+					description="PLG_MEDIA-ACTION_CROP_ASPECT_RATIOS_DESC"
+					multiple="true"
+					layout="joomla.form.field.subform.repeatable-table"
+					default='{"aspect_ratios0":{"label":"1:1","value":"1","group":""},"aspect_ratios1":{"label":"5:4","value":"5/4","group":"landscape"},"aspect_ratios2":{"label":"4:3","value":"4/3","group":"landscape"},"aspect_ratios3":{"label":"3:2","value":"3/2","group":"landscape"},"aspect_ratios4":{"label":"16:9","value":"16/9","group":"landscape"},"aspect_ratios5":{"label":"4:5","value":"4/5","group":"portrait"},"aspect_ratios6":{"label":"3:4","value":"3/4","group":"portrait"},"aspect_ratios7":{"label":"2:3","value":"2/3","group":"portrait"},"aspect_ratios8":{"label":"9:16","value":"9/16","group":"portrait"}}'
+				>
+					<form>
+						<field
+							name="label"
+							type="text"
+							label="PLG_MEDIA-ACTION_CROP_RATIO_LABEL_LABEL"
+							description="PLG_MEDIA-ACTION_CROP_RATIO_LABEL_DESC"
+							required="true"
+							filter="string"
+						/>
+						<field
+							name="value"
+							type="text"
+							label="PLG_MEDIA-ACTION_CROP_RATIO_VALUE_LABEL"
+							description="PLG_MEDIA-ACTION_CROP_RATIO_VALUE_DESC"
+							required="true"
+							pattern="([1-9]\d*/[1-9]\d*|[1-9]\d*)"
+							filter="string"
+							hint="9/16"
+							class="input-small"
+							size="10"
+							maxlength="10"
+						/>
+						<field
+							name="group"
+							type="list"
+							label="PLG_MEDIA-ACTION_CROP_RATIO_GROUP_LABEL"
+							description="PLG_MEDIA-ACTION_CROP_RATIO_GROUP_DESC"
+							default=""
+						>
+							<option value="">PLG_MEDIA-ACTION_CROP_RATIO_GROUP_NONE</option>
+							<option value="landscape">PLG_MEDIA-ACTION_CROP_PARAM_LANDSCAPE</option>
+							<option value="portrait">PLG_MEDIA-ACTION_CROP_PARAM_PORTRAIT</option>
+						</field>
+					</form>
+				</field>
+			</fieldset>
+		</fields>
+	</config>
 </extension>
diff --git a/plugins/media-action/crop/form/crop.xml b/plugins/media-action/crop/form/crop.xml
index 696bde1336c20..e2c8daee7f4ef 100644
--- a/plugins/media-action/crop/form/crop.xml
+++ b/plugins/media-action/crop/form/crop.xml
@@ -64,22 +64,22 @@
 			label="PLG_MEDIA-ACTION_CROP_PARAM_ASPECT"
 			hiddenLabel="true"
 			class="crop-aspect-ratio-options"
-			default="1.111"
-			>
-			<option class="crop-aspect-ratio-option" value="1.111">PLG_MEDIA-ACTION_CROP_PARAM_DEFAULT_RATIO</option>
+			default="10/9"
+		>
+			<option class="crop-aspect-ratio-option" value="10/9">PLG_MEDIA-ACTION_CROP_PARAM_DEFAULT_RATIO</option>
 			<option class="crop-aspect-ratio-option" value="">PLG_MEDIA-ACTION_CROP_PARAM_NO_RATIO</option>
 			<option class="crop-aspect-ratio-option" value="1">1:1</option>
 			<group label="PLG_MEDIA-ACTION_CROP_PARAM_LANDSCAPE">
-				<option class="crop-aspect-ratio-option" value="1.25">5:4</option>
-				<option class="crop-aspect-ratio-option" value="1.3333333333333333">4:3</option>
-				<option class="crop-aspect-ratio-option" value="1.5">3:2</option>
-				<option class="crop-aspect-ratio-option" value="1.7777777777777777">16:9</option>
+				<option class="crop-aspect-ratio-option" value="5/4">5:4</option>
+				<option class="crop-aspect-ratio-option" value="4/3">4:3</option>
+				<option class="crop-aspect-ratio-option" value="3/2">3:2</option>
+				<option class="crop-aspect-ratio-option" value="16/9">16:9</option>
 			</group>
 			<group label="PLG_MEDIA-ACTION_CROP_PARAM_PORTRAIT">
-				<option class="crop-aspect-ratio-option" value="0.8">4:5</option>
-				<option class="crop-aspect-ratio-option" value="0.75">3:4</option>
-				<option class="crop-aspect-ratio-option" value="0.6666666666666667">2:3</option>
-				<option class="crop-aspect-ratio-option" value="0.5625">9:16</option>
+				<option class="crop-aspect-ratio-option" value="4/5">4:5</option>
+				<option class="crop-aspect-ratio-option" value="3/4">3:4</option>
+				<option class="crop-aspect-ratio-option" value="2/3">2:3</option>
+				<option class="crop-aspect-ratio-option" value="9/16">9:16</option>
 			</group>
 		</field>
 	</fieldset>
diff --git a/plugins/media-action/crop/services/provider.php b/plugins/media-action/crop/services/provider.php
index 320edca8f04e2..a30859915e8e2 100644
--- a/plugins/media-action/crop/services/provider.php
+++ b/plugins/media-action/crop/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Crop::class, function (Container $container) {
                 $plugin     = new Crop(
                     (array) PluginHelper::getPlugin('media-action', 'crop')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/media-action/crop/src/Extension/Crop.php b/plugins/media-action/crop/src/Extension/Crop.php
index 8f56d62876889..3f9df84786db1 100644
--- a/plugins/media-action/crop/src/Extension/Crop.php
+++ b/plugins/media-action/crop/src/Extension/Crop.php
@@ -11,6 +11,7 @@
 namespace Joomla\Plugin\MediaAction\Crop\Extension;
 
 use Joomla\CMS\Application\CMSWebApplicationInterface;
+use Joomla\CMS\Form\Form;
 use Joomla\Component\Media\Administrator\Plugin\MediaActionPlugin;
 use Joomla\Event\SubscriberInterface;
 
@@ -25,6 +26,159 @@
  */
 final class Crop extends MediaActionPlugin implements SubscriberInterface
 {
+    /**
+     * The form event. Load additional parameters when available into the field form.
+     * Override to dynamically inject aspect ratios from plugin settings.
+     *
+     * @param   Form       $form  The form
+     * @param   \stdClass  $data  The data (required by the event interface, not used in this implementation)
+     *
+     * @return  void
+     *
+     * @since   6.1.0
+     * @note    The $data parameter is required by the Joomla event interface but is not used in this method.
+     */
+    public function onContentPrepareForm(Form $form, $data): void
+    {
+        // Check if it is the right form
+        if ($form->getName() !== 'com_media.file') {
+            return;
+        }
+
+        $this->loadCss();
+        $this->loadJs();
+
+        // The file with the params for the edit view
+        $paramsFile = JPATH_PLUGINS . '/media-action/' . $this->_name . '/form/' . $this->_name . '.xml';
+
+        // When the file exists, load it into the form
+        if (file_exists($paramsFile)) {
+            $form->loadFile($paramsFile);
+
+            // Get the aspect ratios from plugin parameters
+            $aspectRatios = $this->params->get('aspect_ratios');
+
+            // Convert to array if needed (handles stdClass from Registry)
+            if (\is_object($aspectRatios)) {
+                $aspectRatios = (array) $aspectRatios;
+            }
+
+            // If we have custom aspect ratios, modify the form field
+            if (!empty($aspectRatios) && \is_array($aspectRatios)) {
+                $this->injectAspectRatios($form, $aspectRatios);
+            }
+        }
+    }
+
+    /**
+     * Inject custom aspect ratios into the crop form
+     *
+     * @param   Form   $form          The form object
+     * @param   array  $aspectRatios  The aspect ratios from plugin settings
+     *
+     * @return  void
+     *
+     * @since   6.1.0
+     */
+    private function injectAspectRatios(Form $form, array $aspectRatios): void
+    {
+        // Get the aspectRatio field (try without group first, then with 'crop' group)
+        $field = $form->getField('aspectRatio');
+
+        if (!$field) {
+            $field = $form->getField('aspectRatio', 'crop');
+        }
+
+        if (!$field) {
+            return;
+        }
+
+        // Build new XML for the field with custom options
+        $xml = new \SimpleXMLElement('<field/>');
+        $xml->addAttribute('name', 'aspectRatio');
+        $xml->addAttribute('type', 'groupedlist');
+        $xml->addAttribute('label', 'PLG_MEDIA-ACTION_CROP_PARAM_ASPECT');
+        $xml->addAttribute('hiddenLabel', 'true');
+        $xml->addAttribute('class', 'crop-aspect-ratio-options');
+        $xml->addAttribute('default', '10/9');
+
+        // Add default options
+        $option = $xml->addChild('option', 'PLG_MEDIA-ACTION_CROP_PARAM_DEFAULT_RATIO');
+        $option->addAttribute('class', 'crop-aspect-ratio-option');
+        $option->addAttribute('value', '10/9');
+
+        $option = $xml->addChild('option', 'PLG_MEDIA-ACTION_CROP_PARAM_NO_RATIO');
+        $option->addAttribute('class', 'crop-aspect-ratio-option');
+        $option->addAttribute('value', '');
+
+        // Group ratios by landscape/portrait
+        $grouped = [
+            ''          => [],
+            'landscape' => [],
+            'portrait'  => [],
+        ];
+
+        foreach ($aspectRatios as $ratio) {
+            // Convert individual ratio to array if it's an object
+            $ratio = (array) $ratio;
+
+            $label = $ratio['label'] ?? '';
+            $value = $ratio['value'] ?? '';
+            $group = strtolower(trim($ratio['group'] ?? ''));
+
+            if (empty($label) || $value === '' || $value === null) {
+                continue;
+            }
+
+            if (!isset($grouped[$group])) {
+                $grouped[$group] = [];
+            }
+
+            $grouped[$group][] = [
+                'label' => $label,
+                'value' => $value,
+                'group' => $group,
+            ];
+        }
+
+        // Add ungrouped ratios
+        foreach ($grouped[''] as $ratio) {
+            $option = $xml->addChild('option', htmlspecialchars($ratio['label'], ENT_XML1, 'UTF-8'));
+            $option->addAttribute('class', 'crop-aspect-ratio-option');
+            $option->addAttribute('value', htmlspecialchars($ratio['value'], ENT_XML1, 'UTF-8'));
+        }
+
+        // Add landscape group
+        if (!empty($grouped['landscape'])) {
+            $group = $xml->addChild('group');
+            $group->addAttribute('label', 'PLG_MEDIA-ACTION_CROP_PARAM_LANDSCAPE');
+
+            foreach ($grouped['landscape'] as $ratio) {
+                $option = $group->addChild('option', htmlspecialchars($ratio['label'], ENT_XML1, 'UTF-8'));
+                $option->addAttribute('class', 'crop-aspect-ratio-option');
+                $option->addAttribute('value', htmlspecialchars($ratio['value'], ENT_XML1, 'UTF-8'));
+            }
+        }
+
+        // Add portrait group
+        if (!empty($grouped['portrait'])) {
+            $group = $xml->addChild('group');
+            $group->addAttribute('label', 'PLG_MEDIA-ACTION_CROP_PARAM_PORTRAIT');
+
+            foreach ($grouped['portrait'] as $ratio) {
+                $option = $group->addChild('option', htmlspecialchars($ratio['label'], ENT_XML1, 'UTF-8'));
+                $option->addAttribute('class', 'crop-aspect-ratio-option');
+                $option->addAttribute('value', htmlspecialchars($ratio['value'], ENT_XML1, 'UTF-8'));
+            }
+        }
+
+        // Replace the field in the form
+        // Try setting in default group first, then 'crop' group
+        if (!$form->setField($xml, null, true)) {
+            $form->setField($xml, 'crop', true);
+        }
+    }
+
     /**
      * Load the javascript files of the plugin.
      *
@@ -32,7 +186,7 @@ final class Crop extends MediaActionPlugin implements SubscriberInterface
      *
      * @since   4.0.0
      */
-    protected function loadJs()
+    protected function loadJs(): void
     {
         parent::loadJs();
 
@@ -50,7 +204,7 @@ protected function loadJs()
      *
      * @since   4.0.0
      */
-    protected function loadCss()
+    protected function loadCss(): void
     {
         parent::loadCss();
 
diff --git a/plugins/media-action/resize/resize.xml b/plugins/media-action/resize/resize.xml
index f83ce6c737510..bad0de64f3ab8 100644
--- a/plugins/media-action/resize/resize.xml
+++ b/plugins/media-action/resize/resize.xml
@@ -23,8 +23,8 @@
 		<fields name="params">
 			<fieldset
 				name="batch"
-				label="PLG_MEDIA-ACTION_RESIZE_BATCH_LABEL"
-				description="PLG_MEDIA-ACTION_RESIZE_BATCH_DESC"
+				label="PLG_MEDIA-ACTION_RESIZE_AUTOMATIC_LABEL"
+				description="PLG_MEDIA-ACTION_RESIZE_AUTOMATIC_DESC"
 				>
 
 				<field
diff --git a/plugins/media-action/resize/services/provider.php b/plugins/media-action/resize/services/provider.php
index 9b9ac84fb9273..040aca158b215 100644
--- a/plugins/media-action/resize/services/provider.php
+++ b/plugins/media-action/resize/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Resize::class, function (Container $container) {
                 $plugin     = new Resize(
                     (array) PluginHelper::getPlugin('media-action', 'resize')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/media-action/rotate/services/provider.php b/plugins/media-action/rotate/services/provider.php
index a3d0f9b022cfc..ce64370af4e41 100644
--- a/plugins/media-action/rotate/services/provider.php
+++ b/plugins/media-action/rotate/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Rotate::class, function (Container $container) {
                 $plugin     = new Rotate(
                     (array) PluginHelper::getPlugin('media-action', 'rotate')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/multifactorauth/email/services/provider.php b/plugins/multifactorauth/email/services/provider.php
index d9ff5dc0b0e44..b5d1009cd0e79 100644
--- a/plugins/multifactorauth/email/services/provider.php
+++ b/plugins/multifactorauth/email/services/provider.php
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageFactoryInterface;
+use Joomla\CMS\Mail\MailerFactoryInterface;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\DI\Container;
@@ -32,13 +34,15 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Email::class, function (Container $container) {
                 $plugin = new Email((array) PluginHelper::getPlugin('multifactorauth', 'email'));
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+                $plugin->setMailerFactory($container->get(MailerFactoryInterface::class));
+                $plugin->setLanguageFactory($container->get(LanguageFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/multifactorauth/email/src/Extension/Email.php b/plugins/multifactorauth/email/src/Extension/Email.php
index ce6d668003ec4..e79780516ebd9 100644
--- a/plugins/multifactorauth/email/src/Extension/Email.php
+++ b/plugins/multifactorauth/email/src/Extension/Email.php
@@ -18,10 +18,11 @@
 use Joomla\CMS\Event\MultiFactor\SaveSetup;
 use Joomla\CMS\Event\MultiFactor\Validate;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Input\Input;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\Plugin\CMSPlugin;
@@ -34,6 +35,7 @@
 use Joomla\Component\Users\Administrator\Helper\Mfa as MfaHelper;
 use Joomla\Component\Users\Administrator\Table\MfaTable;
 use Joomla\Event\SubscriberInterface;
+use Joomla\Input\Input;
 use PHPMailer\PHPMailer\Exception as phpMailerException;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -51,6 +53,8 @@
 class Email extends CMSPlugin implements SubscriberInterface
 {
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * Generated OTP length. Constant: 6 numeric digits.
@@ -66,26 +70,6 @@ class Email extends CMSPlugin implements SubscriberInterface
      */
     private const SECRET_KEY_LENGTH = 20;
 
-
-    /**
-     * Should I try to detect and register legacy event listeners, i.e. methods which accept unwrapped arguments? While
-     * this maintains a great degree of backwards compatibility to Joomla! 3.x-style plugins it is much slower. You are
-     * advised to implement your plugins using proper Listeners, methods accepting an AbstractEvent as their sole
-     * parameter, for best performance. Also bear in mind that Joomla! 5.x onwards will only allow proper listeners,
-     * removing support for legacy Listeners.
-     *
-     * @var    boolean
-     * @since  4.2.0
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Implement your plugin methods accepting an AbstractEvent object
-     *              Example:
-     *              onEventTriggerName(AbstractEvent $event) {
-     *                  $context = $event->getArgument(...);
-     *              }
-     */
-    protected $allowLegacyListeners = false;
-
     /**
      * Autoload this plugin's language files
      *
@@ -547,7 +531,12 @@ private function sendCode(string $key, ?User $user = null)
 
         try {
             $jLanguage = $this->getApplication()->getLanguage();
-            $mailer    = new MailTemplate('plg_multifactorauth_email.mail', $jLanguage->getTag());
+            $mailer    = new MailTemplate(
+                'plg_multifactorauth_email.mail',
+                $jLanguage->getTag(),
+                $this->getMailerFactory()->createMailer(),
+                $this->getLanguageFactory()
+            );
             $mailer->addRecipient($user->email, $user->name);
             $mailer->addTemplateData($replacements);
 
diff --git a/plugins/multifactorauth/fixed/services/provider.php b/plugins/multifactorauth/fixed/services/provider.php
index 71922538f10e0..35b4277eb90c3 100644
--- a/plugins/multifactorauth/fixed/services/provider.php
+++ b/plugins/multifactorauth/fixed/services/provider.php
@@ -30,9 +30,9 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Fixed::class, function (Container $container) {
                 return new Fixed((array) PluginHelper::getPlugin('multifactorauth', 'fixed'));
-            }
+            })
         );
     }
 };
diff --git a/plugins/multifactorauth/fixed/src/Extension/Fixed.php b/plugins/multifactorauth/fixed/src/Extension/Fixed.php
index cebdc1814b8e3..95f397fe5bdee 100644
--- a/plugins/multifactorauth/fixed/src/Extension/Fixed.php
+++ b/plugins/multifactorauth/fixed/src/Extension/Fixed.php
@@ -58,26 +58,6 @@ class Fixed extends CMSPlugin implements SubscriberInterface
      */
     private $mfaMethodName = 'fixed';
 
-
-    /**
-     * Should I try to detect and register legacy event listeners, i.e. methods which accept unwrapped arguments? While
-     * this maintains a great degree of backwards compatibility to Joomla! 3.x-style plugins it is much slower. You are
-     * advised to implement your plugins using proper Listeners, methods accepting an AbstractEvent as their sole
-     * parameter, for best performance. Also bear in mind that Joomla! 5.x onwards will only allow proper listeners,
-     * removing support for legacy Listeners.
-     *
-     * @var    boolean
-     * @since  4.2.0
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Implement your plugin methods accepting an AbstractEvent object
-     *              Example:
-     *              onEventTriggerName(AbstractEvent $event) {
-     *                  $context = $event->getArgument(...);
-     *              }
-     */
-    protected $allowLegacyListeners = false;
-
     /**
      * Returns an array of events this subscriber will listen to.
      *
diff --git a/plugins/multifactorauth/totp/services/provider.php b/plugins/multifactorauth/totp/services/provider.php
index bda0724c0b4bb..370234e2a7f3b 100644
--- a/plugins/multifactorauth/totp/services/provider.php
+++ b/plugins/multifactorauth/totp/services/provider.php
@@ -32,13 +32,13 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Totp::class, function (Container $container) {
                 $plugin = new Totp((array) PluginHelper::getPlugin('multifactorauth', 'totp'));
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/multifactorauth/totp/src/Extension/Totp.php b/plugins/multifactorauth/totp/src/Extension/Totp.php
index acfd42e9cc0ce..d1284601c8675 100644
--- a/plugins/multifactorauth/totp/src/Extension/Totp.php
+++ b/plugins/multifactorauth/totp/src/Extension/Totp.php
@@ -57,26 +57,6 @@ class Totp extends CMSPlugin implements SubscriberInterface
      */
     private $mfaMethodName = 'totp';
 
-
-    /**
-     * Should I try to detect and register legacy event listeners, i.e. methods which accept unwrapped arguments? While
-     * this maintains a great degree of backwards compatibility to Joomla! 3.x-style plugins it is much slower. You are
-     * advised to implement your plugins using proper Listeners, methods accepting an AbstractEvent as their sole
-     * parameter, for best performance. Also bear in mind that Joomla! 5.x onwards will only allow proper listeners,
-     * removing support for legacy Listeners.
-     *
-     * @var    boolean
-     * @since  4.2.0
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Implement your plugin methods accepting an AbstractEvent object
-     *              Example:
-     *              onEventTriggerName(AbstractEvent $event) {
-     *                  $context = $event->getArgument(...);
-     *              }
-     */
-    protected $allowLegacyListeners = false;
-
     /**
      * Returns an array of events this subscriber will listen to.
      *
diff --git a/plugins/multifactorauth/webauthn/services/provider.php b/plugins/multifactorauth/webauthn/services/provider.php
index eaf13c16c8230..41a9778ea3ce1 100644
--- a/plugins/multifactorauth/webauthn/services/provider.php
+++ b/plugins/multifactorauth/webauthn/services/provider.php
@@ -32,13 +32,13 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Webauthn::class, function (Container $container) {
                 $plugin = new Webauthn((array) PluginHelper::getPlugin('multifactorauth', 'webauthn'));
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/multifactorauth/webauthn/src/Helper/Credentials.php b/plugins/multifactorauth/webauthn/src/Helper/Credentials.php
index 94444a801cd99..72c6bb4b24ddd 100644
--- a/plugins/multifactorauth/webauthn/src/Helper/Credentials.php
+++ b/plugins/multifactorauth/webauthn/src/Helper/Credentials.php
@@ -19,7 +19,6 @@
 use Joomla\CMS\WebAuthn\Server;
 use Joomla\Plugin\Multifactorauth\Webauthn\CredentialRepository;
 use Joomla\Session\SessionInterface;
-use Laminas\Diactoros\ServerRequestFactory;
 use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientInputs;
 use Webauthn\AuthenticatorSelectionCriteria;
 use Webauthn\PublicKeyCredentialCreationOptions;
@@ -58,11 +57,7 @@ public static function requestAttestation(User $user): string
                 self::getUserEntity($user),
                 PublicKeyCredentialCreationOptions::ATTESTATION_CONVEYANCE_PREFERENCE_NONE,
                 self::getPubKeyDescriptorsForUser($user),
-                new AuthenticatorSelectionCriteria(
-                    AuthenticatorSelectionCriteria::AUTHENTICATOR_ATTACHMENT_NO_PREFERENCE,
-                    false,
-                    AuthenticatorSelectionCriteria::USER_VERIFICATION_REQUIREMENT_PREFERRED
-                ),
+                new AuthenticatorSelectionCriteria(),
                 new AuthenticationExtensionsClientInputs()
             );
 
@@ -126,7 +121,7 @@ public static function verifyAttestation(string $data): ?PublicKeyCredentialSour
         return self::getWebauthnServer($myUser->id)->loadAndCheckAttestationResponse(
             base64_decode($data),
             $publicKeyCredentialCreationOptions,
-            ServerRequestFactory::fromGlobals()
+            Uri::getInstance()->toString(['host'])
         );
     }
 
@@ -220,7 +215,7 @@ public static function verifyAssertion(string $response): void
             $data,
             $publicKeyCredentialRequestOptions,
             self::getUserEntity($user),
-            ServerRequestFactory::fromGlobals()
+            Uri::getInstance()->toString(['host'])
         );
     }
 
@@ -288,17 +283,7 @@ private static function getWebauthnServer(?int $userId): Server
             ''
         );
 
-        $refClass       = new \ReflectionClass(Server::class);
-        $refConstructor = $refClass->getConstructor();
-        $params         = $refConstructor->getParameters();
-
-        if (\count($params) === 3) {
-            // WebAuthn library 2, 3
-            $server = new Server($rpEntity, $repository, null);
-        } else {
-            // WebAuthn library 4 (based on the deprecated comments in library version 3)
-            $server = new Server($rpEntity, $repository);
-        }
+        $server = new Server($rpEntity, $repository);
 
         // Ed25519 is only available with libsodium
         if (!\function_exists('sodium_crypto_sign_seed_keypair')) {
diff --git a/plugins/multifactorauth/yubikey/services/provider.php b/plugins/multifactorauth/yubikey/services/provider.php
index ea824c6f2b296..e6af6509f6bc1 100644
--- a/plugins/multifactorauth/yubikey/services/provider.php
+++ b/plugins/multifactorauth/yubikey/services/provider.php
@@ -31,12 +31,12 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Yubikey::class, function (Container $container) {
                 $plugin = new Yubikey((array) PluginHelper::getPlugin('multifactorauth', 'yubikey'));
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/multifactorauth/yubikey/src/Extension/Yubikey.php b/plugins/multifactorauth/yubikey/src/Extension/Yubikey.php
index 91d67fab62f62..477613f5ba5f4 100644
--- a/plugins/multifactorauth/yubikey/src/Extension/Yubikey.php
+++ b/plugins/multifactorauth/yubikey/src/Extension/Yubikey.php
@@ -15,18 +15,20 @@
 use Joomla\CMS\Event\MultiFactor\GetSetup;
 use Joomla\CMS\Event\MultiFactor\SaveSetup;
 use Joomla\CMS\Event\MultiFactor\Validate;
-use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\User;
+use Joomla\CMS\Version;
 use Joomla\Component\Users\Administrator\DataShape\CaptiveRenderOptions;
 use Joomla\Component\Users\Administrator\DataShape\MethodDescriptor;
 use Joomla\Component\Users\Administrator\DataShape\SetupRenderOptions;
 use Joomla\Component\Users\Administrator\Helper\Mfa as MfaHelper;
 use Joomla\Component\Users\Administrator\Table\MfaTable;
 use Joomla\Event\SubscriberInterface;
+use Joomla\Http\HttpFactory;
 use Joomla\Input\Input;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -55,25 +57,6 @@ class Yubikey extends CMSPlugin implements SubscriberInterface
      */
     private $mfaMethodName = 'yubikey';
 
-    /**
-     * Should I try to detect and register legacy event listeners, i.e. methods which accept unwrapped arguments? While
-     * this maintains a great degree of backwards compatibility to Joomla! 3.x-style plugins it is much slower. You are
-     * advised to implement your plugins using proper Listeners, methods accepting an AbstractEvent as their sole
-     * parameter, for best performance. Also bear in mind that Joomla! 5.x onwards will only allow proper listeners,
-     * removing support for legacy Listeners.
-     *
-     * @var    boolean
-     * @since  4.2.0
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Implement your plugin methods accepting an AbstractEvent object
-     *              Example:
-     *              onEventTriggerName(AbstractEvent $event) {
-     *                  $context = $event->getArgument(...);
-     *              }
-     */
-    protected $allowLegacyListeners = false;
-
     /**
      * Returns an array of events this subscriber will listen to.
      *
@@ -369,7 +352,10 @@ private function validateYubikeyOtp(string $otp): bool
 
         $gotResponse = false;
 
-        $http     = HttpFactory::getHttp();
+        $options = new Registry();
+        $options->set('userAgent', (new Version())->getUserAgent('Joomla', true, false));
+
+        $http     = (new HttpFactory())->getHttp($options);
         $token    = $this->getApplication()->getFormToken();
         $nonce    = md5($token . uniqid(random_int(0, mt_getrandmax())));
         $response = null;
diff --git a/plugins/privacy/actionlogs/services/provider.php b/plugins/privacy/actionlogs/services/provider.php
index 3702b288b9147..ae15f44b6c42a 100644
--- a/plugins/privacy/actionlogs/services/provider.php
+++ b/plugins/privacy/actionlogs/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Actionlogs::class, function (Container $container) {
                 $plugin     = new Actionlogs(
                     (array) PluginHelper::getPlugin('privacy', 'actionlogs')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/privacy/actionlogs/src/Extension/Actionlogs.php b/plugins/privacy/actionlogs/src/Extension/Actionlogs.php
index 75cee753047f8..0a98366612783 100644
--- a/plugins/privacy/actionlogs/src/Extension/Actionlogs.php
+++ b/plugins/privacy/actionlogs/src/Extension/Actionlogs.php
@@ -63,7 +63,7 @@ public function onPrivacyExportRequest(ExportRequestEvent $event): void
         $db     = $this->getDatabase();
         $userId = (int) $user->id;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(['a.*', $db->quoteName('u.name')])
             ->from($db->quoteName('#__action_logs', 'a'))
             ->join('INNER', $db->quoteName('#__users', 'u'), $db->quoteName('a.user_id') . ' = ' . $db->quoteName('u.id'))
diff --git a/plugins/privacy/consents/services/provider.php b/plugins/privacy/consents/services/provider.php
index 07aef738d61ef..1d68f647cede6 100644
--- a/plugins/privacy/consents/services/provider.php
+++ b/plugins/privacy/consents/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Consents::class, function (Container $container) {
                 $plugin     = new Consents(
                     (array) PluginHelper::getPlugin('privacy', 'consents')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/privacy/consents/src/Extension/Consents.php b/plugins/privacy/consents/src/Extension/Consents.php
index 24ed5d43d7ee6..ff6f9ac79b1db 100644
--- a/plugins/privacy/consents/src/Extension/Consents.php
+++ b/plugins/privacy/consents/src/Extension/Consents.php
@@ -62,7 +62,7 @@ public function onPrivacyExportRequest(ExportRequestEvent $event): void
         $domain = $this->createDomain('consents', 'joomla_consent_data');
         $db     = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__privacy_consents'))
             ->where($db->quoteName('user_id') . ' = :id')
diff --git a/plugins/privacy/contact/services/provider.php b/plugins/privacy/contact/services/provider.php
index 8f243981ecc47..a2a1e0e838a4a 100644
--- a/plugins/privacy/contact/services/provider.php
+++ b/plugins/privacy/contact/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Contact::class, function (Container $container) {
                 $plugin     = new Contact(
                     (array) PluginHelper::getPlugin('privacy', 'contact')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/privacy/contact/src/Extension/Contact.php b/plugins/privacy/contact/src/Extension/Contact.php
index 512f9b777cbe4..98de76a4e95d9 100644
--- a/plugins/privacy/contact/src/Extension/Contact.php
+++ b/plugins/privacy/contact/src/Extension/Contact.php
@@ -67,7 +67,7 @@ public function onPrivacyExportRequest(ExportRequestEvent $event): void
         $domains[] = $domain;
         $db        = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__contact_details'))
             ->order($db->quoteName('ordering') . ' ASC');
diff --git a/plugins/privacy/content/services/provider.php b/plugins/privacy/content/services/provider.php
index 53bf509ea22de..747a46f727716 100644
--- a/plugins/privacy/content/services/provider.php
+++ b/plugins/privacy/content/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Content::class, function (Container $container) {
                 $plugin     = new Content(
                     (array) PluginHelper::getPlugin('privacy', 'content')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/privacy/content/src/Extension/Content.php b/plugins/privacy/content/src/Extension/Content.php
index bfe0f2c47ad1f..31fa18cc182d3 100644
--- a/plugins/privacy/content/src/Extension/Content.php
+++ b/plugins/privacy/content/src/Extension/Content.php
@@ -65,7 +65,7 @@ public function onPrivacyExportRequest(ExportRequestEvent $event): void
         $domains[] = $domain;
         $db        = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__content'))
             ->where($db->quoteName('created_by') . ' = ' . (int) $user->id)
diff --git a/plugins/privacy/message/services/provider.php b/plugins/privacy/message/services/provider.php
index 175785f6902cf..ffebd2c228212 100644
--- a/plugins/privacy/message/services/provider.php
+++ b/plugins/privacy/message/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Message::class, function (Container $container) {
                 $plugin     = new Message(
                     (array) PluginHelper::getPlugin('privacy', 'message')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/privacy/message/src/Extension/Message.php b/plugins/privacy/message/src/Extension/Message.php
index e1ba1339331b1..1ed17ad981f6c 100644
--- a/plugins/privacy/message/src/Extension/Message.php
+++ b/plugins/privacy/message/src/Extension/Message.php
@@ -62,7 +62,7 @@ public function onPrivacyExportRequest(ExportRequestEvent $event): void
         $domain = $this->createDomain('user_messages', 'joomla_user_messages_data');
         $db     = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__messages'))
             ->where($db->quoteName('user_id_from') . ' = :useridfrom')
diff --git a/plugins/privacy/user/services/provider.php b/plugins/privacy/user/services/provider.php
index edfb88323f6f0..a82a2518c4abe 100644
--- a/plugins/privacy/user/services/provider.php
+++ b/plugins/privacy/user/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(UserPlugin::class, function (Container $container) {
                 $plugin     = new UserPlugin(
                     (array) PluginHelper::getPlugin('privacy', 'user')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/privacy/user/src/Extension/UserPlugin.php b/plugins/privacy/user/src/Extension/UserPlugin.php
index cf627d563ff73..c50d46eccaffe 100644
--- a/plugins/privacy/user/src/Extension/UserPlugin.php
+++ b/plugins/privacy/user/src/Extension/UserPlugin.php
@@ -165,7 +165,7 @@ private function createNotesDomain(TableUser $user)
         $domain = $this->createDomain('user_notes', 'joomla_user_notes_data');
         $db     = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__user_notes'))
             ->where($db->quoteName('user_id') . ' = :userid')
@@ -199,7 +199,7 @@ private function createProfileDomain(TableUser $user)
         $domain = $this->createDomain('user_profile', 'joomla_user_profile_data');
         $db     = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = :userid')
diff --git a/plugins/quickicon/autoupdate/services/provider.php b/plugins/quickicon/autoupdate/services/provider.php
index 1b4a9224a682f..7b541a2c78628 100644
--- a/plugins/quickicon/autoupdate/services/provider.php
+++ b/plugins/quickicon/autoupdate/services/provider.php
@@ -31,7 +31,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Autoupdate::class, function (Container $container) {
                 $plugin = new Autoupdate(
                     Factory::getApplication()->getDocument(),
                     (array) PluginHelper::getPlugin('quickicon', 'autoupdate')
@@ -39,7 +39,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/quickicon/downloadkey/services/provider.php b/plugins/quickicon/downloadkey/services/provider.php
index 6ec77f993c5cf..7dc0e7d178d78 100644
--- a/plugins/quickicon/downloadkey/services/provider.php
+++ b/plugins/quickicon/downloadkey/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Downloadkey::class, function (Container $container) {
                 $plugin     = new Downloadkey(
                     (array) PluginHelper::getPlugin('quickicon', 'downloadkey')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/quickicon/downloadkey/src/Extension/Downloadkey.php b/plugins/quickicon/downloadkey/src/Extension/Downloadkey.php
index a2efc3e4720a8..e6be8653192b0 100644
--- a/plugins/quickicon/downloadkey/src/Extension/Downloadkey.php
+++ b/plugins/quickicon/downloadkey/src/Extension/Downloadkey.php
@@ -131,7 +131,7 @@ private function getMissingDownloadKeyInfo(): array
             'missing'   => 0,
         ];
 
-        if (!class_exists('Joomla\Component\Installer\Administrator\Helper\InstallerHelper')) {
+        if (!class_exists(ComInstallerHelper::class)) {
             require_once JPATH_ADMINISTRATOR . '/components/com_installer/Helper/InstallerHelper.php';
         }
 
diff --git a/plugins/quickicon/eos/services/provider.php b/plugins/quickicon/eos/services/provider.php
index f84aeac72e3fd..e5c415953b6da 100644
--- a/plugins/quickicon/eos/services/provider.php
+++ b/plugins/quickicon/eos/services/provider.php
@@ -34,7 +34,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Eos::class, function (Container $container) {
                 $plugin     = new Eos(
                     (array) PluginHelper::getPlugin('quickicon', 'eos')
                 );
@@ -42,7 +42,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/quickicon/eos/src/Extension/Eos.php b/plugins/quickicon/eos/src/Extension/Eos.php
index 3e3505318b45a..7a31bda97b4ea 100644
--- a/plugins/quickicon/eos/src/Extension/Eos.php
+++ b/plugins/quickicon/eos/src/Extension/Eos.php
@@ -38,7 +38,7 @@ final class Eos extends CMSPlugin implements SubscriberInterface
      * @var    string
      * @since 4.4.0
      */
-    private const EOS_DATE = '2027-10-12';
+    private const EOS_DATE = '2029-10-16';
 
     /**
      * Load the language file on instantiation.
@@ -139,7 +139,7 @@ private function saveParams(): bool
     {
         $params = $this->params->toString('JSON');
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->update($db->quoteName('#__extensions'))
             ->set($db->quoteName('params') . ' = :params')
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -189,7 +189,7 @@ private function getMessageInfo(int $monthsUntilEOS, int $inverted): array
                 'id'          => 5,
                 'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_ERROR_SUPPORT_ENDED',
                 'messageType' => 'error',
-                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Joomla_5.4.x_to_6.x_Planning_and_Upgrade_Step_by_Step',
+                'messageLink' => 'https://guide.joomla.org/user-manual/migration/joomla-6-to-7-planning-and-upgrade-step-by-step',
                 'snoozable'   => false,
             ];
         }
@@ -200,7 +200,7 @@ private function getMessageInfo(int $monthsUntilEOS, int $inverted): array
                 'id'          => 4,
                 'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_WARNING_SUPPORT_ENDING',
                 'messageType' => 'warning',
-                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Joomla_5.4.x_to_6.x_Planning_and_Upgrade_Step_by_Step',
+                'messageLink' => 'https://guide.joomla.org/user-manual/migration/joomla-6-to-7-planning-and-upgrade-step-by-step',
                 'snoozable'   => true,
             ];
         }
@@ -211,7 +211,7 @@ private function getMessageInfo(int $monthsUntilEOS, int $inverted): array
                 'id'          => 3,
                 'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_WARNING_SECURITY_ONLY',
                 'messageType' => 'warning',
-                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Joomla_5.4.x_to_6.x_Planning_and_Upgrade_Step_by_Step',
+                'messageLink' => 'https://guide.joomla.org/user-manual/migration/joomla-6-to-7-planning-and-upgrade-step-by-step',
                 'snoozable'   => true,
             ];
         }
@@ -222,7 +222,7 @@ private function getMessageInfo(int $monthsUntilEOS, int $inverted): array
                 'id'          => 2,
                 'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_INFO_02',
                 'messageType' => 'info',
-                'messageLink' => 'https://docs.joomla.org/Special:MyLanguage/Pre-Update_Check',
+                'messageLink' => 'https://guide.joomla.org/user-manual/migration/migration-version-update',
                 'snoozable'   => true,
             ];
         }
@@ -233,7 +233,7 @@ private function getMessageInfo(int $monthsUntilEOS, int $inverted): array
                 'id'          => 1,
                 'messageText' => 'PLG_QUICKICON_EOS_MESSAGE_INFO_01',
                 'messageType' => 'info',
-                'messageLink' => 'https://joomla.org/6',
+                'messageLink' => 'https://joomla.org/7',
                 'snoozable'   => true,
             ];
         }
diff --git a/plugins/quickicon/extensionupdate/services/provider.php b/plugins/quickicon/extensionupdate/services/provider.php
index 536d972d0a98d..d093a0e0ea39c 100644
--- a/plugins/quickicon/extensionupdate/services/provider.php
+++ b/plugins/quickicon/extensionupdate/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Extensionupdate::class, function (Container $container) {
                 $plugin     = new Extensionupdate(
                     (array) PluginHelper::getPlugin('quickicon', 'extensionupdate')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/quickicon/extensionupdate/src/Extension/Extensionupdate.php b/plugins/quickicon/extensionupdate/src/Extension/Extensionupdate.php
index 66a0f1a8b9f8e..cb2b1d6bc5cd7 100644
--- a/plugins/quickicon/extensionupdate/src/Extension/Extensionupdate.php
+++ b/plugins/quickicon/extensionupdate/src/Extension/Extensionupdate.php
@@ -83,6 +83,7 @@ public function onGetIcons(QuickIconsEvent $event): void
 
         Text::script('PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE');
         Text::script('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND');
+        Text::script('PLG_QUICKICON_EXTENSIONUPDATE_SECURITY_UPDATEFOUND');
         Text::script('PLG_QUICKICON_EXTENSIONUPDATE_ERROR');
         Text::script('MESSAGE');
         Text::script('ERROR');
diff --git a/plugins/quickicon/joomlaupdate/services/provider.php b/plugins/quickicon/joomlaupdate/services/provider.php
index 2cb1f8b1f5f0d..1948e18cb46c4 100644
--- a/plugins/quickicon/joomlaupdate/services/provider.php
+++ b/plugins/quickicon/joomlaupdate/services/provider.php
@@ -31,7 +31,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Joomlaupdate::class, function (Container $container) {
                 $plugin = new Joomlaupdate(
                     Factory::getApplication()->getDocument(),
                     (array) PluginHelper::getPlugin('quickicon', 'joomlaupdate')
@@ -39,7 +39,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/quickicon/overridecheck/services/provider.php b/plugins/quickicon/overridecheck/services/provider.php
index db1cde666918b..3bb89c8977208 100644
--- a/plugins/quickicon/overridecheck/services/provider.php
+++ b/plugins/quickicon/overridecheck/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(OverrideCheck::class, function (Container $container) {
                 $plugin     = new OverrideCheck(
                     (array) PluginHelper::getPlugin('quickicon', 'overridecheck')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/quickicon/overridecheck/src/Extension/OverrideCheck.php b/plugins/quickicon/overridecheck/src/Extension/OverrideCheck.php
index bd38f3795a174..216a84252345a 100644
--- a/plugins/quickicon/overridecheck/src/Extension/OverrideCheck.php
+++ b/plugins/quickicon/overridecheck/src/Extension/OverrideCheck.php
@@ -119,7 +119,7 @@ public function onGetIcons(QuickIconsEvent $event): void
     private function getOverridePluginId()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('folder') . ' = ' . $db->quote('installer'))
diff --git a/plugins/quickicon/phpversioncheck/services/provider.php b/plugins/quickicon/phpversioncheck/services/provider.php
index c9cbc42035c3b..10bf042f4a74a 100644
--- a/plugins/quickicon/phpversioncheck/services/provider.php
+++ b/plugins/quickicon/phpversioncheck/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(PhpVersionCheck::class, function (Container $container) {
                 $plugin     = new PhpVersionCheck(
                     (array) PluginHelper::getPlugin('quickicon', 'phpversioncheck')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php b/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php
index 5f5164e6317c8..bd4f3a3172ec7 100644
--- a/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php
+++ b/plugins/quickicon/phpversioncheck/src/Extension/PhpVersionCheck.php
@@ -119,30 +119,6 @@ public function onGetIcons(QuickIconsEvent $event): void
     private function getPhpSupport()
     {
         $phpSupportData = [
-            '7.2' => [
-                'security' => '2019-11-30',
-                'eos'      => '2020-11-30',
-            ],
-            '7.3' => [
-                'security' => '2020-12-06',
-                'eos'      => '2021-12-06',
-            ],
-            '7.4' => [
-                'security' => '2021-11-28',
-                'eos'      => '2022-11-28',
-            ],
-            '8.0' => [
-                'security' => '2022-11-26',
-                'eos'      => '2023-11-26',
-            ],
-            '8.1' => [
-                'security' => '2023-11-25',
-                'eos'      => '2025-12-31',
-            ],
-            '8.2' => [
-                'security' => '2024-12-31',
-                'eos'      => '2026-12-31',
-            ],
             '8.3' => [
                 'security' => '2025-12-31',
                 'eos'      => '2027-12-31',
diff --git a/plugins/quickicon/privacycheck/services/provider.php b/plugins/quickicon/privacycheck/services/provider.php
index f16617ba900d6..7608fc36d8675 100644
--- a/plugins/quickicon/privacycheck/services/provider.php
+++ b/plugins/quickicon/privacycheck/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(PrivacyCheck::class, function (Container $container) {
                 $plugin     = new PrivacyCheck(
                     (array) PluginHelper::getPlugin('quickicon', 'privacycheck')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/sampledata/blog/services/provider.php b/plugins/sampledata/blog/services/provider.php
index 30997e372a533..a884447f289a9 100644
--- a/plugins/sampledata/blog/services/provider.php
+++ b/plugins/sampledata/blog/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Blog::class, function (Container $container) {
                 $plugin     = new Blog(
                     (array) PluginHelper::getPlugin('sampledata', 'blog')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/sampledata/blog/src/Extension/Blog.php b/plugins/sampledata/blog/src/Extension/Blog.php
index e213c94f40247..3e69633c0dbf4 100644
--- a/plugins/sampledata/blog/src/Extension/Blog.php
+++ b/plugins/sampledata/blog/src/Extension/Blog.php
@@ -339,7 +339,7 @@ public function onAjaxSampledataApplyStep1(AjaxEvent $event): void
             }
 
             // Get the stage Ids of the new stages
-            $query = $this->getDatabase()->getQuery(true);
+            $query = $this->getDatabase()->createQuery();
 
             $query->select([$this->getDatabase()->quoteName('title'), $this->getDatabase()->quoteName('id')])
                 ->from($this->getDatabase()->quoteName('#__workflow_stages'))
@@ -769,7 +769,7 @@ public function onAjaxSampledataApplyStep1(AjaxEvent $event): void
                 && ComponentHelper::getParams('com_content')->get('workflow_enabled')
             ) {
                 // Set the article featured in #__content_frontpage
-                $this->getDatabase()->getQuery(true);
+                $this->getDatabase()->createQuery();
 
                 $featuredItem = (object) [
                     'content_id'    => $articleModel->getItem()->id,
diff --git a/plugins/sampledata/multilang/services/provider.php b/plugins/sampledata/multilang/services/provider.php
index 05b03e6acba28..8fad70cd86e1f 100644
--- a/plugins/sampledata/multilang/services/provider.php
+++ b/plugins/sampledata/multilang/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(MultiLanguage::class, function (Container $container) {
                 $plugin     = new MultiLanguage(
                     (array) PluginHelper::getPlugin('sampledata', 'multilang')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/sampledata/multilang/src/Extension/MultiLanguage.php b/plugins/sampledata/multilang/src/Extension/MultiLanguage.php
index f0b9b7e9d7658..5f42d3864e6bd 100644
--- a/plugins/sampledata/multilang/src/Extension/MultiLanguage.php
+++ b/plugins/sampledata/multilang/src/Extension/MultiLanguage.php
@@ -22,8 +22,11 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Session\Session;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Module;
 use Joomla\CMS\Workflow\Workflow;
+use Joomla\Component\Categories\Administrator\Table\CategoryTable;
+use Joomla\Component\Content\Administrator\Table\ArticleTable;
+use Joomla\Component\Menus\Administrator\Table\MenuTable;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
@@ -541,7 +544,7 @@ private function enablePlugin($pluginName)
     {
         // Create a new db object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query
             ->update($db->quoteName('#__extensions'))
@@ -599,7 +602,7 @@ private function disableModuleMainMenu()
     {
         // Create a new db object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Disable main menu module with Home set to ALL languages.
         $query
@@ -633,7 +636,7 @@ private function disableModuleMainMenu()
      */
     private function addModuleLanguageSwitcher()
     {
-        $tableModule = Table::getInstance('Module', 'Joomla\\CMS\\Table\\');
+        $tableModule = new Module($this->getDatabase());
 
         $moduleData  = [
             'id'        => 0,
@@ -682,7 +685,7 @@ private function addModuleLanguageSwitcher()
      */
     private function addModuleMenu($itemLanguage)
     {
-        $tableModule = Table::getInstance('Module', 'Joomla\\CMS\\Table\\');
+        $tableModule = new Module($this->getDatabase());
         $title       = 'Main menu ' . $itemLanguage->language;
 
         $moduleData = [
@@ -765,7 +768,7 @@ private function addMenuGroup($itemLanguage)
      *
      * @param   \stdClass  $itemLanguage  Language Object.
      *
-     * @return  Table|boolean Menu Item Object. False otherwise.
+     * @return  MenuTable|boolean Menu Item Object. False otherwise.
      *
      * @since   4.0.0
      */
@@ -840,7 +843,7 @@ private function addAllCategoriesMenuItem($itemLanguage)
      * @param   \stdClass  $itemLanguage  Language Object.
      * @param   integer   $categoryId    The id of the category displayed by the blog.
      *
-     * @return  Table|boolean Menu Item Object. False otherwise.
+     * @return  MenuTable|boolean Menu Item Object. False otherwise.
      *
      * @since   4.0.0
      */
@@ -922,7 +925,7 @@ private function addAssociations($groupedAssociations)
 
         foreach ($groupedAssociations as $context => $associations) {
             $key   = md5(json_encode($associations));
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->insert($db->quoteName('#__associations'));
 
             foreach ($associations as $language => $id) {
@@ -970,7 +973,7 @@ private function addModuleInModuleMenu($moduleId)
     {
         // Create a new db object.
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
         $moduleId = (int) $moduleId;
 
         // Add Module in Module menus.
@@ -995,7 +998,7 @@ private function addModuleInModuleMenu($moduleId)
      *
      * @param   \stdClass  $itemLanguage  Language Object.
      *
-     * @return  Table|boolean Category Object. False otherwise.
+     * @return  CategoryTable|boolean Category Object. False otherwise.
      *
      * @since   4.0.0
      */
@@ -1066,7 +1069,7 @@ public function addCategory($itemLanguage)
      * @param   \stdClass  $itemLanguage  Language Object.
      * @param   integer   $categoryId    The id of the category where we want to add the article.
      *
-     * @return  Table|boolean Article Object. False otherwise.
+     * @return  ArticleTable|boolean Article Object. False otherwise.
      *
      * @since   4.0.0
      */
@@ -1139,7 +1142,7 @@ private function addArticle($itemLanguage, $categoryId)
         // Get the new item ID.
         $newId = $article->get('id');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->insert($db->quoteName('#__content_frontpage'))
             ->values($newId . ', 0, NULL, NULL');
 
@@ -1176,7 +1179,7 @@ private function addArticle($itemLanguage, $categoryId)
     private function publishContentLanguages()
     {
         // Publish the Content Languages.
-        $tableLanguage = Table::getInstance('Language');
+        $tableLanguage = new \Joomla\CMS\Table\Language($this->getDatabase());
 
         $siteLanguages = $this->getInstalledlangs('site');
 
@@ -1283,7 +1286,7 @@ protected function getLanguageList($clientId = 1)
     {
         // Create a new db object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select field element from the extensions table.
         $query->select($db->quoteName(['element', 'name']))
@@ -1364,7 +1367,7 @@ private function getAdminId()
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the admin user ID
         $query
diff --git a/plugins/sampledata/testing/services/provider.php b/plugins/sampledata/testing/services/provider.php
index 285c8d865acdf..777c6d1f519ed 100644
--- a/plugins/sampledata/testing/services/provider.php
+++ b/plugins/sampledata/testing/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Testing::class, function (Container $container) {
                 $plugin     = new Testing(
                     (array) PluginHelper::getPlugin('sampledata', 'testing')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/schemaorg/article/services/provider.php b/plugins/schemaorg/article/services/provider.php
index 35fc6aee06ef8..2576c33461964 100644
--- a/plugins/schemaorg/article/services/provider.php
+++ b/plugins/schemaorg/article/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Article::class, function (Container $container) {
                 $plugin = new Article(
                     (array) PluginHelper::getPlugin('schemaorg', 'article')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/schemaorg/blogposting/services/provider.php b/plugins/schemaorg/blogposting/services/provider.php
index 0db56a9bda580..5e00993a25258 100644
--- a/plugins/schemaorg/blogposting/services/provider.php
+++ b/plugins/schemaorg/blogposting/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(BlogPosting::class, function (Container $container) {
                 $plugin = new BlogPosting(
                     (array) PluginHelper::getPlugin('schemaorg', 'blogposting')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/schemaorg/book/services/provider.php b/plugins/schemaorg/book/services/provider.php
index 74932f1c1bbc3..9774edd2918f1 100644
--- a/plugins/schemaorg/book/services/provider.php
+++ b/plugins/schemaorg/book/services/provider.php
@@ -31,7 +31,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Book::class, function (Container $container) {
                 $plugin = new Book(
                     (array) PluginHelper::getPlugin('schemaorg', 'book')
                 );
@@ -39,7 +39,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/schemaorg/custom/services/provider.php b/plugins/schemaorg/custom/services/provider.php
index c7ca2a863767c..d68ee45302f6b 100644
--- a/plugins/schemaorg/custom/services/provider.php
+++ b/plugins/schemaorg/custom/services/provider.php
@@ -31,7 +31,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Custom::class, function (Container $container) {
                 $plugin = new Custom(
                     (array) PluginHelper::getPlugin('schemaorg', 'custom')
                 );
@@ -39,7 +39,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/schemaorg/event/services/provider.php b/plugins/schemaorg/event/services/provider.php
index 43bffec09faa1..4328de4502006 100644
--- a/plugins/schemaorg/event/services/provider.php
+++ b/plugins/schemaorg/event/services/provider.php
@@ -31,7 +31,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Event::class, function (Container $container) {
                 $plugin = new Event(
                     (array) PluginHelper::getPlugin('schemaorg', 'event')
                 );
@@ -39,7 +39,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/schemaorg/jobposting/services/provider.php b/plugins/schemaorg/jobposting/services/provider.php
index 5a84557111a8c..2e76bbbe9b06a 100644
--- a/plugins/schemaorg/jobposting/services/provider.php
+++ b/plugins/schemaorg/jobposting/services/provider.php
@@ -31,7 +31,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(JobPosting::class, function (Container $container) {
                 $plugin = new JobPosting(
                     (array) PluginHelper::getPlugin('schemaorg', 'jobposting')
                 );
@@ -39,7 +39,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/schemaorg/organization/services/provider.php b/plugins/schemaorg/organization/services/provider.php
index d52add10cea07..5624b8881c782 100644
--- a/plugins/schemaorg/organization/services/provider.php
+++ b/plugins/schemaorg/organization/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Organization::class, function (Container $container) {
                 $plugin = new Organization(
                     (array) PluginHelper::getPlugin('schemaorg', 'organization')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/schemaorg/person/services/provider.php b/plugins/schemaorg/person/services/provider.php
index 1c71c03892e4f..005976e5a3704 100644
--- a/plugins/schemaorg/person/services/provider.php
+++ b/plugins/schemaorg/person/services/provider.php
@@ -31,7 +31,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Person::class, function (Container $container) {
                 $plugin = new Person(
                     (array) PluginHelper::getPlugin('schemaorg', 'person')
                 );
@@ -39,7 +39,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/schemaorg/recipe/services/provider.php b/plugins/schemaorg/recipe/services/provider.php
index 2b53d63612348..41831f493f2fe 100644
--- a/plugins/schemaorg/recipe/services/provider.php
+++ b/plugins/schemaorg/recipe/services/provider.php
@@ -31,7 +31,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Recipe::class, function (Container $container) {
                 $plugin = new Recipe(
                     (array) PluginHelper::getPlugin('schemaorg', 'recipe')
                 );
@@ -39,7 +39,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/accessibility/services/provider.php b/plugins/system/accessibility/services/provider.php
index 345efbc664074..8dc4f6f24edf5 100644
--- a/plugins/system/accessibility/services/provider.php
+++ b/plugins/system/accessibility/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Accessibility::class, function (Container $container) {
                 $plugin     = new Accessibility(
                     (array) PluginHelper::getPlugin('system', 'accessibility')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/actionlogs/services/provider.php b/plugins/system/actionlogs/services/provider.php
index 811539b552016..c723e25adb177 100644
--- a/plugins/system/actionlogs/services/provider.php
+++ b/plugins/system/actionlogs/services/provider.php
@@ -33,7 +33,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(ActionLogs::class, function (Container $container) {
                 $plugin = new ActionLogs(
                     (array) PluginHelper::getPlugin('system', 'actionlogs')
                 );
@@ -42,7 +42,7 @@ function (Container $container) {
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/actionlogs/src/Extension/ActionLogs.php b/plugins/system/actionlogs/src/Extension/ActionLogs.php
index 0ed4effdde34d..2eced72b0d5f3 100644
--- a/plugins/system/actionlogs/src/Extension/ActionLogs.php
+++ b/plugins/system/actionlogs/src/Extension/ActionLogs.php
@@ -174,7 +174,7 @@ public function onContentPrepareData(Model\PrepareDataEvent $event): void
         $db = $this->getDatabase();
         $id = (int) $data->id;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['notify', 'extensions']))
             ->from($db->quoteName('#__action_logs_users'))
             ->where($db->quoteName('user_id') . ' = :userid')
@@ -231,7 +231,7 @@ public function onUserAfterSave(User\AfterSaveEvent $event): void
         $userid     = (int) $user['id'];
         $db         = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__action_logs_users'))
             ->where($db->quoteName('user_id') . ' = :userid')
@@ -318,7 +318,7 @@ public function onUserAfterDelete(User\AfterDeleteEvent $event): void
         $db     = $this->getDatabase();
         $userid = (int) $user['id'];
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__action_logs_users'))
             ->where($db->quoteName('user_id') . ' = :userid')
             ->bind(':userid', $userid, ParameterType::INTEGER);
@@ -393,7 +393,7 @@ public function onExtensionAfterSave(Model\AfterSaveEvent $event): void
 
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['user_id', 'notify', 'extensions']))
             ->from($db->quoteName('#__action_logs_users'));
 
diff --git a/plugins/system/cache/services/provider.php b/plugins/system/cache/services/provider.php
index 4d7527d09bd58..ba1e91c1400bf 100644
--- a/plugins/system/cache/services/provider.php
+++ b/plugins/system/cache/services/provider.php
@@ -34,7 +34,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Cache::class, function (Container $container) {
                 $plugin                 = PluginHelper::getPlugin('system', 'cache');
                 $dispatcher             = $container->get(DispatcherInterface::class);
                 $documentFactory        = $container->get('document.factory');
@@ -47,7 +47,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/debug/services/provider.php b/plugins/system/debug/services/provider.php
index 1adb606bffba4..c236e0032db10 100644
--- a/plugins/system/debug/services/provider.php
+++ b/plugins/system/debug/services/provider.php
@@ -32,13 +32,13 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Debug::class, function (Container $container) {
                 return new Debug(
                     (array) PluginHelper::getPlugin('system', 'debug'),
                     Factory::getApplication(),
                     $container->get(DatabaseInterface::class)
                 );
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/debug/src/Extension/Debug.php b/plugins/system/debug/src/Extension/Debug.php
index b15918d112ded..5689a28953dfe 100644
--- a/plugins/system/debug/src/Extension/Debug.php
+++ b/plugins/system/debug/src/Extension/Debug.php
@@ -486,7 +486,11 @@ public function onAfterDisconnect(ConnectionEvent $event): void
             }
         }
 
-        if ($this->params->get('query_explains') && \in_array($db->getServerType(), ['mysql', 'postgresql'], true)) {
+        if (
+            $this->queryMonitor
+            && $this->params->get('query_explains')
+            && \in_array($db->getServerType(), ['mysql', 'postgresql'], true)
+        ) {
             $logs        = $this->queryMonitor->getLogs();
             $boundParams = $this->queryMonitor->getBoundParams();
 
@@ -500,7 +504,7 @@ public function onAfterDisconnect(ConnectionEvent $event): void
 
                 if ((stripos($query, 'select') === 0) || ($dbVersion56 && ((stripos($query, 'delete') === 0) || (stripos($query, 'update') === 0)))) {
                     try {
-                        $queryInstance = $db->getQuery(true);
+                        $queryInstance = $db->createQuery();
                         $queryInstance->setQuery('EXPLAIN ' . ($dbVersion56 ? 'EXTENDED ' : '') . $query);
 
                         if ($boundParams[$k]) {
@@ -530,7 +534,7 @@ public function onAfterDisconnect(ConnectionEvent $event): void
      *
      * @since   3.1
      *
-     * @deprecated  4.3 will be removed in 6.0
+     * @deprecated  4.3 will be removed in 7.0
      *              Use \Joomla\CMS\Log\Log::add(LogEntry $entry) instead
      */
     public function logger(LogEntry $entry)
diff --git a/plugins/system/debug/src/Storage/FileStorage.php b/plugins/system/debug/src/Storage/FileStorage.php
index 25544244d140b..1532ecdcd243e 100644
--- a/plugins/system/debug/src/Storage/FileStorage.php
+++ b/plugins/system/debug/src/Storage/FileStorage.php
@@ -165,7 +165,7 @@ private function isSecureToReturnData($data): bool
             return false;
         }
 
-        $currentUser           = Factory::getUser();
+        $currentUser           = Factory::getApplication()->getIdentity();
         $currentUserId         = $currentUser->id;
         $currentUserSuperAdmin = $currentUser->authorise('core.admin');
 
diff --git a/plugins/system/fields/services/provider.php b/plugins/system/fields/services/provider.php
index a11cfa03a9e41..2eaa2a1c156ee 100644
--- a/plugins/system/fields/services/provider.php
+++ b/plugins/system/fields/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Fields::class, function (Container $container) {
                 $plugin     = new Fields(
                     (array) PluginHelper::getPlugin('system', 'fields')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/guidedtours/src/Extension/GuidedTours.php b/plugins/system/guidedtours/src/Extension/GuidedTours.php
index 8f014fa71a5f5..3d2bee1837748 100644
--- a/plugins/system/guidedtours/src/Extension/GuidedTours.php
+++ b/plugins/system/guidedtours/src/Extension/GuidedTours.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Session\Session;
 use Joomla\Component\Guidedtours\Administrator\Extension\GuidedtoursComponent;
@@ -202,7 +201,7 @@ public function onBeforeCompileHead()
                     $profileKey = 'guidedtour.id.' . $tour->id;
 
                     // Check if the tour state has already been saved some time before.
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select($db->quoteName('profile_value'))
                         ->from($db->quoteName('#__user_profiles'))
                         ->where($db->quoteName('user_id') . ' = :user_id')
@@ -281,7 +280,7 @@ private function getTour($tourId)
     /**
      * Return a tour and its steps or null if not found
      *
-     * @param   CMSObject  $item  The tour to load
+     * @param   \stdClass  $item  The tour to load
      *
      * @return null|object
      *
diff --git a/plugins/system/highlight/services/provider.php b/plugins/system/highlight/services/provider.php
index 304468d28cf96..a60c465680990 100644
--- a/plugins/system/highlight/services/provider.php
+++ b/plugins/system/highlight/services/provider.php
@@ -30,13 +30,13 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Highlight::class, function (Container $container) {
                 $plugin     = new Highlight(
                     (array) PluginHelper::getPlugin('system', 'highlight')
                 );
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/httpheaders/httpheaders.xml b/plugins/system/httpheaders/httpheaders.xml
index 97836280cb951..f26b422790023 100644
--- a/plugins/system/httpheaders/httpheaders.xml
+++ b/plugins/system/httpheaders/httpheaders.xml
@@ -82,6 +82,7 @@
 							<option value="permissions-policy">Permissions-Policy</option>
 							<option value="referrer-policy">Referrer-Policy</option>
 							<option value="report-to">Report-To</option>
+							<option value="reporting-endpoints">Reporting-Endpoints</option>
 							<option value="strict-transport-security">Strict-Transport-Security</option>
 							<option value="x-frame-options">X-Frame-Options</option>
 						</field>
diff --git a/plugins/system/httpheaders/postinstall/introduction.php b/plugins/system/httpheaders/postinstall/introduction.php
index e077ce1d83eff..50fb2740ec869 100644
--- a/plugins/system/httpheaders/postinstall/introduction.php
+++ b/plugins/system/httpheaders/postinstall/introduction.php
@@ -39,7 +39,7 @@ function httpheaders_postinstall_action()
     // Enable the plugin
     $db = Factory::getDbo();
 
-    $query = $db->getQuery(true)
+    $query = $db->createQuery()
         ->update($db->quoteName('#__extensions'))
         ->set($db->quoteName('enabled') . ' = 1')
         ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -48,7 +48,7 @@ function httpheaders_postinstall_action()
     $db->setQuery($query);
     $db->execute();
 
-    $query = $db->getQuery(true)
+    $query = $db->createQuery()
         ->select('extension_id')
         ->from($db->quoteName('#__extensions'))
         ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
diff --git a/plugins/system/httpheaders/services/provider.php b/plugins/system/httpheaders/services/provider.php
index 90e0147d3372b..30bcc665e5410 100644
--- a/plugins/system/httpheaders/services/provider.php
+++ b/plugins/system/httpheaders/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Httpheaders::class, function (Container $container) {
                 $plugin     = new Httpheaders(
                     (array) PluginHelper::getPlugin('system', 'httpheaders'),
                     Factory::getApplication()
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/httpheaders/src/Extension/Httpheaders.php b/plugins/system/httpheaders/src/Extension/Httpheaders.php
index 76a26cf695173..b62a69c049678 100644
--- a/plugins/system/httpheaders/src/Extension/Httpheaders.php
+++ b/plugins/system/httpheaders/src/Extension/Httpheaders.php
@@ -54,6 +54,7 @@ final class Httpheaders extends CMSPlugin implements SubscriberInterface
         'feature-policy',
         'cross-origin-opener-policy',
         'report-to',
+        'reporting-endpoints',
         'permissions-policy',
         'nel',
     ];
diff --git a/plugins/system/jooa11y/services/provider.php b/plugins/system/jooa11y/services/provider.php
index 070e3eec33be2..a9a34b4dca322 100644
--- a/plugins/system/jooa11y/services/provider.php
+++ b/plugins/system/jooa11y/services/provider.php
@@ -15,6 +15,7 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\DI\Container;
 use Joomla\DI\ServiceProviderInterface;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Plugin\System\Jooa11y\Extension\Jooa11y;
 
 return new class () implements ServiceProviderInterface {
@@ -31,14 +32,15 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Jooa11y::class, function (Container $container) {
                 $plugin     = new Jooa11y(
                     (array) PluginHelper::getPlugin('system', 'jooa11y')
                 );
                 $plugin->setApplication(Factory::getApplication());
+                $plugin->setDispatcher($container->get(DispatcherInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/jooa11y/src/Extension/Jooa11y.php b/plugins/system/jooa11y/src/Extension/Jooa11y.php
index 77958b548f52f..8bdf93f673d04 100644
--- a/plugins/system/jooa11y/src/Extension/Jooa11y.php
+++ b/plugins/system/jooa11y/src/Extension/Jooa11y.php
@@ -15,6 +15,8 @@
 use Joomla\CMS\Event\PageCache\SetCachingEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\Event\DispatcherAwareInterface;
+use Joomla\Event\DispatcherAwareTrait;
 use Joomla\Event\Priority;
 use Joomla\Event\SubscriberInterface;
 
@@ -27,8 +29,10 @@
  *
  * @since  4.1.0
  */
-final class Jooa11y extends CMSPlugin implements SubscriberInterface
+final class Jooa11y extends CMSPlugin implements SubscriberInterface, DispatcherAwareInterface
 {
+    use DispatcherAwareTrait;
+
     /**
      * Subscribe to certain events
      *
diff --git a/plugins/system/languagecode/services/provider.php b/plugins/system/languagecode/services/provider.php
index a4caedef63469..fa5c035a42947 100644
--- a/plugins/system/languagecode/services/provider.php
+++ b/plugins/system/languagecode/services/provider.php
@@ -30,13 +30,13 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(LanguageCode::class, function (Container $container) {
                 $plugin     = new LanguageCode(
                     (array) PluginHelper::getPlugin('system', 'languagecode')
                 );
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/languagefilter/services/provider.php b/plugins/system/languagefilter/services/provider.php
index 3b1a3533e464c..5b1df85239cb8 100644
--- a/plugins/system/languagefilter/services/provider.php
+++ b/plugins/system/languagefilter/services/provider.php
@@ -33,7 +33,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(LanguageFilter::class, function (Container $container) {
                 $plugin = new LanguageFilter(
                     (array) PluginHelper::getPlugin('system', 'languagefilter'),
                     Factory::getApplication(),
@@ -42,7 +42,7 @@ function (Container $container) {
                 $plugin->setSiteRouter($container->get(SiteRouter::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/languagefilter/src/Extension/LanguageFilter.php b/plugins/system/languagefilter/src/Extension/LanguageFilter.php
index 73e6c174feee9..7f9b094b08678 100644
--- a/plugins/system/languagefilter/src/Extension/LanguageFilter.php
+++ b/plugins/system/languagefilter/src/Extension/LanguageFilter.php
@@ -17,6 +17,7 @@
 use Joomla\CMS\Event\Application\AfterDispatchEvent;
 use Joomla\CMS\Event\Application\AfterInitialiseEvent;
 use Joomla\CMS\Event\Application\AfterRouteEvent;
+use Joomla\CMS\Event\Application\BeforeExecuteEvent;
 use Joomla\CMS\Event\Privacy\CollectCapabilitiesEvent;
 use Joomla\CMS\Event\User\AfterSaveEvent;
 use Joomla\CMS\Event\User\BeforeSaveEvent;
@@ -135,6 +136,7 @@ public function __construct(
         $this->sefs         = LanguageHelper::getLanguages('sef');
         $this->lang_codes   = LanguageHelper::getLanguages('lang_code');
         $this->default_lang = ComponentHelper::getParams('com_languages')->get('site', 'en-GB');
+        $installedLanguages = LanguageHelper::getInstalledLanguages(0);
 
         // If language filter plugin is executed in a site page.
         if ($app->isClient('site')) {
@@ -145,7 +147,7 @@ public function __construct(
                 // we also check if frontend language exists and is enabled
                 if (
                     ($language->access && !\in_array($language->access, $levels))
-                    || (!\array_key_exists($language->lang_code, LanguageHelper::getInstalledLanguages(0)))
+                    || (!\array_key_exists($language->lang_code, $installedLanguages))
                 ) {
                     unset($this->lang_codes[$language->lang_code], $this->sefs[$language->sef]);
                 }
@@ -156,7 +158,7 @@ public function __construct(
             $this->current_lang = isset($this->lang_codes[$this->default_lang]) ? $this->default_lang : 'en-GB';
 
             foreach ($this->sefs as $sef => $language) {
-                if (!\array_key_exists($language->lang_code, LanguageHelper::getInstalledLanguages(0))) {
+                if (!\array_key_exists($language->lang_code, $installedLanguages)) {
                     unset($this->lang_codes[$language->lang_code], $this->sefs[$language->sef]);
                 }
             }
@@ -183,6 +185,7 @@ public static function getSubscribedEvents(): array
          * might be needed by other plugins
          */
         return [
+            'onBeforeExecute'                   => 'onBeforeExecute',
             'onAfterInitialise'                 => 'onAfterInitialise',
             'onAfterDispatch'                   => 'onAfterDispatch',
             'onAfterRoute'                      => 'onAfterRoute',
@@ -193,6 +196,28 @@ public static function getSubscribedEvents(): array
         ];
     }
 
+    /**
+     * Listener for the onBeforeExecute event
+     *
+     * @param   BeforeExecuteEvent  $event  The Event object
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    public function onBeforeExecute(BeforeExecuteEvent $event): void
+    {
+        $app = $event->getApplication();
+
+        if (!$app->isClient('site')) {
+            return;
+        }
+
+        // If a language was specified it has priority, otherwise use user or default language settings
+        $app->setLanguageFilter(true);
+        $app->setDetectBrowser($this->params->get('detect_browser', '1') == '1');
+    }
+
     /**
      * After initialise.
      *
@@ -216,6 +241,7 @@ public function onAfterInitialise(AfterInitialiseEvent $event): void
 
         // Attach parse rule.
         $router->attachParseRule([$this, 'parseRule'], Router::PROCESS_BEFORE);
+        $router->attachParseRule([$this, 'setLanguageApplicationState'], Router::PROCESS_BEFORE);
     }
 
     /**
@@ -277,7 +303,6 @@ public function buildRule(&$router, &$uri)
         if (
             !$this->params->get('remove_default_prefix', 0)
             || $lang !== $this->default_lang
-            || $lang !== $this->current_lang
         ) {
             $uri->setPath($uri->getPath() . '/' . $sef . '/');
         }
@@ -329,179 +354,147 @@ public function postprocessNonSEFBuildRule(&$router, &$uri)
      */
     public function parseRule(&$router, &$uri)
     {
-        $app = $this->getApplication();
-
-        // Did we find the current and existing language yet?
-        $found = false;
-
         // Are we in SEF mode or not?
         if ($this->mode_sef) {
             $path  = $uri->getPath();
             $parts = explode('/', $path);
-
-            $sef = StringHelper::strtolower($parts[0]);
-
-            // Do we have a URL Language Code ?
-            if (!isset($this->sefs[$sef])) {
-                // Check if remove default URL language code is set
-                if ($this->params->get('remove_default_prefix', 0)) {
-                    if ($parts[0]) {
-                        // We load a default site language page
-                        $lang_code = $this->default_lang;
-                    } else {
-                        // We check for an existing language cookie
-                        $lang_code = $this->getLanguageCookie();
-                    }
-                } else {
-                    $lang_code = $this->getLanguageCookie();
+            $sef   = StringHelper::strtolower($parts[0]);
+            $lang  = $uri->getVar('lang', '');
+
+            if (isset($this->sefs[$sef])) {
+                // We found a matching language to the lang code
+                $uri->setVar('lang', $this->sefs[$sef]->lang_code);
+                array_shift($parts);
+                $uri->setPath(implode('/', $parts));
+
+                // We were called with the default language code and want to redirect
+                if ($this->params->get('remove_default_prefix', 0) && $uri->getVar('lang') == $this->default_lang) {
+                    $router->setTainted();
                 }
-
-                // No language code. Try using browser settings or default site language
-                if (!$lang_code && $this->params->get('detect_browser', 0) == 1) {
-                    $lang_code = LanguageHelper::detectLanguage();
-                }
-
-                if (!$lang_code) {
-                    $lang_code = $this->default_lang;
-                }
-
-                if ($lang_code === $this->default_lang && $this->params->get('remove_default_prefix', 0)) {
-                    $found = true;
-                }
-            } else {
-                // We found our language
-                $found     = true;
-                $lang_code = $this->sefs[$sef]->lang_code;
-
-                // If we found our language, but it's the default language and we don't want a prefix for that, we are on a wrong URL.
-                // Or we try to change the language back to the default language. We need a redirect to the proper URL for the default language.
-                if ($lang_code === $this->default_lang && $this->params->get('remove_default_prefix', 0)) {
-                    // Create a cookie.
-                    $this->setLanguageCookie($lang_code);
-
-                    $found = false;
-                    array_shift($parts);
-                    $path = implode('/', $parts);
-                }
-
-                // We have found our language and the first part of our URL is the language prefix
-                if ($found) {
-                    array_shift($parts);
-
-                    // Empty parts array when "index.php" is the only part left.
-                    if (\count($parts) === 1 && $parts[0] === 'index.php') {
-                        $parts = [];
-                    }
-
-                    $uri->setPath(implode('/', $parts));
+            } elseif ($this->params->get('remove_default_prefix', 0)) {
+                // We don't have a prefix for the default language, set lang to default language if it is not set
+                if (!$lang) {
+                    $uri->setVar('lang', $this->default_lang);
                 }
+            } elseif (!isset($this->sefs[$lang])) {
+                // No language is set, so we want to redirect to the right language
+                $router->setTainted();
             }
-        } else {
-            // We are not in SEF mode
-            $lang_code = $this->getLanguageCookie();
 
-            if (!$lang_code && $this->params->get('detect_browser', 1)) {
-                $lang_code = LanguageHelper::detectLanguage();
+            // The language was set both per SEF path and per query parameter. Query parameter takes precedence
+            if ($lang && isset($this->sefs[$sef])) {
+                $uri->setVar('lang', $lang);
+                $router->setTainted();
             }
+        } elseif ($uri->hasVar('lang')) {
+            // We are not in SEF mode. Do we have a language set?
+            $lang_code = $uri->getVar('lang');
 
-            if (!isset($this->lang_codes[$lang_code])) {
-                $lang_code = $this->default_lang;
+            if (isset($this->sefs[$lang_code])) {
+                // We found a matching language to the lang code
+                $uri->setVar('lang', $this->sefs[$lang_code]->lang_code);
+            } else {
+                // The language is not installed on our site
+                $uri->delVar('lang');
             }
         }
+    }
 
-        $lang = $uri->getVar('lang', $lang_code);
+    /**
+     * Parse rule to set the applications language state.
+     * This rule is removed after being executed the first time, since
+     * it does redirects and thus disallows parsing more than one URL per page call
+     *
+     * @param   Router  &$router  Router object.
+     * @param   Uri     &$uri     Uri object.
+     *
+     * @return  void
+     *
+     * @since   6.0.0
+     */
+    public function setLanguageApplicationState(&$router, &$uri)
+    {
+        // We check if the parseRule is still attached to keep this b/c
+        if (!\in_array([$this, 'parseRule'], $router->getRules()['parsepreprocess'])) {
+            $router->detachRule('parse', [$this, 'setLanguageApplicationState'], $router::PROCESS_BEFORE);
 
-        if (isset($this->sefs[$lang])) {
-            // We found our language
-            $found     = true;
-            $lang_code = $this->sefs[$lang]->lang_code;
+            return;
         }
 
-        // We are called via POST or the nolangfilter url parameter was set. We don't care about the language
-        // and simply set the default language as our current language.
-        if (
-            $app->getInput()->getMethod() === 'POST'
-            || $app->getInput()->get('nolangfilter', 0) == 1
-            || \count($app->getInput()->post) > 0
-            || \count($app->getInput()->files) > 0
-        ) {
-            $found = true;
-
-            if (!isset($lang_code)) {
-                $lang_code = $this->getLanguageCookie();
-            }
+        $lang_code = false;
 
-            if (!$lang_code && $this->params->get('detect_browser', 1)) {
-                $lang_code = LanguageHelper::detectLanguage();
-            }
+        // Our parse rule discovered a language
+        if ($uri->hasVar('lang')) {
+            $uri_lang_code = $uri->getVar('lang');
 
-            if (!isset($this->lang_codes[$lang_code])) {
-                $lang_code = $this->default_lang;
+            // Check whether the tag exists, first check for full language tag, then for short tag
+            if (isset($this->lang_codes[$uri_lang_code])) {
+                $lang_code = $uri_lang_code;
+            } elseif (isset($this->sefs[$uri_lang_code])) {
+                // Check for short language tag
+                $lang_code = $this->sefs[$uri_lang_code]->lang_code;
             }
         }
 
-        // We have not found the language and thus need to redirect
-        if (!$found) {
-            // Lets find the default language for this user
-            if (!isset($lang_code) || !isset($this->lang_codes[$lang_code])) {
-                $lang_code = false;
+        if (!$lang_code) {
+            /**
+             * We don't know the language yet and want to discover it.
+             * If we remove the default prefix, call by POST or have nolangfilter set,
+             * we simply take the default language.
+             */
+            if (
+                $this->params->get('remove_default_prefix', 0)
+                || $this->getApplication()->getInput()->getMethod() === 'POST'
+                || $this->getApplication()->getInput()->get('nolangfilter', 0) == 1
+                || \count($this->getApplication()->getInput()->post) > 0
+                || \count($this->getApplication()->getInput()->files) > 0
+            ) {
+                $lang_code = $this->default_lang;
+            } else {
+                $lang_code = $this->getLanguageCookie();
 
-                if ($this->params->get('detect_browser', 1)) {
+                // No language code. Try using browser settings or default site language
+                if (!$lang_code && $this->params->get('detect_browser', 0) == 1) {
                     $lang_code = LanguageHelper::detectLanguage();
-
-                    if (!isset($this->lang_codes[$lang_code])) {
-                        $lang_code = false;
-                    }
                 }
 
                 if (!$lang_code) {
                     $lang_code = $this->default_lang;
                 }
-            }
 
-            if ($this->mode_sef) {
-                // Use the current language sef or the default one.
-                if (
-                    $lang_code !== $this->default_lang
-                    || !$this->params->get('remove_default_prefix', 0)
-                ) {
-                    $path = $this->lang_codes[$lang_code]->sef . '/' . $path;
-                }
-
-                $uri->setPath($path);
-
-                if (!$app->get('sef_rewrite')) {
-                    $uri->setPath('index.php/' . $uri->getPath());
-                }
+                if (!$this->params->get('remove_default_prefix', 0) && $uri->getPath() == '') {
+                    if ($this->mode_sef) {
+                        $path = $this->lang_codes[$lang_code]->sef . '/' . $uri->getPath();
 
-                $redirectUri = $uri->base() . $uri->toString(['path', 'query', 'fragment']);
-            } else {
-                $uri->setVar('lang', $this->lang_codes[$lang_code]->sef);
-                $redirectUri = $uri->base() . 'index.php?' . $uri->getQuery();
-            }
+                        if (!$this->getApplication()->get('sef_rewrite')) {
+                            $path = 'index.php/' . $path;
+                        }
 
-            // Set redirect HTTP code to "302 Found".
-            $redirectHttpCode = 302;
+                        $uri->setPath($path);
+                    } else {
+                        $uri->setPath('index.php');
+                        $uri->setVar('lang', $this->lang_codes[$lang_code]->sef);
+                    }
+                    $redirectHttpCode = 301;
+                    $redirectUri      = $uri->base() . $uri->toString(['path', 'query', 'fragment']);
 
-            // If selected language is the default language redirect code is "301 Moved Permanently".
-            if ($lang_code === $this->default_lang) {
-                $redirectHttpCode = 301;
+                    // We cannot cache this redirect in browser. 301 is cacheable by default so we need to force to not cache it in browsers.
+                    $this->getApplication()->setHeader('Expires', 'Wed, 17 Aug 2005 00:00:00 GMT', true);
+                    $this->getApplication()->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT', true);
+                    $this->getApplication()->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate', false);
+                    $this->getApplication()->sendHeaders();
 
-                // We cannot cache this redirect in browser. 301 is cacheable by default so we need to force to not cache it in browsers.
-                $app->setHeader('Expires', 'Wed, 17 Aug 2005 00:00:00 GMT', true);
-                $app->setHeader('Last-Modified', gmdate('D, d M Y H:i:s') . ' GMT', true);
-                $app->setHeader('Cache-Control', 'no-store, no-cache, must-revalidate', false);
-                $app->sendHeaders();
+                    // Redirect to language.
+                    $this->getApplication()->redirect($redirectUri, $redirectHttpCode);
+                }
             }
-
-            // Redirect to language.
-            $app->redirect($redirectUri, $redirectHttpCode);
         }
 
         // We have found our language and now need to set the cookie and the language value in our system
         $this->current_lang = $lang_code;
 
         // Set the request var.
+        $app = $this->getApplication();
         $app->getInput()->set('language', $lang_code);
         $app->set('language', $lang_code);
         $language = $app->getLanguage();
@@ -527,9 +520,9 @@ public function parseRule(&$router, &$uri)
         }
 
         // Create a cookie.
-        if ($this->getLanguageCookie() !== $lang_code) {
-            $this->setLanguageCookie($lang_code);
-        }
+        $this->setLanguageCookie($lang_code);
+
+        $router->detachRule('parse', [$this, 'setLanguageApplicationState'], $router::PROCESS_BEFORE);
     }
 
     /**
diff --git a/plugins/system/log/services/provider.php b/plugins/system/log/services/provider.php
index 37ee33b02ce74..42069a14987bd 100644
--- a/plugins/system/log/services/provider.php
+++ b/plugins/system/log/services/provider.php
@@ -30,13 +30,13 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Log::class, function (Container $container) {
                 $plugin     = new Log(
                     (array) PluginHelper::getPlugin('system', 'log')
                 );
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/logout/services/provider.php b/plugins/system/logout/services/provider.php
index 6825a09cdab59..d993d9b397eac 100644
--- a/plugins/system/logout/services/provider.php
+++ b/plugins/system/logout/services/provider.php
@@ -29,6 +29,8 @@
      */
     public function register(Container $container): void
     {
+        // The logout plugin is a special case which does not use the lazy loading because it
+        // uses the constructor to delete a cookie
         $container->set(
             PluginInterface::class,
             function (Container $container) {
diff --git a/plugins/system/privacyconsent/services/provider.php b/plugins/system/privacyconsent/services/provider.php
index 46f589a691224..abe720eb94318 100644
--- a/plugins/system/privacyconsent/services/provider.php
+++ b/plugins/system/privacyconsent/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(PrivacyConsent::class, function (Container $container) {
                 $plugin     = new PrivacyConsent(
                     (array) PluginHelper::getPlugin('system', 'privacyconsent')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/privacyconsent/src/Extension/PrivacyConsent.php b/plugins/system/privacyconsent/src/Extension/PrivacyConsent.php
index be7a3a344562a..b9f2a537fef76 100644
--- a/plugins/system/privacyconsent/src/Extension/PrivacyConsent.php
+++ b/plugins/system/privacyconsent/src/Extension/PrivacyConsent.php
@@ -244,7 +244,7 @@ public function onUserAfterDelete(User\AfterDeleteEvent $event): void
 
         if ($userId) {
             // Remove user's consent
-            $query = $this->getDatabase()->getQuery(true)
+            $query = $this->getDatabase()->createQuery()
                 ->delete($this->getDatabase()->quoteName('#__privacy_consents'))
                 ->where($this->getDatabase()->quoteName('user_id') . ' = :userid')
                 ->bind(':userid', $userId, ParameterType::INTEGER);
@@ -348,7 +348,7 @@ public function onPrivacyCheckPrivacyPolicyPublished(CheckPrivacyPolicyPublished
         }
 
         // Check if the article exists in database and is published
-        $query = $this->getDatabase()->getQuery(true)
+        $query = $this->getDatabase()->createQuery()
             ->select($this->getDatabase()->quoteName(['id', 'state']))
             ->from($this->getDatabase()->quoteName('#__content'))
             ->where($this->getDatabase()->quoteName('id') . ' = :id')
@@ -404,7 +404,7 @@ private function isUserConsented($userId)
     {
         $userId = (int) $userId;
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
 
         $query->select('COUNT(*)')
             ->from($db->quoteName('#__privacy_consents'))
diff --git a/plugins/system/privacyconsent/src/Field/PrivacyField.php b/plugins/system/privacyconsent/src/Field/PrivacyField.php
index 980fa37b5ced1..27eb513c84437 100644
--- a/plugins/system/privacyconsent/src/Field/PrivacyField.php
+++ b/plugins/system/privacyconsent/src/Field/PrivacyField.php
@@ -84,7 +84,7 @@ protected function getLayoutData()
 
         if ($privacyArticle && Factory::getApplication()->isClient('site')) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['id', 'alias', 'catid', 'language']))
                 ->from($db->quoteName('#__content'))
                 ->where($db->quoteName('id') . ' = :id')
@@ -104,7 +104,7 @@ protected function getLayoutData()
 
             if (Multilanguage::isEnabled()) {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName(['id', 'language']))
                     ->from($db->quoteName('#__menu'))
                     ->where($db->quoteName('id') . ' = :id')
diff --git a/plugins/system/redirect/services/provider.php b/plugins/system/redirect/services/provider.php
index 36179b4c7fbda..b761bf8215fe7 100644
--- a/plugins/system/redirect/services/provider.php
+++ b/plugins/system/redirect/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Redirect::class, function (Container $container) {
                 $plugin     = new Redirect(
                     (array) PluginHelper::getPlugin('system', 'redirect')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/redirect/src/Extension/Redirect.php b/plugins/system/redirect/src/Extension/Redirect.php
index 8bdb1b71c102d..7b211362e1884 100644
--- a/plugins/system/redirect/src/Extension/Redirect.php
+++ b/plugins/system/redirect/src/Extension/Redirect.php
@@ -124,7 +124,7 @@ public function handleError(ErrorEvent $event)
             return;
         }
 
-        $query = $this->getDatabase()->getQuery(true);
+        $query = $this->getDatabase()->createQuery();
 
         $query->select('*')
             ->from($this->getDatabase()->quoteName('#__redirect_links'))
diff --git a/plugins/system/remember/services/provider.php b/plugins/system/remember/services/provider.php
index acfa358859756..540b34655cd2f 100644
--- a/plugins/system/remember/services/provider.php
+++ b/plugins/system/remember/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Remember::class, function (Container $container) {
                 $plugin     = new Remember(
                     (array) PluginHelper::getPlugin('system', 'remember')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/remember/src/Extension/Remember.php b/plugins/system/remember/src/Extension/Remember.php
index 1691654a3b3a6..16267d0e50f7c 100644
--- a/plugins/system/remember/src/Extension/Remember.php
+++ b/plugins/system/remember/src/Extension/Remember.php
@@ -132,7 +132,7 @@ public function onUserBeforeSave(BeforeSaveEvent $event): void
 
         // But now, we need to do something - Delete all tokens for this user!
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__user_keys'))
             ->where($db->quoteName('user_id') . ' = :userid')
             ->bind(':userid', $user['username']);
diff --git a/plugins/system/schedulerunner/services/provider.php b/plugins/system/schedulerunner/services/provider.php
index 446cf366e4511..aeec8cb805f19 100644
--- a/plugins/system/schedulerunner/services/provider.php
+++ b/plugins/system/schedulerunner/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
-                $plugin     = new ScheduleRunner(
+            $container->lazy(ScheduleRunner::class, function (Container $container) {
+                $plugin = new ScheduleRunner(
                     (array) PluginHelper::getPlugin('system', 'schedulerunner')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/schemaorg/services/provider.php b/plugins/system/schemaorg/services/provider.php
index 06ce84cdbbd66..a6cedf9297fbc 100644
--- a/plugins/system/schemaorg/services/provider.php
+++ b/plugins/system/schemaorg/services/provider.php
@@ -34,7 +34,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Schemaorg::class, function (Container $container) {
                 $plugin = new Schemaorg(
                     (array) PluginHelper::getPlugin('system', 'schemaorg')
                 );
@@ -44,7 +44,7 @@ function (Container $container) {
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/schemaorg/src/Extension/Schemaorg.php b/plugins/system/schemaorg/src/Extension/Schemaorg.php
index 61f27f0e23666..366fc16502c46 100644
--- a/plugins/system/schemaorg/src/Extension/Schemaorg.php
+++ b/plugins/system/schemaorg/src/Extension/Schemaorg.php
@@ -97,7 +97,7 @@ public function onContentPrepareData(Model\PrepareDataEvent $event)
         if ($itemId > 0) {
             $db = $this->getDatabase();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__schemaorg'))
                 ->where($db->quoteName('itemId') . '= :itemId')
@@ -203,7 +203,7 @@ public function onContentAfterSave(Model\AfterSaveEvent $event)
         $app     = $this->getApplication();
         $db      = $this->getDatabase();
 
-        if (!$app->isClient('administrator') || !$this->isSupported($context)) {
+        if (!$app->isClient('administrator') && !$app->isClient('api') || !$this->isSupported($context)) {
             return;
         }
 
@@ -214,7 +214,7 @@ public function onContentAfterSave(Model\AfterSaveEvent $event)
             return;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select('*')
             ->from($db->quoteName('#__schemaorg'))
@@ -418,7 +418,7 @@ public function onBeforeCompileHead(BeforeCompileHeadApplicationEvent $event): v
         if ($itemId > 0) {
             // Load the table data from the database
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__schemaorg'))
                 ->where($db->quoteName('itemId') . ' = :itemId')
@@ -468,7 +468,14 @@ public function onBeforeCompileHead(BeforeCompileHeadApplicationEvent $event): v
         $schema->set('@graph', $data);
 
         $prettyPrint  = JDEBUG ? JSON_PRETTY_PRINT : 0;
-        $schemaString = $schema->toString('JSON', ['bitmask' => JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | $prettyPrint]);
+        $bitmask      = JSON_UNESCAPED_SLASHES
+            | JSON_HEX_TAG
+            | JSON_HEX_AMP
+            | JSON_HEX_APOS
+            | JSON_HEX_QUOT
+            | JSON_UNESCAPED_UNICODE
+            | $prettyPrint;
+        $schemaString = $schema->toString('JSON', ['bitmask' => $bitmask]);
 
         if ($schemaString !== '{}') {
             $wa->addInlineScript($schemaString, ['name' => 'inline.schemaorg'], ['type' => 'application/ld+json']);
@@ -597,7 +604,7 @@ public function onContentAfterDelete(Model\AfterDeleteEvent $event)
     public function deleteSchemaOrg($itemId, $context)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->delete($db->quoteName('#__schemaorg'))
             ->where($db->quoteName('itemId') . '= :itemId')
diff --git a/plugins/system/sef/services/provider.php b/plugins/system/sef/services/provider.php
index bea5a6f20b7f7..c11098004c22f 100644
--- a/plugins/system/sef/services/provider.php
+++ b/plugins/system/sef/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Sef::class, function (Container $container) {
                 $plugin     = new Sef(
                     (array) PluginHelper::getPlugin('system', 'sef')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setSiteRouter($container->get(SiteRouter::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/sef/src/Extension/Sef.php b/plugins/system/sef/src/Extension/Sef.php
index b38e2043b3e50..f4e0013e851e0 100644
--- a/plugins/system/sef/src/Extension/Sef.php
+++ b/plugins/system/sef/src/Extension/Sef.php
@@ -16,6 +16,7 @@
 use Joomla\CMS\Event\Application\AfterRenderEvent;
 use Joomla\CMS\Event\Application\AfterRouteEvent;
 use Joomla\CMS\Event\Application\BeforeRespondEvent;
+use Joomla\CMS\Language\LanguageHelper;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Router\Router;
@@ -395,6 +396,15 @@ public function enforceSuffix()
             return;
         }
 
+        // We don't force a suffix for the language homepage
+        $segments = explode('/', $route);
+        $last     = array_pop($segments);
+        $sefs     = LanguageHelper::getLanguages('sef');
+
+        if ($this->getApplication()->getLanguageFilter() && isset($sefs[$last])) {
+            return;
+        }
+
         $suffix       = pathinfo($route, PATHINFO_EXTENSION);
         $nonSEFSuffix = $origUri->getVar('format');
 
diff --git a/plugins/system/shortcut/services/provider.php b/plugins/system/shortcut/services/provider.php
index 2e8e5bc4b7307..57c5f00a784e9 100644
--- a/plugins/system/shortcut/services/provider.php
+++ b/plugins/system/shortcut/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Shortcut::class, function (Container $container) {
                 $plugin     = new Shortcut(
                     (array) PluginHelper::getPlugin('system', 'shortcut')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/skipto/services/provider.php b/plugins/system/skipto/services/provider.php
index 38650139861c9..8d8874503ca86 100644
--- a/plugins/system/skipto/services/provider.php
+++ b/plugins/system/skipto/services/provider.php
@@ -30,13 +30,13 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Skipto::class, function (Container $container) {
                 $plugin     = new Skipto(
                     (array) PluginHelper::getPlugin('system', 'skipto')
                 );
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/stats/services/provider.php b/plugins/system/stats/services/provider.php
index a5cadb036178f..62a5b253b4dc4 100644
--- a/plugins/system/stats/services/provider.php
+++ b/plugins/system/stats/services/provider.php
@@ -10,6 +10,7 @@
 
 \defined('_JEXEC') or die;
 
+use Joomla\CMS\Cache\CacheControllerFactoryInterface;
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -32,15 +33,16 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Stats::class, function (Container $container) {
                 $plugin     = new Stats(
                     (array) PluginHelper::getPlugin('system', 'stats')
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $plugin->setCacheControllerFactory($container->get(CacheControllerFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/stats/src/Extension/Stats.php b/plugins/system/stats/src/Extension/Stats.php
index 7a74db4354742..11ed5e0762f3c 100644
--- a/plugins/system/stats/src/Extension/Stats.php
+++ b/plugins/system/stats/src/Extension/Stats.php
@@ -10,18 +10,20 @@
 
 namespace Joomla\Plugin\System\Stats\Extension;
 
-use Joomla\CMS\Cache\Cache;
+use Joomla\CMS\Cache\CacheControllerFactoryAwareTrait;
 use Joomla\CMS\Event\Application\AfterDispatchEvent;
 use Joomla\CMS\Event\Application\AfterInitialiseEvent;
 use Joomla\CMS\Event\Plugin\AjaxEvent;
 use Joomla\CMS\Event\Plugin\System\Stats\GetStatsDataEvent;
-use Joomla\CMS\Http\HttpFactory;
 use Joomla\CMS\Layout\FileLayout;
 use Joomla\CMS\Log\Log;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\User\UserHelper;
+use Joomla\CMS\Version;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Event\SubscriberInterface;
+use Joomla\Http\HttpFactory;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -39,6 +41,7 @@
 final class Stats extends CMSPlugin implements SubscriberInterface
 {
     use DatabaseAwareTrait;
+    use CacheControllerFactoryAwareTrait;
 
     /**
      * Indicates sending statistics is always allowed.
@@ -477,7 +480,7 @@ private function saveParams()
         $paramsJson = $this->params->toString('JSON');
         $db         = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__extensions'))
             ->set($db->quoteName('params') . ' = :params')
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -528,9 +531,12 @@ private function sendStats()
     {
         $error = false;
 
+        $options = new Registry();
+        $options->set('userAgent', (new Version())->getUserAgent('Joomla', true, false));
+
         try {
             // Don't let the request take longer than 2 seconds to avoid page timeout issues
-            $response = HttpFactory::getHttp()->post($this->serverUrl, $this->getStatsData(), [], 2);
+            $response = (new HttpFactory())->getHttp($options)->post($this->serverUrl, $this->getStatsData(), [], 2);
 
             if (!$response) {
                 $error = 'Could not send site statistics to remote server: No response';
@@ -583,8 +589,8 @@ private function clearCacheGroups(array $clearGroups)
                     'cachebase'    => $this->getApplication()->get('cache_path', JPATH_CACHE),
                 ];
 
-                $cache = Cache::getInstance('callback', $options);
-                $cache->clean();
+                $this->getCacheControllerFactory()
+                    ->createCacheController('callback', $options)->clean();
             } catch (\Exception) {
                 // Ignore it
             }
@@ -603,7 +609,7 @@ private function disablePlugin()
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__extensions'))
             ->set($db->quoteName('enabled') . ' = 0')
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
diff --git a/plugins/system/tasknotification/services/provider.php b/plugins/system/tasknotification/services/provider.php
index 2f5d54b0f8fb3..ab7edb0972ac6 100644
--- a/plugins/system/tasknotification/services/provider.php
+++ b/plugins/system/tasknotification/services/provider.php
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageFactoryInterface;
+use Joomla\CMS\Mail\MailerFactoryInterface;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Database\DatabaseInterface;
@@ -33,16 +35,18 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
-                $plugin     = new TaskNotification(
+            $container->lazy(TaskNotification::class, function (Container $container) {
+                $plugin = new TaskNotification(
                     (array) PluginHelper::getPlugin('system', 'tasknotification')
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+                $plugin->setMailerFactory($container->get(MailerFactoryInterface::class));
+                $plugin->setLanguageFactory($container->get(LanguageFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/system/tasknotification/src/Extension/TaskNotification.php b/plugins/system/tasknotification/src/Extension/TaskNotification.php
index 5e67dd8dfbba6..5d50aa28d6af0 100644
--- a/plugins/system/tasknotification/src/Extension/TaskNotification.php
+++ b/plugins/system/tasknotification/src/Extension/TaskNotification.php
@@ -14,7 +14,9 @@
 use Joomla\CMS\Event\Model;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\UserGroupsHelper;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\User\UserFactoryAwareTrait;
@@ -46,6 +48,8 @@ final class TaskNotification extends CMSPlugin implements SubscriberInterface
 {
     use DatabaseAwareTrait;
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * The task notification form. This form is merged into the task item form by {@see
@@ -301,7 +305,7 @@ private function sendMail(string $template, array $data, string $attachment = ''
         $db  = $this->getDatabase();
 
         // Get all users who are not blocked and have opted in for system mails.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select('DISTINCT ' . $db->quoteName('u.id') . ', ' . $db->quoteName('u.email'))
             ->from($db->quoteName('#__users', 'u'))
@@ -329,7 +333,12 @@ private function sendMail(string $template, array $data, string $attachment = ''
         // Mail all matching users.
         foreach ($users as $user) {
             try {
-                $mailer = new MailTemplate($template, $app->getLanguage()->getTag());
+                $mailer = new MailTemplate(
+                    $template,
+                    $app->getLanguage()->getTag(),
+                    $this->getMailerFactory()->createMailer(),
+                    $this->getLanguageFactory()
+                );
                 $mailer->addTemplateData($data);
                 $mailer->addRecipient($user->email);
 
diff --git a/plugins/system/webauthn/services/provider.php b/plugins/system/webauthn/services/provider.php
index 1b10b823a7f82..f6895862f48cd 100644
--- a/plugins/system/webauthn/services/provider.php
+++ b/plugins/system/webauthn/services/provider.php
@@ -40,8 +40,9 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Webauthn::class, function (Container $container) {
                 $app     = Factory::getApplication();
+                $config  = (array) PluginHelper::getPlugin('system', 'webauthn');
                 $session = $container->has('session') ? $container->get('session') : $this->getSession($app);
 
                 $db                    = $container->get(DatabaseInterface::class);
@@ -53,23 +54,23 @@ function (Container $container) {
                 $params             = new Registry($config['params'] ?? '{}');
 
                 if ($params->get('attestationSupport', 0) == 1) {
-                    $metadataRepository    = $container->has(MetadataStatementRepository::class)
+                    $metadataRepository = $container->has(MetadataStatementRepository::class)
                         ? $container->get(MetadataStatementRepository::class)
                         : new MetadataRepository();
                 }
 
-                $authenticationHelper  = $container->has(Authentication::class)
+                $authenticationHelper = $container->has(Authentication::class)
                     ? $container->get(Authentication::class)
                     : new Authentication($app, $session, $credentialsRepository, $metadataRepository);
 
                 $plugin = new Webauthn(
-                    (array) PluginHelper::getPlugin('system', 'webauthn'),
+                    $config,
                     $authenticationHelper
                 );
                 $plugin->setApplication($app);
 
                 return $plugin;
-            }
+            })
         );
     }
 
diff --git a/plugins/system/webauthn/src/Authentication.php b/plugins/system/webauthn/src/Authentication.php
index fc06b4c60286c..0a3b3beb586b0 100644
--- a/plugins/system/webauthn/src/Authentication.php
+++ b/plugins/system/webauthn/src/Authentication.php
@@ -19,7 +19,6 @@
 use Joomla\CMS\User\User;
 use Joomla\CMS\WebAuthn\Server;
 use Joomla\Session\SessionInterface;
-use Laminas\Diactoros\ServerRequestFactory;
 use Webauthn\AuthenticationExtensions\AuthenticationExtensionsClientInputs;
 use Webauthn\AuthenticatorSelectionCriteria;
 use Webauthn\MetadataService\MetadataStatementRepository;
@@ -190,11 +189,7 @@ public function getPubKeyCreationOptions(User $user): PublicKeyCredentialCreatio
             $this->getUserEntity($user),
             $attestationMode,
             $this->getPubKeyDescriptorsForUser($user),
-            new AuthenticatorSelectionCriteria(
-                AuthenticatorSelectionCriteria::AUTHENTICATOR_ATTACHMENT_NO_PREFERENCE,
-                false,
-                AuthenticatorSelectionCriteria::USER_VERIFICATION_REQUIREMENT_PREFERRED
-            ),
+            new AuthenticatorSelectionCriteria(),
             new AuthenticationExtensionsClientInputs()
         );
 
@@ -273,7 +268,7 @@ public function validateAssertionResponse(string $data, User $user): PublicKeyCr
             $data,
             $this->getPKCredentialRequestOptions(),
             $this->getUserEntity($user),
-            ServerRequestFactory::fromGlobals()
+            Uri::getInstance()->toString(['host'])
         );
     }
 
@@ -305,8 +300,8 @@ public function validateAttestationResponse(string $data): PublicKeyCredentialSo
             throw new \RuntimeException(Text::_('PLG_SYSTEM_WEBAUTHN_ERR_CREATE_NO_PK'));
         }
 
-        /** @var PublicKeyCredentialCreationOptions|null $publicKeyCredentialCreationOptions */
         try {
+            /** @var PublicKeyCredentialCreationOptions|null $publicKeyCredentialCreationOptions */
             $publicKeyCredentialCreationOptions = unserialize(base64_decode($encodedOptions));
         } catch (\Exception) {
             Log::add('The plg_system_webauthn.publicKeyCredentialCreationOptions in the session is invalid', Log::NOTICE, 'webauthn.system');
@@ -333,7 +328,7 @@ public function validateAttestationResponse(string $data): PublicKeyCredentialSo
         return $this->getWebauthnServer()->loadAndCheckAttestationResponse(
             base64_decode($data),
             $publicKeyCredentialCreationOptions,
-            ServerRequestFactory::fromGlobals()
+            Uri::getInstance()->toString(['host'])
         );
     }
 
diff --git a/plugins/system/webauthn/src/CredentialRepository.php b/plugins/system/webauthn/src/CredentialRepository.php
index cfb5a03fc466a..b289726da22e6 100644
--- a/plugins/system/webauthn/src/CredentialRepository.php
+++ b/plugins/system/webauthn/src/CredentialRepository.php
@@ -63,7 +63,7 @@ public function findOneByCredentialId(string $publicKeyCredentialId): ?PublicKey
         /** @var DatabaseInterface $db */
         $db           = $this->getDatabase();
         $credentialId = base64_encode($publicKeyCredentialId);
-        $query        = $db->getQuery(true)
+        $query        = $db->createQuery()
             ->select($db->quoteName('credential'))
             ->from($db->quoteName('#__webauthn_credentials'))
             ->where($db->quoteName('id') . ' = :credentialId')
@@ -99,7 +99,7 @@ public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCre
         /** @var DatabaseInterface $db */
         $db         = $this->getDatabase();
         $userHandle = $publicKeyCredentialUserEntity->getId();
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__webauthn_credentials'))
             ->where($db->quoteName('user_id') . ' = :user_id')
@@ -189,7 +189,7 @@ public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredent
             'label'   => Text::sprintf(
                 'PLG_SYSTEM_WEBAUTHN_LBL_DEFAULT_AUTHENTICATOR_LABEL',
                 $defaultName,
-                $this->formatDate('now')
+                $this->formatDate('now', null, $user->id)
             ),
             'credential' => json_encode($publicKeyCredentialSource),
         ];
@@ -200,7 +200,7 @@ public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredent
 
         // Try to find an existing record
         try {
-            $query     = $db->getQuery(true)
+            $query     = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__webauthn_credentials'))
                 ->where($db->quoteName('id') . ' = :credentialId')
@@ -260,7 +260,7 @@ public function getAll(int $userId): array
         /** @var DatabaseInterface $db */
         $db         = $this->getDatabase();
         $userHandle = $this->getHandleFromUserId($userId);
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__webauthn_credentials'))
             ->where($db->quoteName('user_id') . ' = :user_id')
@@ -328,7 +328,7 @@ public function has(string $credentialId): bool
         /** @var DatabaseInterface $db */
         $db           = $this->getDatabase();
         $credentialId = base64_encode($credentialId);
-        $query        = $db->getQuery(true)
+        $query        = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__webauthn_credentials'))
             ->where($db->quoteName('id') . ' = :credentialId')
@@ -384,7 +384,7 @@ public function remove(string $credentialId): void
         /** @var DatabaseInterface $db */
         $db           = $this->getDatabase();
         $credentialId = base64_encode($credentialId);
-        $query        = $db->getQuery(true)
+        $query        = $db->createQuery()
             ->delete($db->quoteName('#__webauthn_credentials'))
             ->where($db->quoteName('id') . ' = :credentialId')
             ->bind(':credentialId', $credentialId);
@@ -466,10 +466,11 @@ public function getUserIdFromHandle(?string $userHandle): ?int
         $db = $this->getDatabase();
 
         // Check that the userHandle does exist in the database
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__webauthn_credentials'))
-            ->where($db->quoteName('user_id') . ' = ' . $db->q($userHandle));
+            ->where($db->quoteName('user_id') . ' = :userHandle')
+            ->bind(':userHandle', $userHandle);
 
         try {
             $numRecords = $db->setQuery($query)->loadResult();
@@ -482,7 +483,7 @@ public function getUserIdFromHandle(?string $userHandle): ?int
         }
 
         // Prepare the query
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select([$db->quoteName('id')])
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('block') . ' = 0')
@@ -490,7 +491,7 @@ public function getUserIdFromHandle(?string $userHandle): ?int
                 '(' .
                 $db->quoteName('activation') . ' IS NULL OR ' .
                 $db->quoteName('activation') . ' = 0 OR ' .
-                $db->quoteName('activation') . ' = ' . $db->q('') .
+                $db->quoteName('activation') . ' = ' . $db->quote('') .
                 ')'
             );
 
@@ -603,12 +604,12 @@ private function getEncryptionKey(): string
      * @param   string|\DateTime  $date     The date to format
      * @param   string|null       $format   The format string, default is Joomla's DATE_FORMAT_LC6 (usually "Y-m-d
      *                                      H:i:s")
-     * @param   bool              $tzAware  Should the format be timezone aware? See notes above.
+     * @param   bool|int          $tzAware  Should the format be timezone aware? See notes above.
      *
      * @return  string
      * @since   4.2.0
      */
-    private function formatDate($date, ?string $format = null, bool $tzAware = true): string
+    private function formatDate($date, ?string $format = null, bool|int $tzAware = true): string
     {
         $utcTimeZone = new \DateTimeZone('UTC');
         $jDate       = new Date($date, $utcTimeZone);
@@ -621,8 +622,8 @@ private function formatDate($date, ?string $format = null, bool $tzAware = true)
 
             try {
                 $tzDefault = Factory::getApplication()->get('offset');
-            } catch (\Exception) {
-                $tzDefault = 'GMT';
+            } catch (\Exception $e) {
+                $tzDefault = 'UTC';
             }
 
             $user = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($userId ?? 0);
diff --git a/plugins/system/webauthn/src/Extension/Webauthn.php b/plugins/system/webauthn/src/Extension/Webauthn.php
index 5a69921663a21..f6e5dcac6730f 100644
--- a/plugins/system/webauthn/src/Extension/Webauthn.php
+++ b/plugins/system/webauthn/src/Extension/Webauthn.php
@@ -65,25 +65,6 @@ final class Webauthn extends CMSPlugin implements SubscriberInterface
     // Handle user profile deletion
     use UserDeletion;
 
-    /**
-     * Should I try to detect and register legacy event listeners, i.e. methods which accept unwrapped arguments? While
-     * this maintains a great degree of backwards compatibility to Joomla! 3.x-style plugins it is much slower. You are
-     * advised to implement your plugins using proper Listeners, methods accepting an AbstractEvent as their sole
-     * parameter, for best performance. Also bear in mind that Joomla! 5.x onwards will only allow proper listeners,
-     * removing support for legacy Listeners.
-     *
-     * @var    boolean
-     * @since  4.2.0
-     *
-     * @deprecated  4.3 will be removed in 6.0
-     *              Implement your plugin methods accepting an AbstractEvent object
-     *              Example:
-     *              onEventTriggerName(AbstractEvent $event) {
-     *                  $context = $event->getArgument(...);
-     *              }
-     */
-    protected $allowLegacyListeners = false;
-
     /**
      * The WebAuthn authentication helper object
      *
@@ -123,7 +104,7 @@ public function __construct(array $config = [], ?Authentication $authHelper = nu
 
         Log::addLogger([
             'text_file'         => "webauthn_system.php",
-            'text_entry_format' => '{DATETIME}	{PRIORITY}	{CLIENTIP}	{MESSAGE}',
+            'text_entry_format' => "{DATETIME}\t{PRIORITY}\t{CLIENTIP}\t{MESSAGE}",
         ], $logLevels, ["webauthn.system"]);
 
         $this->authenticationHelper = $authHelper ?? (new Authentication());
diff --git a/plugins/system/webauthn/src/MetadataRepository.php b/plugins/system/webauthn/src/MetadataRepository.php
index e157860ae4957..4a2c817aa2a80 100644
--- a/plugins/system/webauthn/src/MetadataRepository.php
+++ b/plugins/system/webauthn/src/MetadataRepository.php
@@ -10,7 +10,8 @@
 
 namespace Joomla\Plugin\System\Webauthn;
 
-use Lcobucci\JWT\Configuration;
+use Lcobucci\JWT\Encoding\JoseEncoder;
+use Lcobucci\JWT\Token\Parser;
 use Lcobucci\JWT\Token\Plain;
 use Webauthn\MetadataService\MetadataStatementRepository;
 use Webauthn\MetadataService\Statement\MetadataStatement;
@@ -126,8 +127,8 @@ private function load(): void
         }
 
         try {
-            $jwtConfig = Configuration::forUnsecuredSigner();
-            $token     = $jwtConfig->parser()->parse($rawJwt);
+            $parser = new Parser(new JoseEncoder());
+            $token  = $parser->parse($rawJwt);
         } catch (\Exception) {
             return;
         }
@@ -138,19 +139,9 @@ private function load(): void
 
         unset($rawJwt);
 
-        $entriesMapper = function (object $entry) {
+        $entriesMapper = function (array $entry): ?MetadataStatement {
             try {
-                $array = json_decode(json_encode($entry->metadataStatement), true);
-
-                /**
-                 * This prevents an error when we're asking for attestation on authenticators which
-                 * don't allow it. We are really not interested in the attestation per se, but
-                 * requiring an attestation is the only way we can get the AAGUID of the
-                 * authenticator.
-                 */
-                if (isset($array['attestationTypes'])) {
-                    unset($array['attestationTypes']);
-                }
+                $array = json_decode(json_encode($entry['metadataStatement']), true);
 
                 return MetadataStatement::createFromArray($array);
             } catch (\Exception) {
diff --git a/plugins/system/webauthn/src/PluginTraits/AdditionalLoginButtons.php b/plugins/system/webauthn/src/PluginTraits/AdditionalLoginButtons.php
index 573b962185711..e53ecb6f1c28c 100644
--- a/plugins/system/webauthn/src/PluginTraits/AdditionalLoginButtons.php
+++ b/plugins/system/webauthn/src/PluginTraits/AdditionalLoginButtons.php
@@ -12,12 +12,12 @@
 
 use Joomla\CMS\Application\CMSApplication;
 use Joomla\CMS\Document\HtmlDocument;
+use Joomla\CMS\Event\User\LoginButtonsEvent;
 use Joomla\CMS\Helper\AuthenticationHelper;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\User\UserHelper;
-use Joomla\Event\Event;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -50,7 +50,7 @@ trait AdditionalLoginButtons
     /**
      * Creates additional login buttons
      *
-     * @param   Event  $event  The event we are handling
+     * @param   LoginButtonsEvent  $event  The event we are handling
      *
      * @return  void
      *
@@ -58,10 +58,9 @@ trait AdditionalLoginButtons
      *
      * @since   4.0.0
      */
-    public function onUserLoginButtons(Event $event): void
+    public function onUserLoginButtons(LoginButtonsEvent $event): void
     {
-        /** @var string $form The HTML ID of the form we are enclosed in */
-        [$form] = array_values($event->getArguments());
+        $formId = $event->getFormId();
 
         // If we determined we should not inject a button return early
         if (!$this->mustDisplayButton()) {
@@ -87,16 +86,16 @@ public function onUserLoginButtons(Event $event): void
         // Extract image if it exists
         $image = file_exists($image) ? file_get_contents($image) : '';
 
-        $this->returnFromEvent($event, [
+        $event->addResult([
             [
                 'label'              => 'PLG_SYSTEM_WEBAUTHN_LOGIN_LABEL',
                 'tooltip'            => 'PLG_SYSTEM_WEBAUTHN_LOGIN_DESC',
                 'id'                 => $randomId,
-                'data-webauthn-form' => $form,
+                'data-webauthn-form' => $formId,
                 'svg'                => $image,
                 'class'              => 'plg_system_webauthn_login_button',
             ],
-            ]);
+        ]);
     }
 
     /**
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandler.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandler.php
index 852d3a353a10e..022dba6374bab 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandler.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandler.php
@@ -11,7 +11,6 @@
 namespace Joomla\Plugin\System\Webauthn\PluginTraits;
 
 use Joomla\CMS\Application\CMSApplication;
-use Joomla\CMS\Event\AbstractEvent;
 use Joomla\CMS\Event\GenericEvent;
 use Joomla\CMS\Event\Plugin\AjaxEvent;
 use Joomla\CMS\Event\Plugin\System\Webauthn\Ajax as PlgSystemWebauthnAjax;
@@ -86,8 +85,7 @@ public function onAjaxWebauthn(AjaxEvent $event): void
             }
 
             // Call the plugin event onAjaxWebauthnSomething where Something is the akaction param.
-            /** @var AbstractEvent|ResultAwareInterface $triggerEvent */
-            $eventName    = 'onAjaxWebauthn' . ucfirst($akaction);
+            $eventName = 'onAjaxWebauthn' . ucfirst($akaction);
 
             switch ($eventName) {
                 case 'onAjaxWebauthn':
diff --git a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php
index f4d339256e63c..cc96e776f6d60 100644
--- a/plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php
+++ b/plugins/system/webauthn/src/PluginTraits/AjaxHandlerLogin.php
@@ -144,7 +144,7 @@ public function onAjaxWebauthnLogin(AjaxLogin $event): void
     private function loginUser(int $userId): void
     {
         // Trick the class auto-loader into loading the necessary classes
-        class_exists('Joomla\\CMS\\Authentication\\Authentication', true);
+        class_exists(Authentication::class, true);
 
         // Fake a successful login message
         $isAdmin = $this->getApplication()->isClient('administrator');
@@ -166,6 +166,7 @@ class_exists('Joomla\\CMS\\Authentication\\Authentication', true);
         $response->status        = $statusSuccess;
         $response->username      = $user->username;
         $response->fullname      = $user->name;
+        $response->email         = $user->email;
         $response->error_message = '';
         $response->language      = $user->getParam('language');
         $response->type          = 'Passwordless';
@@ -260,7 +261,7 @@ class_exists('Joomla\\CMS\\Authentication\\Authentication', true);
     private function getAuthenticationResponseObject(): AuthenticationResponse
     {
         // Force the class auto-loader to load the JAuthentication class
-        class_exists('Joomla\\CMS\\Authentication\\Authentication', true);
+        class_exists(Authentication::class, true);
 
         return new AuthenticationResponse();
     }
diff --git a/plugins/system/webauthn/src/PluginTraits/UserDeletion.php b/plugins/system/webauthn/src/PluginTraits/UserDeletion.php
index 9a883f5157a80..1447cde641217 100644
--- a/plugins/system/webauthn/src/PluginTraits/UserDeletion.php
+++ b/plugins/system/webauthn/src/PluginTraits/UserDeletion.php
@@ -10,10 +10,10 @@
 
 namespace Joomla\Plugin\System\Webauthn\PluginTraits;
 
+use Joomla\CMS\Event\User\AfterDeleteEvent;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Log\Log;
 use Joomla\Database\DatabaseInterface;
-use Joomla\Event\Event;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -32,23 +32,20 @@ trait UserDeletion
      *
      * This method is called after user data is deleted from the database.
      *
-     * @param   Event  $event  The event we are handling
+     * @param   AfterDeleteEvent  $event  The event we are handling
      *
      * @return  void
      *
      * @since   4.0.0
      */
-    public function onUserAfterDelete(Event $event): void
+    public function onUserAfterDelete(AfterDeleteEvent $event): void
     {
-        /**
-         * @var   array       $user    Holds the user data
-         * @var   bool        $success True if user was successfully stored in the database
-         * @var   string|null $msg     Message
-         */
-        [$user, $success, $msg] = array_values($event->getArguments());
+        $user    = $event->getUser();
+        $success = $event->getDeletingResult();
+        $msg     = $event->getErrorMessage();
 
         if (!$success) {
-            $this->returnFromEvent($event, true);
+            return;
         }
 
         $userId = ArrayHelper::getValue($user, 'id', 0, 'int');
@@ -57,12 +54,14 @@ public function onUserAfterDelete(Event $event): void
             Log::add("Removing WebAuthn Passwordless Login information for deleted user #{$userId}", Log::DEBUG, 'webauthn.system');
 
             /** @var DatabaseInterface $db */
-            $db = Factory::getContainer()->get(DatabaseInterface::class);
+            $db         = Factory::getContainer()->get(DatabaseInterface::class);
+            $repository = $this->authenticationHelper->getCredentialsRepository();
+            $userHandle = $repository->getHandleFromUserId($userId);
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__webauthn_credentials'))
-                ->where($db->quoteName('user_id') . ' = :userId')
-                ->bind(':userId', $userId);
+                ->where($db->quoteName('user_id') . ' = :userHandle')
+                ->bind(':userHandle', $userHandle);
 
             try {
                 $db->setQuery($query)->execute();
diff --git a/plugins/task/checkfiles/services/provider.php b/plugins/task/checkfiles/services/provider.php
index 705884ddebd8e..22db05d69b05e 100644
--- a/plugins/task/checkfiles/services/provider.php
+++ b/plugins/task/checkfiles/services/provider.php
@@ -31,7 +31,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Checkfiles::class, function (Container $container) {
                 $plugin = new Checkfiles(
                     (array) PluginHelper::getPlugin('task', 'checkfiles'),
                     JPATH_ROOT . '/images/'
@@ -39,7 +39,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/task/deleteactionlogs/services/provider.php b/plugins/task/deleteactionlogs/services/provider.php
index 9c720792dbd1d..4ed883bc4df2b 100644
--- a/plugins/task/deleteactionlogs/services/provider.php
+++ b/plugins/task/deleteactionlogs/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(DeleteActionLogs::class, function (Container $container) {
                 $plugin = new DeleteActionLogs(
                     (array) PluginHelper::getPlugin('task', 'deleteactionlogs')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/task/deleteactionlogs/src/Extension/DeleteActionLogs.php b/plugins/task/deleteactionlogs/src/Extension/DeleteActionLogs.php
index 0015106b2dfe6..48272bc20c6d0 100644
--- a/plugins/task/deleteactionlogs/src/Extension/DeleteActionLogs.php
+++ b/plugins/task/deleteactionlogs/src/Extension/DeleteActionLogs.php
@@ -78,10 +78,11 @@ public static function getSubscribedEvents(): array
     private function deleteLogs(ExecuteTaskEvent $event): int
     {
         $daysToDeleteAfter = (int) $event->getArgument('params')->logDeletePeriod ?? 0;
-        $this->logTask(\sprintf('Delete Logs after %d days', $daysToDeleteAfter));
+        $this->logTask(\sprintf($this->getApplication()->getLanguage()->_('PLG_TASK_DELETEACTIONLOGS_LOG_DELETE_AFTER'), $daysToDeleteAfter));
+
         $now               = Factory::getDate()->toSql();
         $db                = $this->getDatabase();
-        $query             = $db->getQuery(true);
+        $query             = $db->createQuery();
 
         if ($daysToDeleteAfter > 0) {
             $days = -1 * $daysToDeleteAfter;
@@ -100,7 +101,7 @@ private function deleteLogs(ExecuteTaskEvent $event): int
             }
         }
 
-        $this->logTask('Delete Logs end');
+        $this->logTask($this->getApplication()->getLanguage()->_('PLG_TASK_DELETEACTIONLOGS_LOG_DELETE_END'), 'info');
 
         return Status::OK;
     }
diff --git a/plugins/task/globalcheckin/services/provider.php b/plugins/task/globalcheckin/services/provider.php
index 31d557d1124a1..8ef2f1d86516b 100644
--- a/plugins/task/globalcheckin/services/provider.php
+++ b/plugins/task/globalcheckin/services/provider.php
@@ -30,14 +30,14 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Globalcheckin::class, function (Container $container) {
                 $checkin = new Globalcheckin(
                     (array) PluginHelper::getPlugin('task', 'globalcheckin')
                 );
                 $checkin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $checkin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/task/globalcheckin/src/Extension/Globalcheckin.php b/plugins/task/globalcheckin/src/Extension/Globalcheckin.php
index 97b0a1b8d7324..bf49fd71f85c8 100644
--- a/plugins/task/globalcheckin/src/Extension/Globalcheckin.php
+++ b/plugins/task/globalcheckin/src/Extension/Globalcheckin.php
@@ -92,7 +92,7 @@ protected function makeCheckin(ExecuteTaskEvent $event): int
                 continue;
             }
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName($tn))
                 ->set($db->quoteName('checked_out') . ' = DEFAULT')
                 ->set($db->quoteName('checked_out_time') . ' = NULL');
diff --git a/plugins/task/privacyconsent/services/provider.php b/plugins/task/privacyconsent/services/provider.php
index e18155de47218..4d77df3d492f0 100644
--- a/plugins/task/privacyconsent/services/provider.php
+++ b/plugins/task/privacyconsent/services/provider.php
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageFactoryInterface;
+use Joomla\CMS\Mail\MailerFactoryInterface;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Database\DatabaseInterface;
@@ -33,16 +35,18 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(PrivacyConsent::class, function (Container $container) {
                 $plugin = new PrivacyConsent(
                     (array) PluginHelper::getPlugin('task', 'privacyconsent')
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+                $plugin->setMailerFactory($container->get(MailerFactoryInterface::class));
+                $plugin->setLanguageFactory($container->get(LanguageFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/task/privacyconsent/src/Extension/PrivacyConsent.php b/plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
index 4ff194dd5d8e5..7368b41c26db6 100644
--- a/plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
+++ b/plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
@@ -12,8 +12,10 @@
 
 use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Router\Route;
@@ -44,6 +46,8 @@ final class PrivacyConsent extends CMSPlugin implements SubscriberInterface
     use DatabaseAwareTrait;
     use TaskPluginTrait;
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * @var string[]
@@ -122,7 +126,7 @@ private function remindExpiringConsents($expire, $remind): int
         $now      = Factory::getDate()->toSql();
         $period   = '-' . ($expire - $remind);
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
 
         $query->select($db->quoteName(['r.id', 'r.user_id', 'u.email']))
             ->from($db->quoteName('#__privacy_consents', 'r'))
@@ -159,7 +163,12 @@ private function remindExpiringConsents($expire, $remind): int
                     'token'    => $token,
                 ];
 
-                $mailer = new MailTemplate('plg_task_privacyconsent.request.reminder', $app->getLanguage()->getTag());
+                $mailer = new MailTemplate(
+                    'plg_task_privacyconsent.request.reminder',
+                    $app->getLanguage()->getTag(),
+                    $this->getMailerFactory()->createMailer(),
+                    $this->getLanguageFactory()
+                );
                 $mailer->addTemplateData($templateData);
                 $mailer->addRecipient($user->email);
 
@@ -190,7 +199,7 @@ private function remindExpiringConsents($expire, $remind): int
                 return Status::KNOCKOUT;
             }
         }
-        $this->logTask('Remind end');
+        $this->logTask($this->getApplication()->getLanguage()->_('PLG_TASK_PRIVACYCONSENT_LOG_REMIND_END'), 'info');
 
         return Status::OK;
     }
@@ -210,7 +219,7 @@ private function invalidateExpiredConsents($expire): int
         $now    = Factory::getDate()->toSql();
         $period = '-' . $expire;
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
 
         $query->select($db->quoteName(['id', 'user_id']))
             ->from($db->quoteName('#__privacy_consents'))
@@ -237,7 +246,7 @@ private function invalidateExpiredConsents($expire): int
 
         foreach ($users as $user) {
             $userId = (int) $user->id;
-            $query  = $db->getQuery(true)
+            $query  = $db->createQuery()
                 ->update($db->quoteName('#__privacy_consents'))
                 ->set($db->quoteName('state') . ' = 0')
                 ->where($db->quoteName('id') . ' = :userid')
diff --git a/plugins/task/requests/forms/get_requests.xml b/plugins/task/requests/forms/get_requests.xml
index aa1beddfe5cc0..2681eccfe24b2 100644
--- a/plugins/task/requests/forms/get_requests.xml
+++ b/plugins/task/requests/forms/get_requests.xml
@@ -48,6 +48,28 @@
 				label="PLG_TASK_REQUESTS_LABEL_AUTH_KEY"
 				showon="auth:1"
 			/>
+			<field
+				name="customHeaders"
+				type="subform"
+				label="PLG_TASK_REQUESTS_LABEL_CUSTOM_HEADERS"
+				multiple="true"
+				layout="joomla.form.field.subform.repeatable-table"
+				>
+				<form>
+					<field
+						name="name"
+						type="text"
+						label="PLG_TASK_REQUESTS_LABEL_CUSTOM_HEADER_NAME"
+						filter="string"
+					/>
+					<field
+						name="value"
+						type="text"
+						label="PLG_TASK_REQUESTS_LABEL_CUSTOM_HEADER_VALUE"
+						filter="string"
+					/>
+				</form>
+			</field>
 		</fieldset>
 	</fields>
 </form>
diff --git a/plugins/task/requests/services/provider.php b/plugins/task/requests/services/provider.php
index d75b12af73c45..ad4dda212fc77 100644
--- a/plugins/task/requests/services/provider.php
+++ b/plugins/task/requests/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Requests::class, function (Container $container) {
                 $plugin = new Requests(
                     (array) PluginHelper::getPlugin('task', 'requests'),
                     new HttpFactory(),
@@ -41,7 +41,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/task/requests/src/Extension/Requests.php b/plugins/task/requests/src/Extension/Requests.php
index 654dab31db6b2..4cc5cf7401640 100644
--- a/plugins/task/requests/src/Extension/Requests.php
+++ b/plugins/task/requests/src/Extension/Requests.php
@@ -11,6 +11,7 @@
 namespace Joomla\Plugin\Task\Requests\Extension;
 
 use Joomla\CMS\Plugin\CMSPlugin;
+use Joomla\CMS\Version;
 use Joomla\Component\Scheduler\Administrator\Event\ExecuteTaskEvent;
 use Joomla\Component\Scheduler\Administrator\Task\Status as TaskStatus;
 use Joomla\Component\Scheduler\Administrator\Traits\TaskPluginTrait;
@@ -18,6 +19,7 @@
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Path;
 use Joomla\Http\HttpFactory;
+use Joomla\Registry\Registry;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -126,8 +128,23 @@ protected function makeGetRequest(ExecuteTaskEvent $event): int
             $headers = ['Authorization' => $authType . ' ' . $authKey];
         }
 
+        $options = new Registry();
+        $options->set('userAgent', (new Version())->getUserAgent('Joomla', true, false));
+
+        foreach ((array) ($params->customHeaders ?? []) as $customHeader) {
+            $customHeader = (object) $customHeader;
+            $headerName   = trim((string) ($customHeader->name ?? ''));
+
+            if ($headerName === '') {
+                continue;
+            }
+
+            $headerValue          = (string) ($customHeader->value ?? '');
+            $headers[$headerName] = $headerValue;
+        }
+
         try {
-            $response = $this->httpFactory->getHttp([])->get($url, $headers, $timeout);
+            $response = $this->httpFactory->getHttp($options)->get($url, $headers, $timeout);
         } catch (\Exception $e) {
             $this->logTask($this->getApplication()->getLanguage()->_('PLG_TASK_REQUESTS_TASK_GET_REQUEST_LOG_TIMEOUT'));
 
diff --git a/plugins/task/rotatelogs/services/provider.php b/plugins/task/rotatelogs/services/provider.php
index a69fe6d34c557..f8e69787b4a4a 100644
--- a/plugins/task/rotatelogs/services/provider.php
+++ b/plugins/task/rotatelogs/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(RotateLogs::class, function (Container $container) {
                 $plugin = new RotateLogs(
                     (array) PluginHelper::getPlugin('task', 'rotatelogs')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/task/sessiongc/services/provider.php b/plugins/task/sessiongc/services/provider.php
index fc2b244368342..f54c17293a688 100644
--- a/plugins/task/sessiongc/services/provider.php
+++ b/plugins/task/sessiongc/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(SessionGC::class, function (Container $container) {
                 $plugin = new SessionGC(
                     (array) PluginHelper::getPlugin('task', 'sessiongc'),
                     $container->get(MetadataManager::class)
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/task/sitestatus/services/provider.php b/plugins/task/sitestatus/services/provider.php
index 34ef4b92c11a1..65afe3149e507 100644
--- a/plugins/task/sitestatus/services/provider.php
+++ b/plugins/task/sitestatus/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container)
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(SiteStatus::class, function (Container $container) {
                 $plugin = new SiteStatus(
                     (array) PluginHelper::getPlugin('task', 'sitestatus'),
                     ArrayHelper::fromObject(new JConfig()),
@@ -41,7 +41,7 @@ function (Container $container) {
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/task/updatenotification/services/provider.php b/plugins/task/updatenotification/services/provider.php
index 3898556ffe4be..9cf44fcab73c7 100644
--- a/plugins/task/updatenotification/services/provider.php
+++ b/plugins/task/updatenotification/services/provider.php
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageFactoryInterface;
+use Joomla\CMS\Mail\MailerFactoryInterface;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\Database\DatabaseInterface;
 use Joomla\DI\Container;
@@ -32,15 +34,17 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(UpdateNotification::class, function (Container $container) {
                 $plugin = new UpdateNotification(
                     (array) PluginHelper::getPlugin('task', 'updatenotification')
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
+                $plugin->setMailerFactory($container->get(MailerFactoryInterface::class));
+                $plugin->setLanguageFactory($container->get(LanguageFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/task/updatenotification/src/Extension/UpdateNotification.php b/plugins/task/updatenotification/src/Extension/UpdateNotification.php
index c4fcb08f95af1..e7b42727b3618 100644
--- a/plugins/task/updatenotification/src/Extension/UpdateNotification.php
+++ b/plugins/task/updatenotification/src/Extension/UpdateNotification.php
@@ -13,10 +13,12 @@
 use Joomla\CMS\Access\Access;
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Extension\ExtensionHelper;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Mail\Exception\MailDisabledException;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\Plugin\CMSPlugin;
-use Joomla\CMS\Table\Table;
+use Joomla\CMS\Table\Asset;
 use Joomla\CMS\Updater\Updater;
 use Joomla\CMS\Uri\Uri;
 use Joomla\CMS\Version;
@@ -43,6 +45,8 @@ final class UpdateNotification extends CMSPlugin implements SubscriberInterface
 {
     use DatabaseAwareTrait;
     use TaskPluginTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * @var string[]
@@ -208,7 +212,12 @@ private function sendNotification(ExecuteTaskEvent $event): int
         // Send the emails to the Super Users
         foreach ($superUsers as $superUser) {
             try {
-                $mailer = new MailTemplate('plg_task_updatenotification.mail', $jLanguage->getTag());
+                $mailer = new MailTemplate(
+                    'plg_task_updatenotification.mail',
+                    $jLanguage->getTag(),
+                    $this->getMailerFactory()->createMailer(),
+                    $this->getLanguageFactory()
+                );
                 $mailer->addRecipient($superUser->email);
                 $mailer->addTemplateData($substitutions);
                 $mailer->send();
@@ -221,7 +230,7 @@ private function sendNotification(ExecuteTaskEvent $event): int
             }
         }
 
-        $this->logTask('UpdateNotification end');
+        $this->logTask($this->getApplication()->getLanguage()->_('PLG_TASK_UPDATENOTIFICATION_END'), 'info');
 
         return Status::OK;
     }
@@ -257,7 +266,8 @@ private function getSuperUsers($email = null)
         $ret = [];
 
         try {
-            $rootId    = Table::getInstance('Asset')->getRootId();
+            $table     = new Asset($db);
+            $rootId    = $table->getRootId();
             $rules     = Access::getAssetRules($rootId)->getData();
             $rawGroups = $rules['core.admin']->getData();
             $groups    = [];
@@ -281,7 +291,7 @@ private function getSuperUsers($email = null)
 
         // Get the user IDs of users belonging to the SA groups
         try {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('user_id'))
                 ->from($db->quoteName('#__user_usergroup_map'))
                 ->whereIn($db->quoteName('group_id'), $groups);
@@ -298,7 +308,7 @@ private function getSuperUsers($email = null)
 
         // Get the user information for the Super Administrator users
         try {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['id', 'username', 'email']))
                 ->from($db->quoteName('#__users'))
                 ->whereIn($db->quoteName('id'), $userIDs)
diff --git a/plugins/user/contactcreator/services/provider.php b/plugins/user/contactcreator/services/provider.php
index e2096d743b139..dbe1a4a97da5d 100644
--- a/plugins/user/contactcreator/services/provider.php
+++ b/plugins/user/contactcreator/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(ContactCreator::class, function (Container $container) {
                 $plugin     = new ContactCreator(
                     (array) PluginHelper::getPlugin('user', 'contactcreator')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/user/joomla/services/provider.php b/plugins/user/joomla/services/provider.php
index 77df09c207b08..01a2b1dfd6d78 100644
--- a/plugins/user/joomla/services/provider.php
+++ b/plugins/user/joomla/services/provider.php
@@ -12,6 +12,8 @@
 
 use Joomla\CMS\Extension\PluginInterface;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageFactoryInterface;
+use Joomla\CMS\Mail\MailerFactoryInterface;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\User\UserFactoryInterface;
 use Joomla\Database\DatabaseInterface;
@@ -33,16 +35,18 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Joomla::class, function (Container $container) {
                 $plugin     = new Joomla(
                     (array) PluginHelper::getPlugin('user', 'joomla')
                 );
                 $plugin->setApplication(Factory::getApplication());
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
+                $plugin->setMailerFactory($container->get(MailerFactoryInterface::class));
+                $plugin->setLanguageFactory($container->get(LanguageFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/user/joomla/src/Extension/Joomla.php b/plugins/user/joomla/src/Extension/Joomla.php
index 46ac35d93399a..ae6d2eedddc26 100644
--- a/plugins/user/joomla/src/Extension/Joomla.php
+++ b/plugins/user/joomla/src/Extension/Joomla.php
@@ -18,8 +18,10 @@
 use Joomla\CMS\Event\User\LoginEvent;
 use Joomla\CMS\Event\User\LogoutEvent;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\LanguageFactoryAwareTrait;
 use Joomla\CMS\Language\LanguageFactoryInterface;
 use Joomla\CMS\Log\Log;
+use Joomla\CMS\Mail\MailerFactoryAwareTrait;
 use Joomla\CMS\Mail\MailTemplate;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Uri\Uri;
@@ -45,6 +47,8 @@ final class Joomla extends CMSPlugin implements SubscriberInterface
 {
     use DatabaseAwareTrait;
     use UserFactoryAwareTrait;
+    use MailerFactoryAwareTrait;
+    use LanguageFactoryAwareTrait;
 
     /**
      * Returns an array of events this subscriber will listen to.
@@ -132,7 +136,7 @@ public function onUserAfterDelete(AfterDeleteEvent $event): void
 
         try {
             $db->setQuery(
-                $db->getQuery(true)
+                $db->createQuery()
                     ->delete($db->quoteName('#__messages'))
                     ->where($db->quoteName('user_id_from') . ' = :userId')
                     ->bind(':userId', $userId, ParameterType::INTEGER)
@@ -143,7 +147,7 @@ public function onUserAfterDelete(AfterDeleteEvent $event): void
 
         // Delete Multi-factor Authentication user profile records
         $profileKey = 'mfa.%';
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->delete($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = :userId')
             ->where($db->quoteName('profile_key') . ' LIKE :profileKey')
@@ -157,7 +161,7 @@ public function onUserAfterDelete(AfterDeleteEvent $event): void
         }
 
         // Delete Multi-factor Authentication records
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__user_mfa'))
             ->where($db->quoteName('user_id') . ' = :userId')
             ->bind(':userId', $userId, ParameterType::INTEGER);
@@ -240,7 +244,12 @@ public function onUserAfterSave(AfterSaveEvent $event): void
             'email'    => $user['email'],
         ];
 
-        $mailer = new MailTemplate('plg_user_joomla.mail', $userLocale);
+        $mailer = new MailTemplate(
+            'plg_user_joomla.mail',
+            $userLocale,
+            $this->getMailerFactory()->createMailer(),
+            $this->getLanguageFactory()
+        );
         $mailer->addTemplateData($data);
         $mailer->addUnsafeTags(['username', 'password', 'name', 'email']);
         $mailer->addRecipient($user['email'], $user['name']);
@@ -345,7 +354,7 @@ public function onUserLogin(LoginEvent $event)
         $db = $this->getDatabase();
 
         // Purge the old session
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__session'))
             ->where($db->quoteName('session_id') . ' = :sessionid')
             ->bind(':sessionid', $oldSessionId);
@@ -390,7 +399,7 @@ public function onUserLogout(LogoutEvent $event)
         $options  = $event->getOptions();
 
         $my      = $this->getApplication()->getIdentity();
-        $session = Factory::getSession();
+        $session = $this->getApplication()->getSession();
 
         $userid = (int) $user['id'];
 
diff --git a/plugins/user/profile/services/provider.php b/plugins/user/profile/services/provider.php
index 37f1aba8043a8..ef5fec0793b3b 100644
--- a/plugins/user/profile/services/provider.php
+++ b/plugins/user/profile/services/provider.php
@@ -32,7 +32,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Profile::class, function (Container $container) {
                 $plugin     = new Profile(
                     (array) PluginHelper::getPlugin('user', 'profile')
                 );
@@ -40,7 +40,7 @@ function (Container $container) {
                 $plugin->setDatabase($container->get(DatabaseInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/user/profile/src/Extension/Profile.php b/plugins/user/profile/src/Extension/Profile.php
index 0f42e8c13a186..ab930e0cc49c3 100644
--- a/plugins/user/profile/src/Extension/Profile.php
+++ b/plugins/user/profile/src/Extension/Profile.php
@@ -94,7 +94,7 @@ public function onContentPrepareData(PrepareDataEvent $event)
             if (!isset($data->profile) && $userId > 0) {
                 // Load the profile data from the database.
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select(
                         [
                             $db->quoteName('profile_key'),
@@ -377,7 +377,7 @@ public function onUserAfterSave(AfterSaveEvent $event): void
                 $key = 'profile.' . $key;
             }
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__user_profiles'))
                 ->where($db->quoteName('user_id') . ' = :userid')
                 ->whereIn($db->quoteName('profile_key'), $keys, ParameterType::STRING)
@@ -450,7 +450,7 @@ public function onUserAfterDelete(AfterDeleteEvent $event): void
 
         if ($userId) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__user_profiles'))
                 ->where($db->quoteName('user_id') . ' = :userid')
                 ->where($db->quoteName('profile_key') . ' LIKE ' . $db->quote('profile.%'))
diff --git a/plugins/user/profile/src/Field/TosField.php b/plugins/user/profile/src/Field/TosField.php
index b1d2a7bcf9fc9..56b458f81db52 100644
--- a/plugins/user/profile/src/Field/TosField.php
+++ b/plugins/user/profile/src/Field/TosField.php
@@ -90,7 +90,7 @@ protected function getLabel()
             $attribs['data-bs-target'] = '#tosModal';
 
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->select($db->quoteName(['id', 'alias', 'catid', 'language']))
                 ->from($db->quoteName('#__content'))
diff --git a/plugins/user/terms/services/provider.php b/plugins/user/terms/services/provider.php
index 4418a9b38ab27..16df89f8d4b89 100644
--- a/plugins/user/terms/services/provider.php
+++ b/plugins/user/terms/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Terms::class, function (Container $container) {
                 $plugin     = new Terms(
                     (array) PluginHelper::getPlugin('user', 'terms')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/user/terms/src/Field/TermsField.php b/plugins/user/terms/src/Field/TermsField.php
index 113f3ac8c4a0d..4cf7698fb2f11 100644
--- a/plugins/user/terms/src/Field/TermsField.php
+++ b/plugins/user/terms/src/Field/TermsField.php
@@ -83,7 +83,7 @@ protected function getLayoutData()
 
         if ($termsArticle && Factory::getApplication()->isClient('site')) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['id', 'alias', 'catid', 'language']))
                 ->from($db->quoteName('#__content'))
                 ->where($db->quoteName('id') . ' = :id')
diff --git a/plugins/user/token/services/provider.php b/plugins/user/token/services/provider.php
index f186eb0897fc4..6de2d6ed123ae 100644
--- a/plugins/user/token/services/provider.php
+++ b/plugins/user/token/services/provider.php
@@ -33,7 +33,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Token::class, function (Container $container) {
                 $plugin     = new Token(
                     (array) PluginHelper::getPlugin('user', 'token')
                 );
@@ -42,7 +42,7 @@ function (Container $container) {
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/user/token/src/Extension/Token.php b/plugins/user/token/src/Extension/Token.php
index 90ffd4ffe2ed6..0f4a5ce8e253f 100644
--- a/plugins/user/token/src/Extension/Token.php
+++ b/plugins/user/token/src/Extension/Token.php
@@ -10,7 +10,6 @@
 
 namespace Joomla\Plugin\User\Token\Extension;
 
-use Joomla\CMS\Crypt\Crypt;
 use Joomla\CMS\Event\Model\PrepareDataEvent;
 use Joomla\CMS\Event\Model\PrepareFormEvent;
 use Joomla\CMS\Event\User\AfterDeleteEvent;
@@ -19,6 +18,7 @@
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\User\UserFactoryAwareTrait;
+use Joomla\Crypt\Crypt;
 use Joomla\Database\DatabaseAwareTrait;
 use Joomla\Database\ParameterType;
 use Joomla\Event\SubscriberInterface;
@@ -137,7 +137,7 @@ public function onContentPrepareData(PrepareDataEvent $event): void
         // Load the profile data from the database.
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select([
                         $db->quoteName('profile_key'),
                         $db->quoteName('profile_value'),
@@ -352,7 +352,7 @@ public function onUserAfterSave(AfterSaveEvent $event): void
 
         // Remove existing Joomla Token user profile values
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = :userId')
             ->where($db->quoteName('profile_key') . ' LIKE :profileKey');
@@ -370,7 +370,7 @@ public function onUserAfterSave(AfterSaveEvent $event): void
 
         // Save the new Joomla Token user profile values
         $order = 1;
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->insert($db->quoteName('#__user_profiles'))
             ->columns([
                     $db->quoteName('user_id'),
@@ -418,7 +418,7 @@ public function onUserAfterDelete(AfterDeleteEvent $event): void
 
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__user_profiles'))
                 ->where($db->quoteName('user_id') . ' = :userId')
                 ->where($db->quoteName('profile_key') . ' LIKE :profileKey');
@@ -462,7 +462,7 @@ private function getTokenSeedForUser(int $userId): ?string
     {
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('profile_value'))
                 ->from($db->quoteName('#__user_profiles'))
                 ->where($db->quoteName('profile_key') . ' = :profileKey')
@@ -612,7 +612,7 @@ private function hasTokenProfileFields(?int $userId): bool
         }
 
         $db = $this->getDatabase();
-        $q  = $db->getQuery(true)
+        $q  = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = ' . $userId)
diff --git a/plugins/webservices/banners/services/provider.php b/plugins/webservices/banners/services/provider.php
index 1f1bfc3c5994e..56b6e032106b9 100644
--- a/plugins/webservices/banners/services/provider.php
+++ b/plugins/webservices/banners/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Banners::class, function (Container $container) {
                 $plugin     = new Banners(
                     (array) PluginHelper::getPlugin('webservices', 'banners')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/config/services/provider.php b/plugins/webservices/config/services/provider.php
index 22576a29bd22d..3053e6f8806ef 100644
--- a/plugins/webservices/config/services/provider.php
+++ b/plugins/webservices/config/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Config::class, function (Container $container) {
                 $plugin     = new Config(
                     (array) PluginHelper::getPlugin('webservices', 'config')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/contact/services/provider.php b/plugins/webservices/contact/services/provider.php
index eb47facf55ca3..83ef1bf5e7c6a 100644
--- a/plugins/webservices/contact/services/provider.php
+++ b/plugins/webservices/contact/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Contact::class, function (Container $container) {
                 $plugin     = new Contact(
                     (array) PluginHelper::getPlugin('webservices', 'contact')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/content/services/provider.php b/plugins/webservices/content/services/provider.php
index 258c06a85880d..55923cfadcdfa 100644
--- a/plugins/webservices/content/services/provider.php
+++ b/plugins/webservices/content/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Content::class, function (Container $container) {
                 $plugin     = new Content(
                     (array) PluginHelper::getPlugin('webservices', 'content')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/installer/services/provider.php b/plugins/webservices/installer/services/provider.php
index b1479f3def5ea..e8b5d2a08c97b 100644
--- a/plugins/webservices/installer/services/provider.php
+++ b/plugins/webservices/installer/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Installer::class, function (Container $container) {
                 $plugin     = new Installer(
                     (array) PluginHelper::getPlugin('webservices', 'installer')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/joomlaupdate/services/provider.php b/plugins/webservices/joomlaupdate/services/provider.php
index 60bd5123c3fcd..28bce0fde0c88 100644
--- a/plugins/webservices/joomlaupdate/services/provider.php
+++ b/plugins/webservices/joomlaupdate/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Joomlaupdate::class, function (Container $container) {
                 $plugin     = new Joomlaupdate(
                     (array) PluginHelper::getPlugin('webservices', 'joomlaupdate')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/languages/services/provider.php b/plugins/webservices/languages/services/provider.php
index 129c5164c0ba6..9d3a31845890e 100644
--- a/plugins/webservices/languages/services/provider.php
+++ b/plugins/webservices/languages/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Languages::class, function (Container $container) {
                 $plugin     = new Languages(
                     (array) PluginHelper::getPlugin('webservices', 'languages')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/media/services/provider.php b/plugins/webservices/media/services/provider.php
index 34b61c6e668d5..6f2170e3c9f64 100644
--- a/plugins/webservices/media/services/provider.php
+++ b/plugins/webservices/media/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Media::class, function (Container $container) {
                 $plugin     = new Media(
                     (array) PluginHelper::getPlugin('webservices', 'media')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/menus/services/provider.php b/plugins/webservices/menus/services/provider.php
index 39bc043351f4c..22507934e2cfa 100644
--- a/plugins/webservices/menus/services/provider.php
+++ b/plugins/webservices/menus/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Menus::class, function (Container $container) {
                 $plugin     = new Menus(
                     (array) PluginHelper::getPlugin('webservices', 'menus')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/messages/services/provider.php b/plugins/webservices/messages/services/provider.php
index c94e11df4df31..630116c963111 100644
--- a/plugins/webservices/messages/services/provider.php
+++ b/plugins/webservices/messages/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Messages::class, function (Container $container) {
                 $plugin     = new Messages(
                     (array) PluginHelper::getPlugin('webservices', 'messages')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/modules/services/provider.php b/plugins/webservices/modules/services/provider.php
index 3b08a5aa00f8c..7be0713f7e3c4 100644
--- a/plugins/webservices/modules/services/provider.php
+++ b/plugins/webservices/modules/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Modules::class, function (Container $container) {
                 $plugin     = new Modules(
                     (array) PluginHelper::getPlugin('webservices', 'modules')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/newsfeeds/services/provider.php b/plugins/webservices/newsfeeds/services/provider.php
index a98d357d21cfa..34d8db4a2a708 100644
--- a/plugins/webservices/newsfeeds/services/provider.php
+++ b/plugins/webservices/newsfeeds/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Newsfeeds::class, function (Container $container) {
                 $plugin     = new Newsfeeds(
                     (array) PluginHelper::getPlugin('webservices', 'newsfeeds')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/plugins/services/provider.php b/plugins/webservices/plugins/services/provider.php
index 5d9b283f2ba5d..6b7a1ca3f3ce9 100644
--- a/plugins/webservices/plugins/services/provider.php
+++ b/plugins/webservices/plugins/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Plugins::class, function (Container $container) {
                 $plugin     = new Plugins(
                     (array) PluginHelper::getPlugin('webservices', 'plugins')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/privacy/services/provider.php b/plugins/webservices/privacy/services/provider.php
index cf9630e79f959..3c6bcb9d51e55 100644
--- a/plugins/webservices/privacy/services/provider.php
+++ b/plugins/webservices/privacy/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Privacy::class, function (Container $container) {
                 $plugin     = new Privacy(
                     (array) PluginHelper::getPlugin('webservices', 'privacy')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/redirect/services/provider.php b/plugins/webservices/redirect/services/provider.php
index d1140afd21a59..b942215a26afa 100644
--- a/plugins/webservices/redirect/services/provider.php
+++ b/plugins/webservices/redirect/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Redirect::class, function (Container $container) {
                 $plugin     = new Redirect(
                     (array) PluginHelper::getPlugin('webservices', 'redirect')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/tags/services/provider.php b/plugins/webservices/tags/services/provider.php
index a110593807fbe..ec3554f891693 100644
--- a/plugins/webservices/tags/services/provider.php
+++ b/plugins/webservices/tags/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Tags::class, function (Container $container) {
                 $plugin     = new Tags(
                     (array) PluginHelper::getPlugin('webservices', 'tags')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/templates/services/provider.php b/plugins/webservices/templates/services/provider.php
index b01eec6d98d2d..1e1e4414325cb 100644
--- a/plugins/webservices/templates/services/provider.php
+++ b/plugins/webservices/templates/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Templates::class, function (Container $container) {
                 $plugin     = new Templates(
                     (array) PluginHelper::getPlugin('webservices', 'templates')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/webservices/users/services/provider.php b/plugins/webservices/users/services/provider.php
index 414b18450ec18..a822cc3a66c1c 100644
--- a/plugins/webservices/users/services/provider.php
+++ b/plugins/webservices/users/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Users::class, function (Container $container) {
                 $plugin     = new Users(
                     (array) PluginHelper::getPlugin('webservices', 'users')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/workflow/featuring/services/provider.php b/plugins/workflow/featuring/services/provider.php
index 69b1208720d24..d3707fd78dcd7 100644
--- a/plugins/workflow/featuring/services/provider.php
+++ b/plugins/workflow/featuring/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Featuring::class, function (Container $container) {
                 $plugin     = new Featuring(
                     (array) PluginHelper::getPlugin('workflow', 'featuring')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/workflow/featuring/src/Extension/Featuring.php b/plugins/workflow/featuring/src/Extension/Featuring.php
index ed53418123401..639d10c353e06 100644
--- a/plugins/workflow/featuring/src/Extension/Featuring.php
+++ b/plugins/workflow/featuring/src/Extension/Featuring.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Plugin\Workflow\Featuring\Extension;
 
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\Event\AbstractEvent;
 use Joomla\CMS\Event\Model;
 use Joomla\CMS\Event\Table\BeforeStoreEvent;
@@ -28,7 +29,6 @@
 use Joomla\Event\EventInterface;
 use Joomla\Event\SubscriberInterface;
 use Joomla\Registry\Registry;
-use Joomla\String\Inflector;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -194,7 +194,7 @@ public function onAfterDisplay(DisplayEvent $event)
         $section   = $event->getArgument('section');
 
         // We need the single model context for checking for workflow
-        $singularsection = Inflector::singularize($section);
+        $singularsection = InflectorFactory::create()->build()->singularize($section);
 
         if (!$this->isSupported($component . '.' . $singularsection)) {
             return;
@@ -269,7 +269,7 @@ public function onWorkflowBeforeTransition(WorkflowTransitionEvent $event)
             AbstractEvent::create(
                 'onContentBeforeChangeFeatured',
                 [
-                    'eventClass'  => 'Joomla\Component\Content\Administrator\Event\Model\FeatureEvent',
+                    'eventClass'  => FeatureEvent::class,
                     'subject'     => $this,
                     'extension'   => $context,
                     'pks'         => $pks,
diff --git a/plugins/workflow/notification/services/provider.php b/plugins/workflow/notification/services/provider.php
index ed4e9f34eb14a..16cced9051a81 100644
--- a/plugins/workflow/notification/services/provider.php
+++ b/plugins/workflow/notification/services/provider.php
@@ -34,7 +34,7 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Notification::class, function (Container $container) {
                 $plugin     = new Notification(
                     (array) PluginHelper::getPlugin('workflow', 'notification'),
                     $container->get(LanguageFactoryInterface::class)
@@ -44,7 +44,7 @@ function (Container $container) {
                 $plugin->setUserFactory($container->get(UserFactoryInterface::class));
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/workflow/notification/src/Extension/Notification.php b/plugins/workflow/notification/src/Extension/Notification.php
index ca9c1facc8225..952e33422cb54 100644
--- a/plugins/workflow/notification/src/Extension/Notification.php
+++ b/plugins/workflow/notification/src/Extension/Notification.php
@@ -330,7 +330,7 @@ private function removeLocked(array $userIds): array
         $db = $this->getDatabase();
 
         // Check for locked inboxes would be better to have _cdf settings in the user_object or a filter in users model
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('user_id'))
             ->from($db->quoteName('#__messages_cfg'))
diff --git a/plugins/workflow/publishing/services/provider.php b/plugins/workflow/publishing/services/provider.php
index 02267c5f7c608..c9374f20a4c5b 100644
--- a/plugins/workflow/publishing/services/provider.php
+++ b/plugins/workflow/publishing/services/provider.php
@@ -31,14 +31,14 @@ public function register(Container $container): void
     {
         $container->set(
             PluginInterface::class,
-            function (Container $container) {
+            $container->lazy(Publishing::class, function (Container $container) {
                 $plugin     = new Publishing(
                     (array) PluginHelper::getPlugin('workflow', 'publishing')
                 );
                 $plugin->setApplication(Factory::getApplication());
 
                 return $plugin;
-            }
+            })
         );
     }
 };
diff --git a/plugins/workflow/publishing/src/Extension/Publishing.php b/plugins/workflow/publishing/src/Extension/Publishing.php
index 1fdf788b37a3b..e5a7c8c554cbc 100644
--- a/plugins/workflow/publishing/src/Extension/Publishing.php
+++ b/plugins/workflow/publishing/src/Extension/Publishing.php
@@ -10,11 +10,13 @@
 
 namespace Joomla\Plugin\Workflow\Publishing\Extension;
 
+use Doctrine\Inflector\InflectorFactory;
 use Joomla\CMS\Event\Model;
 use Joomla\CMS\Event\Table\BeforeStoreEvent;
 use Joomla\CMS\Event\View\DisplayEvent;
 use Joomla\CMS\Event\Workflow\WorkflowFunctionalityUsedEvent;
 use Joomla\CMS\Event\Workflow\WorkflowTransitionEvent;
+use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\Model\DatabaseModelInterface;
@@ -23,10 +25,10 @@
 use Joomla\CMS\Table\TableInterface;
 use Joomla\CMS\Workflow\WorkflowPluginTrait;
 use Joomla\CMS\Workflow\WorkflowServiceInterface;
+use Joomla\Event\DispatcherInterface;
 use Joomla\Event\EventInterface;
 use Joomla\Event\SubscriberInterface;
 use Joomla\Registry\Registry;
-use Joomla\String\Inflector;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -210,7 +212,7 @@ public function onAfterDisplay(DisplayEvent $event)
         $section   = $event->getArgument('section');
 
         // We need the single model context for checking for workflow
-        $singularsection = Inflector::singularize($section);
+        $singularsection = InflectorFactory::create()->build()->singularize($section);
 
         if (!$this->isSupported($component . '.' . $singularsection)) {
             return;
@@ -282,11 +284,14 @@ public function onWorkflowBeforeTransition(WorkflowTransitionEvent $event)
          */
         $this->getApplication()->set('plgWorkflowPublishing.' . $context, $pks);
 
-        $result = $this->getApplication()->triggerEvent('onContentBeforeChangeState', [
-            $context,
-            $pks,
-            $value,
-            ]);
+        $result = Factory::getContainer()->get(DispatcherInterface::class)->dispatch(
+            'onContentBeforeChangeState',
+            new Model\BeforeChangeStateEvent('onContentBeforeChangeState', [
+                'context' => $context,
+                'subject' => $pks,
+                'value'   => $value,
+            ])
+        )->getArgument('result', []);
 
         // Release allowed pks, the job is done
         $this->getApplication()->set('plgWorkflowPublishing.' . $context, []);
diff --git a/renovate.json b/renovate.json
index 4af50ee723422..0117105124924 100644
--- a/renovate.json
+++ b/renovate.json
@@ -14,7 +14,7 @@
   "packageRules": [
     {
       "enabled": false,
-      "matchBaseBranches": "5.2-dev",
+      "matchBaseBranches": "6.0-dev",
       "matchPackagePatterns": ["*"]
     }
   ],
diff --git a/ruleset.xml b/ruleset.xml
index dbe75cebc35d8..2067140bd8900 100644
--- a/ruleset.xml
+++ b/ruleset.xml
@@ -9,6 +9,7 @@
     <exclude-pattern type="relative">^cache/*</exclude-pattern>
     <exclude-pattern type="relative">^media/*</exclude-pattern>
     <exclude-pattern type="relative">^node_modules/*</exclude-pattern>
+    <exclude-pattern type="relative">^plugins/behaviour/compat6/classes/*</exclude-pattern>
     <exclude-pattern type="relative">^tmp/*</exclude-pattern>
 
     <!-- Exclude 3rd party libraries and Framework code. -->
@@ -96,7 +97,6 @@
         <exclude-pattern type="relative">libraries/src/Form/Field/CaptchaField\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Input/Json\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Installer/Manifest\.php</exclude-pattern>
-        <exclude-pattern type="relative">libraries/src/MVC/Model/DatabaseAwareTrait\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/MVC/Model/FormBehaviorTrait\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/MVC/Model/ItemModel\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/MVC/Model/StateBehaviorTrait\.php</exclude-pattern>
@@ -131,8 +131,6 @@
         <exclude-pattern type="relative">administrator/components/com_users/src/Service/HTML/Users\.php</exclude-pattern>
         <exclude-pattern type="relative">components/com_content/helpers/icon\.php</exclude-pattern>
         <exclude-pattern type="relative">components/com_content/helpers/icon\.php</exclude-pattern>
-        <exclude-pattern type="relative">libraries/src/Filesystem/Stream\.php</exclude-pattern>
-        <exclude-pattern type="relative">libraries/src/Filesystem/Streams/StreamString\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Installer/Adapter/ComponentAdapter\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Installer/Adapter/LanguageAdapter\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Installer/Adapter/ModuleAdapter\.php</exclude-pattern>
@@ -204,9 +202,6 @@
         <exclude-pattern type="relative">libraries/src/Encrypt/Base32\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Environment/Browser\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Feed/FeedFactory\.php</exclude-pattern>
-        <exclude-pattern type="relative">libraries/src/Filesystem/Folder\.php</exclude-pattern>
-        <exclude-pattern type="relative">libraries/src/Filesystem/Stream\.php</exclude-pattern>
-        <exclude-pattern type="relative">libraries/src/Filesystem/Support/StringController\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/HTML/Helpers/Grid\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Installer/Adapter/ComponentAdapter\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Installer/Adapter/LanguageAdapter\.php</exclude-pattern>
@@ -246,8 +241,6 @@
         <!-- should be reconsidered -->
         <exclude-pattern type="relative">administrator/components/com_installer/src/Model/DatabaseModel\.php</exclude-pattern>
         <exclude-pattern type="relative">libraries/src/Client/FtpClient\.php</exclude-pattern>
-        <exclude-pattern type="relative">libraries/src/Filesystem/Path\.php</exclude-pattern>
-        <exclude-pattern type="relative">libraries/src/Filesystem/Streams/StreamString\.php</exclude-pattern>
 
         <!-- expected, may move exception to file or refactor implementation -->
         <exclude-pattern type="relative">index\.php</exclude-pattern>
diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php
index 4afadf8bb9e4d..4485b5f9adb99 100644
--- a/templates/cassiopeia/error.php
+++ b/templates/cassiopeia/error.php
@@ -77,6 +77,39 @@
 // Override 'template.active' asset to set correct ltr/rtl dependency
 $wa->registerStyle('template.active', '', [], [], ['template.cassiopeia.' . ($this->direction === 'rtl' ? 'rtl' : 'ltr')]);
 
+// Advanced Color Settings
+$paramsColorSettings = $this->params->get('colorSettings', false);
+
+if ($paramsColorSettings) {
+    $wa->registerAndUseStyle('colors_custom', 'global/' . 'colors_custom.css')
+    ->addInlineStyle(':root {
+        --body-bg: ' . $this->params->get('bodybg') . ';
+        --body-color: ' . $this->params->get('bodycolor') . ';
+        --btnbg: ' . $this->params->get('btnbg') . ';
+        --btnbgh: ' . $this->params->get('btnbgh') . ';
+        --btncolor: ' . $this->params->get('btncolor') . ';
+        --btncolorh: ' . $this->params->get('btncolorh') . ';
+        --footerbg: ' . $this->params->get('footerbg') . ';
+        --footercolor: ' . $this->params->get('footercolor') . ';
+        --headerbg: ' . $this->params->get('headerbg') . ';
+        --headercolor: ' . $this->params->get('headercolor') . ';
+        --link-color: ' . $this->params->get('linkcolor') . ';
+        --link-hover-color: ' . $this->params->get('linkcolorh') . ';
+    }');
+}
+
+// Advanced Font Settings
+$paramsFontSettings = $this->params->get('fontSettings', false);
+
+if ($paramsFontSettings) {
+    $wa->addInlineStyle(':root {
+        --body-font-size: ' . $this->params->get('bodysize') . 'rem;
+        --h1size: ' . $this->params->get('h1size') . 'rem;
+        --h2size: ' . $this->params->get('h2size') . 'rem;
+        --h3size: ' . $this->params->get('h3size') . 'rem;
+    }');
+}
+
 // Browsers support SVG favicons
 $this->addHeadLink(HTMLHelper::_('image', 'joomla-favicon.svg', '', [], true, 1), 'icon', 'rel', ['type' => 'image/svg+xml']);
 $this->addHeadLink(HTMLHelper::_('image', 'favicon.ico', '', [], true, 1), 'alternate icon', 'rel', ['type' => 'image/vnd.microsoft.icon']);
diff --git a/templates/cassiopeia/joomla.asset.json b/templates/cassiopeia/joomla.asset.json
index 67b53cd7103da..4570677e11604 100644
--- a/templates/cassiopeia/joomla.asset.json
+++ b/templates/cassiopeia/joomla.asset.json
@@ -2,7 +2,7 @@
   "$schema": "https://developer.joomla.org/schemas/json-schema/web_assets.json",
   "name": "cassiopeia",
   "version": "4.0.0",
-  "description": "This file contains details of the assets used by Cassiopeia, the default Joomla 4 site template.",
+  "description": "This file contains details of the assets used by Cassiopeia, the default Joomla site template.",
   "license": "GPL-2.0-or-later",
   "assets": [
     {
diff --git a/templates/cassiopeia_extended/component.php b/templates/cassiopeia_extended/component.php
new file mode 100644
index 0000000000000..afa3e7e2e0e2d
--- /dev/null
+++ b/templates/cassiopeia_extended/component.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.cassiopeia_extended
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var Joomla\CMS\Document\HtmlDocument $this */
+
+require JPATH_THEMES . '/cassiopeia/component.php';
+
+$wa = $this->getWebAssetManager();
+
+// Advanced Color Settings
+$wa->registerAndUseStyle('colors_custom', 'global/colors.css')
+    ->addInlineStyle(':root {
+        --body-bg: ' . $this->params->get('bodybg') . ';
+        --body-color: ' . $this->params->get('bodycolor') . ';
+        --btnbg: ' . $this->params->get('btnbg') . ';
+        --btnbgh: ' . $this->params->get('btnbgh') . ';
+        --btncolor: ' . $this->params->get('btncolor') . ';
+        --btncolorh: ' . $this->params->get('btncolorh') . ';
+        --footerbg: ' . $this->params->get('footerbg') . ';
+        --footercolor: ' . $this->params->get('footercolor') . ';
+        --headerbg: ' . $this->params->get('headerbg') . ';
+        --headercolor: ' . $this->params->get('headercolor') . ';
+        --link-color: ' . $this->params->get('linkcolor') . ';
+        --link-hover-color: ' . $this->params->get('linkcolorh') . ';
+    }')
+
+    // Advanced Font Settings
+    ->registerAndUseStyle('font_advanced', 'global/fonts.css')
+    ->addInlineStyle(':root {
+        --body-font-size: ' . $this->params->get('bodysize') . 'rem;
+        --h1size: ' . $this->params->get('h1size') . 'rem;
+        --h2size: ' . $this->params->get('h2size') . 'rem;
+        --h3size: ' . $this->params->get('h3size') . 'rem;
+    }');
diff --git a/templates/cassiopeia_extended/error.php b/templates/cassiopeia_extended/error.php
new file mode 100644
index 0000000000000..d0e28a014d185
--- /dev/null
+++ b/templates/cassiopeia_extended/error.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.cassiopeia_extended
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var Joomla\CMS\Document\HtmlDocument $this */
+
+require JPATH_THEMES . '/cassiopeia/error.php';
+
+$wa = $this->getWebAssetManager();
+
+// Advanced Color Settings
+$wa->registerAndUseStyle('colors_custom', 'global/colors.css')
+    ->addInlineStyle(':root {
+        --body-bg: ' . $this->params->get('bodybg') . ';
+        --body-color: ' . $this->params->get('bodycolor') . ';
+        --btnbg: ' . $this->params->get('btnbg') . ';
+        --btnbgh: ' . $this->params->get('btnbgh') . ';
+        --btncolor: ' . $this->params->get('btncolor') . ';
+        --btncolorh: ' . $this->params->get('btncolorh') . ';
+        --footerbg: ' . $this->params->get('footerbg') . ';
+        --footercolor: ' . $this->params->get('footercolor') . ';
+        --headerbg: ' . $this->params->get('headerbg') . ';
+        --headercolor: ' . $this->params->get('headercolor') . ';
+        --link-color: ' . $this->params->get('linkcolor') . ';
+        --link-hover-color: ' . $this->params->get('linkcolorh') . ';
+    }')
+
+    // Advanced Font Settings
+    ->registerAndUseStyle('font_advanced', 'global/fonts.css')
+    ->addInlineStyle(':root {
+        --body-font-size: ' . $this->params->get('bodysize') . 'rem;
+        --h1size: ' . $this->params->get('h1size') . 'rem;
+        --h2size: ' . $this->params->get('h2size') . 'rem;
+        --h3size: ' . $this->params->get('h3size') . 'rem;
+    }');
diff --git a/templates/cassiopeia_extended/html/index.html b/templates/cassiopeia_extended/html/index.html
new file mode 100644
index 0000000000000..2efb97f319a35
--- /dev/null
+++ b/templates/cassiopeia_extended/html/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/templates/cassiopeia_extended/index.php b/templates/cassiopeia_extended/index.php
new file mode 100644
index 0000000000000..daff44f19b495
--- /dev/null
+++ b/templates/cassiopeia_extended/index.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.cassiopeia_extended
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var Joomla\CMS\Document\HtmlDocument $this */
+
+require JPATH_THEMES . '/cassiopeia/index.php';
+
+$wa = $this->getWebAssetManager();
+
+// Advanced Color Settings
+$wa->registerAndUseStyle('colors_custom', 'global/colors.css')
+    ->addInlineStyle(':root {
+        --body-bg: ' . $this->params->get('bodybg') . ';
+        --body-color: ' . $this->params->get('bodycolor') . ';
+        --btnbg: ' . $this->params->get('btnbg') . ';
+        --btnbgh: ' . $this->params->get('btnbgh') . ';
+        --btncolor: ' . $this->params->get('btncolor') . ';
+        --btncolorh: ' . $this->params->get('btncolorh') . ';
+        --footerbg: ' . $this->params->get('footerbg') . ';
+        --footercolor: ' . $this->params->get('footercolor') . ';
+        --headerbg: ' . $this->params->get('headerbg') . ';
+        --headercolor: ' . $this->params->get('headercolor') . ';
+        --link-color: ' . $this->params->get('linkcolor') . ';
+        --link-hover-color: ' . $this->params->get('linkcolorh') . ';
+    }')
+
+    // Advanced Font Settings
+    ->registerAndUseStyle('font_advanced', 'global/fonts.css')
+    ->addInlineStyle(':root {
+        --body-font-size: ' . $this->params->get('bodysize') . 'rem;
+        --h1size: ' . $this->params->get('h1size') . 'rem;
+        --h2size: ' . $this->params->get('h2size') . 'rem;
+        --h3size: ' . $this->params->get('h3size') . 'rem;
+    }');
diff --git a/templates/cassiopeia_extended/offline.php b/templates/cassiopeia_extended/offline.php
new file mode 100644
index 0000000000000..ab4822fbbc57e
--- /dev/null
+++ b/templates/cassiopeia_extended/offline.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.cassiopeia_extended
+ *
+ * @copyright   (C) 2025 Open Source Matters, Inc. <https://www.joomla.org>
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/** @var Joomla\CMS\Document\HtmlDocument $this */
+
+require JPATH_THEMES . '/cassiopeia/offline.php';
+
+$wa = $this->getWebAssetManager();
+
+// Advanced Color Settings
+$wa->registerAndUseStyle('colors_custom', 'global/colors.css')
+    ->addInlineStyle(':root {
+        --body-bg: ' . $this->params->get('bodybg') . ';
+        --body-color: ' . $this->params->get('bodycolor') . ';
+        --btnbg: ' . $this->params->get('btnbg') . ';
+        --btnbgh: ' . $this->params->get('btnbgh') . ';
+        --btncolor: ' . $this->params->get('btncolor') . ';
+        --btncolorh: ' . $this->params->get('btncolorh') . ';
+        --footerbg: ' . $this->params->get('footerbg') . ';
+        --footercolor: ' . $this->params->get('footercolor') . ';
+        --headerbg: ' . $this->params->get('headerbg') . ';
+        --headercolor: ' . $this->params->get('headercolor') . ';
+        --link-color: ' . $this->params->get('linkcolor') . ';
+        --link-hover-color: ' . $this->params->get('linkcolorh') . ';
+    }')
+
+    // Advanced Font Settings
+    ->registerAndUseStyle('font_advanced', 'global/fonts.css')
+    ->addInlineStyle(':root {
+        --body-font-size: ' . $this->params->get('bodysize') . 'rem;
+        --h1size: ' . $this->params->get('h1size') . 'rem;
+        --h2size: ' . $this->params->get('h2size') . 'rem;
+        --h3size: ' . $this->params->get('h3size') . 'rem;
+    }');
diff --git a/templates/cassiopeia_extended/templateDetails.xml b/templates/cassiopeia_extended/templateDetails.xml
new file mode 100644
index 0000000000000..0a99dc794d94c
--- /dev/null
+++ b/templates/cassiopeia_extended/templateDetails.xml
@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="template" client="site">
+	<name>cassiopeia_extended</name>
+	<version>1.0</version>
+	<creationDate>2025-07</creationDate>
+	<author>Joomla! Project</author>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<copyright>(C) 2025 Open Source Matters, Inc.</copyright>
+	<description>TPL_CASSIOPEIA_EXTENDED_XML_DESCRIPTION</description>
+    <inheritable>0</inheritable>
+    <parent>cassiopeia</parent>
+	<files>
+		<filename>component.php</filename>
+		<filename>error.php</filename>
+		<filename>index.php</filename>
+		<filename>offline.php</filename>
+		<filename>templateDetails.xml</filename>
+		<folder>html</folder>
+	</files>
+	<media destination="templates/site/cassiopeia_extended" folder="media">
+		<folder>css</folder>
+		<folder>images</folder>
+		<folder>scss</folder>
+	</media>
+	<positions>
+		<position>topbar</position>
+		<position>below-top</position>
+		<position>menu</position>
+		<position>search</position>
+		<position>banner</position>
+		<position>top-a</position>
+		<position>top-b</position>
+		<position>main-top</position>
+		<position>main-bottom</position>
+		<position>breadcrumbs</position>
+		<position>sidebar-left</position>
+		<position>sidebar-right</position>
+		<position>bottom-a</position>
+		<position>bottom-b</position>
+		<position>footer</position>
+		<position>debug</position>
+		<!-- used directly in the error.php and included here so the position will appear in the list of available positions -->
+		<position>error-403</position>
+		<position>error-404</position>
+	</positions>
+	<config>
+		<fields name="params">
+			<fieldset name="advanced">
+				<field
+					name="brand"
+					type="radio"
+					label="TPL_CASSIOPEIA_BRAND_LABEL"
+					default="1"
+					layout="joomla.form.field.radio.switcher"
+					filter="options"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+
+				<field
+					name="logoFile"
+					type="media"
+					schemes="http,https,ftp,ftps,data,file"
+					validate="url"
+					relative="true"
+					default=""
+					label="TPL_CASSIOPEIA_LOGO_LABEL"
+					showon="brand:1"
+				/>
+
+				<field
+					name="siteTitle"
+					type="text"
+					default=""
+					label="TPL_CASSIOPEIA_TITLE"
+					filter="string"
+					showon="brand:1"
+				/>
+
+				<field
+					name="siteDescription"
+					type="text"
+					default=""
+					label="TPL_CASSIOPEIA_TAGLINE_LABEL"
+					description="TPL_CASSIOPEIA_TAGLINE_DESC"
+					filter="string"
+					showon="brand:1"
+				/>
+
+				<field
+					name="fluidContainer"
+					type="radio"
+					layout="joomla.form.field.radio.switcher"
+					default="0"
+					label="TPL_CASSIOPEIA_FLUID_LABEL"
+					>
+					<option value="0">TPL_CASSIOPEIA_STATIC</option>
+					<option value="1">TPL_CASSIOPEIA_FLUID</option>
+				</field>
+
+				<field
+					name="stickyHeader"
+					type="radio"
+					label="TPL_CASSIOPEIA_STICKY_LABEL"
+					layout="joomla.form.field.radio.switcher"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+
+				<field
+					name="backTop"
+					type="radio"
+					label="TPL_CASSIOPEIA_BACKTOTOP_LABEL"
+					layout="joomla.form.field.radio.switcher"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+			</fieldset>
+
+			<fieldset name="colors" label="TPL_CASSIOPEIA_COLORS_FIELDSET_LABEL">
+
+				<field
+					name="headerbg"
+					type="color"
+					parentclass="span-3-inline stack"
+					default="rgb(193, 205, 207)"
+					format="rgb"
+					label="TPL_CASSIOPEIA_HEADER_BACKGROUND_COLOR_LABEL"
+				/>
+
+				<field
+					name="headercolor"
+					type="color"
+					parentclass="span-3-inline stack"
+					default="rgb(23, 23, 23)"
+					format="rgb"
+					label="TPL_CASSIOPEIA_HEADER_TEXT_COLOR_LABEL"
+				/>
+
+				<field
+					name="bodybg"
+					type="color"
+					parentclass="span-3-inline stack"
+					default="rgb(254, 254, 254)"
+					format="rgb"
+					label="TPL_CASSIOPEIA_BODY_BACKGROUND_COLOR_LABEL"
+				/>
+
+				<field
+					name="bodycolor"
+					type="color"
+					parentclass="span-3-inline stack"
+					default="rgb(23, 23, 23)"
+					format="rgb"
+					label="TPL_CASSIOPEIA_BODY_TEXT_COLOR_LABEL"
+					description=""
+				/>
+
+				<field
+					name="linkcolor"
+					type="color"
+					parentclass="span-3-inline stack"
+					default="rgb(29, 121, 137)"
+					format="rgb"
+					label="TPL_CASSIOPEIA_LINK_COLOR_LABEL"
+				/>
+
+				<field
+					name="linkcolorh"
+					type="color"
+					parentclass="span-3-inline stack"
+					default="rgb(14, 59, 67)"
+					format="rgb"
+					label="TPL_CASSIOPEIA_LINK_HOVER_COLOR_LABEL"
+				/>
+
+				<field
+					name="btnbg"
+					type="color"
+					parentclass="span-3-inline stack"
+					default="rgb(206, 60, 55)"
+					format="rgb"
+					label="TPL_CASSIOPEIA_BUTTON_BACKGROUND_COLOR_LABEL"
+				/>
+
+				<field
+					name="btnbgh"
+					type="color"
+					parentclass="span-3-inline stack"
+					default="rgb(131, 35, 32)"
+					format="rgb"
+					label="TPL_CASSIOPEIA_BUTTON_BACKGROUND_HOVER_COLOR_LABEL"
+				/>
+
+				<field
+					name="btncolor"
+					type="color"
+					parentclass="span-3-inline stack"
+					default="rgb(254, 254, 254)"
+					format="rgb"
+					label="TPL_CASSIOPEIA_BUTTON_COLOR_LABEL"
+				/>
+
+				<field
+					name="btncolorh"
+					type="color"
+					parentclass="span-3-inline stack"
+					default="rgb(254, 254, 254)"
+					format="rgb"
+					label="TPL_CASSIOPEIA_BUTTON_HOVER_COLOR_LABEL"
+				/>
+
+				<field
+					name="footerbg"
+					type="color"
+					parentclass="span-3-inline stack"
+					default="rgb(29, 121, 137)"
+					format="rgb"
+					label="TPL_CASSIOPEIA_FOOTER_BACKGROUND_COLOR_LABEL"
+				/>
+
+				<field
+					name="footercolor"
+					type="color"
+					parentclass="span-3-inline stack"
+					default="rgb(254, 254, 254)"
+					format="rgb"
+					label="TPL_CASSIOPEIA_FOOTER_TEXT_COLOR_LABEL"
+				/>
+			</fieldset>
+
+			<fieldset name="fonts" label="TPL_CASSIOPEIA_FONTS_FIELDSET_LABEL">
+
+				<field
+					name="useFontScheme"
+					type="groupedlist"
+					label="TPL_CASSIOPEIA_FONT_LABEL"
+					default="0"
+					>
+					<option value="0">JNONE</option>
+					<group label="TPL_CASSIOPEIA_FONT_SYSTEM">
+						<option value="system">TPL_CASSIOPEIA_FONT_SYSTEM_SELECT</option>
+					</group>
+					<group label="TPL_CASSIOPEIA_FONT_GROUP_LOCAL">
+						<option value="media/templates/site/cassiopeia/css/global/fonts-local_roboto.css">Roboto (local)</option>
+					</group>
+					<group label="TPL_CASSIOPEIA_FONT_GROUP_WEB">
+						<option value="https://fonts.googleapis.com/css2?family=Fira+Sans:wght@100;300;400;700&amp;display=swap">Fira Sans (web)</option>
+						<option value="https://fonts.googleapis.com/css2?family=Noto+Sans:wght@100;300;400;700&amp;family=Roboto:wght@100;300;400;700&amp;display=swap">Roboto + Noto Sans (web)</option>
+					</group>
+				</field>
+
+				<field
+					name="systemFontBody"
+					type="list"
+					label="TPL_CASSIOPEIA_FONT_SYSTEM_BODY"
+					default=""
+					validate="options"
+					showon="useFontScheme:system"
+					>
+					<option value="">JSELECT</option>
+					<option value="Charter, 'Bitstream Charter', 'Sitka Text', Cambria, serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_TRANSITIONAL</option>
+					<option value="'Iowan Old Style', 'Palatino Linotype', 'URW Palladio L', P052, serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_OLDSTYLE</option>
+					<option value="Seravek, 'Gill Sans Nova', Ubuntu, Calibri, 'DejaVu Sans', source-sans-pro, sans-serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_HUMANIST</option>
+					<option value="Avenir, 'Avenir Next LT Pro', Montserrat, Corbel, 'URW Gothic', source-sans-pro, sans-serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_GEOMETRIC</option>
+					<option value="Optima, Candara, 'Noto Sans', source-sans-pro, sans-serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_CLASSICAL</option>
+					<option value="Inter, Roboto, 'Helvetica Neue', 'Arial Nova', 'Nimbus Sans', Arial, sans-serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_GROTESQUE</option>
+					<option value="'Nimbus Mono PS', 'Courier New', 'Cutive Mono', monospace">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_MONOSPACE</option>
+					<option value="ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_CODE</option>
+					<option value="Bahnschrift, 'DIN Alternate', 'Franklin Gothic Medium', 'Nimbus Sans Narrow', sans-serif-condensed, sans-serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_INDUSTRIAL</option>
+					<option value="ui-rounded, 'Hiragino Maru Gothic ProN', Quicksand, Comfortaa, Manjari, 'Arial Rounded MT Bold', Calibri, source-sans-pro, sans-serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_ROUNDED</option>
+					<option value="Rockwell, 'Rockwell Nova', 'Roboto Slab', 'DejaVu Serif', 'Sitka Small', serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_SLAB</option>
+					<option value="Superclarendon, 'Bookman Old Style', 'URW Bookman', 'URW Bookman L', 'Georgia Pro', Georgia, serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_ANTIQUE</option>
+					<option value="Didot, 'Bodoni MT', 'Noto Serif Display', 'URW Palladio L', P052, Sylfaen, serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_DIDONE</option>
+					<option value="'Segoe Print', 'Bradley Hand', Chilanka, TSCu_Comic, casual, cursive">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_HANDWRITTEN</option>
+				</field>
+
+				<field
+					name="systemFontHeading"
+					type="list"
+					label="TPL_CASSIOPEIA_FONT_SYSTEM_HEADING"
+					default=""
+					validate="options"
+					showon="useFontScheme:system"
+					>
+					<option value="">JSELECT</option>
+					<option value="Charter, 'Bitstream Charter', 'Sitka Text', Cambria, serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_TRANSITIONAL</option>
+					<option value="'Iowan Old Style', 'Palatino Linotype', 'URW Palladio L', P052, serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_OLDSTYLE</option>
+					<option value="Seravek, 'Gill Sans Nova', Ubuntu, Calibri, 'DejaVu Sans', source-sans-pro, sans-serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_HUMANIST</option>
+					<option value="Avenir, 'Avenir Next LT Pro', Montserrat, Corbel, 'URW Gothic', source-sans-pro, sans-serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_GEOMETRIC</option>
+					<option value="Optima, Candara, 'Noto Sans', source-sans-pro, sans-serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_CLASSICAL</option>
+					<option value="Inter, Roboto, 'Helvetica Neue', 'Arial Nova', 'Nimbus Sans', Arial, sans-serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_GROTESQUE</option>
+					<option value="'Nimbus Mono PS', 'Courier New', 'Cutive Mono', monospace">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_MONOSPACE</option>
+					<option value="ui-monospace, 'Cascadia Code', 'Source Code Pro', Menlo, Consolas, 'DejaVu Sans Mono', monospace">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_CODE</option>
+					<option value="Bahnschrift, 'DIN Alternate', 'Franklin Gothic Medium', 'Nimbus Sans Narrow', sans-serif-condensed, sans-serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_INDUSTRIAL</option>
+					<option value="ui-rounded, 'Hiragino Maru Gothic ProN', Quicksand, Comfortaa, Manjari, 'Arial Rounded MT Bold', Calibri, source-sans-pro, sans-serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_ROUNDED</option>
+					<option value="Rockwell, 'Rockwell Nova', 'Roboto Slab', 'DejaVu Serif', 'Sitka Small', serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_SLAB</option>
+					<option value="Superclarendon, 'Bookman Old Style', 'URW Bookman', 'URW Bookman L', 'Georgia Pro', Georgia, serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_ANTIQUE</option>
+					<option value="Didot, 'Bodoni MT', 'Noto Serif Display', 'URW Palladio L', P052, Sylfaen, serif">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_DIDONE</option>
+					<option value="'Segoe Print', 'Bradley Hand', Chilanka, TSCu_Comic, casual, cursive">TPL_CASSIOPEIA_FONT_SYSTEM_STACK_SYSTEM_HANDWRITTEN</option>
+				</field>
+
+				<field
+					name="noteFontScheme"
+					type="note"
+					description="TPL_CASSIOPEIA_FONT_NOTE_TEXT"
+					class="alert alert-warning"
+					suffix="rem"
+				/>
+
+				<field
+					name="bodysize"
+					type="number"
+					default="1"
+					label="TPL_CASSIOPEIA_BODY_SIZE"
+					validate="number"
+					min="0"
+				/>
+
+				<field
+					name="h1size"
+					type="number"
+					default="2"
+					label="TPL_CASSIOPEIA_H1_SIZE"
+					validate="number"
+					min="0"
+				/>
+
+				<field
+					name="h2size"
+					type="number"
+					default="1.7"
+					label="TPL_CASSIOPEIA_H2_SIZE"
+					validate="number"
+					min="0"
+				/>
+
+				<field
+					name="h3size"
+					type="number"
+					default="1.5"
+					label="TPL_CASSIOPEIA_H3_SIZE"
+					validate="number"
+					min="0"
+				/>
+			</fieldset>
+		</fields>
+	</config>
+</extension>
diff --git a/templates/system/build_incomplete.html b/templates/system/build_incomplete.html
index 1e9c9d8a6cd84..327f68dc2dc8f 100644
--- a/templates/system/build_incomplete.html
+++ b/templates/system/build_incomplete.html
@@ -5,8 +5,8 @@
 	<meta name="robots" content="noindex, nofollow">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<title>Joomla: Environment Setup Incomplete</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
-	<style>html{background:#ee2a00;background:-moz-radial-gradient(center,ellipse cover,#f1f1f1 0,#ee2a00 100%);background:-webkit-radial-gradient(center,ellipse cover,#f1f1f1 0,#ee2a00 100%);background:radial-gradient(#f1f1f1 0,#ee2a00 100%) no-repeat fixed}body{color:#555;background-color:#0000;margin:0;padding:0;font:14px/18px sans-serif}ol,ul{margin:0;padding:0;list-style:none}a{color:#0084b4;text-decoration:none}a:hover,a:focus{text-decoration:underline}p a{line-height:inherit}.container{flex-direction:column;justify-content:center;align-items:center;width:100%;height:100vh;margin:0 auto;display:flex;position:relative;overflow:hidden}.alert-main{background:#fff;border:1px solid #0000001a;border-radius:5px;margin:0 20px;padding:20px 60px;display:block;position:relative;box-shadow:0 0 10px #0000000d}svg{z-index:-1;width:400px;position:absolute;bottom:-120px;right:-70px;transform:rotate(10deg)}h1,p{z-index:10;text-align:center;text-rendering:optimizeLegibility;position:relative}h1{text-shadow:0 1px 2px #0003;margin:18px 0 0;font-size:40px;font-weight:200;line-height:1}p,label{color:#777;margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid #0000001a;border-radius:.25rem;padding:.4rem .85rem;font-size:1rem;font-weight:400;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{text-align:left;margin:8px 20px;font-size:11px}.footer ul{margin-bottom:5px}.footer li{margin:0 5px;line-height:20px;display:inline}.footer li,.footer a{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem;display:block}.links li{margin-top:20px;display:inline-block}@media screen and (width<=480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
-	<script>window.errorLocale={"af-ZA":{"language":"Engels GB","header":"Omgewinginstelling Onvolledig","text1":"Dit wil voorkom asof jy Joomla! probeer bestuur vanaf ons git bewaarplek. Om dit te doen, moet jy eers 'n paar ekstra stappe uitvoer.","help-url-text":"Meer besonderhede"},"ar-AA":{"language":"اللغة العربية بالكود الموحد","header":"إعداد البيئة غير مكتمل","text1":"يبدو أنك تحاول تشغيل جوملا! من مستودع git الخاص بنا. يتطلب هذا منك إكمال خطوتين إضافيتين أولاً.","help-url-text":"المزيد من التفاصيل"},"be-BY":{"language":"Беларуская BY","header":"Працоўнае асяроддзе не наладжанае","text1":"Здаецца, Вы спрабуеце ўсталяваць Joomla з нашага Git-сховішча. Для гэтага спачатку зрабіце некалькі дадатковых крокаў.","help-url-text":"Падрабязней"},"bg-BG":{"language":"Български","header":"Настройката на обкръжаващата среда е непълна","text1":"Изглежда, че се опитвате да стартирате Joomla! от нашето git хранилище. За да направите това, първо трябва да изпълните няколко допълнителни стъпки.","help-url-text":"Повече детайли"},"ca-ES":{"language":"Català ca_ES","header":"Configuració de l'entorn incomplerta","text1":"Sembla que estàs intentant executar Joomla! des del nostre repositori a git. Per a fer-ho, primer has de completar un parell de passos addicionals.","help-url-text":"Més detalls"},"cs-CZ":{"language":"Čeština","header":"Nastavení prostředi je neúplné","text1":"Zdá se, že se pokoušíte spustit Joomla! z našeho Git repozitáře. K tomu je třeba nejprve dokončit pár dalších kroků.","help-url-text":"Více podrobností"},"cy-GB":{"language":"Cymraeg GB","header":"Sefydlu'r Amgylchedd heb ei gwblhau","text1":"Ymddengys eich bod yn ceisio rhedeg Joomla! o'n ystorfa git.  I wneud hynny mae angen i chi gwblhau ambell gam ychwanegol yn gyntaf.","help-url-text":"Mwy o Fanylion"},"da-DK":{"language":"Dansk DK","header":"Miljø opsætning ufuldstændig","text1":"Det ser ud til at du forsøger at køre Joomla! fra vores git repository. For at gøre dette, kræves det at du gennemfører et par ekstra skridt først.","help-url-text":"Flere detaljer"},"de-AT":{"language":"Deutsch AT","header":"Umgebungseinstellungen unvollständig","text1":"Es sieht so aus, als ob versucht wird, Joomla aus dem Git-Repository heraus zu installieren. Um dies zu tun, müssen zuerst ein paar zusätzliche Schritte durchführt werden.","help-url-text":"Weitere Informationen"},"de-CH":{"language":"Deutsch CH","header":"Umgebungseinstellungen unvollständig","text1":"Es sieht so aus, als ob versucht wird, Joomla aus dem Git-Repository heraus zu installieren. Um dies zu tun, müssen zuerst ein paar zusätzliche Schritte durchführt werden.","help-url-text":"Weitere Informationen"},"de-DE":{"language":"Deutsch DE","header":"Umgebungseinstellungen unvollständig","text1":"Es sieht so aus, als ob versucht wird, Joomla aus dem Git-Repository heraus zu installieren. Um dies zu tun, müssen zuerst ein paar zusätzliche Schritte durchführt werden.","help-url-text":"Weitere Informationen"},"de-LI":{"language":"Deutsch LI","header":"Umgebungseinstellungen unvollständig","text1":"Es sieht so aus, als ob versucht wird, Joomla aus dem Git-Repository heraus zu installieren. Um dies zu tun, müssen zuerst ein paar zusätzliche Schritte durchführt werden.","help-url-text":"Weitere Informationen"},"de-LU":{"language":"Deutsch LU","header":"Umgebungseinstellungen unvollständig","text1":"Es sieht so aus, als ob versucht wird, Joomla aus dem Git-Repository heraus zu installieren. Um dies zu tun, müssen zuerst ein paar zusätzliche Schritte durchführt werden.","help-url-text":"Weitere Informationen"},"el-GR":{"language":"Greek el-GR","header":"Δεν έχει ολοκληρωθεί η εγκατάσταση","text1":"Φαίνεται ότι προσπαθείτε να εγκαταστήσετε το Joomla από το αποθετήριο Git. Ακολουθήστε μερικά επιπλέον βήματα πριν ξεκινήσετε την εγκατάσταση.","help-url-text":"Περισσότερες Λεπτομέρειες"},"en-AU":{"language":"English AU","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you to complete a couple of extra steps first.","help-url-text":"More Details"},"en-CA":{"language":"English CA","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you to complete a couple of extra steps first.","help-url-text":"More Details"},"en-GB":{"language":"English GB","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you to complete a couple of extra steps first.","help-url-text":"More Details"},"en-NZ":{"language":"English NZ","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you to complete a couple of extra steps first.","help-url-text":"More Details"},"en-US":{"language":"English US","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you complete a couple of extra steps first.","help-url-text":"[ More Detail %s ]"},"es-ES":{"language":"Español ES","header":"Configuración del entorno de trabajo incompleta","text1":"Parece que está intentando ejecutar Joomla! desde nuestro repositorio en Git. Para hacerlo, primero debe completar un par de pasos adicionales.","help-url-text":"Más detalles"},"et-EE":{"language":"Estonian","header":"Keskkonna seadistamine pole valmis","text1":"Näib, et sa proovid paigaldada Joomla! meie Git hoidlast. Selle tegemiseks on vaja eelnevalt teha mõned lisaliigutused.","help-url-text":"Lisainfo"},"eu-ES":{"language":"Euskara ES","header":"Ingurune Konfigurazioa osatu gabe","text1":"Badirudi Joomla exekutatzen saiatzen ari zarela! gure git biltegitik. Horretarako, beste urrats gehigarri batzuk eman behar dituzu.","help-url-text":"Xehetasun Gehiago"},"fa-AF":{"language":"فارسی دری","header":"تنظیمات محیطی کامل نشد","text1":"به نظر سعی در اجرای جوملا! از طریق مخزن Git را دارید. برای انجام این کار، در ابتدا، نیاز به چند مرحله‌ی اضافه دارید.","help-url-text":"جزئیات بیشتر"},"fa-IR":{"language":"Persian IR","header":"تنظیم محیط ناقص است","text1":"به نظر می رسد که شما سعی در اجرای جوملا از مخزن گیت را دارید! برای انجام این کار ابتدا باید دو مرحله اضافی را انجام دهید.","help-url-text":"جزئیات بیشتر"},"fi-FI":{"language":"Suomi","header":"Ympäristön asennus on epätäydellinen","text1":"Näyttää siltä, että yrität ajaa Joomlaa meidän git-repositorystä. Tehdäksesi niin joudut suorittamaan ensin pari ylimääräistä vaihetta.","help-url-text":"Lisätietoja"},"fr-CA":{"language":"Français FR","header":"Configuration de l'environnement incomplète","text1":"Il semble que vous essayez d'exécuter Joomla! depuis notre dépôt git. Pour cela vous devez d'abord compléter quelques étapes supplémentaires.","help-url-text":"Plus de détails"},"fr-FR":{"language":"Français FR","header":"Configuration de l'environnement incomplète","text1":"Il semble que vous essayez d'exécuter Joomla! depuis notre dépôt git. Pour cela vous devez d'abord compléter quelques étapes supplémentaires.","help-url-text":"Plus de détails"},"he-IL":{"language":"אנגלית GB","header":"הגדרת הסביבה לא הושלמה","text1":"נראה שאתה מנסה להריץ את ג'ומלה ממאגר ה- git שלנו. לשם כך עליך לבצע מספר שלבים נוספים תחילה.","help-url-text":"פרטים נוספים"},"hr-HR":{"language":"Hrvatski HR","header":"Nepotpuna postavka okoline","text1":"Čini se da pokušavate pokrenuti Joomla! iz našeg git reprozitorija. Da biste to učinili, morate prvo dovršiti nekoliko dodatnih koraka.","help-url-text":"Više detalja"},"hu-HU":{"language":"Magyar","header":"A környezet beállítása hiányos","text1":"Úgy tűnik, hogy a Joomla!-t a saját tárolónkból próbálja futtatni. Ehhez először el kell végeznie néhány további lépést.","help-url-text":"Több részlet"},"it-IT":{"language":"Italiano IT","header":"Impostazione ambiente incompleta","text1":"Sembra che si stia tentando di avviare Joomla! dal nostro archivio git. Per riuscirci è necessario completare anzitutto un paio di altri passaggi.","help-url-text":"Maggiori Dettagli"},"ja-JP":{"language":"Japanese JP","header":"環境設定が不完全です","text1":"gitリポジトリからJoomlaを実行しようとしているようです。これを行うには、最初にいくつかの追加手順を完了する必要があります。","help-url-text":"詳細表示"},"ka-GE":{"language":"ქართული GE","header":"გარემოს კონფიგურირება არ არის დასულებული","text1":"როგორც ჩანს, თქვენ ცდილობთ Joomla! დაყენებას ჩვენი Git-რეპოზიტორიდან. ამისათვის საჭიროა ჯერ შეასრულოთ რამოდენიმე დამატებითი ნაბიჯი.","help-url-text":"ვრცლად"},"kk-KZ":{"language":"English GB","header":"Тұғыр орнату аяқталмады","text1":"Біздің git қамбамыздан Joomla! - ны іске қосқыңыз келген сияқты. Ол үшін бірнеше қосымша қадамдарды орындау қажет.","help-url-text":"Қосымша мәліметтер"},"ko-KR":{"language":"Korean KO","header":"환경 설정 불완전","text1":"Joomla가 git repository에서 작동되기 위해서는 추가 설정이 필요합니다.","help-url-text":"자세히 보기"},"lt-LT":{"language":"Lietuvių LT","header":"Aplinkos sąranka nebaigta","text1":"Panašu, kad bandote paleisti „Joomla“! iš mūsų git saugyklos. Norėdami tai padaryti, pirmiausia turite atlikti keletą papildomų veiksmų.","help-url-text":"Daugiau detalių"},"lv-LV":{"language":"Latviešu LV","header":"Nepilnīga Joomla uzstādīšana","text1":"Šķiet, ka jūs mēģināt palaist Joomla! no mūsu git krātuves. Lai to izdarītu, vispirms ir jāveic dažas papildu darbības.","help-url-text":"Vairāk informācijas"},"mk-MK":{"language":"English GB","header":"Поставување на работната средина не е завршено","text1":"Изгледа дека се обидувате да стартувате Joomla! од нашето git складиште. За да го направите ова, потребно е прво да завршите неколку дополнителни чекори.","help-url-text":"Повеќе детали"},"nl-BE":{"language":"Vlaams BE","header":"Omgeving instellen onvolledig","text1":"Het lijkt erop dat u probeert Joomla! uit te voeren vanuit onze git repository. Hiervoor is vereist dat u eerst een aantal extra stappen heeft voltooid.","help-url-text":"Meer details"},"nl-NL":{"language":"Engels GB","header":"Omgeving instellen onvolledig","text1":"Het lijkt erop dat u probeert Joomla! uit te voeren vanuit onze git repository. Hiervoor is vereist dat u eerst een aantal extra stappen heeft voltooid.","help-url-text":"Meer details"},"pl-PL":{"language":"Polski PL","header":"Konfiguracja środowiska niekompletna","text1":"Wygląda na to, że próbujesz uruchomić Joomla! z naszego repozytorium git. Aby to zrobić, musisz najpierw wykonać kilka dodatkowych kroków.","help-url-text":"[ Więcej szczegółów]"},"pt-BR":{"language":"Português do Brasil (pt-BR)","header":"Configuração do Ambiente Incompleta","text1":"Parece que você está tentando executar o Joomla! do nosso repositório git. Para fazer isso, primeiro é necessário que você conclua alguns passos adicionais.","help-url-text":"Mais detalhes"},"pt-PT":{"language":"Portuguese (pt-PT)","header":"Configuração do ambiente incompleta","text1":"Parece que está a tentar executar o Joomla a partir do nosso repositório Git. Se é o que pretende fazer, primeiro terá de efetuar algumas etapas adicionais.","help-url-text":"Mais detalhes"},"ro-RO":{"language":"Română RO","header":"Configurarea mediului este incompletă","text1":"Se pare că încercaţi să rulaţi Joomla! din repozitoriul nostru git. Pentru a face acest lucru este necesar să finalizaţi câţiva paşi în plus mai întâi.","help-url-text":"Mai multe detalii"},"ru-RU":{"language":"Русский RU","header":"Настройка среды не завершена","text1":"Похоже, вы пытаетесь установить Joomla из Git-репозитория. Пожалуйста, выполните несколько дополнительных шагов перед началом установки.","help-url-text":"Подробнее"},"sk-SK":{"language":"Slovensky","header":"Nastavenie prostredia je neúplné","text1":"Vyzerá to tak, že sa pokúšate spustiť Joomla! z nášho git repozitára. Aby ste tak urobili, musíte najprv dokončiť niekoľko ďalších krokov.","help-url-text":"Viac podrobností"},"sl-SI":{"language":"Slovenščina SI","header":"Nastavitev okolja nepopolna","text1":"Izgleda da poskušate zagnati Joomla! iz našega git skladišča. Če želite to narediti, morate najprej opraviti še nekaj dodatnih korakov.","help-url-text":"Več podrobnosti"},"sr-YU":{"language":"Srpski Latinica SRB","header":"Podešavanje okruženja je nepotpuno","text1":"Izgleda da pokušavate da pokrenete Joomla! iz našeg git skladišta. Da biste to uradili potrebno je da završite nekoliko dodatnih koraka.","help-url-text":"Više detalja"},"sv-SE":{"language":"Svensk SE","header":"Miljöinställning inte klar","text1":"Det ser ut som du försöker köra Joomla! från vårt git repository. För att göra detta kräver att du först slutför ett par extra steg.","help-url-text":"Mer detaljer"},"ta-IN":{"language":"தமிழ் இந்தியா","header":"சூழல் அமைப்பு முடிவுபெறவில்லை","text1":"தாங்கள் Joomla!-வை எங்கள் git களஞ்சியத்திலிருந்து இயக்க முயற்சிக்கிறீர்கள் என்று தெரிகிறது. அவ்வாறு செய்வதற்கு தாங்கள் முதலில் இரண்டு கூடுதல் கட்டங்களை முடிக்க வேண்டும்.","help-url-text":"அதிக விவரம்"},"th-TH":{"language":"ภาษาไทย","header":"การตั้งค่าสภาพแวดล้อมไม่สมบูรณ์","text1":"ดูเหมือนว่าคุณกำลังพยายามเรียกใช้ Joomla! จากที่เก็บ git ของเรา ในการดำเนินการดังกล่าว คุณต้องทำตามขั้นตอนเพิ่มเติมสองสามขั้นตอนพิเศษก่อน","help-url-text":"รายละเอียดเพิ่มเติม"},"tr-TR":{"language":"Turkish TR","header":"Ortam Kurulumu Tamamlanmadı","text1":"Joomla! git depomuzdan çalıştırmaya çalışıyorsunuz. Bunu yapmak için önce birkaç ekstra adımı tamamlamanız gerekir.","help-url-text":"Daha Fazla Detay"},"uk-UA":{"language":"Українська (UA)","header":"Налаштування навколишнього середовища неповне","text1":"Схоже, ви намагаєтеся запустити Joomla! від нашого сховища GIT. Для цього потрібно спочатку завершити декілька додаткових кроків.","help-url-text":"Детальніше"},"ur-PK":{"language":"انگریزی جی-بی","header":"ماحولیاتی سیٹ اپ نامکمل ہے۔","text1":"ایسا لگتا ہے کہ آپ جملہ چلانے کی کوشش کر رہے ہیں! ہمارے گٹ ذخیرے سے۔ ایسا کرنے کے لیے آپ کو پہلے چند اضافی اقدامات مکمل کرنے کی ضرورت ہے۔","help-url-text":"مزید تفصیلات"},"vi-VN":{"language":"Vietnamese VN","header":"Thiết lập môi trường chưa hoàn thành","text1":"Có vẻ như bạn đang cố chạy Joomla! từ kho lưu trữ git của chúng tôi. Để làm như vậy, trước tiên bạn phải hoàn thành một vài bước bổ sung.","help-url-text":"Thêm chi tiết"},"zh-CN":{"language":"简体中文","header":"环境设置不完整","text1":"看来你是想从 git 仓库中运行 Joomla！ 这样做需要首先完成几个步骤.","help-url-text":"显示全部"},"zh-TW":{"language":"中文 台灣繁體","header":"環境建立未完成","text1":"看起來你嘗試要從 Joomla! 的 Git 資源庫執行 Joomla!，要做得先完成一連串額外步驟。","help-url-text":"更多細節"}};</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
+	<style>html{background:#ee2a00 radial-gradient(#f1f1f1 0,#ee2a00 100%) no-repeat fixed}body{color:#555;background-color:#0000;margin:0;padding:0;font:14px/18px sans-serif}ol,ul{margin:0;padding:0;list-style:none}a{color:#0084b4;text-decoration:none}a:hover,a:focus{text-decoration:underline}p a{line-height:inherit}.container{flex-direction:column;justify-content:center;align-items:center;width:100%;height:100vh;margin:0 auto;display:flex;position:relative;overflow:hidden}.alert-main{background:#fff;border:1px solid #0000001a;border-radius:5px;margin:0 20px;padding:20px 60px;display:block;position:relative;box-shadow:0 0 10px #0000000d}svg{z-index:-1;width:400px;position:absolute;bottom:-120px;right:-70px;transform:rotate(10deg)}h1,p{z-index:10;text-align:center;text-rendering:optimizelegibility;position:relative}h1{text-shadow:0 1px 2px #0003;margin:18px 0 0;font-size:40px;font-weight:200;line-height:1}p,label{color:#777;margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid #0000001a;border-radius:.25rem;padding:.4rem .85rem;font-size:1rem;font-weight:400;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{text-align:left;margin:8px 20px;font-size:11px}.footer ul{margin-bottom:5px}.footer li{margin:0 5px;line-height:20px;display:inline}.footer li,.footer a{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem;display:block}.links li{margin-top:20px;display:inline-block}@media screen and (width<=480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
+	<script>window.errorLocale={"af-ZA":{"language":"Engels GB","header":"Omgewinginstelling Onvolledig","text1":"Dit wil voorkom asof jy Joomla! probeer bestuur vanaf ons git bewaarplek. Om dit te doen, moet jy eers 'n paar ekstra stappe uitvoer.","help-url-text":"Meer besonderhede"},"ar-AA":{"language":"اللغة العربية بالكود الموحد","header":"إعداد البيئة غير مكتمل","text1":"يبدو أنك تحاول تشغيل جوملا! من مستودع git الخاص بك. للقيام بذلك يتطلب منك إكمال خطوتين إضافيتين أولاً.","help-url-text":"[ المزيد من التفاصيل %s]"},"be-BY":{"language":"Беларуская BY","header":"Наладжванне працоўнага асяроддзя не завершана","text1":"Падобна на тое, што вы спрабуеце ўсталяваць Joomla з нашага Git-рэпазітара. Калі ласка, выканайце некалькі дадатковых крокаў перад пачаткам усталявання.","help-url-text":"Больш дэталяў"},"bg-BG":{"language":"Български","header":"Настройката на обкръжаващата среда е непълна","text1":"Изглежда, че се опитвате да стартирате Joomla! от нашето git хранилище. За да направите това, първо трябва да изпълните няколко допълнителни стъпки.","help-url-text":"Повече детайли"},"ca-ES":{"language":"Anglès GB","header":"Configuració de l'entorn incomplerta","text1":"Sembla que està intentant executar Joomla! des del nostre repositori en Git. Per a fer-ho, primer has de completar un parell de passos addicionals.","help-url-text":"Més detalls"},"cs-CZ":{"language":"Čeština","header":"Nastavení prostředi je neúplné","text1":"Zdá se, že se pokoušíte spustit Joomla! z našeho Git repozitáře. K tomu je třeba nejprve dokončit pár dalších kroků.","help-url-text":"Více podrobností"},"cy-GB":{"language":"Cymraeg GB","header":"Sefydlu'r Amgylchedd heb ei gwblhau","text1":"Ymddengys eich bod yn ceisio rhedeg Joomla! o'n ystorfa git.  I wneud hynny mae angen i chi gwblhau ambell gam ychwanegol yn gyntaf.","help-url-text":"Mwy o Fanylion"},"da-DK":{"language":"Dansk DK","header":"Miljø opsætning ufuldstændig","text1":"Det ser ud til at du forsøger at køre Joomla! fra vores git repository. For at gøre dette, kræves det at du gennemfører et par ekstra skridt først.","help-url-text":"Flere detaljer"},"de-AT":{"language":"Deutsch AT","header":"Umgebungseinstellungen unvollständig","text1":"Es sieht so aus, als ob versucht wird, Joomla aus dem Git-Repository heraus zu installieren. Um dies zu tun, müssen zuerst ein paar zusätzliche Schritte durchführt werden.","help-url-text":"Weitere Informationen"},"de-CH":{"language":"Deutsch CH","header":"Umgebungseinstellungen unvollständig","text1":"Es sieht so aus, als ob versucht wird, Joomla aus dem Git-Repository heraus zu installieren. Um dies zu tun, müssen zuerst ein paar zusätzliche Schritte durchführt werden.","help-url-text":"Weitere Informationen"},"de-DE":{"language":"Deutsch DE","header":"Umgebungseinstellungen unvollständig","text1":"Es sieht so aus, als ob versucht wird, Joomla aus dem Git-Repository heraus zu installieren. Um dies zu tun, müssen zuerst ein paar zusätzliche Schritte durchführt werden.","help-url-text":"Weitere Informationen"},"de-LI":{"language":"Deutsch LI","header":"Umgebungseinstellungen unvollständig","text1":"Es sieht so aus, als ob versucht wird, Joomla aus dem Git-Repository heraus zu installieren. Um dies zu tun, müssen zuerst ein paar zusätzliche Schritte durchführt werden.","help-url-text":"Weitere Informationen"},"de-LU":{"language":"Deutsch LU","header":"Umgebungseinstellungen unvollständig","text1":"Es sieht so aus, als ob versucht wird, Joomla aus dem Git-Repository heraus zu installieren. Um dies zu tun, müssen zuerst ein paar zusätzliche Schritte durchführt werden.","help-url-text":"Weitere Informationen"},"el-GR":{"language":"Greek el-GR","header":"Δεν έχει ολοκληρωθεί η εγκατάσταση","text1":"Φαίνεται ότι προσπαθείτε να εγκαταστήσετε το Joomla από το αποθετήριο Git. Ακολουθήστε μερικά επιπλέον βήματα πριν ξεκινήσετε την εγκατάσταση.","help-url-text":"Περισσότερες Λεπτομέρειες"},"en-AU":{"language":"English AU","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you to complete a couple of extra steps first.","help-url-text":"More Details"},"en-CA":{"language":"English CA","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you to complete a couple of extra steps first.","help-url-text":"More Details"},"en-GB":{"language":"English GB","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you to complete a couple of extra steps first.","help-url-text":"More Details"},"en-NZ":{"language":"English NZ","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you to complete a couple of extra steps first.","help-url-text":"More Details"},"en-US":{"language":"English US","header":"Environment Setup Incomplete","text1":"It looks like you are trying to run Joomla! from our git repository. To do so requires you complete a couple of extra steps first.","help-url-text":"[ More Detail %s ]"},"es-ES":{"language":"English GB","header":"Configuración del entorno de trabajo incompleta","text1":"Parece que está intentando ejecutar Joomla! desde nuestro repositorio en Git. Para hacerlo, primero debe completar un par de pasos adicionales.","help-url-text":"Más detalles"},"et-EE":{"language":"Estonian","header":"Keskkonna seadistamine pole valmis","text1":"Näib, et sa proovid paigaldada Joomla! meie Git hoidlast. Selle tegemiseks on vaja eelnevalt teha mõned lisaliigutused.","help-url-text":"Lisainfo"},"eu-ES":{"language":"Euskara ES","header":"Ingurune Konfigurazioa osatu gabe","text1":"Badirudi Joomla exekutatzen saiatzen ari zarela! gure git biltegitik. Horretarako, beste urrats gehigarri batzuk eman behar dituzu.","help-url-text":"Xehetasun Gehiago"},"fa-AF":{"language":"فارسی دری","header":"تنظیمات محیطی کامل نشد","text1":"به نظر سعی در اجرای جوملا! از طریق مخزن Git را دارید. برای انجام این کار، در ابتدا، نیاز به چند مرحله‌ی اضافه دارید.","help-url-text":"جزئیات بیشتر"},"fa-IR":{"language":"Persian IR","header":"تنظیم محیط ناقص است","text1":"به نظر می رسد که شما سعی در اجرای جوملا از مخزن گیت را دارید! برای انجام این کار ابتدا باید دو مرحله اضافی را انجام دهید.","help-url-text":"جزئیات بیشتر"},"fi-FI":{"language":"Suomi","header":"Ympäristön asennus on epätäydellinen","text1":"Näyttää siltä, että yrität ajaa Joomlaa meidän git-repositorystä. Tehdäksesi niin joudut suorittamaan ensin pari ylimääräistä vaihetta.","help-url-text":"Lisätietoja"},"fr-CA":{"language":"Français FR","header":"Configuration de l'environnement incomplète","text1":"Il semble que vous essayez d'exécuter Joomla! depuis notre dépôt git. Pour ce faire, vous devez d'abord compléter quelques étapes supplémentaires.","help-url-text":"Plus de détails"},"fr-FR":{"language":"Français FR","header":"Configuration de l'environnement incomplète","text1":"Il semble que vous essayez d'exécuter Joomla! depuis notre dépôt git. Pour cela vous devez d'abord compléter quelques étapes supplémentaires.","help-url-text":"Plus de détails"},"he-IL":{"language":"אנגלית GB","header":"הגדרת הסביבה לא הושלמה","text1":"נראה שאתה מנסה להריץ את ג'ומלה ממאגר ה- git שלנו. לשם כך עליך לבצע מספר שלבים נוספים תחילה.","help-url-text":"פרטים נוספים"},"hr-HR":{"language":"Hrvatski HR","header":"Nepotpuna postavka okoline","text1":"Čini se da pokušavate pokrenuti Joomla! iz našeg git reprozitorija. Da biste to učinili, morate prvo dovršiti nekoliko dodatnih koraka.","help-url-text":"Više detalja"},"hu-HU":{"language":"Magyar","header":"A környezet beállítása hiányos","text1":"Úgy tűnik, hogy a Joomla!-t a saját tárolónkból próbálja futtatni. Ehhez először el kell végeznie néhány további lépést.","help-url-text":"Több részlet"},"it-IT":{"language":"Italiano IT","header":"Impostazione ambiente incompleta","text1":"Sembra che si stia tentando di avviare Joomla! dal nostro archivio git. Per riuscirci è necessario completare anzitutto un paio di altri passaggi.","help-url-text":"Maggiori Dettagli"},"ja-JP":{"language":"Japanese JP","header":"環境設定が不完全です","text1":"gitリポジトリからJoomlaを実行しようとしているようです。これを行うには、最初にいくつかの追加手順を完了する必要があります。","help-url-text":"詳細表示"},"ka-GE":{"language":"ქართული GE","header":"გარემოს კონფიგურირება არ არის დასულებული","text1":"როგორც ჩანს, თქვენ ცდილობთ Joomla! დაყენებას ჩვენი Git-რეპოზიტორიდან. ამისათვის საჭიროა ჯერ შეასრულოთ რამოდენიმე დამატებითი ნაბიჯი.","help-url-text":"დეტალურად"},"kk-KZ":{"language":"English GB","header":"Тұғыр орнату аяқталмады","text1":"Біздің git қамбамыздан Joomla! - ны іске қосқыңыз келген сияқты. Ол үшін бірнеше қосымша қадамдарды орындау қажет.","help-url-text":"Қосымша мәліметтер"},"ko-KR":{"language":"Korean KO","header":"환경 설정이 완료되지 않았습니다.","text1":"Git 저장소에서 Joomla!를 설치하려는 것 같습니다. 이렇게 하려면 먼저 몇 가지 추가 단계를 완료해야 합니다.","help-url-text":"자세히 보기"},"lt-LT":{"language":"Lietuvių LT","header":"Aplinkos sąranka nebaigta","text1":"Panašu, kad bandote paleisti „Joomla“! iš mūsų git saugyklos. Norėdami tai padaryti, pirmiausia turite atlikti keletą papildomų veiksmų.","help-url-text":"Daugiau detalių"},"lv-LV":{"language":"Latviešu LV","header":"Nepilnīga Joomla uzstādīšana","text1":"Šķiet, ka jūs mēģināt palaist Joomla! no mūsu git krātuves. Lai to izdarītu, vispirms ir jāveic dažas papildu darbības.","help-url-text":"Vairāk informācijas"},"mk-MK":{"language":"English GB","header":"Поставување на работната средина не е завршено","text1":"Изгледа дека се обидувате да стартувате Joomla! од нашето git складиште. За да го направите ова, потребно е прво да завршите неколку дополнителни чекори.","help-url-text":"Повеќе детали"},"nl-BE":{"language":"Engels GB","header":"Omgeving instellen onvolledig","text1":"Het lijkt erop dat u probeert Joomla! uit te voeren vanuit onze git repository. Hiervoor is vereist dat u eerst een aantal extra stappen heeft voltooid.","help-url-text":"Meer details"},"nl-NL":{"language":"Engels GB","header":"Omgeving instellen onvolledig","text1":"Het lijkt erop dat u probeert Joomla! uit te voeren vanuit onze git repository. Hiervoor is vereist dat u eerst een aantal extra stappen heeft voltooid.","help-url-text":"Meer details"},"pl-PL":{"language":"Polski PL","header":"Konfiguracja środowiska niekompletna","text1":"Wygląda na to, że próbujesz uruchomić Joomla! z naszego repozytorium git. Aby to zrobić, musisz najpierw wykonać kilka dodatkowych kroków.","help-url-text":"[ Więcej szczegółów]"},"pt-BR":{"language":"Português do Brasil (pt-BR)","header":"Configuração do Ambiente Incompleta","text1":"Parece que você está tentando executar o Joomla! do nosso repositório git. Para fazer isso, primeiro é necessário que você conclua alguns passos adicionais.","help-url-text":"[ Mais Detalhe %s ]"},"pt-PT":{"language":"Portuguese (pt-PT)","header":"Configuração do ambiente incompleta","text1":"Parece que está a tentar executar o Joomla a partir do nosso repositório Git. Se é o que pretende fazer, primeiro terá de efetuar algumas etapas adicionais.","help-url-text":"Mais detalhes"},"ro-RO":{"language":"Română RO","header":"Configurarea mediului este incompletă","text1":"Se pare că încercaţi să rulaţi Joomla! din repozitoriul nostru git. Pentru a face acest lucru este necesar să finalizaţi câţiva paşi în plus mai întâi.","help-url-text":"Mai multe detalii"},"ru-RU":{"language":"Русский RU","header":"Настройка среды не завершена","text1":"Похоже, вы пытаетесь установить Joomla из Git-репозитория. Пожалуйста, выполните несколько дополнительных шагов перед началом установки.","help-url-text":"Подробнее"},"sk-SK":{"language":"Slovensky","header":"Nastavenie prostredia je neúplné","text1":"Vyzerá to tak, že sa pokúšate spustiť Joomla! z nášho git repozitára. Aby ste tak urobili, musíte najprv dokončiť niekoľko ďalších krokov.","help-url-text":"Viac podrobností"},"sl-SI":{"language":"Slovenščina SI","header":"Nastavitev okolja nepopolna","text1":"Izgleda da poskušate zagnati Joomla! iz našega git skladišča. Če želite to narediti, morate najprej opraviti še nekaj dodatnih korakov.","help-url-text":"Več podrobnosti"},"sr-YU":{"language":"Srpski Latinica SRB","header":"Podešavanje okruženja je nepotpuno","text1":"Izgleda da pokušavate da pokrenete Joomla! iz našeg git skladišta. Da biste to uradili potrebno je da završite nekoliko dodatnih koraka.","help-url-text":"Više detalja"},"sv-SE":{"language":"Svensk SE","header":"Miljöinställning inte klar","text1":"Det ser ut som du försöker köra Joomla! från vårt git repository. För att göra detta kräver att du först slutför ett par extra steg.","help-url-text":"Mer detaljer"},"ta-IN":{"language":"தமிழ் இந்தியா","header":"சூழல் அமைப்பு முடிவுபெறவில்லை","text1":"தாங்கள் Joomla!-வை எங்கள் git களஞ்சியத்திலிருந்து இயக்க முயற்சிக்கிறீர்கள் என்று தெரிகிறது. அவ்வாறு செய்வதற்கு தாங்கள் முதலில் இரண்டு கூடுதல் கட்டங்களை முடிக்க வேண்டும்.","help-url-text":"அதிக விவரம்"},"th-TH":{"language":"ภาษาไทย","header":"การตั้งค่าสภาพแวดล้อมไม่สมบูรณ์","text1":"ดูเหมือนว่าคุณกำลังพยายามเรียกใช้ Joomla! จากที่เก็บ git ของเรา ในการดำเนินการดังกล่าว คุณต้องทำตามขั้นตอนเพิ่มเติมสองสามขั้นตอนพิเศษก่อน","help-url-text":"รายละเอียดเพิ่มเติม"},"tr-TR":{"language":"Turkish TR","header":"Ortam Kurulumu Tamamlanmadı","text1":"Joomla! git depomuzdan çalıştırmaya çalışıyorsunuz. Bunu yapmak için önce birkaç ekstra adımı tamamlamanız gerekir.","help-url-text":"Daha Fazla Detay"},"uk-UA":{"language":"Українська (UA)","header":"Налаштування навколишнього середовища неповне","text1":"Схоже, ви намагаєтеся запустити Joomla! від нашого сховища GIT. Для цього потрібно спочатку завершити декілька додаткових кроків.","help-url-text":"Детальніше"},"ur-PK":{"language":"انگریزی جی-بی","header":"ماحولیاتی سیٹ اپ نامکمل ہے۔","text1":"ایسا لگتا ہے کہ آپ جملہ چلانے کی کوشش کر رہے ہیں! ہمارے گٹ ذخیرے سے۔ ایسا کرنے کے لیے آپ کو پہلے چند اضافی اقدامات مکمل کرنے کی ضرورت ہے۔","help-url-text":"مزید تفصیلات"},"vi-VN":{"language":"Vietnamese VN","header":"Thiết lập môi trường chưa hoàn thành","text1":"Có vẻ như bạn đang cố chạy Joomla! từ kho lưu trữ git của chúng tôi. Để làm như vậy, trước tiên bạn phải hoàn thành một vài bước bổ sung.","help-url-text":"Thêm chi tiết"},"zh-CN":{"language":"简体中文","header":"环境设置不完整","text1":"看来你是想从 git 仓库中运行 Joomla！ 这样做需要首先完成几个步骤.","help-url-text":"显示全部"},"zh-TW":{"language":"中文 台灣繁體","header":"環境建立未完成","text1":"看起來你嘗試要從 Joomla! 的 Git 資源庫執行 Joomla!，要做得先完成一連串額外步驟。","help-url-text":"更多細節"}};</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
 </head>
 <body>
 <div class="container">
diff --git a/templates/system/fatal-error.html b/templates/system/fatal-error.html
index 68247714020c9..e55fe49789879 100644
--- a/templates/system/fatal-error.html
+++ b/templates/system/fatal-error.html
@@ -5,8 +5,8 @@
 	<meta name="robots" content="noindex, nofollow">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<title>An Error Occurred: {{statusText}}</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
-	<style>html{background:#ee2a00;background:-moz-radial-gradient(center,ellipse cover,#f1f1f1 0,#ee2a00 100%);background:-webkit-radial-gradient(center,ellipse cover,#f1f1f1 0,#ee2a00 100%);background:radial-gradient(#f1f1f1 0,#ee2a00 100%) no-repeat fixed}body{color:#555;background-color:#0000;margin:0;padding:0;font:14px/18px sans-serif}ol,ul{margin:0;padding:0;list-style:none}a{color:#0084b4;text-decoration:none}a:hover,a:focus{text-decoration:underline}p a{line-height:inherit}.container{flex-direction:column;justify-content:center;align-items:center;width:100%;height:100vh;margin:0 auto;display:flex;position:relative;overflow:hidden}.alert-main{background:#fff;border:1px solid #0000001a;border-radius:5px;margin:0 20px;padding:20px 60px;display:block;position:relative;box-shadow:0 0 10px #0000000d}svg{z-index:-1;width:400px;position:absolute;bottom:-120px;right:-70px;transform:rotate(10deg)}h1,p{z-index:10;text-align:center;text-rendering:optimizeLegibility;position:relative}h1{text-shadow:0 1px 2px #0003;margin:18px 0 0;font-size:40px;font-weight:200;line-height:1}p,label{color:#777;margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid #0000001a;border-radius:.25rem;padding:.4rem .85rem;font-size:1rem;font-weight:400;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{text-align:left;margin:8px 20px;font-size:11px}.footer ul{margin-bottom:5px}.footer li{margin:0 5px;line-height:20px;display:inline}.footer li,.footer a{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem;display:block}.links li{margin-top:20px;display:inline-block}@media screen and (width<=480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
-	<script>window.errorLocale={"af-ZA":{"language":"Engels GB","header":"Jammer, daar was 'n probleem waarvan ons nie kon herstel nie.","text1":"Die bediener gee terug 'n \"{{statusCode_statusText}}\"","help-url-text":"Help my om dit op te los"},"ar-AA":{"language":"اللغة العربية بالكود الموحد","header":"عذرًا، كانت هناك مشكلة لم نتمكن من تجاوزها.","text1":"أرجع الخادم \"{{statusCode_statusText}}\"","help-url-text":"ساعدني في حل هذا"},"be-BY":{"language":"Беларуская BY","header":"Выбачайце, здарылася непапраўная памылка.","text1":"Сервер вярнуў адказ: \"{{statusCode_statusText}}\"","help-url-text":"Дапамажыце мне выправіць гэта"},"bg-BG":{"language":"Български","header":"За съжаление възникна проблем, който не можахме да поправим.","text1":"Сървърът върна \"{{statusCode_statusText}}\"","help-url-text":"Помогнете ми да разреша това"},"ca-ES":{"language":"Català ca_ES","header":"Ho sentim, hi ha hagut un problema que no hem pogut recuperar.","text1":"El servidor ha retornat \"{{statusCode_statusText}}\"","help-url-text":"Ajuda'm a resoldre això"},"cs-CZ":{"language":"Čeština","header":"Omlouváme se, došlo k problému, ze kterého jsme se nemohli vrátit.","text1":"Server vrátil \"{{statusCode_statusText}}\"","help-url-text":"Pomozte mi to vyřešit"},"cy-GB":{"language":"Cymraeg GB","header":"Mae'n ddrwg gennym, bu problem na lwyddwyd i'w goresgyn.","text1":"Dychwelwyd \"{{statusCode_statusText}}\" gan y gweinydd","help-url-text":"Helpwch fi i ddatrys hyn"},"da-DK":{"language":"Dansk DK","header":"Beklager, men der opstod et problem som ikke kan rettes.","text1":"Serveren returnerede en \"{{statusCode_statusText}}\"","help-url-text":"Hjælp mig med at løse dette"},"de-AT":{"language":"Deutsch AT","header":"Es ist ein Problem aufgetreten.","text1":"Der Server lieferte ein &quot;{{statusCode_statusText}}&quot;","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-CH":{"language":"Deutsch CH","header":"Es ist ein Problem aufgetreten.","text1":"Der Server lieferte ein &quot;{{statusCode_statusText}}&quot;","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-DE":{"language":"Deutsch DE","header":"Es ist ein Problem aufgetreten.","text1":"Der Server lieferte ein &quot;{{statusCode_statusText}}&quot;","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-LI":{"language":"Deutsch LI","header":"Es ist ein Problem aufgetreten.","text1":"Der Server lieferte ein &quot;{{statusCode_statusText}}&quot;","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-LU":{"language":"Deutsch LU","header":"Es ist ein Problem aufgetreten.","text1":"Der Server lieferte ein &quot;{{statusCode_statusText}}&quot;","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"el-GR":{"language":"Greek el-GR","header":"Λυπούμαστε, υπήρξε ένα πρόβλημα από το οποίο δεν μπορέσαμε να ανακάμψουμε.","text1":"Ο διακομιστής επέστρεψε ένα \"{{statusCode_statusText}}\"","help-url-text":"Βοήθεια για την επίλυση"},"en-AU":{"language":"English AU","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"},"en-CA":{"language":"English CA","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"},"en-GB":{"language":"English GB","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"},"en-NZ":{"language":"English NZ","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"},"en-US":{"language":"English US","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"},"es-ES":{"language":"Español ES","header":"Lo sentimos, hubo un problema del que no pudimos recuperarnos.","text1":"El servidor devuelve un \"{{statusCode_statusText}}\"","help-url-text":"Ayúdeme a resolver esto"},"et-EE":{"language":"Estonian","header":"Vabandame, aga tegemist on veaga, millega me toime ei tule.","text1":"Serverilt saadi vastus \"{{statusCode_statusText}}\"","help-url-text":"Aita mul seda lahendada"},"eu-ES":{"language":"Euskara ES","header":"Barkatu, ezin izan dugu berreskuratu izandako arazoa.","text1":"Zerbitzariak hau itzuli du \"{{statusCode_statusText}}\"","help-url-text":"Lagundu niri hau konpontzen"},"fa-AF":{"language":"فارسی دری","header":"با عرض پوزش، مشکلی پیش آمده که نمی‌توانیم آن را حل کنیم.","text1":"سرور یک \"{{statusCode_statusText}}\" را بازگشت داده است","help-url-text":"برای حل این مشکل کمک کن"},"fa-IR":{"language":"Persian IR","header":"متأسفیم، مشکلی پیش آمد که نتوانستیم آن را برطرف کنیم.","text1":"سرور بازگشت \"{{statusCode_statusText}}\"","help-url-text":"به من کمک کنید تا این مسئله را حل کنم"},"fi-FI":{"language":"Suomi","header":"Pahoittelut, meillä oli ongelma, josta emme voineet toipua.","text1":"Palvelin palautti \"{{statusCode_statusText}}\"","help-url-text":"Auta minua ratkaisemaan tämä"},"fr-CA":{"language":"Français FR","header":"Désolé, il y a eu un problème que nous n'avons pas pu récupérer.","text1":"Le serveur a renvoyé un \"{{statusCode_statusText}}\"","help-url-text":"Aidez-moi à résoudre ceci"},"fr-FR":{"language":"Français FR","header":"Désolé, il y a eu un problème que nous n'avons pas pu récupérer.","text1":"Le serveur a renvoyé un \"{{statusCode_statusText}}\"","help-url-text":"Aidez-moi à résoudre ceci"},"he-IL":{"language":"אנגלית GB","header":"מצטערים, הייתה בעיה שלא הצלחנו להתאושש ממנה.","text1":"השרת החזיר \"{{statusCode_statusText}}\"","help-url-text":"עזור לי לפתור זאת"},"hr-HR":{"language":"Hrvatski HR","header":"Nažalost, došlo je do problema koji nismo u mogućnosti oporaviti.","text1":"Server je vratio \"{{statusCode_statusText}}\"","help-url-text":"Pomozite mi riješiti ovo"},"hu-HU":{"language":"Magyar","header":"Sajnáljuk, de egy olyan hiba történt, amelyet nem sikerült megoldanunk.","text1":"A kiszolgáló egy \"{{statusCode_statusText}} \" üzenetet adott vissza","help-url-text":"Segíts ezt megoldani"},"it-IT":{"language":"Italiano IT","header":"Siamo spiacenti, c'è stato un problema che non abbiamo potuto risolvere.","text1":"Il server ha restituito un \"{{statusCode_statusText}}\"","help-url-text":"Aiutami a risolvere questo"},"ja-JP":{"language":"Japanese JP","header":"申し訳ありませんが、回復できない問題が発生しました。","text1":"サーバーの応答：「{{statusCode_statusText}}」","help-url-text":"この問題を解決するには"},"ka-GE":{"language":"ქართული GE","header":"უკაცრავად, გაჩნდა პრობლემა რომელსაც ვერ გავუმკლავდით.","text1":"სერვერმა დააბრუნა პასუხი \"{{statusCode_statusText}}\"","help-url-text":"დამეხმარეთ პრობლემის მოგვარებაში"},"kk-KZ":{"language":"English GB","header":"Кешіріңіз, біз түзете алмайтын қателік байқалды.","text1":"Сервер мынаны қайтарды: \"{{statusCode_statusText}}\"","help-url-text":"Бұл мәселені шешуге көмектес"},"ko-KR":{"language":"Korean KO","header":"자동 복구될 수 없는 문제가 발생했습니다.","text1":"서버가 \"{{statusCode_statusText}}\" 를 리턴했습니다.","help-url-text":"이 문제를 해결하도록 도와주세요."},"lt-LT":{"language":"Lietuvių LT","header":"Atsiprašome, kilo problema, nuo kurios negalėjome atsistatyti.","text1":"Iš serverio gautas atsakymas \"{{statusCode_statusText}}\"","help-url-text":"Padėkite man tai išspręsti"},"lv-LV":{"language":"Latviešu LV","header":"Diemžēl radās problēma, no kā nevarēja atgūt.","text1":"Servera atbilde \"{{statusCode_statusText}}\"","help-url-text":"Palīdziet man to atrisināt"},"mk-MK":{"language":"English GB","header":"Извинете, имаше проблем од кој не можевме да се опоравиме.","text1":"Серверот врати \"{{statusCode_statusText}}\"","help-url-text":"Помогни ми да го решам ова"},"nl-BE":{"language":"Vlaams BE","header":"Sorry, er deed zich een probleem voor dat we niet konden herstellen.","text1":"De server heeft een \"{{statusCode_statusText}} \" teruggestuurd","help-url-text":"Help dit probleem op te lossen"},"nl-NL":{"language":"Engels GB","header":"Sorry, er deed zich een probleem voor dat we niet konden herstellen.","text1":"De server heeft een \"{{statusCode_statusText}} \" teruggestuurd","help-url-text":"Help dit probleem op te lossen"},"pl-PL":{"language":"Polski PL","header":"Niestety, wystąpił problem, którego nie mogliśmy rozwiązać.","text1":"Odpowiedź serwera \"{{statusCode_statusText}}\"","help-url-text":"Pomoc w rozwiązaniu tego problemu"},"pt-BR":{"language":"Português do Brasil (pt-BR)","header":"Desculpe, houve um problema que não pôde ser recuperado.","text1":"O servidor retornou um \"{{statusCode_statusText}}\"","help-url-text":"Ajude-me a resolver isto"},"pt-PT":{"language":"Portuguese (pt-PT)","header":"Desculpe, ocorreu um problema do qual não foi possível recuperar.","text1":"O servidor devolveu um \"{{statusCode_statusText}}\"","help-url-text":"Ajude-me a resolver isto"},"ro-RO":{"language":"Română RO","header":"Ne pare rău, a apărut o problemă de la care nu ne-am putut reveni.","text1":"Serverul a returnat \"{{statusCode_statusText}}\"","help-url-text":"Ajută-mă să rezolv această problemă"},"ru-RU":{"language":"Русский RU","header":"Произошла критическая ошибка","text1":"Сервер вернул ответ \"{{statusCode_statusText}}\".","help-url-text":"Подробнее о решении проблемы"},"sk-SK":{"language":"Slovensky","header":"Prepáčte, ale došlo k problému, ktorý nedokážeme obnoviť.","text1":"Server vrátil \"{{statusCode_statusText}}\"","help-url-text":"Pomôžte mi vyriešiť to"},"sl-SI":{"language":"Slovenščina SI","header":"Žal je prišlo do težave, od katere se nismo mogli obnoviti.","text1":"Strežnik je vrnil \"{{statusCode_statusText}}\"","help-url-text":"Pomagajte mi rešiti to težavo"},"sr-YU":{"language":"Srpski Latinica SRB","header":"Žao nam je, došlo je do problema i ne možemo se oporaviti.","text1":"Server je vratio grešku \"{{statusCode_statusText}}\"","help-url-text":"Kako da rešim ovo"},"sv-SE":{"language":"Svensk SE","header":"Tyvärr, det uppstod ett problem som vi inte kunde återhämta oss från.","text1":"Servern returnerade en \"{{statusCode_statusText}}\"","help-url-text":"Hjälp mig att lösa detta"},"ta-IN":{"language":"தமிழ் இந்தியா","header":"மன்னிக்கவும், எங்களால் மீட்க முடியாத ஒரு சிக்கல் இருந்தது.","text1":"சேவையகம் திருப்பியது: \"{{statusCode_statusText}}\"","help-url-text":"இதனைத் தீர்க்க எனக்கு உதவுக"},"th-TH":{"language":"ภาษาไทย","header":"ขออภัย เกิดปัญหาที่เราไม่สามารถกู้คืนได้","text1":"เซิฟเวอร์ตอบกลับมาว่า \"{{statusCode_statusText}}\"","help-url-text":"ช่วยฉันแก้ปัญหานี้"},"tr-TR":{"language":"Turkish TR","header":"Üzgünüz, çözemediğimiz bir sorun oluştu.","text1":"Sunucu bir \"{{statusCode_statusText}}\" döndürdü","help-url-text":"Bunu çözmeme yardım et"},"uk-UA":{"language":"Українська (UA)","header":"На жаль, виникла проблема, з якою ми не змогли впоратися.","text1":"Сервер повернув \"{{statusCode_statusText}}\"","help-url-text":"Допоможіть мені це вирішити"},"ur-PK":{"language":"انگریزی جی-بی","header":"معاف کیجیے گا، ایک مسئلہ تھا جس سے ہم بازیاب نہ ہو سکے.","text1":"سرور نے \"{{statusCode_statusText}}\" لوٹایا","help-url-text":"اس کو حل کرنے میں میری مدد کریں."},"vi-VN":{"language":"Vietnamese VN","header":"Xin lỗi, đã xảy ra sự cố mà chúng tôi không thể khôi phục.","text1":"Máy chủ trả về một \"{{statusCode_statusText}}\"","help-url-text":"Giúp tôi giải quyết vấn đề này"},"zh-CN":{"language":"简体中文","header":"抱歉，有一个无法恢复的问题。","text1":"服务器返回 \"{{statusCode_statusText}}\"","help-url-text":"帮助我解决这个问题"},"zh-TW":{"language":"中文 台灣繁體","header":"很抱歉，遇到問題無法回復。","text1":"伺服器回傳 \"{{statusCode_statusText}}\" 訊息","help-url-text":"協助我解決這個問題"}};</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
+	<style>html{background:#ee2a00 radial-gradient(#f1f1f1 0,#ee2a00 100%) no-repeat fixed}body{color:#555;background-color:#0000;margin:0;padding:0;font:14px/18px sans-serif}ol,ul{margin:0;padding:0;list-style:none}a{color:#0084b4;text-decoration:none}a:hover,a:focus{text-decoration:underline}p a{line-height:inherit}.container{flex-direction:column;justify-content:center;align-items:center;width:100%;height:100vh;margin:0 auto;display:flex;position:relative;overflow:hidden}.alert-main{background:#fff;border:1px solid #0000001a;border-radius:5px;margin:0 20px;padding:20px 60px;display:block;position:relative;box-shadow:0 0 10px #0000000d}svg{z-index:-1;width:400px;position:absolute;bottom:-120px;right:-70px;transform:rotate(10deg)}h1,p{z-index:10;text-align:center;text-rendering:optimizelegibility;position:relative}h1{text-shadow:0 1px 2px #0003;margin:18px 0 0;font-size:40px;font-weight:200;line-height:1}p,label{color:#777;margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid #0000001a;border-radius:.25rem;padding:.4rem .85rem;font-size:1rem;font-weight:400;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{text-align:left;margin:8px 20px;font-size:11px}.footer ul{margin-bottom:5px}.footer li{margin:0 5px;line-height:20px;display:inline}.footer li,.footer a{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem;display:block}.links li{margin-top:20px;display:inline-block}@media screen and (width<=480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
+	<script>window.errorLocale={"af-ZA":{"language":"Engels GB","header":"Jammer, daar was 'n probleem waarvan ons nie kon herstel nie.","text1":"Die bediener gee terug 'n \"{{statusCode_statusText}}\"","help-url-text":"Help my om dit op te los"},"ar-AA":{"language":"اللغة العربية بالكود الموحد","header":"عذرًا ، كانت هناك مشكلة لم نتمكن من تجاوزها.","text1":"أعاد الخادم ملف \"{{statusCode_statusText}}\"","help-url-text":"ساعدني في حل هذا"},"be-BY":{"language":"Беларуская BY","header":"Выбачце, здарылася крытычная памылка, якой мы ня можам даць рады.","text1":"Сервер звярнуў адказ \"{{statusCode_statusText}}\"","help-url-text":"Дапамажыце мне гэта вырашыць"},"bg-BG":{"language":"Български","header":"За съжаление възникна проблем, който не можахме да поправим.","text1":"Сървърът върна \"{{statusCode_statusText}}\"","help-url-text":"Помогнете ми да разреша това"},"ca-ES":{"language":"Anglès GB","header":"Ho sentim, hi ha hagut un problema del qual no ens hem pogut recuperar.","text1":"El servidor ha retornat \"{{statusCode_statusText}}\"","help-url-text":"Ajuda'm a resoldre això"},"cs-CZ":{"language":"Čeština","header":"Omlouváme se, došlo k problému, ze kterého jsme se nemohli vrátit.","text1":"Server vrátil \"{{statusCode_statusText}}\"","help-url-text":"Pomozte mi to vyřešit"},"cy-GB":{"language":"Cymraeg GB","header":"Mae'n ddrwg gennym, bu problem na lwyddwyd i'w goresgyn.","text1":"Dychwelwyd \"{{statusCode_statusText}}\" gan y gweinydd","help-url-text":"Helpwch fi i ddatrys hyn"},"da-DK":{"language":"Dansk DK","header":"Beklager, men der opstod et problem som ikke kan rettes.","text1":"Serveren returnerede en \"{{statusCode_statusText}}\"","help-url-text":"Hjælp mig med at løse dette"},"de-AT":{"language":"Deutsch AT","header":"Es ist ein Problem aufgetreten.","text1":"Der Server lieferte ein &quot;{{statusCode_statusText}}&quot;","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-CH":{"language":"Deutsch CH","header":"Es ist ein Problem aufgetreten.","text1":"Der Server lieferte ein &quot;{{statusCode_statusText}}&quot;","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-DE":{"language":"Deutsch DE","header":"Es ist ein Problem aufgetreten.","text1":"Der Server lieferte ein &quot;{{statusCode_statusText}}&quot;","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-LI":{"language":"Deutsch LI","header":"Es ist ein Problem aufgetreten.","text1":"Der Server lieferte ein &quot;{{statusCode_statusText}}&quot;","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-LU":{"language":"Deutsch LU","header":"Es ist ein Problem aufgetreten.","text1":"Der Server lieferte ein &quot;{{statusCode_statusText}}&quot;","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"el-GR":{"language":"Greek el-GR","header":"Λυπούμαστε, υπήρξε ένα πρόβλημα από το οποίο δεν μπορέσαμε να ανακάμψουμε.","text1":"Ο διακομιστής επέστρεψε ένα \"{{statusCode_statusText}}\"","help-url-text":"Βοήθεια για την επίλυση"},"en-AU":{"language":"English AU","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"},"en-CA":{"language":"English CA","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"},"en-GB":{"language":"English GB","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"},"en-NZ":{"language":"English NZ","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"},"en-US":{"language":"English US","header":"Sorry, there was a problem we could not recover from.","text1":"The server returned a \"{{statusCode_statusText}}\"","help-url-text":"Help me resolve this"},"es-ES":{"language":"English GB","header":"Lo sentimos, hubo un problema del que no pudimos recuperarnos.","text1":"El servidor devuelve un \"{{statusCode_statusText}}\"","help-url-text":"Ayúdeme a resolver esto"},"et-EE":{"language":"Estonian","header":"Vabandame, aga tegemist on veaga, millega me toime ei tule.","text1":"Serverilt saadi vastus \"{{statusCode_statusText}}\"","help-url-text":"Aita mul seda lahendada"},"eu-ES":{"language":"Euskara ES","header":"Barkatu, ezin izan dugu berreskuratu izandako arazoa.","text1":"Zerbitzariak hau itzuli du \"{{statusCode_statusText}}\"","help-url-text":"Lagundu niri hau konpontzen"},"fa-AF":{"language":"فارسی دری","header":"با عرض پوزش، مشکلی پیش آمده که نمی‌توانیم آن را حل کنیم.","text1":"سرور یک \"{{statusCode_statusText}}\" را بازگشت داده است","help-url-text":"برای حل این مشکل کمک کن"},"fa-IR":{"language":"Persian IR","header":"متأسفیم، مشکلی پیش آمد که نتوانستیم آن را برطرف کنیم.","text1":"سرور بازگشت \"{{statusCode_statusText}}\"","help-url-text":"به من کمک کنید تا این مسئله را حل کنم"},"fi-FI":{"language":"Suomi","header":"Pahoittelut, meillä oli ongelma, josta emme voineet toipua.","text1":"Palvelin palautti \"{{statusCode_statusText}}\"","help-url-text":"Auta minua ratkaisemaan tämä"},"fr-CA":{"language":"Français FR","header":"Désolé, il y a eu un problème que nous n'avons pas pu récupérer.","text1":"Le serveur a renvoyé un \"{{statusCode_statusText}}\"","help-url-text":"Aidez-moi à résoudre ceci"},"fr-FR":{"language":"Français FR","header":"Désolé, il y a eu un problème que nous n'avons pas pu récupérer.","text1":"Le serveur a renvoyé un \"{{statusCode_statusText}}\"","help-url-text":"Aidez-moi à résoudre ceci"},"he-IL":{"language":"אנגלית GB","header":"מצטערים, הייתה בעיה שלא הצלחנו להתאושש ממנה.","text1":"השרת החזיר \"{{statusCode_statusText}}\"","help-url-text":"עזור לי לפתור זאת"},"hr-HR":{"language":"Hrvatski HR","header":"Nažalost, došlo je do problema koji nismo u mogućnosti oporaviti.","text1":"Server je vratio \"{{statusCode_statusText}}\"","help-url-text":"Pomozite mi riješiti ovo"},"hu-HU":{"language":"Magyar","header":"Sajnáljuk, de egy olyan hiba történt, amelyet nem sikerült megoldanunk.","text1":"A kiszolgáló egy \"{{statusCode_statusText}} \" üzenetet adott vissza","help-url-text":"Segíts ezt megoldani"},"it-IT":{"language":"Italiano IT","header":"Siamo spiacenti, c'è stato un problema che non abbiamo potuto risolvere.","text1":"Il server ha restituito un \"{{statusCode_statusText}}\"","help-url-text":"Aiutami a risolvere questo"},"ja-JP":{"language":"Japanese JP","header":"申し訳ありませんが、回復できない問題が発生しました。","text1":"サーバーの応答：「{{statusCode_statusText}}」","help-url-text":"この問題を解決するには"},"ka-GE":{"language":"ქართული GE","header":"უკაცრავად, გაჩნდა პრობლემა რომელსაც ვერ გავუმკლავდით.","text1":"სერვერმა დააბრუნა პასუხი \"{{statusCode_statusText}}\"","help-url-text":"დამეხმარეთ პრობლემის მოგვარებაში"},"kk-KZ":{"language":"English GB","header":"Кешіріңіз, біз түзете алмайтын қателік байқалды.","text1":"Сервер мынаны қайтарды: \"{{statusCode_statusText}}\"","help-url-text":"Бұл мәселені шешуге көмектес"},"ko-KR":{"language":"Korean KO","header":"자동 복구될 수 없는 문제가 발생했습니다.","text1":"서버 리턴 값은 \"{{statusCode_statusText}}\" 입니다.","help-url-text":"처리해야 하는 문제가 발생했습니다."},"lt-LT":{"language":"Lietuvių LT","header":"Atsiprašome, kilo problema, nuo kurios negalėjome atsistatyti.","text1":"Iš serverio gautas atsakymas \"{{statusCode_statusText}}\"","help-url-text":"Padėkite man tai išspręsti"},"lv-LV":{"language":"Latviešu LV","header":"Diemžēl radās problēma, no kā nevarēja atgūt.","text1":"Servera atbilde \"{{statusCode_statusText}}\"","help-url-text":"Palīdziet man to atrisināt"},"mk-MK":{"language":"English GB","header":"Извинете, имаше проблем од кој не можевме да се опоравиме.","text1":"Серверот врати \"{{statusCode_statusText}}\"","help-url-text":"Помогни ми да го решам ова"},"nl-BE":{"language":"Engels GB","header":"Sorry, er deed zich een probleem voor dat we niet konden herstellen.","text1":"De server heeft een \"{{statusCode_statusText}} \" teruggestuurd","help-url-text":"Help dit probleem op te lossen"},"nl-NL":{"language":"Engels GB","header":"Sorry, er deed zich een probleem voor dat we niet konden herstellen.","text1":"De server heeft een \"{{statusCode_statusText}} \" teruggestuurd","help-url-text":"Help dit probleem op te lossen"},"pl-PL":{"language":"Polski PL","header":"Niestety, wystąpił problem, którego nie mogliśmy rozwiązać.","text1":"Odpowiedź serwera \"{{statusCode_statusText}}\"","help-url-text":"Pomoc w rozwiązaniu tego problemu"},"pt-BR":{"language":"Português do Brasil (pt-BR)","header":"Desculpe, houve um problema do qual não pudemos nos recuperar.","text1":"O servidor retornou um \"{{statusCode_statusText}}\"","help-url-text":"Ajude-me a resolver isto"},"pt-PT":{"language":"Portuguese (pt-PT)","header":"Desculpe, ocorreu um problema do qual não foi possível recuperar.","text1":"O servidor devolveu um \"{{statusCode_statusText}}\"","help-url-text":"Ajude-me a resolver isto"},"ro-RO":{"language":"Română RO","header":"Ne pare rău, a apărut o problemă de la care nu ne-am putut reveni.","text1":"Serverul a returnat \"{{statusCode_statusText}}\"","help-url-text":"Ajută-mă să rezolv această problemă"},"ru-RU":{"language":"Русский RU","header":"Произошла критическая ошибка","text1":"Сервер вернул ответ \"{{statusCode_statusText}}\".","help-url-text":"Подробнее о решении проблемы"},"sk-SK":{"language":"Slovensky","header":"Prepáčte, ale došlo k problému, ktorý nedokážeme obnoviť.","text1":"Server vrátil \"{{statusCode_statusText}}\"","help-url-text":"Pomôžte mi vyriešiť to"},"sl-SI":{"language":"Slovenščina SI","header":"Žal je prišlo do težave, od katere se nismo mogli obnoviti.","text1":"Strežnik je vrnil \"{{statusCode_statusText}}\"","help-url-text":"Pomagajte mi rešiti to težavo"},"sr-YU":{"language":"Srpski Latinica SRB","header":"Žao nam je, došlo je do problema i ne možemo se oporaviti.","text1":"Server je vratio grešku \"{{statusCode_statusText}}\"","help-url-text":"Kako da rešim ovo"},"sv-SE":{"language":"Svensk SE","header":"Tyvärr, det uppstod ett problem som vi inte kunde återhämta oss från.","text1":"Servern returnerade en \"{{statusCode_statusText}}\"","help-url-text":"Hjälp mig att lösa detta"},"ta-IN":{"language":"தமிழ் இந்தியா","header":"மன்னிக்கவும், எங்களால் மீட்க முடியாத ஒரு சிக்கல் இருந்தது.","text1":"சேவையகம் திருப்பியது: \"{{statusCode_statusText}}\"","help-url-text":"இதனைத் தீர்க்க எனக்கு உதவுக"},"th-TH":{"language":"ภาษาไทย","header":"ขออภัย เกิดปัญหาที่เราไม่สามารถกู้คืนได้","text1":"เซิฟเวอร์ตอบกลับมาว่า \"{{statusCode_statusText}}\"","help-url-text":"ช่วยฉันแก้ปัญหานี้"},"tr-TR":{"language":"Turkish TR","header":"Üzgünüz, çözemediğimiz bir sorun oluştu.","text1":"Sunucu bir \"{{statusCode_statusText}}\" döndürdü","help-url-text":"Bunu çözmeme yardım et"},"uk-UA":{"language":"Українська (UA)","header":"На жаль, виникла проблема, з якою ми не змогли впоратися.","text1":"Сервер повернув \"{{statusCode_statusText}}\"","help-url-text":"Допоможіть мені це вирішити"},"ur-PK":{"language":"انگریزی جی-بی","header":"معاف کیجیے گا، ایک مسئلہ تھا جس سے ہم بازیاب نہ ہو سکے۔","text1":"سرور نے \"{{statusCode_statusText}}\" لوٹایا","help-url-text":"اس کو حل کرنے میں میری مدد کریں۔"},"vi-VN":{"language":"Vietnamese VN","header":"Xin lỗi, đã xảy ra sự cố mà chúng tôi không thể khôi phục.","text1":"Máy chủ trả về một \"{{statusCode_statusText}}\"","help-url-text":"Giúp tôi giải quyết vấn đề này"},"zh-CN":{"language":"简体中文","header":"抱歉，有一个无法恢复的问题。","text1":"服务器返回 \"{{statusCode_statusText}}\"","help-url-text":"帮助我解决这个问题"},"zh-TW":{"language":"中文 台灣繁體","header":"很抱歉，遇到問題無法回復。","text1":"伺服器回傳 \"{{statusCode_statusText}}\" 訊息","help-url-text":"協助我解決這個問題"}};</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
 </head>
 <body>
 <div class="container">
diff --git a/templates/system/incompatible.html b/templates/system/incompatible.html
index 513d0941d61e5..113843b4b6b14 100644
--- a/templates/system/incompatible.html
+++ b/templates/system/incompatible.html
@@ -5,8 +5,8 @@
 	<meta name="robots" content="noindex, nofollow">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<title>Joomla: unsupported PHP version</title><!-- Sets the page title, IMPORTANT DO NOT REMOVE -->
-	<style>html{background:#ee2a00;background:-moz-radial-gradient(center,ellipse cover,#f1f1f1 0,#ee2a00 100%);background:-webkit-radial-gradient(center,ellipse cover,#f1f1f1 0,#ee2a00 100%);background:radial-gradient(#f1f1f1 0,#ee2a00 100%) no-repeat fixed}body{color:#555;background-color:#0000;margin:0;padding:0;font:14px/18px sans-serif}ol,ul{margin:0;padding:0;list-style:none}a{color:#0084b4;text-decoration:none}a:hover,a:focus{text-decoration:underline}p a{line-height:inherit}.container{flex-direction:column;justify-content:center;align-items:center;width:100%;height:100vh;margin:0 auto;display:flex;position:relative;overflow:hidden}.alert-main{background:#fff;border:1px solid #0000001a;border-radius:5px;margin:0 20px;padding:20px 60px;display:block;position:relative;box-shadow:0 0 10px #0000000d}svg{z-index:-1;width:400px;position:absolute;bottom:-120px;right:-70px;transform:rotate(10deg)}h1,p{z-index:10;text-align:center;text-rendering:optimizeLegibility;position:relative}h1{text-shadow:0 1px 2px #0003;margin:18px 0 0;font-size:40px;font-weight:200;line-height:1}p,label{color:#777;margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid #0000001a;border-radius:.25rem;padding:.4rem .85rem;font-size:1rem;font-weight:400;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{text-align:left;margin:8px 20px;font-size:11px}.footer ul{margin-bottom:5px}.footer li{margin:0 5px;line-height:20px;display:inline}.footer li,.footer a{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem;display:block}.links li{margin-top:20px;display:inline-block}@media screen and (width<=480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
-	<script>window.errorLocale={"af-ZA":{"language":"Engels GB","header":"Jammer, jou PHP weergawe word nie ondersteun nie.","text1":"Jou gasheer moet PHP weergawe {{phpversion}} of nuwer hê om hierdie weergawe van Joomla te gebruik.","help-url-text":"Help my om dit op te los"},"ar-AA":{"language":"اللغة العربية بالكود الموحد","header":"عذرًا، إصدار PHP الخاص بك غير مدعوم.","text1":"يحتاج الخادم الخاص بك إلى استخدام إصدار PHP {{phpversion}} أو أحدث لتشغيل هذا الإصدار من جوملا.","help-url-text":"ساعدني في حل هذا"},"be-BY":{"language":"Беларуская BY","header":"Выбачайце, Ваша версія PHP не падтрымліваецца","text1":"Каб запусціць гэтую версію Joomla, Ваш хост мусіць мець PHP {{phpversion}} або навейшы.","help-url-text":"Дапамажыце мне выправіць гэта"},"bg-BG":{"language":"Български","header":"Вашата PHP версия не се поддържа.","text1":"Вашият хост трябва да използва PHP версия {{phpversion}} или по -нова, за да стартира тази версия на Joomla.","help-url-text":"Помогнете ми да разреша това"},"ca-ES":{"language":"Català ca_ES","header":"Ho sentim, la teva versió de PHP no és compatible.","text1":"Cal que el teu servidor utilitzi la versió de PHP {{phpversion}} o posterior per executar aquesta versió de Joomla.","help-url-text":"Ajuda'm a resoldre això"},"cs-CZ":{"language":"Čeština","header":"Omlouváme se, vaše verze PHP není podporována.","text1":"Pro spuštění této verze Joomla musí váš hostitel použít PHP verzi {{phpversion}} nebo novější","help-url-text":"Pomozte mi to vyřešit"},"cy-GB":{"language":"Cymraeg GB","header":"Mae'n ddrwg gennym ond dydi ni ddim yn cefnogi eich fersiwn PHP","text1":"Mae eich lletywr angen defnyddio fersiwn PHP {{phpversion}} neu ddiweddarach i redeg y fersiwn hon o Joomla.","help-url-text":"Helpwch fi i ddatrys hyn"},"da-DK":{"language":"Dansk DK","header":"Beklager, din PHP version er ikke understøttet.","text1":"Din host skal anvende PHP version {{phpversion}} eller nyere for at køre denne version af Joomla.","help-url-text":"Hjælp mig med at løse dette"},"de-AT":{"language":"Deutsch AT","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-CH":{"language":"Deutsch CH","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-DE":{"language":"Deutsch DE","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-LI":{"language":"Deutsch LI","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-LU":{"language":"Deutsch LU","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"el-GR":{"language":"Greek el-GR","header":"Λυπούμαστε, αυτή η έκδοση PHP δεν υποστηρίζεται.","text1":"Ο διακομιστής πρέπει να διαθέτει την έκδοση PHP {{phpversion}} ή νεότερη για την εκτέλεση αυτής της έκδοσης του Joomla.","help-url-text":"Βοήθεια για την επίλυση"},"en-AU":{"language":"English AU","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-CA":{"language":"English CA","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-GB":{"language":"English GB","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-NZ":{"language":"English NZ","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-US":{"language":"English US","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"es-ES":{"language":"Español ES","header":"Lo sentimos, su versión de PHP no es compatible.","text1":"Para poder usar esta versión de Joomla su hospedaje necesita usar la versión {{phpversion}} de PHP o superior.","help-url-text":"Ayúdeme a resolver esto"},"et-EE":{"language":"Estonian","header":"Vabandust, aga sinu PHP versioon ei ole toetatud.","text1":"Sinu veebimajutuse pakkuja peab kasutama PHP versiooni {{phpversion}} või uuemat, et seda Joomla versiooni jooksutada.","help-url-text":"Aita mul seda lahendada"},"eu-ES":{"language":"Euskara ES","header":"Barka, zure PHP bertsioa ez da bateragarria.","text1":"Zure ostalariak PHP bertsio hau {{phpversion}}  edo berriagoa erabili behar du Joomla bertsio honekin funtzionatzeko.","help-url-text":"Lagundu niri hau konpontzen"},"fa-AF":{"language":"فارسی دری","header":"با عرض پوزش، نسخه‌ی PHP شما پشتیبانی نمی‌شود.","text1":"شما برای اجرای این نسخه از جوملا، به نسخه‌ی PHP {{phpversion}} یا بالاتر احتیاج دارید.","help-url-text":"برای حل این مشکل کمک کن"},"fa-IR":{"language":"Persian IR","header":"متأسفیم، نسخه PHP شما پشتیبانی نمی شود.","text1":"میزبان شما برای اجرای این نسخه از جوملا نیاز به استفاده از نسخه PHP {{phpversion}} یا نسخه جدیدتر دارد.","help-url-text":"به من کمک کنید تا این مسئله را حل کنم"},"fi-FI":{"language":"Suomi","header":"PHP-versiotasi ei tueta.","text1":"Palvelimen täytyy käyttää PHP-versiota {{phpversion}} tai uudempaa jotta voit käyttää tätä Joomlan versiota.","help-url-text":"Auta minua ratkaisemaan tämä"},"fr-CA":{"language":"Français FR","header":"Désolé, votre version de PHP n'est pas prise en charge.","text1":"Votre serveur a besoin d'utiliser la version {{phpversion}} de PHP ou supérieure pour exécuter cette version de Joomla.","help-url-text":"Aidez-moi à résoudre ceci"},"fr-FR":{"language":"Français FR","header":"Désolé, votre version de PHP n'est pas prise en charge.","text1":"Votre serveur a besoin d'utiliser la version {{phpversion}} de PHP ou supérieure pour exécuter cette version de Joomla.","help-url-text":"Aidez-moi à résoudre ceci"},"he-IL":{"language":"אנגלית GB","header":"מצטערים, גרסת ה- PHP שלך אינה נתמכת.","text1":"השרת מארח שלך צריך להשתמש בגרסת PHP {{phpversion}} ואילך כדי להריץ גירסה זו של ג'ומלה.","help-url-text":"עזור לי לפתור זאת"},"hr-HR":{"language":"Hrvatski HR","header":"Nažalost, vaša PHP verzija nije podržana.","text1":"Za pokretanje ove Joomla verzije, vaš host treba koristiti PHP verziju {{phpversion}} ili noviju.","help-url-text":"Pomozite mi riješiti ovo"},"hu-HU":{"language":"Magyar","header":"Sajnáljuk, de a PHP verziója nem támogatott.","text1":"Ennek a Joomla! verziónak a futtatásához a kiszolgálónak PHP {{phpversion}} vagy újabb verziót kell használnia.","help-url-text":"Segíts ezt megoldani"},"it-IT":{"language":"Italiano IT","header":"Siamo spiacenti, la tua versione di PHP non è supportata.","text1":"Il tuo host ha bisogno della versione di PHP {{phpversion}} o una più recente per avviare questa versione di Joomla.","help-url-text":"Aiutami a risolvere questo"},"ja-JP":{"language":"Japanese JP","header":"申し訳ありませんが、お使いのPHPバージョンはサポートされていません。","text1":"このバージョンのJoomlaを実行するには、ホストがPHPバージョン {{phpversion}} 以降を使用する必要があります。","help-url-text":"この問題を解決するには"},"ka-GE":{"language":"ქართული GE","header":"უკაცრავად, თქვენს PHP ვერსიას არა აქვს მხარდაჭერა.","text1":"Joomla! ამ ვერსიის დასაყენებლად თქვენი ჰოსტი უნდა იყენებდეს PHP {{phpversion}} ვერსიას ან უფრო ახალს.","help-url-text":"დამეხმარეთ პრობლემის მოგვარებაში"},"kk-KZ":{"language":"English GB","header":"Кешіріңіз, сіздің PHP нұсқаңызға қолдау көрсетілмейді.","text1":"Хостыңыз PHP {{phpversion}} немесе оданда жоғары нұсқасы болғанда ғана бұл нұсқадағы Joomla-ны іске қоса аласыз.","help-url-text":"Бұл мәселені шешуге көмектес"},"ko-KR":{"language":"Korean KO","header":"죄송합니다. 사용 중인 PHP 버전이 지원되지 않습니다.","text1":"해당 버전의 Joomla를 사용하기 위해서는 PHP 버전 {{phpversion}} 또는 그 상위 버전이 필요합니다.","help-url-text":"이 문제를 해결하도록 도와주세요."},"lt-LT":{"language":"Lietuvių LT","header":"Atsiprašome, Jūsų PHP versija yra nepalaikoma.","text1":"Kad paleisti šios versijos Joomla, Jūsų talpinimo serveris turi palaikyti {{phpversion}} arba vėlesnę PHP versiją.","help-url-text":"Padėkite man tai išspręsti"},"lv-LV":{"language":"Latviešu LV","header":"Diemžēl jūsu PHP versija netiek atbalstīta.","text1":"Lai palaistu šo Joomla versiju, serverim ir jāizmanto {{phpversion}} PHP versija vai jaunāka.","help-url-text":"Palīdziet man to atrisināt"},"mk-MK":{"language":"English GB","header":"За жал, вашата верзија на PHP не е поддржана.","text1":"Вашиот хост треба да користи PHP верзија {{phpversion}} или понова за да ја стартува оваа верзија на Joomla.","help-url-text":"Помогни ми да го решам ова"},"nl-BE":{"language":"Vlaams BE","header":"Sorry, uw PHP-versie wordt niet ondersteund.","text1":"Uw host moet PHP versie {{phpversion}} of nieuwer gebruiken om deze versie van Joomla uit te voeren.","help-url-text":"Help dit probleem op te lossen"},"nl-NL":{"language":"Engels GB","header":"Sorry, uw PHP-versie wordt niet ondersteund.","text1":"Uw host moet PHP versie {{phpversion}} of nieuwer gebruiken om deze versie van Joomla uit te voeren.","help-url-text":"Help dit probleem op te lossen"},"pl-PL":{"language":"Polski PL","header":"Niestety, Twoja wersja PHP nie jest obsługiwana.","text1":"Twój serwer musi używać PHP w wersji {{phpversion}} lub nowszej, aby zainstalować tę wersję Joomla.","help-url-text":"Pomoc w rozwiązaniu tego problemu"},"pt-BR":{"language":"Português do Brasil (pt-BR)","header":"Desculpe, sua versão do PHP não é suportada.","text1":"Seu servidor precisa usar a versão {{phpversion}} do PHP ou uma versão mais recente para executar esta versão do Joomla.","help-url-text":"Ajude-me a resolver isto"},"pt-PT":{"language":"Portuguese (pt-PT)","header":"Lamentamos, mas a sua versão de PHP não é suportada.","text1":"O seu alojamento terá de usar PHP na versão {{phpversion}}, ou mais recente, para poder utilizar esta versão do Joomla.","help-url-text":"Ajude-me a resolver isto"},"ro-RO":{"language":"Română RO","header":"Ne pare rău, versiunea dvs de PHP nu este acceptată.","text1":"Gazda dvs. trebuie să folosească versiunea PHP {{phpversion}} sau una mai nouă pentru a rula această versiune Joomla.","help-url-text":"Ajută-mă să rezolv această problemă"},"ru-RU":{"language":"Русский RU","header":"Используемая версия PHP не поддерживается","text1":"Для установки Joomla необходимо наличие PHP {{phpversion}} или более новой версии.","help-url-text":"Подробнее о решении проблемы"},"sk-SK":{"language":"Slovensky","header":"Prepáčte, ale vaša verzia PHP nie je podporovaná.","text1":"Aby táto verzia Joomla fungovala, váš hosting musí používať PHP vo verzii {{phpversion}} alebo novšej.","help-url-text":"Pomôžte mi vyriešiť to"},"sl-SI":{"language":"Slovenščina SI","header":"Žal vaša PHP različica ni podprta.","text1":"Vaš gostitelj mora uporabljati PHP različico  {{phpversion}} ali novejšo za zagon te različice Joomle.","help-url-text":"Pomagajte mi rešiti to težavo"},"sr-YU":{"language":"Srpski Latinica SRB","header":"Žao nam je vaša PHP verzija nije podržana.","text1":"Vaš host mora da koristi PHP verziju {{phpversion}} ili noviju da bi ova vezija Joomla! radila.","help-url-text":"Kako da rešim ovo"},"sv-SE":{"language":"Svensk SE","header":"Tyvärr, din PHP-version stöds inte.","text1":"Ditt webbhotell måste använda PHP-version {{phpversion}} eller nyare för att köra denna version av Joomla.","help-url-text":"Hjälp mig att lösa detta"},"ta-IN":{"language":"தமிழ் இந்தியா","header":"மன்னிக்கவும், உங்கள் PHP பதிப்பு ஆதரிக்கப்படவில்லை.","text1":"Joomla-வின் இந்தப் பதிப்பை இயக்க, தங்கள் புரவலர்-கணினி (host) ஆனது PHP பதிப்பு {{phpversion}} அல்லது அதற்கும் மேலான பதிப்பைப் பயன்படுத்த வேண்டும்.","help-url-text":"இதனைத் தீர்க்க எனக்கு உதவுக"},"th-TH":{"language":"ภาษาไทย","header":"ขออภัย ไม่รองรับเวอร์ชัน PHP ของคุณ","text1":"โฮสต์ของคุณต้องใช้เวอร์ชัน PHP {{phpversion}} หรือใหม่กว่าเพื่อเรียกใช้ Joomla เวอร์ชันนี้","help-url-text":"ช่วยฉันแก้ปัญหานี้"},"tr-TR":{"language":"Turkish TR","header":"Üzgünüz, PHP sürümünüz desteklenmiyor.","text1":"Joomla'nın bu sürümünü çalıştırmak için sunucunuzun PHP {{phpversion}} sürümünü veya daha yenisini kullanması gerekir.","help-url-text":"Bunu çözmeme yardım et"},"uk-UA":{"language":"Українська (UA)","header":"На жаль, ваша версія PHP не підтримується.","text1":"Ваш хост повинен використовувати версію PHP {{phpversion}} або новішу для запуску цієї версії Joomla.","help-url-text":"Допоможіть мені це вирішити"},"ur-PK":{"language":"انگریزی جی-بی","header":"معذرت، آپ کا پی ایچ پی ورژن تعاون یافتہ نہیں ہے۔","text1":"جملہ کے اس ورژن کو چلانے کے لیے آپ کے میزبان کو پی ایچ پی ورژن {{phpversion}} یا اس سے جدید تر استعمال کرنے کی ضرورت ہے۔","help-url-text":"اس کو حل کرنے میں میری مدد کریں۔"},"vi-VN":{"language":"Vietnamese VN","header":"Xin lỗi, phiên bản PHP của bạn không được hỗ trợ.","text1":"Máy chủ của bạn cần sử dụng PHP phiên bản {{phpversion}} hoặc mới hơn để chạy phiên bản Joomla này.","help-url-text":"Giúp tôi giải quyết vấn đề này"},"zh-CN":{"language":"简体中文","header":"抱歉，PHP 版本不支持。","text1":"需要 PHP {{phpversion}} 或更新的版本运行","help-url-text":"帮助我解决这个问题"},"zh-TW":{"language":"中文 台灣繁體","header":"對不起，你的PHP版本並不支援","text1":"您的主機需要PHP版本{{phpversion}}或以上來執行這個版本的Joomla","help-url-text":"協助我解決這個問題"}};</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
+	<style>html{background:#ee2a00 radial-gradient(#f1f1f1 0,#ee2a00 100%) no-repeat fixed}body{color:#555;background-color:#0000;margin:0;padding:0;font:14px/18px sans-serif}ol,ul{margin:0;padding:0;list-style:none}a{color:#0084b4;text-decoration:none}a:hover,a:focus{text-decoration:underline}p a{line-height:inherit}.container{flex-direction:column;justify-content:center;align-items:center;width:100%;height:100vh;margin:0 auto;display:flex;position:relative;overflow:hidden}.alert-main{background:#fff;border:1px solid #0000001a;border-radius:5px;margin:0 20px;padding:20px 60px;display:block;position:relative;box-shadow:0 0 10px #0000000d}svg{z-index:-1;width:400px;position:absolute;bottom:-120px;right:-70px;transform:rotate(10deg)}h1,p{z-index:10;text-align:center;text-rendering:optimizelegibility;position:relative}h1{text-shadow:0 1px 2px #0003;margin:18px 0 0;font-size:40px;font-weight:200;line-height:1}p,label{color:#777;margin:10px 0 20px;font-size:18px;font-weight:300;line-height:25px}p a{color:#1c3d5c;font-weight:700}.link-help{background-color:#f5f5f5;border:1px solid #0000001a;border-radius:.25rem;padding:.4rem .85rem;font-size:1rem;font-weight:400;text-decoration:none}.link-help:hover{background-color:#eee;text-decoration:none}.footer{text-align:left;margin:8px 20px;font-size:11px}.footer ul{margin-bottom:5px}.footer li{margin:0 5px;line-height:20px;display:inline}.footer li,.footer a{color:#1c3d5c}.footer a:hover{color:#59b0ff}.links{text-align:center;margin-top:4rem;margin-left:auto;margin-right:auto;font-size:1rem;display:block}.links li{margin-top:20px;display:inline-block}@media screen and (width<=480px){.container{height:auto;padding-top:20px;padding-bottom:20px}h1{font-size:30px}.link-help{white-space:nowrap}}</style><!-- Sets the page styling, IMPORTANT DO NOT REMOVE -->
+	<script>window.errorLocale={"af-ZA":{"language":"Engels GB","header":"Jammer, jou PHP weergawe word nie ondersteun nie.","text1":"Jou gasheer moet PHP weergawe {{phpversion}} of nuwer hê om hierdie weergawe van Joomla te gebruik.","help-url-text":"Help my om dit op te los"},"ar-AA":{"language":"اللغة العربية بالكود الموحد","header":"عذرًا ، إصدار PHP الخاص بك غير مدعوم.","text1":"يحتاج مضيفك إلى استخدام إصدار PHP {{phpversion}} أو أحدث لتشغيل هذا الإصدار من جوملا.","help-url-text":"ساعدني في حل هذا"},"be-BY":{"language":"Беларуская BY","header":"Выбачайце, Ваша версія PHP не падтрымліваецца.","text1":"Каб запусціць гэтую версію Joomla, на серверы трэба мець версію PHP {{phpversion}} або навейшую.","help-url-text":"Дапамажыце мне гэта вырашыць"},"bg-BG":{"language":"Български","header":"Вашата PHP версия не се поддържа.","text1":"Вашият хост трябва да използва PHP версия {{phpversion}} или по -нова, за да стартира тази версия на Joomla.","help-url-text":"Помогнете ми да разреша това"},"ca-ES":{"language":"Anglès GB","header":"Ho sentim, la teva versió de PHP no es compatible.","text1":"Cal que el teu servidor utilitzi la versió de PHP {{phpversion}} o posterior per executar aquesta versió de Joomla.","help-url-text":"Ajuda'm a resoldre això"},"cs-CZ":{"language":"Čeština","header":"Omlouváme se, vaše verze PHP není podporována.","text1":"Pro spuštění této verze Joomla musí váš hostitel použít PHP verzi {{phpversion}} nebo novější","help-url-text":"Pomozte mi to vyřešit"},"cy-GB":{"language":"Cymraeg GB","header":"Mae'n ddrwg gennym ond dydi ni ddim yn cefnogi eich fersiwn PHP","text1":"Mae eich lletywr angen defnyddio fersiwn PHP {{phpversion}} neu ddiweddarach i redeg y fersiwn hon o Joomla.","help-url-text":"Helpwch fi i ddatrys hyn"},"da-DK":{"language":"Dansk DK","header":"Beklager, din PHP version er ikke understøttet.","text1":"Din host skal anvende PHP version {{phpversion}} eller nyere for at køre denne version af Joomla.","help-url-text":"Hjælp mig med at løse dette"},"de-AT":{"language":"Deutsch AT","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-CH":{"language":"Deutsch CH","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-DE":{"language":"Deutsch DE","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-LI":{"language":"Deutsch LI","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"de-LU":{"language":"Deutsch LU","header":"Die verwendete PHP-Version wird leider nicht unterstützt.","text1":"Der Webserver muss die PHP-Version {{phpversion}} oder neuer verwenden, um diese Version von Joomla auszuführen.","help-url-text":"Weitere Informationen sind in der Dokumentation zu finden."},"el-GR":{"language":"Greek el-GR","header":"Λυπούμαστε, αυτή η έκδοση PHP δεν υποστηρίζεται.","text1":"Ο διακομιστής πρέπει να διαθέτει την έκδοση PHP {{phpversion}} ή νεότερη για την εκτέλεση αυτής της έκδοσης του Joomla.","help-url-text":"Βοήθεια για την επίλυση"},"en-AU":{"language":"English AU","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-CA":{"language":"English CA","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-GB":{"language":"English GB","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-NZ":{"language":"English NZ","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"en-US":{"language":"English US","header":"Sorry, your PHP version is not supported.","text1":"Your host needs to use PHP version {{phpversion}} or newer to run this version of Joomla.","help-url-text":"Help me resolve this"},"es-ES":{"language":"English GB","header":"Lo sentimos, su versión de PHP no es compatible.","text1":"Para poder usar esta versión de Joomla su hospedaje necesita usar la versión {{phpversion}} de PHP o superior.","help-url-text":"Ayúdeme a resolver esto"},"et-EE":{"language":"Estonian","header":"Vabandust, aga sinu PHP versioon ei ole toetatud.","text1":"Sinu veebimajutuse pakkuja peab kasutama PHP versiooni {{phpversion}} või uuemat, et seda Joomla versiooni jooksutada.","help-url-text":"Aita mul seda lahendada"},"eu-ES":{"language":"Euskara ES","header":"Barka, zure PHP bertsioa ez da bateragarria.","text1":"Zure ostalariak PHP bertsio hau {{phpversion}}  edo berriagoa erabili behar du Joomla bertsio honekin funtzionatzeko.","help-url-text":"Lagundu niri hau konpontzen"},"fa-AF":{"language":"فارسی دری","header":"با عرض پوزش، نسخه‌ی PHP شما پشتیبانی نمی‌شود.","text1":"شما برای اجرای این نسخه از جوملا، به نسخه‌ی PHP {{phpversion}} یا بالاتر احتیاج دارید.","help-url-text":"برای حل این مشکل کمک کن"},"fa-IR":{"language":"Persian IR","header":"متأسفیم، نسخه PHP شما پشتیبانی نمی شود.","text1":"میزبان شما برای اجرای این نسخه از جوملا نیاز به استفاده از نسخه PHP {{phpversion}} یا نسخه جدیدتر دارد.","help-url-text":"به من کمک کنید تا این مسئله را حل کنم"},"fi-FI":{"language":"Suomi","header":"PHP-versiotasi ei tueta.","text1":"Palvelimen täytyy käyttää PHP-versiota {{phpversion}} tai uudempaa jotta voit käyttää tätä Joomlan versiota.","help-url-text":"Auta minua ratkaisemaan tämä"},"fr-CA":{"language":"Français FR","header":"Désolé, votre version de PHP n'est pas prise en charge.","text1":"Votre serveur a besoin d'utiliser la version {{phpversion}} de PHP ou supérieure pour exécuter cette version de Joomla.","help-url-text":"Aidez-moi à résoudre ceci"},"fr-FR":{"language":"Français FR","header":"Désolé, votre version de PHP n'est pas prise en charge.","text1":"Votre serveur a besoin d'utiliser la version {{phpversion}} de PHP ou supérieure pour exécuter cette version de Joomla.","help-url-text":"Aidez-moi à résoudre ceci"},"he-IL":{"language":"אנגלית GB","header":"מצטערים, גרסת ה- PHP שלך אינה נתמכת.","text1":"השרת מארח שלך צריך להשתמש בגרסת PHP {{phpversion}} ואילך כדי להריץ גירסה זו של ג'ומלה.","help-url-text":"עזור לי לפתור זאת"},"hr-HR":{"language":"Hrvatski HR","header":"Nažalost, vaša PHP verzija nije podržana.","text1":"Za pokretanje ove Joomla verzije, vaš host treba koristiti PHP verziju {{phpversion}} ili noviju.","help-url-text":"Pomozite mi riješiti ovo"},"hu-HU":{"language":"Magyar","header":"Sajnáljuk, de a PHP verziója nem támogatott.","text1":"Ennek a Joomla! verziónak a futtatásához a kiszolgálónak PHP {{phpversion}} vagy újabb verziót kell használnia.","help-url-text":"Segíts ezt megoldani"},"it-IT":{"language":"Italiano IT","header":"Siamo spiacenti, la tua versione di PHP non è supportata.","text1":"Il tuo host ha bisogno della versione di PHP {{phpversion}} o una più recente per avviare questa versione di Joomla.","help-url-text":"Aiutami a risolvere questo"},"ja-JP":{"language":"Japanese JP","header":"申し訳ありませんが、お使いのPHPバージョンはサポートされていません。","text1":"このバージョンのJoomlaを実行するには、ホストがPHPバージョン {{phpversion}} 以降を使用する必要があります。","help-url-text":"この問題を解決するには"},"ka-GE":{"language":"ქართული GE","header":"უკაცრავად, თქვენს PHP ვერსიას არა აქვს მხარდაჭერა.","text1":"Joomla! ამ ვერსიის დასაყენებლად თქვენი ჰოსტი უნდა იყენებდეს PHP {{phpversion}} ვერსიას ან უფრო ახალს.","help-url-text":"დამეხმარეთ პრობლემის მოგვარებაში"},"kk-KZ":{"language":"English GB","header":"Кешіріңіз, сіздің PHP нұсқаңызға қолдау көрсетілмейді.","text1":"Хостыңыз PHP {{phpversion}} немесе оданда жоғары нұсқасы болғанда ғана бұл нұсқадағы Joomla-ны іске қоса аласыз.","help-url-text":"Бұл мәселені шешуге көмектес"},"ko-KR":{"language":"Korean KO","header":"죄송합니다. 사용 중인 PHP 버전은 지원되지 않습니다.","text1":"해당 버전의 Joomla를 사용하기 위해서는 PHP 버전 {{phpversion}} 또는 그 상위 버전이 필요합니다.","help-url-text":"처리해야 하는 문제가 발생했습니다."},"lt-LT":{"language":"Lietuvių LT","header":"Atsiprašome, Jūsų PHP versija yra nepalaikoma.","text1":"Kad paleisti šios versijos Joomla, Jūsų talpinimo serveris turi palaikyti {{phpversion}} arba vėlesnę PHP versiją.","help-url-text":"Padėkite man tai išspręsti"},"lv-LV":{"language":"Latviešu LV","header":"Diemžēl jūsu PHP versija netiek atbalstīta.","text1":"Lai palaistu šo Joomla versiju, serverim ir jāizmanto {{phpversion}} PHP versija vai jaunāka.","help-url-text":"Palīdziet man to atrisināt"},"mk-MK":{"language":"English GB","header":"За жал, вашата верзија на PHP не е поддржана.","text1":"Вашиот хост треба да користи PHP верзија {{phpversion}} или понова за да ја стартува оваа верзија на Joomla.","help-url-text":"Помогни ми да го решам ова"},"nl-BE":{"language":"Engels GB","header":"Sorry, uw PHP-versie wordt niet ondersteund.","text1":"Uw host moet PHP versie {{phpversion}} of nieuwer gebruiken om deze versie van Joomla uit te voeren.","help-url-text":"Help dit probleem op te lossen"},"nl-NL":{"language":"Engels GB","header":"Sorry, uw PHP-versie wordt niet ondersteund.","text1":"Uw host moet PHP versie {{phpversion}} of nieuwer gebruiken om deze versie van Joomla uit te voeren.","help-url-text":"Help dit probleem op te lossen"},"pl-PL":{"language":"Polski PL","header":"Niestety, Twoja wersja PHP nie jest obsługiwana.","text1":"Twój serwer musi używać PHP w wersji {{phpversion}} lub nowszej, aby zainstalować tę wersję Joomla.","help-url-text":"Pomoc w rozwiązaniu tego problemu"},"pt-BR":{"language":"Português do Brasil (pt-BR)","header":"Desculpe, sua versão do PHP não é suportada.","text1":"Seu servidor precisa usar a versão {{phpversion}} do PHP ou uma versão mais recente para executar esta versão do Joomla.","help-url-text":"Ajude-me a resolver isto"},"pt-PT":{"language":"Portuguese (pt-PT)","header":"Lamentamos, mas a sua versão de PHP não é suportada.","text1":"O seu alojamento terá de usar PHP na versão {{phpversion}}, ou mais recente, para poder utilizar esta versão do Joomla.","help-url-text":"Ajude-me a resolver isto"},"ro-RO":{"language":"Română RO","header":"Ne pare rău, versiunea dvs de PHP nu este acceptată.","text1":"Gazda dvs. trebuie să folosească versiunea PHP {{phpversion}} sau una mai nouă pentru a rula această versiune Joomla.","help-url-text":"Ajută-mă să rezolv această problemă"},"ru-RU":{"language":"Русский RU","header":"Используемая версия PHP не поддерживается","text1":"Для установки Joomla необходимо наличие PHP {{phpversion}} или более новой версии.","help-url-text":"Подробнее о решении проблемы"},"sk-SK":{"language":"Slovensky","header":"Prepáčte, ale vaša verzia PHP nie je podporovaná.","text1":"Aby táto verzia Joomla fungovala, váš hosting musí používať PHP vo verzii {{phpversion}} alebo novšej.","help-url-text":"Pomôžte mi vyriešiť to"},"sl-SI":{"language":"Slovenščina SI","header":"Žal vaša PHP različica ni podprta.","text1":"Vaš gostitelj mora uporabljati PHP različico  {{phpversion}} ali novejšo za zagon te različice Joomle.","help-url-text":"Pomagajte mi rešiti to težavo"},"sr-YU":{"language":"Srpski Latinica SRB","header":"Žao nam je vaša PHP verzija nije podržana.","text1":"Vaš host mora da koristi PHP verziju {{phpversion}} ili noviju da bi ova vezija Joomla! radila.","help-url-text":"Kako da rešim ovo"},"sv-SE":{"language":"Svensk SE","header":"Tyvärr, din PHP-version stöds inte.","text1":"Ditt webbhotell måste använda PHP-version {{phpversion}} eller nyare för att köra denna version av Joomla.","help-url-text":"Hjälp mig att lösa detta"},"ta-IN":{"language":"தமிழ் இந்தியா","header":"மன்னிக்கவும், உங்கள் PHP பதிப்பு ஆதரிக்கப்படவில்லை.","text1":"Joomla-வின் இந்தப் பதிப்பை இயக்க, தங்கள் புரவலர்-கணினி (host) ஆனது PHP பதிப்பு {{phpversion}} அல்லது அதற்கும் மேலான பதிப்பைப் பயன்படுத்த வேண்டும்.","help-url-text":"இதனைத் தீர்க்க எனக்கு உதவுக"},"th-TH":{"language":"ภาษาไทย","header":"ขออภัย ไม่รองรับเวอร์ชัน PHP ของคุณ","text1":"โฮสต์ของคุณต้องใช้เวอร์ชัน PHP {{phpversion}} หรือใหม่กว่าเพื่อเรียกใช้ Joomla เวอร์ชันนี้","help-url-text":"ช่วยฉันแก้ปัญหานี้"},"tr-TR":{"language":"Turkish TR","header":"Üzgünüz, PHP sürümünüz desteklenmiyor.","text1":"Joomla'nın bu sürümünü çalıştırmak için sunucunuzun PHP {{phpversion}} sürümünü veya daha yenisini kullanması gerekir.","help-url-text":"Bunu çözmeme yardım et"},"uk-UA":{"language":"Українська (UA)","header":"На жаль, ваша версія PHP не підтримується.","text1":"Ваш хост повинен використовувати версію PHP {{phpversion}} або новішу для запуску цієї версії Joomla.","help-url-text":"Допоможіть мені це вирішити"},"ur-PK":{"language":"انگریزی جی-بی","header":"معذرت، آپ کا پی ایچ پی ورژن تعاون یافتہ نہیں ہے۔","text1":"جملہ کے اس ورژن کو چلانے کے لیے آپ کے میزبان کو پی ایچ پی ورژن {{phpversion}} یا اس سے جدید تر استعمال کرنے کی ضرورت ہے۔","help-url-text":"اس کو حل کرنے میں میری مدد کریں۔"},"vi-VN":{"language":"Vietnamese VN","header":"Xin lỗi, phiên bản PHP của bạn không được hỗ trợ.","text1":"Máy chủ của bạn cần sử dụng PHP phiên bản {{phpversion}} hoặc mới hơn để chạy phiên bản Joomla này.","help-url-text":"Giúp tôi giải quyết vấn đề này"},"zh-CN":{"language":"简体中文","header":"抱歉，PHP 版本不支持。","text1":"需要 PHP {{phpversion}} 或更新的版本运行","help-url-text":"帮助我解决这个问题"},"zh-TW":{"language":"中文 台灣繁體","header":"對不起，你的PHP版本並不支援","text1":"您的主機需要PHP版本{{phpversion}}或以上來執行這個版本的Joomla","help-url-text":"協助我解決這個問題"}};</script><!-- Sets the content of the translated text, IMPORTANT DO NOT REMOVE -->
 </head>
 <body>
 <div class="container">
diff --git a/tests/System/entrypoint.sh b/tests/System/entrypoint.sh
index a01aa2b40afd4..7507113b49154 100644
--- a/tests/System/entrypoint.sh
+++ b/tests/System/entrypoint.sh
@@ -44,4 +44,4 @@ if [ -z "$( ls -A '/root/.cache/Cypress' )" ]; then
   npx cypress verify
 fi
 
-npx cypress run --browser=$BROWSER --e2e --env cmsPath=/tests/www/$TEST_GROUP,db_type=$DB_ENGINE,db_host=$DB_HOST,db_password=joomla_ut,db_prefix="${TEST_GROUP}_",logFile=/var/log/apache2/error.log --config baseUrl=https://localhost/$TEST_GROUP,screenshotsFolder=$JOOMLA_BASE/tests/System/output/screenshots
+npx cypress run --browser=$BROWSER --e2e --expose cmsPath=/tests/www/$TEST_GROUP,db_type=$DB_ENGINE,db_host=$DB_HOST,db_password=joomla_ut,db_prefix="${TEST_GROUP}_",logFile=/var/log/apache2/error.log --config baseUrl=https://localhost/$TEST_GROUP,screenshotsFolder=$JOOMLA_BASE/tests/System/output/screenshots
diff --git a/tests/System/exclude.txt b/tests/System/exclude.txt
index f16ec39b200f7..3b8664d7eac0a 100644
--- a/tests/System/exclude.txt
+++ b/tests/System/exclude.txt
@@ -7,7 +7,6 @@ node_modules
 .editorconfig
 .gitignore
 .php-cs-fixer.dist.php
-build.xml
 composer.json
 composer.lock
 crowdin.yml
diff --git a/tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js b/tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js
index 1b36bea17a7c5..2ef9ae2121fd2 100644
--- a/tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js
+++ b/tests/System/integration/administrator/components/com_actionlogs/Actionlogs.cy.js
@@ -19,7 +19,7 @@ describe('Test in backend that the action logs', () => {
     cy.doAdministratorLogout();
     cy.doAdministratorLogin();
     cy.visit('/administrator/index.php?option=com_actionlogs&view=actionlogs');
-    cy.contains(`User ${Cypress.env('username')} logged in to admin`);
+    cy.contains(`User ${Cypress.expose('username')} logged in to admin`);
     cy.task('queryDB', 'TRUNCATE #__action_logs');
   });
 
diff --git a/tests/System/integration/administrator/components/com_config/Application.cy.js b/tests/System/integration/administrator/components/com_config/Application.cy.js
index c38a55aaf76ac..8a392aafd7a7e 100644
--- a/tests/System/integration/administrator/components/com_config/Application.cy.js
+++ b/tests/System/integration/administrator/components/com_config/Application.cy.js
@@ -16,8 +16,8 @@ describe('Test in backend that the application configuration', () => {
   it('can send a test mail', () => {
     cy.get('#configTabs div[role="tablist"] button[aria-controls="page-server"]').click();
     cy.get('#jform_mailer').select('smtp');
-    cy.get('#jform_smtphost').clear().type(Cypress.env('smtp_host'));
-    cy.get('#jform_smtpport').clear().type(Cypress.env('smtp_port'));
+    cy.get('#jform_smtphost').clear().type(Cypress.expose('smtp_host'));
+    cy.get('#jform_smtpport').clear().type(Cypress.expose('smtp_port'));
     cy.get('#jform_smtpsecure').select('none');
     cy.get('#sendtestmail').click();
 
@@ -26,8 +26,8 @@ describe('Test in backend that the application configuration', () => {
 
       expect(mails.length).to.equal(1);
       cy.wrap(mails[0].body).should('have.string', 'This is a test mail sent using');
-      cy.wrap(mails[0].sender).should('equal', Cypress.env('email'));
-      cy.wrap(mails[0].receivers).should('have.property', Cypress.env('email'));
+      cy.wrap(mails[0].sender).should('equal', Cypress.expose('email'));
+      cy.wrap(mails[0].receivers).should('have.property', Cypress.expose('email'));
     });
   });
 });
diff --git a/tests/System/integration/administrator/components/com_installer/FromUrl.cy.js b/tests/System/integration/administrator/components/com_installer/FromUrl.cy.js
index 7a8a4e1e9c825..f32088dcb4390 100644
--- a/tests/System/integration/administrator/components/com_installer/FromUrl.cy.js
+++ b/tests/System/integration/administrator/components/com_installer/FromUrl.cy.js
@@ -25,6 +25,6 @@ describe('Test in backend that the Installer', () => {
     cy.contains('Uninstall').click();
     cy.clickDialogConfirm(true);
     // Check if the uninstallation was successful
-    cy.contains('Uninstalling the component was successful');
+    cy.contains('Uninstalling the component com_patchtester was successful.');
   });
 });
diff --git a/tests/System/integration/administrator/components/com_installer/Languages.cy.js b/tests/System/integration/administrator/components/com_installer/Languages.cy.js
index 930db7d4a156a..9eb2ab7add648 100644
--- a/tests/System/integration/administrator/components/com_installer/Languages.cy.js
+++ b/tests/System/integration/administrator/components/com_installer/Languages.cy.js
@@ -8,9 +8,17 @@ describe('Test in backend that the Installer', () => {
     cy.get('h1.page-title').should('contain.text', 'Extensions: Languages');
   });
 
-  it('has Afrikaans Language installable', () => {
-    cy.get('tr.row0').should('contain.text', 'Afrikaans').then(() => {
-      cy.get('input.btn.btn-primary.btn-sm').should('exist');
+  it('has any Language installable', () => {
+    cy.get('body').then((body) => {
+      if (body.find('#installer-languages table').length === 0) {
+        cy.get('#installer-languages .alert.alert-info').should('contain.text', 'No Matching Results');
+        cy.checkForSystemMessage('Can\'t connect to https://update.joomla.org/language/translationlist');
+      } else {
+        cy.get('#installer-languages table').within(() => {
+          cy.get('input[type="button"]').should('have.value', 'Install');
+          cy.get('a[target="_blank"]').invoke('attr', 'href').should('match', /^https:\/\/update\.joomla\.org\/language\/details/);
+        });
+      }
     });
   });
 });
diff --git a/tests/System/integration/administrator/components/com_login/Login.cy.js b/tests/System/integration/administrator/components/com_login/Login.cy.js
index 824ab5aae209b..51a10e2e90561 100644
--- a/tests/System/integration/administrator/components/com_login/Login.cy.js
+++ b/tests/System/integration/administrator/components/com_login/Login.cy.js
@@ -6,8 +6,8 @@ describe('Test in backend that the login component', () => {
 
   it('can log in and out', () => {
     cy.visit('administrator/index.php');
-    cy.get('#mod-login-username').type(Cypress.env('username'));
-    cy.get('#mod-login-password').type(Cypress.env('password'));
+    cy.get('#mod-login-username').type(Cypress.expose('username'));
+    cy.get('#mod-login-password').type(Cypress.expose('password'));
     cy.get('#btn-login-submit').click();
 
     cy.get('h1.page-title').should('contain', 'Home Dashboard');
@@ -21,7 +21,7 @@ describe('Test in backend that the login component', () => {
   it('can not log in with wrong username', () => {
     cy.visit('administrator/index.php');
     cy.get('#mod-login-username').type('invalid');
-    cy.get('#mod-login-password').type(Cypress.env('password'));
+    cy.get('#mod-login-password').type(Cypress.expose('password'));
     cy.get('#btn-login-submit').click();
 
     cy.checkForSystemMessage('Username and password do not match or you do not have an account yet.');
@@ -29,7 +29,7 @@ describe('Test in backend that the login component', () => {
 
   it('can not log in with wrong password', () => {
     cy.visit('administrator/index.php');
-    cy.get('#mod-login-username').type(Cypress.env('username'));
+    cy.get('#mod-login-username').type(Cypress.expose('username'));
     cy.get('#mod-login-password').type('invalid');
     cy.get('#btn-login-submit').click();
 
diff --git a/tests/System/integration/administrator/components/com_users/Levels.cy.js b/tests/System/integration/administrator/components/com_users/Levels.cy.js
index fda381242df76..3e974312cf6c9 100644
--- a/tests/System/integration/administrator/components/com_users/Levels.cy.js
+++ b/tests/System/integration/administrator/components/com_users/Levels.cy.js
@@ -19,7 +19,7 @@ describe('Test in backend that the user access level list', () => {
   it('can open the access level form', () => {
     cy.clickToolbarButton('New');
 
-    cy.contains('Level Details');
+    cy.contains('User Groups With Viewing Access');
   });
 
   it('can delete the test level', () => {
diff --git a/tests/System/integration/administrator/components/com_users/Mfa.cy.js b/tests/System/integration/administrator/components/com_users/Mfa.cy.js
index 5c06f44af81b4..13294a82155cc 100644
--- a/tests/System/integration/administrator/components/com_users/Mfa.cy.js
+++ b/tests/System/integration/administrator/components/com_users/Mfa.cy.js
@@ -24,8 +24,8 @@ describe('Test in backend that the user', () => {
     cy.get('.com-users-methods-list-method-name-email .com-users-methods-list-method-record').contains('Test Code');
     cy.clickToolbarButton('Cancel');
     cy.doAdministratorLogout();
-    cy.get('#mod-login-username').type(Cypress.env('username'));
-    cy.get('#mod-login-password').type(Cypress.env('password'));
+    cy.get('#mod-login-username').type(Cypress.expose('username'));
+    cy.get('#mod-login-password').type(Cypress.expose('password'));
     cy.get('#form-login').submit();
     cy.get('#users-mfa-title').contains('Test Code');
     cy.task('getMails').then((mails) => {
@@ -64,8 +64,8 @@ describe('Test in backend that the user', () => {
     cy.get('.com-users-methods-list-method-name-totp .com-users-methods-list-method-record').contains('Test Code');
     cy.clickToolbarButton('Cancel');
     cy.doAdministratorLogout();
-    cy.get('#mod-login-username').type(Cypress.env('username'));
-    cy.get('#mod-login-password').type(Cypress.env('password'));
+    cy.get('#mod-login-username').type(Cypress.expose('username'));
+    cy.get('#mod-login-password').type(Cypress.expose('password'));
     cy.get('#form-login').submit();
     cy.get('#users-mfa-title').contains('Verification code');
     cy.get('@secret').then((secret) => cy.get('#users-mfa-code').clear().type(TOTP.generate(secret).otp));
@@ -102,8 +102,8 @@ describe('Test in backend that the user', () => {
     cy.get('.com-users-methods-list-method-name-webauthn .com-users-methods-list-method-record').contains('Test Passkey');
     cy.clickToolbarButton('Cancel');
     cy.doAdministratorLogout();
-    cy.get('#mod-login-username').type(Cypress.env('username'));
-    cy.get('#mod-login-password').type(Cypress.env('password'));
+    cy.get('#mod-login-username').type(Cypress.expose('username'));
+    cy.get('#mod-login-password').type(Cypress.expose('password'));
     cy.get('#form-login').submit();
     cy.get('#users-mfa-title').contains('Passkey');
     cy.get('#toolbar-user-mfa-submit').click();
@@ -142,8 +142,8 @@ describe('Test in backend that the user', () => {
     cy.get('#toolbar-user-mfa-edit-cancel').contains('Back').click();
     cy.clickToolbarButton('Cancel');
     cy.doAdministratorLogout();
-    cy.get('#mod-login-username').type(Cypress.env('username'));
-    cy.get('#mod-login-password').type(Cypress.env('password'));
+    cy.get('#mod-login-username').type(Cypress.expose('username'));
+    cy.get('#mod-login-password').type(Cypress.expose('password'));
     cy.get('#form-login').submit();
     cy.get('#users-mfa-title').contains('Verification code');
     cy.get('#toolbar-user-mfa-choose-another').click();
diff --git a/tests/System/integration/api/com_banners/Banners.cy.js b/tests/System/integration/api/com_banners/Banners.cy.js
index 6619b1ed4ee6f..e8b5a47781f10 100644
--- a/tests/System/integration/api/com_banners/Banners.cy.js
+++ b/tests/System/integration/api/com_banners/Banners.cy.js
@@ -9,6 +9,22 @@ describe('Test that banners API endpoint', () => {
         .should('include', 'automated test banner'));
   });
 
+  it('can deliver a list of unpublished banners', () => {
+    cy.db_createBanner({ name: 'automated test banner', state: 0 })
+      .then(() => cy.api_get('/banners?filter[state]=0'))
+      .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
+        .its('name')
+        .should('include', 'automated test banner'));
+  });
+
+  it('can deliver a list of published banners', () => {
+    cy.db_createBanner({ name: 'automated test banner', state: 1 })
+      .then(() => cy.api_get('/banners?filter[state]=1'))
+      .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
+        .its('name')
+        .should('include', 'automated test banner'));
+  });
+
   it('can deliver a single banner', () => {
     cy.db_createBanner({ name: 'automated test banner' })
       .then((banner) => cy.api_get(`/banners/${banner.id}`))
@@ -48,4 +64,39 @@ describe('Test that banners API endpoint', () => {
     cy.db_createBanner({ name: 'automated test banner', state: -2 })
       .then((banner) => cy.api_delete(`/banners/${banner.id}`));
   });
+
+  it('check correct response for delete a not existent banner', () => {
+    cy.api_getBearerToken().then((token) => {
+      cy.request({
+        method: 'DELETE',
+        url: '/api/index.php/v1/banners/9999',
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
+        failOnStatusCode: false,
+      }).then((response) => {
+        expect(response.status).to.equal(404);
+        expect(response.body.data.message).to.include('Resource not found');
+      });
+    });
+  });
+
+  it('cannot delete a banner that is not trashed', () => {
+    cy.db_createBanner({ name: 'automated test banner' })
+      .then((banner) => {
+        cy.api_getBearerToken().then((token) => {
+          cy.request({
+            method: 'DELETE',
+            url: `/api/index.php/v1/banners/${banner.id}`,
+            headers: {
+              Authorization: `Bearer ${token}`,
+            },
+            failOnStatusCode: false,
+          }).then((response) => {
+            expect(response.status).to.equal(409);
+            expect(response.body.data.message).to.include('must be trashed before it can be deleted');
+          });
+        });
+      });
+  });
 });
diff --git a/tests/System/integration/api/com_banners/Categories.cy.js b/tests/System/integration/api/com_banners/Categories.cy.js
index 4778c08e4fb20..14b5a08c5f9b6 100644
--- a/tests/System/integration/api/com_banners/Categories.cy.js
+++ b/tests/System/integration/api/com_banners/Categories.cy.js
@@ -8,6 +8,20 @@ describe('Test that banners categories API endpoint', () => {
       .then((response) => cy.api_responseContains(response, 'title', 'automated test banner category'));
   });
 
+  it('can deliver a list of published categories', () => {
+    cy.db_createCategory({ title: 'automated test banner category', extension: 'com_banners', published: 1 })
+      .then((id) => cy.db_createBanner({ name: 'automated test banner', catid: id }))
+      .then(() => cy.api_get('/banners/categories?filter[state]=1'))
+      .then((response) => cy.api_responseContains(response, 'title', 'automated test banner category'));
+  });
+
+  it('can deliver a list of unpublished categories', () => {
+    cy.db_createCategory({ title: 'automated test banner category', extension: 'com_banners', published: 0 })
+      .then((id) => cy.db_createBanner({ name: 'automated test banner', catid: id }))
+      .then(() => cy.api_get('/banners/categories?filter[state]=0'))
+      .then((response) => cy.api_responseContains(response, 'title', 'automated test banner category'));
+  });
+
   it('can deliver a single category', () => {
     cy.db_createCategory({ title: 'automated test banner category', extension: 'com_banners' })
       .then((id) => cy.api_get(`/banners/categories/${id}`))
diff --git a/tests/System/integration/api/com_contact/Categories.cy.js b/tests/System/integration/api/com_contact/Categories.cy.js
index 7dcf9767a95ef..88f6b773a4690 100644
--- a/tests/System/integration/api/com_contact/Categories.cy.js
+++ b/tests/System/integration/api/com_contact/Categories.cy.js
@@ -8,6 +8,20 @@ describe('Test that contact categories API endpoint', () => {
       .then((response) => cy.api_responseContains(response, 'title', 'automated test contact category'));
   });
 
+  it('can deliver a list of published categories', () => {
+    cy.db_createCategory({ title: 'automated test contact category', extension: 'com_contact', published: 1 })
+      .then((id) => cy.db_createContact({ name: 'automated test contact', catid: id }))
+      .then(() => cy.api_get('/contacts/categories?filter[state]=1'))
+      .then((response) => cy.api_responseContains(response, 'title', 'automated test contact category'));
+  });
+
+  it('can deliver a list of unpublished categories', () => {
+    cy.db_createCategory({ title: 'automated test contact category', extension: 'com_contact', published: 0 })
+      .then((id) => cy.db_createContact({ name: 'automated test contact', catid: id }))
+      .then(() => cy.api_get('/contacts/categories?filter[state]=0'))
+      .then((response) => cy.api_responseContains(response, 'title', 'automated test contact category'));
+  });
+
   it('can deliver a single category', () => {
     cy.db_createCategory({ title: 'automated test contact category', extension: 'com_contact' })
       .then((id) => cy.api_get(`/contacts/categories/${id}`))
diff --git a/tests/System/integration/api/com_contact/Contacts.cy.js b/tests/System/integration/api/com_contact/Contacts.cy.js
index 02ede312d367f..34b282ff470c9 100644
--- a/tests/System/integration/api/com_contact/Contacts.cy.js
+++ b/tests/System/integration/api/com_contact/Contacts.cy.js
@@ -47,15 +47,26 @@ describe('Test that contacts API endpoint', () => {
   });
 
   it('check correct response for delete a not existent contact', () => {
-    cy.api_delete('/contacts/9999')
-      .then((result) => expect(result.status).to.eq(204));
+    cy.api_getBearerToken().then((token) => {
+      cy.request({
+        method: 'DELETE',
+        url: '/api/index.php/v1/contacts/9999',
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
+        failOnStatusCode: false,
+      }).then((response) => {
+        expect(response.status).to.equal(404);
+        expect(response.body.data.message).to.include('Resource not found');
+      });
+    });
   });
 
   it('can submit a contact form', () => {
     cy.db_getUserId().then((id) => cy.db_createContact({ name: 'automated test contact', user_id: id, params: '{"show_email_form":"1"}' }))
       .then((contact) => cy.api_post(`/contacts/form/${contact.id}`, {
-        contact_name: Cypress.env('name'),
-        contact_email: Cypress.env('email'),
+        contact_name: Cypress.expose('name'),
+        contact_email: Cypress.expose('email'),
         contact_subject: 'automated test subject',
         contact_message: 'automated test message',
       }))
@@ -64,11 +75,11 @@ describe('Test that contacts API endpoint', () => {
 
     cy.task('getMails').then((mails) => {
       expect(mails.length).to.equal(1);
-      cy.wrap(mails[0].sender).should('equal', Cypress.env('email'));
-      cy.wrap(mails[0].receivers).should('have.property', Cypress.env('email'));
-      cy.wrap(mails[0].headers.subject).should('equal', `${Cypress.env('sitename')}: automated test subject`);
+      cy.wrap(mails[0].sender).should('equal', Cypress.expose('email'));
+      cy.wrap(mails[0].receivers).should('have.property', Cypress.expose('email'));
+      cy.wrap(mails[0].headers.subject).should('equal', `${Cypress.expose('sitename')}: automated test subject`);
       cy.wrap(mails[0].body).should('have.string', 'This is an enquiry email via');
-      cy.wrap(mails[0].body).should('have.string', `${Cypress.env('name')} ${Cypress.env('email')}`);
+      cy.wrap(mails[0].body).should('have.string', `${Cypress.expose('name')} ${Cypress.expose('email')}`);
       cy.wrap(mails[0].body).should('have.string', 'automated test message');
     });
   });
diff --git a/tests/System/integration/api/com_content/Articles.cy.js b/tests/System/integration/api/com_content/Articles.cy.js
index 73ec99ae6198c..709c8eb15a7a1 100644
--- a/tests/System/integration/api/com_content/Articles.cy.js
+++ b/tests/System/integration/api/com_content/Articles.cy.js
@@ -9,6 +9,18 @@ describe('Test that content API endpoint', () => {
         .should('include', 'automated test article'));
   });
 
+  it('can deliver a list of articles filtered by the modified start and end filter', () => {
+    cy.db_createArticle({ title: 'automated test article before', modified: '2025-03-15 10:00:00' })
+      .then(() => cy.db_createArticle({ title: 'automated test article within', modified: '2025-03-15 15:00:00' }))
+      .then(() => cy.db_createArticle({ title: 'automated test article after', modified: '2025-03-15 20:00:00' }))
+      .then(() => cy.api_get('/content/articles?filter[modified_start]=2025-03-15 14:00:00&filter[modified_end]=2025-03-15 16:00:00'))
+      .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
+        .its('title')
+        .should('include', 'automated test article within')
+        .should('not.include', 'automated test article before')
+        .should('not.include', 'automated test article after'));
+  });
+
   it('can deliver a list of unpublished articles', () => {
     cy.db_createArticle({ title: 'automated test article', state: 0 })
       .then(() => cy.api_get('/content/articles?filter[state]=0'))
@@ -33,6 +45,17 @@ describe('Test that content API endpoint', () => {
         .should('include', 'automated test article'));
   });
 
+  it('can deliver a single article with separate fields intro and full text ', () => {
+    cy.db_createArticle({ title: 'automated test article', introtext: 'This is the intro text.', fulltext: 'This is the full text.' })
+      .then((article) => cy.api_get(`/content/articles/${article.id}`))
+      .then((response) =>
+        cy.wrap(response.body.data.attributes).should((attrs) => {
+          expect(attrs.introtext).to.include('This is the intro text.');
+          expect(attrs.fulltext).to.include('This is the full text.');
+        }),
+      );
+  });
+
   it('can create an article', () => {
     cy.db_createCategory({ extension: 'com_content' })
       .then((categoryId) => cy.api_post('/content/articles', {
@@ -69,4 +92,50 @@ describe('Test that content API endpoint', () => {
     cy.db_createArticle({ title: 'automated test article', state: -2 })
       .then((article) => cy.api_delete(`/content/articles/${article.id}`));
   });
+
+  it('creates unique alias when duplicate article is created', () => {
+    cy.db_createCategory({ extension: 'com_content' })
+      .then((categoryId) => {
+        // Create first article
+        return cy.api_post('/content/articles', {
+          title: 'test article',
+          alias: 'test-article',
+          catid: categoryId,
+          introtext: '',
+          fulltext: '',
+          state: 1,
+          access: 1,
+          language: '*',
+          created: '2023-01-01 20:00:00',
+          modified: '2023-01-01 20:00:00',
+          images: '',
+          urls: '',
+          attribs: '',
+          metadesc: '',
+          metadata: '',
+        }).then(() => {
+          // Create second article with same title and alias
+          return cy.api_post('/content/articles', {
+            title: 'test article',
+            alias: 'test-article',
+            catid: categoryId,
+            introtext: '',
+            fulltext: '',
+            state: 1,
+            access: 1,
+            language: '*',
+            created: '2023-01-01 20:00:00',
+            modified: '2023-01-01 20:00:00',
+            images: '',
+            urls: '',
+            attribs: '',
+            metadesc: '',
+            metadata: '',
+          });
+        });
+      })
+      .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
+        .its('alias')
+        .should('equal', 'test-article-2'));
+  });
 });
diff --git a/tests/System/integration/api/com_content/Categories.cy.js b/tests/System/integration/api/com_content/Categories.cy.js
index c4a68f4f12247..8e05310e37255 100644
--- a/tests/System/integration/api/com_content/Categories.cy.js
+++ b/tests/System/integration/api/com_content/Categories.cy.js
@@ -8,6 +8,20 @@ describe('Test that content categories API endpoint', () => {
       .then((response) => cy.api_responseContains(response, 'title', 'automated test content category'));
   });
 
+  it('can deliver a list of published categories', () => {
+    cy.db_createCategory({ title: 'automated test content category', extension: 'com_content', published: 1 })
+      .then((id) => cy.db_createArticle({ title: 'automated test article', catid: id }))
+      .then(() => cy.api_get('/content/categories?filter[state]=1'))
+      .then((response) => cy.api_responseContains(response, 'title', 'automated test content category'));
+  });
+
+  it('can deliver a list of unpublished categories', () => {
+    cy.db_createCategory({ title: 'automated test content category', extension: 'com_content', published: 0 })
+      .then((id) => cy.db_createArticle({ title: 'automated test article', catid: id }))
+      .then(() => cy.api_get('/content/categories?filter[state]=0'))
+      .then((response) => cy.api_responseContains(response, 'title', 'automated test content category'));
+  });
+
   it('can deliver a single category', () => {
     cy.db_createCategory({ title: 'automated test content category', extension: 'com_content' })
       .then((id) => cy.api_get(`/content/categories/${id}`))
diff --git a/tests/System/integration/api/com_contenthistory/Banner.cy.js b/tests/System/integration/api/com_contenthistory/Banner.cy.js
index 0b887006c25c4..8d8a1ebf067df 100644
--- a/tests/System/integration/api/com_contenthistory/Banner.cy.js
+++ b/tests/System/integration/api/com_contenthistory/Banner.cy.js
@@ -42,7 +42,6 @@ describe('Test that contenthistory for banners API endpoint', () => {
           const bannerName = versionData.name;
           const { alias } = versionData;
           const createdDate = versionData.created;
-          const modifiedDate = versionData.modified;
 
           // Log details for debugging
           cy.log(`History ID: ${historyId}`);
@@ -52,12 +51,10 @@ describe('Test that contenthistory for banners API endpoint', () => {
           cy.log(`Banner Name: ${bannerName}`);
           cy.log(`Alias: ${alias}`);
           cy.log(`Created Date: ${createdDate}`);
-          cy.log(`Modified Date: ${modifiedDate}`);
 
           // Perform assertions
           expect(attributes).to.have.property('editor_user_id');
           expect(versionData).to.have.property('name');
-          expect(versionData).to.have.property('modified');
           expect(bannerName).to.eq('automated test banner');
         });
 
diff --git a/tests/System/integration/api/com_contenthistory/Contact.cy.js b/tests/System/integration/api/com_contenthistory/Contact.cy.js
index 3815e09ad06a9..6953d5523c1e6 100644
--- a/tests/System/integration/api/com_contenthistory/Contact.cy.js
+++ b/tests/System/integration/api/com_contenthistory/Contact.cy.js
@@ -37,7 +37,6 @@ describe('Test that contenthistory for contact API endpoint', () => {
           const contactName = versionData.name;
           const { alias } = versionData;
           const createdDate = versionData.created;
-          const modifiedDate = versionData.modified;
 
           // Log details for debugging
           cy.log(`History ID: ${historyId}`);
@@ -47,12 +46,10 @@ describe('Test that contenthistory for contact API endpoint', () => {
           cy.log(`Contact Name: ${contactName}`);
           cy.log(`Alias: ${alias}`);
           cy.log(`Created Date: ${createdDate}`);
-          cy.log(`Modified Date: ${modifiedDate}`);
 
           // Perform assertions
           expect(attributes).to.have.property('editor_user_id');
           expect(versionData).to.have.property('name');
-          expect(versionData).to.have.property('modified');
           expect(contactName).to.eq('automated test contact');
         });
 
diff --git a/tests/System/integration/api/com_contenthistory/Content.cy.js b/tests/System/integration/api/com_contenthistory/Content.cy.js
index 9f939f7b97119..26fbad1921960 100644
--- a/tests/System/integration/api/com_contenthistory/Content.cy.js
+++ b/tests/System/integration/api/com_contenthistory/Content.cy.js
@@ -47,7 +47,6 @@ describe('Test that contenthistory for content API endpoint', () => {
           const articleTitle = versionData.title;
           const { alias } = versionData;
           const createdDate = versionData.created;
-          const modifiedDate = versionData.modified;
 
           // Log details for debugging
           cy.log(`History ID: ${historyId}`);
@@ -57,12 +56,10 @@ describe('Test that contenthistory for content API endpoint', () => {
           cy.log(`Article Title: ${articleTitle}`);
           cy.log(`Alias: ${alias}`);
           cy.log(`Created Date: ${createdDate}`);
-          cy.log(`Modified Date: ${modifiedDate}`);
 
           // Perform assertions
           expect(attributes).to.have.property('editor_user_id');
           expect(versionData).to.have.property('title');
-          expect(versionData).to.have.property('modified');
           expect(articleTitle).to.eq('automated test article');
         });
 
diff --git a/tests/System/integration/api/com_languages/Languages.cy.js b/tests/System/integration/api/com_languages/Languages.cy.js
index 0d942ff683fa5..0d9a3faa9767e 100644
--- a/tests/System/integration/api/com_languages/Languages.cy.js
+++ b/tests/System/integration/api/com_languages/Languages.cy.js
@@ -1,7 +1,12 @@
 describe('Test that languages API endpoint', () => {
   it('can deliver a list of languages', () => {
-    cy.api_get('/languages')
-      .then((response) => cy.wrap(response).its('body').its('data.0').its('type')
-        .should('include', 'languages'));
+    cy.api_get('/languages').then((response) => {
+      if (response?.body?.data.length === 0) {
+        cy.wrap(response).its('body.data').should('have.length', 0);
+        cy.wrap(response).its('body.links.self').should('include', '/api/index.php/v1/languages');
+      } else {
+        cy.wrap(response).its('body.data.0.type').should('include', 'languages');
+      }
+    });
   });
 });
diff --git a/tests/System/integration/api/com_users/Levels.cy.js b/tests/System/integration/api/com_users/Levels.cy.js
index 529cd2a602c6a..d0d4aa9d434bc 100644
--- a/tests/System/integration/api/com_users/Levels.cy.js
+++ b/tests/System/integration/api/com_users/Levels.cy.js
@@ -4,12 +4,12 @@ describe('Test that users access levels API endpoint', () => {
   it('can deliver a list of user access levels', () => {
     cy.api_get('/users/levels')
       .then((response) => cy.wrap(response).its('body').its('data.0').its('attributes')
-      .its('title')
-      .should('include', 'Public'));
+        .its('title')
+        .should('include', 'Public'));
   });
 
   it('can deliver a single users access level', () => {
-    cy.db_createUserLevel({ title: 'automated test level'})
+    cy.db_createUserLevel({ title: 'automated test level' })
       .then((level) => cy.api_get(`/users/levels/${level.id}`))
       .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
         .its('title')
@@ -28,7 +28,7 @@ describe('Test that users access levels API endpoint', () => {
   });
 
   it('can update a users access level', () => {
-    cy.db_createUserLevel({ title: 'automated test level'})
+    cy.db_createUserLevel({ title: 'automated test level' })
       .then((level) => cy.api_patch(`/users/levels/${level.id}`, { title: 'updated automated test level' }))
       .then((response) => cy.wrap(response).its('body').its('data').its('attributes')
         .its('title')
@@ -36,34 +36,34 @@ describe('Test that users access levels API endpoint', () => {
   });
 
   it('can delete a user access level', () => {
-    cy.db_createUserLevel({ title: 'automated test level'})
+    cy.db_createUserLevel({ title: 'automated test level' })
       .then((level) => cy.api_delete(`/users/levels/${level.id}`));
   });
 
-  it('can patch a users access level and check the rules', () => {      
-      cy.api_post('/users/levels', {
-        id: '0',
-        title: 'automated test level',
-        rules: [1, 2], 
-      }).then((createResponse) => {
-        const createdId = createResponse.body.data.id;
-        cy.api_patch(`/users/levels/${createdId}`, {
-          title: 'updated automated test level',
-        }).then((patchResponse) => {
-          expect(patchResponse.status).to.eq(200);
-          cy.wrap(patchResponse).its('body').its('data').its('attributes').its('title')
-            .should('eq', 'updated automated test level');
-          cy.wrap(patchResponse).its('body').its('data').its('attributes').its('rules')
-            .then((rules) => {
-              if (typeof rules === 'string') {
-                const normalized = rules.replace(/\s+/g, '');
-                expect(normalized).to.eq([1,2]);
-              } else {
-                const nums = rules.map((r) => (typeof r === 'string' ? Number(r) : r));
-                expect(nums).to.deep.equal([1, 2]);
-              }
-            });
-        });
+  it('can patch a users access level and check the rules', () => {
+    cy.api_post('/users/levels', {
+      id: '0',
+      title: 'automated test level',
+      rules: [1, 2],
+    }).then((createResponse) => {
+      const createdId = createResponse.body.data.id;
+      cy.api_patch(`/users/levels/${createdId}`, {
+        title: 'updated automated test level',
+      }).then((patchResponse) => {
+        expect(patchResponse.status).to.eq(200);
+        cy.wrap(patchResponse).its('body').its('data').its('attributes').its('title')
+          .should('eq', 'updated automated test level');
+        cy.wrap(patchResponse).its('body').its('data').its('attributes').its('rules')
+          .then((rules) => {
+            if (typeof rules === 'string') {
+              const normalized = rules.replace(/\s+/g, '');
+              expect(normalized).to.eq([1, 2]);
+            } else {
+              const nums = rules.map((r) => (typeof r === 'string' ? Number(r) : r));
+              expect(nums).to.deep.equal([1, 2]);
+            }
+          });
       });
     });
+  });
 });
diff --git a/tests/System/integration/cli/Cache.cy.js b/tests/System/integration/cli/Cache.cy.js
index 97fb36b1dfa52..d8ae434ef4766 100644
--- a/tests/System/integration/cli/Cache.cy.js
+++ b/tests/System/integration/cli/Cache.cy.js
@@ -1,8 +1,8 @@
 describe('Test that console command cache', () => {
   it('can clean cache', () => {
-    const cachedFile = Cypress.env('cmsPath') + 'administrator/cache/test.txt';
+    const cachedFile = Cypress.expose('cmsPath') + 'administrator/cache/test.txt';
     cy.task('writeRelativeFile', { path: 'administrator/cache/test.txt', content: 'test delete file from cache', mode: 0o666 });
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php cache:clean`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php cache:clean`)
       .its('stdout')
       .should('contain', 'Cache cleaned');
     cy.readFile(cachedFile).should('not.exist');
diff --git a/tests/System/integration/cli/CheckExtensionsUpdates.cy.js b/tests/System/integration/cli/CheckExtensionsUpdates.cy.js
index cb7dd1ea91f78..1855b883c8c39 100644
--- a/tests/System/integration/cli/CheckExtensionsUpdates.cy.js
+++ b/tests/System/integration/cli/CheckExtensionsUpdates.cy.js
@@ -1,6 +1,6 @@
 describe('Test that console command check extensions update', () => {
   it('can check update', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php update:extensions:check`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php update:extensions:check`)
       .its('stdout')
       .should('contain', 'There are no updates available');
   });
diff --git a/tests/System/integration/cli/Config.cy.js b/tests/System/integration/cli/Config.cy.js
new file mode 100644
index 0000000000000..7d3aaaa41a89b
--- /dev/null
+++ b/tests/System/integration/cli/Config.cy.js
@@ -0,0 +1,22 @@
+describe('Test that console command config', () => {
+  it('can get sitename', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php config:get sitename`)
+      .its('stdout')
+      .should('contain', Cypress.expose('sitename'));
+  });
+
+  it('can set sitename', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php config:set sitename="${Cypress.expose('sitename')}"`)
+      .its('stdout')
+      .should('contain', '[OK] Configuration set');
+  });
+
+  it('can not set invalid database name', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php config:set db=invalid`, { failOnNonZeroExit: false }).then((result) => {
+      cy.wrap(result).its('exitCode')
+        .should('equal', 4);
+      cy.wrap(result).its('stdout')
+        .should('contain', '[ERROR] Cannot connect to database');
+    });
+  });
+});
diff --git a/tests/System/integration/cli/ConfigGet.cy.js b/tests/System/integration/cli/ConfigGet.cy.js
index b77f81ab71bcb..3672488c2e8ae 100644
--- a/tests/System/integration/cli/ConfigGet.cy.js
+++ b/tests/System/integration/cli/ConfigGet.cy.js
@@ -1,6 +1,6 @@
 describe('Test CLI command config:get', () => {
   it('can get all configuration options', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php config:get`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php config:get`)
       .then((result) => {
         expect(result.stdout).to.contain('Option');
         expect(result.stdout).to.contain('Value');
@@ -10,7 +10,7 @@ describe('Test CLI command config:get', () => {
   });
 
   it('can get database configuration group', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php config:get --group=db`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php config:get --group=db`)
       .then((result) => {
         // Check output contains expected database configuration options
         expect(result.stdout).to.contain('Option');
@@ -24,13 +24,13 @@ describe('Test CLI command config:get', () => {
         expect(result.stdout).to.contain('dbencryption');
         expect(result.stdout).to.contain('dbsslverifyservercert');
         // Check for specific values
-        expect(result.stdout.toLowerCase()).to.contain(Cypress.env('db_type').toLowerCase());
+        expect(result.stdout.toLowerCase()).to.contain(Cypress.expose('db_type').toLowerCase());
         expect(result.stdout).to.contain('root');
-    });
+      });
   });
 
   it('can get mail configuration group', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php config:get --group=mail`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php config:get --group=mail`)
       .then((result) => {
         // Check output contains expected mail configuration options
         expect(result.stdout).to.contain('Option');
@@ -45,11 +45,11 @@ describe('Test CLI command config:get', () => {
         expect(result.stdout).to.contain('smtphost');
         expect(result.stdout).to.contain('smtpsecure');
         expect(result.stdout).to.contain('smtpport');
-    });
-  })
+      });
+  });
 
   it('can get session configuration group', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php config:get --group=session`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php config:get --group=session`)
       .then((result) => {
         // Check output contains expected session configuration options
         expect(result.stdout).to.contain('Option');
@@ -61,13 +61,13 @@ describe('Test CLI command config:get', () => {
         // Check for specific values
         expect(result.stdout).to.contain('database');
         expect(result.stdout).to.contain('false');
-    });
+      });
   });
 
   it('get error for non existent configuration group', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php config:get --group=test`, { failOnNonZeroExit: false })
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php config:get --group=test`, { failOnNonZeroExit: false })
       .then((result) => {
         expect(result.stdout).to.contain('[ERROR] Group *test* not found');
-    });
+      });
   });
 });
diff --git a/tests/System/integration/cli/Extensions.cy.js b/tests/System/integration/cli/Extensions.cy.js
new file mode 100644
index 0000000000000..1e24d429415cd
--- /dev/null
+++ b/tests/System/integration/cli/Extensions.cy.js
@@ -0,0 +1,25 @@
+describe('Test that console command extension', () => {
+  it('can disable an extension', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php extension:disable 1`)
+      .its('stdout')
+      .should('contain', '[OK] Component with ID of 1 com_wrapper disabled');
+  });
+
+  it('cannot disable a non existent extension', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php extension:disable 2025`, { failOnNonZeroExit: false })
+      .its('stdout')
+      .should('contain', '[ERROR] Extension with ID of 2025 not found');
+  });
+
+  it('can enable an extension', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php extension:enable 1`)
+      .its('stdout')
+      .should('contain', '[OK] Component with ID of 1 com_wrapper enabled');
+  });
+
+  it('cannot enable a non existent extension', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php extension:enable 2025`, { failOnNonZeroExit: false })
+      .its('stdout')
+      .should('contain', '[ERROR] Extension with ID of 2025 not found');
+  });
+});
diff --git a/tests/System/integration/cli/ExtensionsList.cy.js b/tests/System/integration/cli/ExtensionsList.cy.js
index 83bc3975e488d..6998eec321368 100644
--- a/tests/System/integration/cli/ExtensionsList.cy.js
+++ b/tests/System/integration/cli/ExtensionsList.cy.js
@@ -1,42 +1,49 @@
 describe('Test that console command list extensions', () => {
-    it('can list extensions by type component', () => {
-        cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php extension:list --type=component`)
-            .its('stdout')
-            .should('contain', 'com_admin');
-    });
-    it('can list extensions by type file', () => {
-        cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php extension:list --type=file`)
-            .its('stdout')
-            .should('contain', 'files_joomla');
-    });
-    it('can list extensions by type language', () => {
-        cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php extension:list --type=language`)
-            .its('stdout')
-            .should('contain', 'English (en-GB)');
-    });
-    it('can list extensions by type library', () => {
-        cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php extension:list --type=library`)
-            .its('stdout')
-            .should('contain', 'lib_joomla');
-    });
-    it('can list extensions by type module', () => {
-        cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php extension:list --type=module`)
-            .its('stdout')
-            .should('contain', 'mod_custom');
-    });
-    it('can list extensions by type package', () => {
-        cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php extension:list --type=package`)
-            .its('stdout')
-            .should('contain', 'English (en-GB) Language Pack');
-    });
-    it('can list extensions by type plugin', () => {
-        cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php extension:list --type=plugin`)
-            .its('stdout')
-            .should('contain', 'plg_authentication_joomla');
-    });
-    it('can list extensions by type template', () => {
-        cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php extension:list --type=template`)
-            .its('stdout')
-            .should('contain', 'cassiopeia');
-    });
+  it('can list extensions by type component', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php extension:list --type=component`)
+      .its('stdout')
+      .should('contain', 'com_admin');
+  });
+
+  it('can list extensions by type file', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php extension:list --type=file`)
+      .its('stdout')
+      .should('contain', 'files_joomla');
+  });
+
+  it('can list extensions by type language', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php extension:list --type=language`)
+      .its('stdout')
+      .should('contain', 'English (en-GB)');
+  });
+
+  it('can list extensions by type library', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php extension:list --type=library`)
+      .its('stdout')
+      .should('contain', 'lib_joomla');
+  });
+
+  it('can list extensions by type module', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php extension:list --type=module`)
+      .its('stdout')
+      .should('contain', 'mod_custom');
+  });
+
+  it('can list extensions by type package', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php extension:list --type=package`)
+      .its('stdout')
+      .should('contain', 'English (en-GB) Language Pack');
+  });
+
+  it('can list extensions by type plugin', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php extension:list --type=plugin`)
+      .its('stdout')
+      .should('contain', 'plg_authentication_joomla');
+  });
+
+  it('can list extensions by type template', () => {
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php extension:list --type=template`)
+      .its('stdout')
+      .should('contain', 'cassiopeia');
+  });
 });
diff --git a/tests/System/integration/cli/Finder.cy.js b/tests/System/integration/cli/Finder.cy.js
index 95b59280b5250..2feedf76b1f33 100644
--- a/tests/System/integration/cli/Finder.cy.js
+++ b/tests/System/integration/cli/Finder.cy.js
@@ -1,11 +1,11 @@
 describe('Test that console command finder', () => {
   it('can index content', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php finder:index`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php finder:index`)
       .its('stdout')
       .should('contain', 'Total Processing Time');
   });
   it('can purge and index content', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php finder:index purge`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php finder:index purge`)
       .its('stdout')
       .should('contain', 'Clear index')
       .should('contain', 'Total Processing Time');
diff --git a/tests/System/integration/cli/Scheduler.cy.js b/tests/System/integration/cli/Scheduler.cy.js
index 934fef8bddb68..9f39ce67665ab 100644
--- a/tests/System/integration/cli/Scheduler.cy.js
+++ b/tests/System/integration/cli/Scheduler.cy.js
@@ -1,42 +1,42 @@
 describe('Test that console command scheduler', () => {
   it('can list scheduled tasks', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php scheduler:list`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php scheduler:list`)
       .its('stdout')
       .should('contain', 'Rotate Logs');
   });
 
   it('can update scheduled task state', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php scheduler:state --id=1 --state=1 -n`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php scheduler:state --id=1 --state=1 -n`)
       .its('stdout')
       .should('contain', 'Task ID 1 enabled.');
   });
 
   it('cannot update state of non-existent task', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php scheduler:state --id=123 --state=1 -n`, { failOnNonZeroExit: false })
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php scheduler:state --id=123 --state=1 -n`, { failOnNonZeroExit: false })
       .its('stdout')
       .should('contain', "Task ID '123' does not exist!");
   });
 
   it('cannot update to non-existent state for a task', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php scheduler:state --id=1 --state=123 -n`, { failOnNonZeroExit: false })
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php scheduler:state --id=1 --state=123 -n`, { failOnNonZeroExit: false })
       .its('stdout')
       .should('contain', 'Invalid state passed!');
   });
 
   it('can run a task', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php scheduler:run --id=1`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php scheduler:run --id=1`)
       .its('stdout')
       .should('contain', 'Task#01 \'Rotate Logs\' processed in');
   });
 
   it('cannot run a non existent task', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php scheduler:run --id=123`, { failOnNonZeroExit: false })
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php scheduler:run --id=123`, { failOnNonZeroExit: false })
       .its('stdout')
       .should('contain', 'No matching task found!');
   });
 
   it('cannot run a not due task', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php scheduler:run`, {failOnNonZeroExit: false})
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php scheduler:run`, { failOnNonZeroExit: false })
       .its('stdout')
       .should('contain', 'No tasks due!');
   });
diff --git a/tests/System/integration/cli/Session.cy.js b/tests/System/integration/cli/Session.cy.js
index d4e13ea41ca5e..87ba7ca8d0914 100644
--- a/tests/System/integration/cli/Session.cy.js
+++ b/tests/System/integration/cli/Session.cy.js
@@ -1,11 +1,11 @@
 describe('Test that console command session', () => {
   it('can garbage collection', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php session:gc`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php session:gc`)
       .its('stdout')
       .should('contain', 'Garbage collection completed');
   });
   it('can metadata garbage collection', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php session:metadata:gc`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php session:metadata:gc`)
       .its('stdout')
       .should('contain', 'Metadata garbage collection completed');
   });
diff --git a/tests/System/integration/cli/SiteUpDown.cy.js b/tests/System/integration/cli/SiteUpDown.cy.js
index cca8274887504..15880a47909c2 100644
--- a/tests/System/integration/cli/SiteUpDown.cy.js
+++ b/tests/System/integration/cli/SiteUpDown.cy.js
@@ -1,11 +1,11 @@
 describe('Test that console command site', () => {
   it('can set the site down', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php site:down`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php site:down`)
       .its('stdout')
       .should('contain', 'Website is now offline');
   });
   it('can set the site up', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php site:up`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php site:up`)
       .its('stdout')
       .should('contain', 'Website is now online');
   });
diff --git a/tests/System/integration/cli/User.cy.js b/tests/System/integration/cli/User.cy.js
index f8ca86d9fc306..96644be95c04c 100644
--- a/tests/System/integration/cli/User.cy.js
+++ b/tests/System/integration/cli/User.cy.js
@@ -1,36 +1,36 @@
 describe('Test that console command user', () => {
   it('can list users', () => {
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php user:list`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php user:list`)
       .its('stdout')
-      .should('contain', `${Cypress.env('username')}`);
+      .should('contain', `${Cypress.expose('username')}`);
   });
   it('can add a user', () => {
     const para = '--username=test --name=test --password=123456789012 --email=test@530.test --usergroup=Manager -n';
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php user:add ${para}`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php user:add ${para}`)
       .its('stdout')
       .should('contain', 'User created!');
   });
   it('can reset password', () => {
     const para = '--username=test --password=abcdefghilmno -n';
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php user:reset-password ${para}`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php user:reset-password ${para}`)
       .its('stdout')
       .should('contain', 'Password changed!');
   });
   it('can add a user to user group', () => {
     const para = '--username=test --group=Registered -n';
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php user:addtogroup ${para}`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php user:addtogroup ${para}`)
       .its('stdout')
       .should('contain', "Added 'test' to group 'Registered'!");
   });
   it('can remove a user from user group', () => {
     const para = '--username=test --group=Registered -n';
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php user:removefromgroup ${para}`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php user:removefromgroup ${para}`)
       .its('stdout')
       .should('contain', "Removed 'test' from group 'Registered'!");
   });
   it('can delete a user', () => {
     const para = '--username=test -n';
-    cy.exec(`php ${Cypress.env('cmsPath')}/cli/joomla.php user:delete ${para}`)
+    cy.exec(`php ${Cypress.expose('cmsPath')}/cli/joomla.php user:delete ${para}`)
       .its('stdout')
       .should('contain', 'User test deleted!');
   });
diff --git a/tests/System/integration/install/Installation.cy.js b/tests/System/integration/install/Installation.cy.js
index 5b664e8a22594..6973d2da6958f 100644
--- a/tests/System/integration/install/Installation.cy.js
+++ b/tests/System/integration/install/Installation.cy.js
@@ -2,11 +2,11 @@ describe('Install Joomla', () => {
   it('blocks admin password with less than 12 characters', () => {
     cy.task('deleteRelativePath', 'configuration.php');
     cy.visit('/installation/index.php');
-    cy.get('#jform_site_name').clear().type(Cypress.env('sitename'));
+    cy.get('#jform_site_name').clear().type(Cypress.expose('sitename'));
     cy.get('#step1').click();
-    cy.get('#jform_admin_user').clear().type(Cypress.env('name'));
-    cy.get('#jform_admin_username').clear().type(Cypress.env('username'));
-    cy.get('#jform_admin_email').clear().type(Cypress.env('email'));
+    cy.get('#jform_admin_user').clear().type(Cypress.expose('name'));
+    cy.get('#jform_admin_username').clear().type(Cypress.expose('username'));
+    cy.get('#jform_admin_email').clear().type(Cypress.expose('email'));
     cy.get('#jform_admin_password').clear().type('Short1!');
     cy.get('#jform_admin_password').blur();
 
@@ -20,11 +20,11 @@ describe('Install Joomla', () => {
   it('allows admin password with 12 or more characters', () => {
     cy.task('deleteRelativePath', 'configuration.php');
     cy.visit('/installation/index.php');
-    cy.get('#jform_site_name').clear().type(Cypress.env('sitename'));
+    cy.get('#jform_site_name').clear().type(Cypress.expose('sitename'));
     cy.get('#step1').click();
-    cy.get('#jform_admin_user').clear().type(Cypress.env('name'));
-    cy.get('#jform_admin_username').clear().type(Cypress.env('username'));
-    cy.get('#jform_admin_email').clear().type(Cypress.env('email'));
+    cy.get('#jform_admin_user').clear().type(Cypress.expose('name'));
+    cy.get('#jform_admin_username').clear().type(Cypress.expose('username'));
+    cy.get('#jform_admin_email').clear().type(Cypress.expose('email'));
     cy.get('#jform_admin_password').clear().type('ValidPass123!');
     cy.get('#jform_admin_password').blur();
 
@@ -38,11 +38,11 @@ describe('Install Joomla', () => {
   it('blocks admin password with spaces at the beginning', () => {
     cy.task('deleteRelativePath', 'configuration.php');
     cy.visit('/installation/index.php');
-    cy.get('#jform_site_name').clear().type(Cypress.env('sitename'));
+    cy.get('#jform_site_name').clear().type(Cypress.expose('sitename'));
     cy.get('#step1').click();
-    cy.get('#jform_admin_user').clear().type(Cypress.env('name'));
-    cy.get('#jform_admin_username').clear().type(Cypress.env('username'));
-    cy.get('#jform_admin_email').clear().type(Cypress.env('email'));
+    cy.get('#jform_admin_user').clear().type(Cypress.expose('name'));
+    cy.get('#jform_admin_username').clear().type(Cypress.expose('username'));
+    cy.get('#jform_admin_email').clear().type(Cypress.expose('email'));
     cy.get('#jform_admin_password').clear().type(' ValidPass123!');
     cy.get('#jform_admin_password').blur();
 
@@ -56,11 +56,11 @@ describe('Install Joomla', () => {
   it('blocks admin password with spaces at the end', () => {
     cy.task('deleteRelativePath', 'configuration.php');
     cy.visit('/installation/index.php');
-    cy.get('#jform_site_name').clear().type(Cypress.env('sitename'));
+    cy.get('#jform_site_name').clear().type(Cypress.expose('sitename'));
     cy.get('#step1').click();
-    cy.get('#jform_admin_user').clear().type(Cypress.env('name'));
-    cy.get('#jform_admin_username').clear().type(Cypress.env('username'));
-    cy.get('#jform_admin_email').clear().type(Cypress.env('email'));
+    cy.get('#jform_admin_user').clear().type(Cypress.expose('name'));
+    cy.get('#jform_admin_username').clear().type(Cypress.expose('username'));
+    cy.get('#jform_admin_email').clear().type(Cypress.expose('email'));
     cy.get('#jform_admin_password').clear().type('ValidPass123! ');
     cy.get('#jform_admin_password').blur();
 
@@ -74,11 +74,11 @@ describe('Install Joomla', () => {
   it('allows spaces in the middle of admin_password', () => {
     cy.task('deleteRelativePath', 'configuration.php');
     cy.visit('/installation/index.php');
-    cy.get('#jform_site_name').clear().type(Cypress.env('sitename'));
+    cy.get('#jform_site_name').clear().type(Cypress.expose('sitename'));
     cy.get('#step1').click();
-    cy.get('#jform_admin_user').clear().type(Cypress.env('name'));
-    cy.get('#jform_admin_username').clear().type(Cypress.env('username'));
-    cy.get('#jform_admin_email').clear().type(Cypress.env('email'));
+    cy.get('#jform_admin_user').clear().type(Cypress.expose('name'));
+    cy.get('#jform_admin_username').clear().type(Cypress.expose('username'));
+    cy.get('#jform_admin_email').clear().type(Cypress.expose('email'));
     cy.get('#jform_admin_password').clear().type('Valid Pass 123!');
     cy.get('#jform_admin_password').blur();
 
@@ -91,18 +91,18 @@ describe('Install Joomla', () => {
 
   it('Install Joomla', () => {
     const config = {
-      sitename: Cypress.env('sitename'),
-      name: Cypress.env('name'),
-      username: Cypress.env('username'),
-      password: Cypress.env('password'),
-      email: Cypress.env('email'),
-      db_type: Cypress.env('db_type'),
-      db_host: Cypress.env('db_host'),
-      db_port: Cypress.env('db_port'),
-      db_user: Cypress.env('db_user'),
-      db_password: Cypress.env('db_password'),
-      db_name: Cypress.env('db_name'),
-      db_prefix: Cypress.env('db_prefix'),
+      sitename: Cypress.expose('sitename'),
+      name: Cypress.expose('name'),
+      username: Cypress.expose('username'),
+      password: Cypress.expose('password'),
+      email: Cypress.expose('email'),
+      db_type: Cypress.expose('db_type'),
+      db_host: Cypress.expose('db_host'),
+      db_port: Cypress.expose('db_port'),
+      db_user: Cypress.expose('db_user'),
+      db_password: Cypress.expose('db_password'),
+      db_name: Cypress.expose('db_name'),
+      db_prefix: Cypress.expose('db_prefix'),
     };
 
     // If exists, delete PHP configuration file to force a new installation
@@ -110,7 +110,7 @@ describe('Install Joomla', () => {
     cy.installJoomla(config);
 
     // Disable compat plugin
-    cy.db_enableExtension(0, 'plg_behaviour_compat');
+    cy.db_enableExtension(0, 'plg_behaviour_compat6');
 
     cy.doAdministratorLogin(config.username, config.password, false);
     cy.cancelTour();
@@ -121,7 +121,7 @@ describe('Install Joomla', () => {
     // Setup mailing
     cy.config_setParameter('mailonline', true);
     cy.config_setParameter('mailer', 'smtp');
-    cy.config_setParameter('smtphost', Cypress.env('smtp_host'));
-    cy.config_setParameter('smtpport', Cypress.env('smtp_port'));
+    cy.config_setParameter('smtphost', Cypress.expose('smtp_host'));
+    cy.config_setParameter('smtpport', Cypress.expose('smtp_port'));
   });
 });
diff --git a/tests/System/integration/plugins/actionlog/joomla/Actionlogs.cy.js b/tests/System/integration/plugins/actionlog/joomla/Actionlogs.cy.js
index 051c57394806c..5f736fd58ad0a 100644
--- a/tests/System/integration/plugins/actionlog/joomla/Actionlogs.cy.js
+++ b/tests/System/integration/plugins/actionlog/joomla/Actionlogs.cy.js
@@ -128,12 +128,12 @@ describe('Test that the Action Logs plugin', () => {
     cy.get('#jform_password1').type('Password123!');
     cy.get('#jform_password2').type('Password123!');
     cy.get('#jform_email1').type('frontendtest@example.com');
-    
+
     cy.get('button[type="submit"]').contains('Register').click();
 
     // Go back to backend to check action log
     cy.visit('/administrator/index.php?option=com_actionlogs&view=actionlogs');
-    
+
     // Asserts that user registration was logged
     cy.contains('registered').should('be.visible');
     cy.db_updateExtensionParameter('allowUserRegistration', '0', 'com_users');
diff --git a/tests/System/integration/plugins/system/shortcut/ShortcutPlugin.cy.js b/tests/System/integration/plugins/system/shortcut/ShortcutPlugin.cy.js
index 97ce1411b6896..a4b0434f9fc2b 100644
--- a/tests/System/integration/plugins/system/shortcut/ShortcutPlugin.cy.js
+++ b/tests/System/integration/plugins/system/shortcut/ShortcutPlugin.cy.js
@@ -1,10 +1,10 @@
-beforeEach(() => { cy.doAdministratorLogin(); });
-afterEach(() => {
-  cy.task('queryDB', "DELETE FROM #__banners WHERE name = 'Test banner'");
-  cy.task('queryDB', "DELETE FROM #__contact_details WHERE name = 'Test contact'");
-});
-
 describe('Test that the shortcut system plugin', () => {
+  beforeEach(() => cy.doAdministratorLogin());
+  afterEach(() => {
+    cy.task('queryDB', "DELETE FROM #__banners WHERE name = 'Test banner'");
+    cy.task('queryDB', "DELETE FROM #__contact_details WHERE name = 'Test contact'");
+  });
+
   it('can save (apply) edit form', () => {
     cy.visit('/administrator/index.php?option=com_banners&task=banner.add');
     cy.get('#jform_name').clear().type('Test banner').blur();
diff --git a/tests/System/integration/plugins/system/tasknotification/TaskNotification.cy.js b/tests/System/integration/plugins/system/tasknotification/TaskNotification.cy.js
index 0f7b56f7a713f..94ec2cde0a9a8 100644
--- a/tests/System/integration/plugins/system/tasknotification/TaskNotification.cy.js
+++ b/tests/System/integration/plugins/system/tasknotification/TaskNotification.cy.js
@@ -35,15 +35,15 @@ describe('Test that the task notification system plugin', () => {
       });
       cy.get('joomla-dialog[type="inline"]').should('be.visible');
       cy.get('joomla-dialog[type="inline"]').within(() => {
-        cy.get('header.joomla-dialog-header').should('contain', `Test task (ID: ${task.id})`);
+        cy.get('header.joomla-dialog-header').should('contain', `Run Task (ID: ${task.id})`);
         cy.get('div.scheduler-status').should('contain', 'Status: Completed');
       });
       cy.task('getMails').then((mails) => {
         cy.wrap(mails).should('have.lengthOf', 1);
         cy.wrap(mails[0].body).should('have.string', `Scheduled Task#${task.id}, Test task, has been successfully executed`);
         cy.wrap(mails[0].headers.subject).should('have.string', 'Task Successful');
-        cy.wrap(mails[0].headers.from).should('equal', `"${Cypress.env('sitename')}" <${Cypress.env('email')}>`);
-        cy.wrap(mails[0].headers.to).should('equal', Cypress.env('email'));
+        cy.wrap(mails[0].headers.from).should('equal', `"${Cypress.expose('sitename')}" <${Cypress.expose('email')}>`);
+        cy.wrap(mails[0].headers.to).should('equal', Cypress.expose('email'));
       });
     });
   });
@@ -70,7 +70,7 @@ describe('Test that the task notification system plugin', () => {
       });
       cy.get('joomla-dialog[type="inline"]').should('be.visible');
       cy.get('joomla-dialog[type="inline"]').within(() => {
-        cy.get('header.joomla-dialog-header').should('contain', `Test task (ID: ${task.id})`);
+        cy.get('header.joomla-dialog-header').should('contain', `Run Task (ID: ${task.id})`);
         cy.get('div.scheduler-status').should('contain', 'Status: Completed');
       });
       cy.task('getMails').then((mails) => {
@@ -78,8 +78,8 @@ describe('Test that the task notification system plugin', () => {
         cy.wrap(mails[0].body).should('have.string', `Scheduled Task#${task.id}, Test task, has failed with exit code 5`);
         cy.wrap(mails[0].attachments).should('have.lengthOf', 1);
         cy.wrap(mails[0].headers.subject).should('have.string', 'Task Failure');
-        cy.wrap(mails[0].headers.from).should('equal', `"${Cypress.env('sitename')}" <${Cypress.env('email')}>`);
-        cy.wrap(mails[0].headers.to).should('equal', Cypress.env('email'));
+        cy.wrap(mails[0].headers.from).should('equal', `"${Cypress.expose('sitename')}" <${Cypress.expose('email')}>`);
+        cy.wrap(mails[0].headers.to).should('equal', Cypress.expose('email'));
       });
     });
   });
diff --git a/tests/System/integration/plugins/system/webauthn/WebauthnPlugin.cy.js b/tests/System/integration/plugins/system/webauthn/WebauthnPlugin.cy.js
new file mode 100644
index 0000000000000..bb2676da17ae4
--- /dev/null
+++ b/tests/System/integration/plugins/system/webauthn/WebauthnPlugin.cy.js
@@ -0,0 +1,92 @@
+describe('Test that the webauthn system plugin', { browser: '!firefox' }, () => {
+  beforeEach(() => {
+    Cypress.automation('remote:debugger:protocol', { command: 'WebAuthn.enable', params: {} }).then(() => {
+      Cypress.automation('remote:debugger:protocol', {
+        command: 'WebAuthn.addVirtualAuthenticator',
+        params: {
+          options: {
+            protocol: 'ctap2', transport: 'internal', hasResidentKey: true, hasUserVerification: true, isUserVerified: true,
+          },
+        },
+      });
+    });
+  });
+  afterEach(() => {
+    cy.db_updateExtensionParameter('attestationSupport', '0', 'plg_system_webauthn');
+    Cypress.automation('remote:debugger:protocol', { command: 'WebAuthn.disable', params: {} });
+  });
+
+  it('can use passkeys in frontend', () => {
+    cy.doFrontendLogin();
+    cy.visit('/index.php?option=com_users&view=profile');
+    cy.get('#users-profile-custom-webauthn').contains('Passkey Login');
+    cy.get('.com-users-profile__edit.btn-toolbar').contains('Edit Profile').click();
+    cy.get('#plg_system_webauthn-manage-add').click();
+    cy.get('#plg_system_webauthn-management-interface table tbody tr').contains('Generic Passkey');
+    cy.get('.plg_system_webauthn-manage-edit').contains('Edit Name').click();
+    cy.get('.webauthnManagementEditorRow input').clear().type('Test Passkey');
+    cy.get('.webauthnManagementEditorRow button').contains('Save').click();
+    cy.doFrontendLogout();
+    cy.db_updateExtensionParameter('attestationSupport', '1', 'plg_system_webauthn');
+    cy.visit('index.php?option=com_users&view=login');
+    cy.get('form.mod-login input[name="username"]').type(Cypress.expose('username'));
+    cy.get('.mod-login .plg_system_webauthn_login_button').contains('Sign in with a passkey').click();
+    cy.get('.mod-login-logout button[type=submit]').should('exist').should('contain', 'Log out');
+    cy.visit('/index.php?option=com_users&view=profile');
+    cy.get('.com-users-profile__edit.btn-toolbar').contains('Edit Profile').click();
+    cy.get('#plg_system_webauthn-management-interface table img').should('be.visible');
+    cy.get('.plg_system_webauthn-manage-delete').contains('Remove').click();
+    cy.get('.plg_system_webauthn-manage-delete').should('not.exist');
+  });
+
+  it('can use passkeys in backend', () => {
+    cy.doAdministratorLogin(null, null, false);
+    cy.visit('/administrator/index.php?option=com_users&view=users');
+    cy.get('.header-profile:visible').click();
+    cy.get('.header-profile a.dropdown-item').contains('Edit Account').click();
+    cy.get('#myTab div[role="tablist"] button[aria-controls="attrib-webauthn"]').contains('Passkey Login').click();
+    cy.get('#plg_system_webauthn-manage-add').click();
+    cy.get('#plg_system_webauthn-management-interface table tbody tr').contains('Generic Passkey');
+    cy.get('.plg_system_webauthn-manage-edit').contains('Edit Name').click();
+    cy.get('.webauthnManagementEditorRow input').clear().type('Test Passkey');
+    cy.get('.webauthnManagementEditorRow button').contains('Save').click();
+    cy.clickToolbarButton('Cancel');
+    cy.doAdministratorLogout();
+    cy.db_updateExtensionParameter('attestationSupport', '1', 'plg_system_webauthn');
+    cy.get('#mod-login-username').type(Cypress.expose('username'));
+    cy.get('#form-login .plg_system_webauthn_login_button').contains('Sign in with a passkey').click();
+    cy.get('h1.page-title').should('contain', 'Home Dashboard');
+    cy.visit('/administrator/index.php?option=com_users&view=users');
+    cy.get('.header-profile:visible').click();
+    cy.get('.header-profile a.dropdown-item').contains('Edit Account').click();
+    cy.get('#myTab div[role="tablist"] button[aria-controls="attrib-webauthn"]').contains('Passkey Login').click();
+    cy.get('#plg_system_webauthn-management-interface table img').should('be.visible');
+    cy.get('.plg_system_webauthn-manage-delete').contains('Remove').click();
+    cy.get('.plg_system_webauthn-manage-delete').should('not.exist');
+  });
+
+  it('can delete passkeys when the user is deleted', () => {
+    let webauthnCredentials;
+    cy.db_createUser({ name: 'test user', email: 'test@example.com' });
+    cy.doFrontendLogin('test', 'test', null);
+    cy.visit('/index.php?option=com_users&view=profile');
+    cy.get('#users-profile-custom-webauthn').contains('Passkey Login');
+    cy.get('.com-users-profile__edit.btn-toolbar').contains('Edit Profile').click();
+    cy.get('#plg_system_webauthn-manage-add').click();
+    cy.get('#plg_system_webauthn-management-interface table tbody tr').contains('Generic Passkey');
+    cy.task('queryDB', 'SELECT * FROM #__webauthn_credentials').then((data) => {
+      webauthnCredentials = data.length;
+    });
+    cy.doAdministratorLogin();
+    cy.visit('/administrator/index.php?option=com_users&view=users');
+    cy.searchForItem('test user');
+    cy.checkAllResults();
+    cy.clickToolbarButton('Action');
+    cy.contains('Delete').click();
+    cy.clickDialogConfirm(true);
+    cy.checkForSystemMessage('User deleted.');
+    cy.task('queryDB', 'SELECT * FROM #__webauthn_credentials').then((data) => {
+      expect(data.length).to.eq(webauthnCredentials - 1);
+    });
+  });
+});
diff --git a/tests/System/integration/site/components/com_config/Config.cy.js b/tests/System/integration/site/components/com_config/Config.cy.js
index b69209aa1b4b5..66a960819d46a 100644
--- a/tests/System/integration/site/components/com_config/Config.cy.js
+++ b/tests/System/integration/site/components/com_config/Config.cy.js
@@ -8,7 +8,7 @@ describe('Test in frontend that the config config view', () => {
     cy.get('#application-form button[data-submit-task="config.apply"]').click();
 
     cy.checkForSystemMessage('Configuration saved.');
-    cy.title().should('equal', `Home - ${Cypress.env('sitename')}`);
+    cy.title().should('equal', `Home - ${Cypress.expose('sitename')}`);
     cy.get('#jform_sitename_pagetitles').select('No');
     cy.get('#application-form button[data-submit-task="config.apply"]').click();
 
diff --git a/tests/System/integration/site/components/com_content/CustomFields.cy.js b/tests/System/integration/site/components/com_content/CustomFields.cy.js
index 65781f03b29d2..473985932efa7 100644
--- a/tests/System/integration/site/components/com_content/CustomFields.cy.js
+++ b/tests/System/integration/site/components/com_content/CustomFields.cy.js
@@ -9,7 +9,7 @@ describe('Test in frontend that the content component with custom fields', () =>
       value: value,
     });
   };
-  
+
   const visitContentFrontend = () => {
     cy.visit(`/index.php?option=com_content&view=article&id=${article.id}&catid=${article.catid}`);
   };
@@ -18,7 +18,7 @@ describe('Test in frontend that the content component with custom fields', () =>
     return cy.db_createField({
       context: 'com_content.article',
       group_id: fieldGroupId,
-      ...fieldOptions
+      ...fieldOptions,
     }).then((fieldId) => insertFieldValue(fieldId, value));
   };
 
@@ -28,7 +28,7 @@ describe('Test in frontend that the content component with custom fields', () =>
       article = createdArticle;
       return cy.db_createFieldGroup({
         title: 'Test Field Group Frontend',
-        context: 'com_content.article'
+        context: 'com_content.article',
       });
     }).then((id) => {
       fieldGroupId = id;
@@ -44,7 +44,7 @@ describe('Test in frontend that the content component with custom fields', () =>
   it('displays a custom text field value', () => {
     createFieldWithValue(
       { title: 'Test Text Field', name: 'test-text-field-frontend', type: 'text' },
-      'My custom text value'
+      'My custom text value',
     ).then(() => {
       visitContentFrontend();
       cy.contains('My custom text value').should('be.visible');
@@ -54,7 +54,7 @@ describe('Test in frontend that the content component with custom fields', () =>
   it('does not display an unpublished field', () => {
     createFieldWithValue(
       { title: 'Unpublished Field', name: 'unpublished-field-frontend', type: 'text', state: 0 },
-      'This is a secret'
+      'This is a secret',
     ).then(() => {
       visitContentFrontend();
       cy.contains('This is a secret').should('not.exist');
@@ -68,9 +68,9 @@ describe('Test in frontend that the content component with custom fields', () =>
         label: 'Hidden Label Field',
         name: 'hidden-label-field-frontend',
         type: 'text',
-        params: JSON.stringify({ showlabel: "0" })
+        params: JSON.stringify({ showlabel: '0' }),
       },
-      'Value with a hidden label'
+      'Value with a hidden label',
     ).then(() => {
       visitContentFrontend();
       cy.contains('Hidden Label Field').should('not.exist');
@@ -81,9 +81,9 @@ describe('Test in frontend that the content component with custom fields', () =>
   it('applies a custom display class to the field container', () => {
     createFieldWithValue(
       { title: 'Render Class Field', name: 'render-class-field', type: 'text',
-        params: JSON.stringify({ render_class: 'my-custom-class' })
+        params: JSON.stringify({ render_class: 'my-custom-class' }),
       },
-      'This field has a custom class'
+      'This field has a custom class',
     ).then(() => {
       visitContentFrontend();
       cy.get('.my-custom-class')
@@ -95,9 +95,9 @@ describe('Test in frontend that the content component with custom fields', () =>
   it('applies a custom value class to the field value', () => {
     createFieldWithValue(
       { title: 'Render Class Field', name: 'render-class-field', type: 'text',
-        params: JSON.stringify({ value_render_class: 'my-custom-class' })
+        params: JSON.stringify({ value_render_class: 'my-custom-class' }),
       },
-      'This field has a custom class'
+      'This field has a custom class',
     ).then(() => {
       visitContentFrontend();
       cy.get('.my-custom-class')
@@ -109,9 +109,9 @@ describe('Test in frontend that the content component with custom fields', () =>
   it('displays a prefix and suffix around the value', () => {
     createFieldWithValue(
       { title: 'Prefix Suffix Field', name: 'prefix-suffix-field', type: 'text',
-        params: JSON.stringify({ prefix: 'Before...', suffix: '...After' })
+        params: JSON.stringify({ prefix: 'Before...', suffix: '...After' }),
       },
-      'the value'
+      'the value',
     ).then(() => {
       visitContentFrontend();
       cy.contains('Before... the value ...After').should('be.visible');
diff --git a/tests/System/integration/site/components/com_privacy/Request.cy.js b/tests/System/integration/site/components/com_privacy/Request.cy.js
index f4122ab668c11..7df11653e78b6 100644
--- a/tests/System/integration/site/components/com_privacy/Request.cy.js
+++ b/tests/System/integration/site/components/com_privacy/Request.cy.js
@@ -13,8 +13,8 @@ describe('Test in frontend that the privacy request view', () => {
     cy.task('getMails').then((mails) => {
       cy.get('.alert-message').should('contain.text', 'Your information request has been created. Before it can be processed, you must verify this request. An email has been sent to your address with additional instructions to complete this verification.');
       expect(mails.length).to.equal(2);
-      cy.wrap(mails[0].sender).should('equal', Cypress.env('email'));
-      cy.wrap(mails[0].body).should('have.string', `A new information request has been submitted by ${Cypress.env('email')}.`);
+      cy.wrap(mails[0].sender).should('equal', Cypress.expose('email'));
+      cy.wrap(mails[0].body).should('have.string', `A new information request has been submitted by ${Cypress.expose('email')}.`);
       cy.wrap(mails[1].body).should('have.string', 'Someone has created a request to export all personal information related to this email address at ');
     });
   });
@@ -30,8 +30,8 @@ describe('Test in frontend that the privacy request view', () => {
         cy.task('getMails').then((mails) => {
           cy.get('.alert-message').should('contain.text', 'Your information request has been created. Before it can be processed, you must verify this request. An email has been sent to your address with additional instructions to complete this verification.');
           expect(mails.length).to.equal(2);
-          cy.wrap(mails[0].sender).should('equal', Cypress.env('email'));
-          cy.wrap(mails[0].body).should('have.string', `A new information request has been submitted by ${Cypress.env('email')}.`);
+          cy.wrap(mails[0].sender).should('equal', Cypress.expose('email'));
+          cy.wrap(mails[0].body).should('have.string', `A new information request has been submitted by ${Cypress.expose('email')}.`);
           cy.wrap(mails[1].body).should('have.string', 'Someone has created a request to export all personal information related to this email address at ');
         });
       });
@@ -45,8 +45,8 @@ describe('Test in frontend that the privacy request view', () => {
     cy.task('getMails').then((mails) => {
       cy.get('.alert-message').should('contain.text', 'Your information request has been created. Before it can be processed, you must verify this request. An email has been sent to your address with additional instructions to complete this verification.');
       expect(mails.length).to.equal(2);
-      cy.wrap(mails[0].sender).should('equal', Cypress.env('email'));
-      cy.wrap(mails[0].body).should('have.string', `A new information request has been submitted by ${Cypress.env('email')}.`);
+      cy.wrap(mails[0].sender).should('equal', Cypress.expose('email'));
+      cy.wrap(mails[0].body).should('have.string', `A new information request has been submitted by ${Cypress.expose('email')}.`);
       cy.wrap(mails[1].body).should('have.string', 'Someone has created a request to remove all personal information related to this email address at ');
     });
   });
@@ -62,8 +62,8 @@ describe('Test in frontend that the privacy request view', () => {
         cy.task('getMails').then((mails) => {
           cy.get('.alert-message').should('contain.text', 'Your information request has been created. Before it can be processed, you must verify this request. An email has been sent to your address with additional instructions to complete this verification.');
           expect(mails.length).to.equal(2);
-          cy.wrap(mails[0].sender).should('equal', Cypress.env('email'));
-          cy.wrap(mails[0].body).should('have.string', `A new information request has been submitted by ${Cypress.env('email')}.`);
+          cy.wrap(mails[0].sender).should('equal', Cypress.expose('email'));
+          cy.wrap(mails[0].body).should('have.string', `A new information request has been submitted by ${Cypress.expose('email')}.`);
           cy.wrap(mails[1].body).should('have.string', 'Someone has created a request to remove all personal information related to this email address at ');
         });
       });
diff --git a/tests/System/integration/site/components/com_users/Logout.cy.js b/tests/System/integration/site/components/com_users/Logout.cy.js
index 80221ff1fa908..e906aeff4ca31 100644
--- a/tests/System/integration/site/components/com_users/Logout.cy.js
+++ b/tests/System/integration/site/components/com_users/Logout.cy.js
@@ -4,7 +4,7 @@ describe('Test in frontend that the users logout view', () => {
     cy.doFrontendLogin(null, null, false);
     cy.visit('/index.php?option=com_users&view=login&layout=logout&task=user.menulogout');
 
-    cy.contains(`Hi ${Cypress.env('name')}`).should('not.exist');
+    cy.contains(`Hi ${Cypress.expose('name')}`).should('not.exist');
     // This is disabled for now as it looks like cypress has an issue after redirect with the session
     // cy.checkForSystemMessage('You have been logged out.');
   });
@@ -17,7 +17,7 @@ describe('Test in frontend that the users logout view', () => {
         cy.visit('/');
         cy.get('a:contains(Automated logout)').click();
 
-        cy.contains(`Hi ${Cypress.env('name')}`).should('not.exist');
+        cy.contains(`Hi ${Cypress.expose('name')}`).should('not.exist');
         cy.checkForSystemMessage('You have been logged out.');
       });
   });
diff --git a/tests/System/integration/site/components/com_users/Mfa.cy.js b/tests/System/integration/site/components/com_users/Mfa.cy.js
index 7712d712ab4d0..6aea42da0097b 100644
--- a/tests/System/integration/site/components/com_users/Mfa.cy.js
+++ b/tests/System/integration/site/components/com_users/Mfa.cy.js
@@ -20,8 +20,8 @@ describe('Test in frontend that the user', () => {
     cy.get('#com-users-method-edit').submit();
     cy.get('.com-users-methods-list-method-name-email .com-users-methods-list-method-record').contains('Test Code');
     cy.doFrontendLogout();
-    cy.get('form.mod-login input[name="username"]').type(Cypress.env('username'));
-    cy.get('form.mod-login input[name="password"]').type(Cypress.env('password'));
+    cy.get('form.mod-login input[name="username"]').type(Cypress.expose('username'));
+    cy.get('form.mod-login input[name="password"]').type(Cypress.expose('password'));
     cy.get('form.mod-login').submit();
     cy.get('#users-mfa-title').contains('Test Code');
     cy.task('getMails').then((mails) => {
@@ -53,8 +53,8 @@ describe('Test in frontend that the user', () => {
     cy.get('#com-users-method-edit').submit();
     cy.get('.com-users-methods-list-method-name-totp .com-users-methods-list-method-record').contains('Test Code');
     cy.doFrontendLogout();
-    cy.get('form.mod-login input[name="username"]').type(Cypress.env('username'));
-    cy.get('form.mod-login input[name="password"]').type(Cypress.env('password'));
+    cy.get('form.mod-login input[name="username"]').type(Cypress.expose('username'));
+    cy.get('form.mod-login input[name="password"]').type(Cypress.expose('password'));
     cy.get('form.mod-login').submit();
     cy.get('#users-mfa-title').contains('Verification code');
     cy.get('@secret').then((secret) => cy.get('#users-mfa-code').clear().type(TOTP.generate(secret).otp));
@@ -84,8 +84,8 @@ describe('Test in frontend that the user', () => {
     cy.get('#com-users-method-edit button.multifactorauth_webauthn_setup').click();
     cy.get('.com-users-methods-list-method-name-webauthn .com-users-methods-list-method-record').contains('Test Passkey');
     cy.doFrontendLogout();
-    cy.get('form.mod-login input[name="username"]').type(Cypress.env('username'));
-    cy.get('form.mod-login input[name="password"]').type(Cypress.env('password'));
+    cy.get('form.mod-login input[name="username"]').type(Cypress.expose('username'));
+    cy.get('form.mod-login input[name="password"]').type(Cypress.expose('password'));
     cy.get('form.mod-login').submit();
     cy.get('#users-mfa-title').contains('Passkey');
     cy.get('#users-mfa-captive-button-submit').click();
@@ -116,8 +116,8 @@ describe('Test in frontend that the user', () => {
       .click();
     cy.get('table > tbody > tr > td').first().invoke('text').then((code) => cy.wrap(/\d{8}/.exec(code)[0]).as('code'));
     cy.doFrontendLogout();
-    cy.get('form.mod-login input[name="username"]').type(Cypress.env('username'));
-    cy.get('form.mod-login input[name="password"]').type(Cypress.env('password'));
+    cy.get('form.mod-login input[name="username"]').type(Cypress.expose('username'));
+    cy.get('form.mod-login input[name="password"]').type(Cypress.expose('password'));
     cy.get('form.mod-login').submit();
     cy.get('#users-mfa-title').contains('Verification code');
     cy.get('#users-mfa-captive-form-choose-another a').click();
diff --git a/tests/System/integration/site/components/com_users/Registration.cy.js b/tests/System/integration/site/components/com_users/Registration.cy.js
index c48405cd519c6..44fc95b310487 100644
--- a/tests/System/integration/site/components/com_users/Registration.cy.js
+++ b/tests/System/integration/site/components/com_users/Registration.cy.js
@@ -15,17 +15,17 @@ describe('Test in frontend that the users registration view', () => {
     cy.get('.com-users-registration__form').should('contain.text', 'User Registration');
     cy.get('#jform_name').clear().type('test user');
     cy.get('#jform_username').clear().type('testuser');
-    cy.get('#jform_password1').clear().type(`${Cypress.env('password')}-test`);
-    cy.get('#jform_password2').clear().type(`${Cypress.env('password')}-test`);
+    cy.get('#jform_password1').clear().type(`${Cypress.expose('password')}-test`);
+    cy.get('#jform_password2').clear().type(`${Cypress.expose('password')}-test`);
     cy.get('#jform_email1').clear().type('testuser@example.com');
     cy.get('#member-registration').submit();
     cy.checkForSystemMessage('Your account has been created and a verification link has been sent to the email address you entered.');
 
     cy.task('getMails').then((mails) => {
       cy.wrap(mails).should('have.lengthOf', 1);
-      cy.wrap(mails[0].headers.subject).should('have.string', `Account Details for test user at ${Cypress.env('sitename')}`);
+      cy.wrap(mails[0].headers.subject).should('have.string', `Account Details for test user at ${Cypress.expose('sitename')}`);
       cy.wrap(mails[0].headers.to).should('equal', 'testuser@example.com');
-      cy.wrap(mails[0].body).should('have.string', `Hello test user,\n\nThank you for registering at ${Cypress.env('sitename')}.`);
+      cy.wrap(mails[0].body).should('have.string', `Hello test user,\n\nThank you for registering at ${Cypress.expose('sitename')}.`);
       cy.wrap(mails[0].body).should('match', /http\S+\?task=registration\.activate&token=[a-z0-9]+/);
       cy.wrap(/http\S+\?task=registration\.activate&token=[a-z0-9]+/.exec(mails[0].body)[0]).as('activatelink');
       cy.wrap(mails[0].html).should('be.false');
@@ -35,9 +35,9 @@ describe('Test in frontend that the users registration view', () => {
 
     cy.task('getMails').then((mails) => {
       cy.wrap(mails).should('have.lengthOf', 2);
-      cy.wrap(mails[1].headers.subject).should('have.string', `Registration approval required for account of test user at ${Cypress.env('sitename')}`);
-      cy.wrap(mails[1].headers.to).should('equal', Cypress.env('email'));
-      cy.wrap(mails[1].body).should('have.string', `Hello administrator,\n\nA new user has registered at ${Cypress.env('sitename')}.`);
+      cy.wrap(mails[1].headers.subject).should('have.string', `Registration approval required for account of test user at ${Cypress.expose('sitename')}`);
+      cy.wrap(mails[1].headers.to).should('equal', Cypress.expose('email'));
+      cy.wrap(mails[1].body).should('have.string', `Hello administrator,\n\nA new user has registered at ${Cypress.expose('sitename')}.`);
       cy.wrap(mails[1].body).should('have.string', 'Name :  test user');
       cy.wrap(mails[1].body).should('have.string', 'email:  testuser@example.com');
       cy.wrap(mails[1].body).should('have.string', 'Username:  testuser');
@@ -54,12 +54,12 @@ describe('Test in frontend that the users registration view', () => {
     cy.doFrontendLogout();
     cy.task('getMails').then((mails) => {
       cy.wrap(mails).should('have.lengthOf', 3);
-      cy.wrap(mails[2].headers.subject).should('have.string', `Account activated for test user at ${Cypress.env('sitename')}`);
+      cy.wrap(mails[2].headers.subject).should('have.string', `Account activated for test user at ${Cypress.expose('sitename')}`);
       cy.wrap(mails[2].headers.to).should('equal', 'testuser@example.com');
       cy.wrap(mails[2].body).should('have.string', 'Hello test user,\n\nYour account has been activated by an administrator.');
       cy.wrap(mails[2].html).should('be.false');
     });
-    cy.doFrontendLogin('testuser', `${Cypress.env('password')}-test`);
+    cy.doFrontendLogin('testuser', `${Cypress.expose('password')}-test`);
     cy.doFrontendLogout();
   });
 
diff --git a/tests/System/integration/site/components/com_users/Remind.cy.js b/tests/System/integration/site/components/com_users/Remind.cy.js
index 1d73bb3c6ab4a..0f43b6ae799b5 100644
--- a/tests/System/integration/site/components/com_users/Remind.cy.js
+++ b/tests/System/integration/site/components/com_users/Remind.cy.js
@@ -14,7 +14,7 @@ describe('Test in frontend that the users remind view', () => {
           expect(mails.length).to.equal(1);
           cy.wrap(mails[0].body).should('have.string', 'A username reminder has been requested');
           cy.wrap(mails[0].body).should('have.string', '/component/users/login');
-          cy.wrap(mails[0].sender).should('equal', Cypress.env('email'));
+          cy.wrap(mails[0].sender).should('equal', Cypress.expose('email'));
           cy.wrap(mails[0].receivers).should('have.property', 'test@example.com');
         });
       });
diff --git a/tests/System/integration/site/components/com_users/Reset.cy.js b/tests/System/integration/site/components/com_users/Reset.cy.js
index 1bf4610f07ac2..ea987bc69a6ff 100644
--- a/tests/System/integration/site/components/com_users/Reset.cy.js
+++ b/tests/System/integration/site/components/com_users/Reset.cy.js
@@ -14,7 +14,7 @@ describe('Test in frontend that the users reset view', () => {
           expect(mails.length).to.equal(1);
           cy.wrap(mails[0].body).should('have.string', 'To reset your password, you will need to submit this verification code');
           cy.wrap(mails[0].body).should('have.string', '/component/users/reset');
-          cy.wrap(mails[0].sender).should('equal', Cypress.env('email'));
+          cy.wrap(mails[0].sender).should('equal', Cypress.expose('email'));
           cy.wrap(mails[0].receivers).should('have.property', 'test@example.com');
         });
       });
@@ -37,7 +37,7 @@ describe('Test in frontend that the users reset view', () => {
           expect(mails.length).to.equal(1);
           cy.wrap(mails[0].body).should('have.string', 'To reset your password, you will need to submit this verification code');
           cy.wrap(mails[0].body).should('have.string', '/test-reset');
-          cy.wrap(mails[0].sender).should('equal', Cypress.env('email'));
+          cy.wrap(mails[0].sender).should('equal', Cypress.expose('email'));
           cy.wrap(mails[0].receivers).should('have.property', 'test@example.com');
         });
       });
diff --git a/tests/System/plugins/db.mjs b/tests/System/plugins/db.mjs
index e8bdcbff02f00..e57200820ebf1 100644
--- a/tests/System/plugins/db.mjs
+++ b/tests/System/plugins/db.mjs
@@ -18,7 +18,7 @@ let postgresConnectionPool = null;
  */
 function queryTestDB(joomlaQuery, config) {
   // Substitute the joomla table prefix
-  let query = joomlaQuery.replaceAll('#__', config.env.db_prefix);
+  let query = joomlaQuery.replaceAll('#__', config.expose.db_prefix);
 
   // Parse the table name
   const tableNameOfInsert = query.match(/insert\s+into\s+(.*?)\s/i);
@@ -35,9 +35,9 @@ function queryTestDB(joomlaQuery, config) {
   }
 
   // Do we use PostgreSQL?
-  if (config.env.db_type === 'pgsql' || config.env.db_type === 'PostgreSQL (PDO)') {
+  if (config.expose.db_type === 'pgsql' || config.expose.db_type === 'PostgreSQL (PDO)') {
     if (postgresConnectionPool === null) {
-      let hostOrUnixPath = config.env.db_host;
+      let hostOrUnixPath = config.expose.db_host;
 
       /* Verify if the connection is a Unix socket by checking for the "unix:/" prefix.
        * PostgreSQL JS driver does not support this prefix, so it must be removed.
@@ -51,10 +51,10 @@ function queryTestDB(joomlaQuery, config) {
       // Initialisation on the first call
       postgresConnectionPool = new Pool({
         host: hostOrUnixPath,
-        port: config.env.db_port,
-        database: config.env.db_name,
-        user: config.env.db_user,
-        password: config.env.db_password,
+        port: config.expose.db_port,
+        database: config.expose.db_name,
+        user: config.expose.db_user,
+        password: config.expose.db_password,
         max: 10, // Use only this (unchanged default) maximum number of connections in the pool
       });
     }
@@ -98,23 +98,23 @@ function queryTestDB(joomlaQuery, config) {
      * MariaDB and MySQL JS drivers do not support this prefix, so it must be removed.
      * We standardise the use of this prefix with the PHP driver by handling it here.
      */
-    if (config.env.db_host.startsWith('unix:/')) {
+    if (config.expose.db_host.startsWith('unix:/')) {
       // If the host is a Unix socket, extract the socket path
       connectionConfig = {
         // e.g. 'unix:/var/run/mysqld/mysqld.sock' -> '/var/run/mysqld/mysqld.sock'
-        socketPath: config.env.db_host.replace('unix:', ''),
-        user: config.env.db_user,
-        password: config.env.db_password,
-        database: config.env.db_name,
+        socketPath: config.expose.db_host.replace('unix:', ''),
+        user: config.expose.db_user,
+        password: config.expose.db_password,
+        database: config.expose.db_name,
       };
     } else {
       // Otherwise, use regular TCP host connection settings
       connectionConfig = {
-        host: config.env.db_host,
-        port: config.env.db_port,
-        user: config.env.db_user,
-        password: config.env.db_password,
-        database: config.env.db_name,
+        host: config.expose.db_host,
+        port: config.expose.db_port,
+        user: config.expose.db_user,
+        password: config.expose.db_password,
+        database: config.expose.db_name,
       };
     }
 
@@ -162,18 +162,18 @@ function deleteInsertedItems(config) {
     // Delete the items from the database
     promises.push(queryTestDB(`DELETE FROM ${item.table} WHERE id IN (${item.rows.join(',')})`, config).then(() => {
       // Cleanup some tables we do not have control over from inserted items
-      if (item.table === `${config.env.db_prefix}users`) {
+      if (item.table === `${config.expose.db_prefix}users`) {
         promises.push(queryTestDB(`DELETE FROM #__user_usergroup_map WHERE user_id IN (${item.rows.join(',')})`, config));
         promises.push(queryTestDB(`DELETE FROM #__user_profiles WHERE user_id IN (${item.rows.join(',')})`, config));
         promises.push(queryTestDB(`DELETE FROM #__session WHERE userid IN (${item.rows.join(',')})`, config));
       }
 
-      if (item.table === `${config.env.db_prefix}content`) {
+      if (item.table === `${config.expose.db_prefix}content`) {
         promises.push(queryTestDB(`DELETE FROM #__content_frontpage WHERE content_id IN (${item.rows.join(',')})`, config));
         promises.push(queryTestDB(`DELETE FROM #__workflow_associations WHERE item_id IN (${item.rows.join(',')}) AND extension = 'com_content.article'`, config));
       }
 
-      if (item.table === `${config.env.db_prefix}modules`) {
+      if (item.table === `${config.expose.db_prefix}modules`) {
         promises.push(queryTestDB(`DELETE FROM #__modules_menu WHERE moduleid IN (${item.rows.join(',')})`, config));
       }
     }));
diff --git a/tests/System/plugins/fs.mjs b/tests/System/plugins/fs.mjs
index b7304c4af5b35..ff53f248fba98 100644
--- a/tests/System/plugins/fs.mjs
+++ b/tests/System/plugins/fs.mjs
@@ -15,7 +15,7 @@ import { umask } from 'node:process';
  * @returns null
  */
 function deleteRelativePath(relativePath, config) {
-  const fullPath = join(config.env.cmsPath, relativePath);
+  const fullPath = join(config.expose.cmsPath, relativePath);
   rmSync(fullPath, { recursive: true, force: true });
 
   return null;
@@ -38,7 +38,7 @@ function deleteRelativePath(relativePath, config) {
 function writeRelativeFile(relativePath, content, config, mode = 0o444) {
   return new Promise((resolve, reject) => {
     try {
-      const fullPath = join(config.env.cmsPath, relativePath);
+      const fullPath = join(config.expose.cmsPath, relativePath);
       // Prologue: Reset process file mode creation mask to ensure the umask value is not subtracted
       const oldmask = umask(0);
       // Create missing parent directories with 'rwxrwxrwx'
@@ -73,8 +73,8 @@ function writeRelativeFile(relativePath, content, config, mode = 0o444) {
  * @returns null
  */
 function copyRelativeFile(source, destination, config) {
-  const fullSource = join(config.env.cmsPath, source);
-  const fullDestination = join(config.env.cmsPath, destination);
+  const fullSource = join(config.expose.cmsPath, source);
+  const fullDestination = join(config.expose.cmsPath, destination);
 
   copyFileSync(fullSource, fullDestination);
 
diff --git a/tests/System/plugins/logs.mjs b/tests/System/plugins/logs.mjs
index dd69be37b2048..ea77052f068d6 100644
--- a/tests/System/plugins/logs.mjs
+++ b/tests/System/plugins/logs.mjs
@@ -8,7 +8,7 @@ import { existsSync, readFileSync, writeFileSync } from 'node:fs';
  * @returns null
  */
 function checkForLogs(config) {
-  const { logFile } = config.env;
+  const { logFile } = config.expose;
   if (!existsSync(logFile)) {
     return null;
   }
@@ -29,7 +29,7 @@ function checkForLogs(config) {
  * @returns null
  */
 function clearLogs(config) {
-  const { logFile } = config.env;
+  const { logFile } = config.expose;
   if (!existsSync(logFile)) {
     return null;
   }
diff --git a/tests/System/plugins/mail.mjs b/tests/System/plugins/mail.mjs
index ab4f4e3f9b3c2..0083f3c4491eb 100644
--- a/tests/System/plugins/mail.mjs
+++ b/tests/System/plugins/mail.mjs
@@ -19,10 +19,10 @@ async function getMails() {
     }
 
     // Sleep for a second
-    await new Promise((r) => { setTimeout(r, 1000); });
+    await new Promise((r) => setTimeout(r, 1000));
   }
 
-  return new Promise((resolve) => { resolve(cachedMails); });
+  return new Promise((resolve) => resolve(cachedMails));
 }
 
 /**
@@ -48,7 +48,7 @@ function startMailServer(config) {
   }
 
   // Start the mail server on the configured port
-  mailServer = mailTester.init(config.env.smtp_port);
+  mailServer = mailTester.init(config.expose.smtp_port);
 
   // Uncomment the next line when you want to see the incoming mails while writing the tests
   // mailServer.module('logAll');
diff --git a/tests/System/support/commands/config.mjs b/tests/System/support/commands/config.mjs
index e9d51de635fac..d86bc030cf08f 100644
--- a/tests/System/support/commands/config.mjs
+++ b/tests/System/support/commands/config.mjs
@@ -1,5 +1,5 @@
 Cypress.Commands.add('config_setParameter', (parameter, value) => {
-  const configPath = `${Cypress.env('cmsPath')}/configuration.php`;
+  const configPath = `${Cypress.expose('cmsPath')}/configuration.php`;
 
   // Return a Cypress chainable for chaining
   return cy.readFile(configPath).then((fileContent) => {
diff --git a/tests/System/support/commands/db.mjs b/tests/System/support/commands/db.mjs
index c30e92958f582..0cac699a380f3 100644
--- a/tests/System/support/commands/db.mjs
+++ b/tests/System/support/commands/db.mjs
@@ -700,7 +700,7 @@ Cypress.Commands.add('db_enableExtension', (value, extension) => cy.task('queryD
  * @returns integer
  */
 Cypress.Commands.add('db_getUserId', () => {
-  cy.task('queryDB', `SELECT id FROM #__users WHERE username = '${Cypress.env('username')}'`)
+  cy.task('queryDB', `SELECT id FROM #__users WHERE username = '${Cypress.expose('username')}'`)
     .then((id) => {
       if (id.length === 0) {
         return 0;
diff --git a/tests/System/support/index.js b/tests/System/support/index.js
index 43be275d13c82..64b3a60b94be3 100644
--- a/tests/System/support/index.js
+++ b/tests/System/support/index.js
@@ -11,3 +11,10 @@ afterEach(() => {
   cy.task('checkForLogs');
   cy.task('cleanupDB');
 });
+
+// Disable "Transition was skipped" exceptions, which are happen randomly in installation test
+Cypress.on('uncaught:exception', (err) => {
+  if (err.message.includes('Transition was skipped')) {
+    return false;
+  }
+});
diff --git a/tests/Unit/Component/Actionlogs/Administrator/Model/ActionlogConfigModelTest.php b/tests/Unit/Component/Actionlogs/Administrator/Model/ActionlogConfigModelTest.php
index 3f6fde9875f54..b7321d5587b30 100644
--- a/tests/Unit/Component/Actionlogs/Administrator/Model/ActionlogConfigModelTest.php
+++ b/tests/Unit/Component/Actionlogs/Administrator/Model/ActionlogConfigModelTest.php
@@ -35,7 +35,7 @@ public function testGetLogContentTypeParams()
     {
         $config = new \stdClass();
         $db     = $this->createStub(DatabaseInterface::class);
-        $db->method('getQuery')->willReturn($this->getQueryStub($db));
+        $db->method('createQuery')->willReturn($this->getQueryStub($db));
         $db->method('loadObject')->willReturn($config);
 
         $model = new ActionlogConfigModel(['dbo' => $db], $this->createStub(MVCFactoryInterface::class));
@@ -53,7 +53,7 @@ public function testGetLogContentTypeParams()
     public function testGetNullLogContentTypeParams()
     {
         $db = $this->createStub(DatabaseInterface::class);
-        $db->method('getQuery')->willReturn($this->getQueryStub($db));
+        $db->method('createQuery')->willReturn($this->getQueryStub($db));
 
         $model = new ActionlogConfigModel(['dbo' => $db], $this->createStub(MVCFactoryInterface::class));
 
diff --git a/tests/Unit/Libraries/Cms/Access/RulesTest.php b/tests/Unit/Libraries/Cms/Access/RulesTest.php
index 0298ad1f3239b..8f8266ba27c55 100644
--- a/tests/Unit/Libraries/Cms/Access/RulesTest.php
+++ b/tests/Unit/Libraries/Cms/Access/RulesTest.php
@@ -12,7 +12,6 @@
 
 use Joomla\CMS\Access\Rule;
 use Joomla\CMS\Access\Rules;
-use Joomla\CMS\Object\CMSObject;
 use Joomla\Tests\Unit\UnitTestCase;
 
 /**
@@ -340,10 +339,10 @@ public function testGetAllowed()
         $rules   = new Rules($ruleData);
         $allowed = $rules->getAllowed(-42);
 
-        $this->assertInstanceOf(CMSObject::class, $allowed);
-        $this->assertTrue($allowed->get('create'));
-        $this->assertTrue($allowed->get('edit'));
-        $this->assertNull($allowed->get('delete'));
+        $this->assertInstanceOf(\stdClass::class, $allowed);
+        $this->assertTrue($allowed->create);
+        $this->assertTrue($allowed->edit);
+        $this->assertFalse(isset($allowed->delete));
     }
 
     /**
diff --git a/tests/Unit/Libraries/Cms/Form/Rule/EmailRuleTest.php b/tests/Unit/Libraries/Cms/Form/Rule/EmailRuleTest.php
index c277ac1e7e2f8..14cde0a4a5129 100644
--- a/tests/Unit/Libraries/Cms/Form/Rule/EmailRuleTest.php
+++ b/tests/Unit/Libraries/Cms/Form/Rule/EmailRuleTest.php
@@ -10,6 +10,7 @@
 
 namespace Joomla\Tests\Unit\Libraries\Cms\Form\Rule;
 
+use Algo26\IdnaConvert\Exception\InvalidCharacterException;
 use Joomla\CMS\Form\Rule\EmailRule;
 use Joomla\Tests\Unit\UnitTestCase;
 
@@ -73,8 +74,12 @@ public function testRule(bool $expected, \SimpleXMLElement $element, string $val
         if ($expected) {
             $this->assertTrue((new EmailRule())->test($element, $value));
         } else {
-            $this->expectException(\UnexpectedValueException::class);
-            (new EmailRule())->test($element, $value);
+            try {
+                (new EmailRule())->test($element, $value);
+                $this->fail('Expected exception was not thrown');
+            } catch (\UnexpectedValueException | InvalidCharacterException) {
+                $this->assertTrue(true);
+            }
         }
     }
 }
diff --git a/tests/Unit/Libraries/Cms/Form/Rule/EqualsRuleTest.php b/tests/Unit/Libraries/Cms/Form/Rule/EqualsRuleTest.php
index 9bac743b76bc4..23cb05f17f2ba 100644
--- a/tests/Unit/Libraries/Cms/Form/Rule/EqualsRuleTest.php
+++ b/tests/Unit/Libraries/Cms/Form/Rule/EqualsRuleTest.php
@@ -46,25 +46,25 @@ public function dataTest(): array
 
         return [
             [true, $xml, 'testvalue', null, new Registry(['testfield' => 'testvalue']), $form],
-            [true, $xml, 'testvalue', '', new Registry(['testfield' => 'testvalue']), $form],
+            [true, $xml, 'testvalue', '', new Registry(['testfield'     => 'testvalue']), $form],
             [true, $xml, 'testvaluegroup', 'user', new Registry(['user' => ['testfield' => 'testvaluegroup']]), $form],
             [true, $xml, '', null, new Registry(), $form],
-            [true, $xml, '1', null, new Registry(['testfield' => '1']), $form],
-            [true, $xml, '2', null, new Registry(['testfield' => '02']), $form],
-            [true, $xml, '3', null, new Registry(['testfield' => 3]), $form],
+            [true, $xml, '1', null, new Registry(['testfield'  => '1']), $form],
+            [true, $xml, '2', null, new Registry(['testfield'  => '02']), $form],
+            [true, $xml, '3', null, new Registry(['testfield'  => 3]), $form],
             [true, $xml, '04', null, new Registry(['testfield' => '4']), $form],
-            [true, $xml, '5', null, new Registry(['testfield' => 5]), $form],
-            [true, $xml, 6, null, new Registry(['testfield' => '6']), $form],
-            [true, $xml, '0', null, new Registry(['testfield' => false]), $form],
-            [true, $xml, 0, null, new Registry(['testfield' => false]), $form],
-            [true, $xml, 4, null, new Registry(['testfield' => true]), $form],
+            [true, $xml, '5', null, new Registry(['testfield'  => 5]), $form],
+            [true, $xml, 6, null, new Registry(['testfield'    => '6']), $form],
+            [true, $xml, '0', null, new Registry(['testfield'  => false]), $form],
+            [true, $xml, 0, null, new Registry(['testfield'    => false]), $form],
+            [true, $xml, 4, null, new Registry(['testfield'    => true]), $form],
             [false, $xml, 'testvalue', null, new Registry(), $form],
-            [false, $xml, 'testvalue', null, new Registry(['testfield' => '']), $form],
-            [false, $xml, 'TESTVALUE', null, new Registry(['testfield' => 'testvalue']), $form],
+            [false, $xml, 'testvalue', null, new Registry(['testfield'  => '']), $form],
+            [false, $xml, 'TESTVALUE', null, new Registry(['testfield'  => 'testvalue']), $form],
             [false, $xml, 'testvalue2', null, new Registry(['testfield' => 'testvalue']), $form],
-            [false, $xml, '', null, new Registry(['testfield' => 'testvalue']), $form],
-            [false, $xml, 'testvaluegroup', 'a', new Registry(['user' => ['testfield' => 'testvaluegroup']]), $form],
-            [false, $xml, 'a', null, new Registry(['testfield' => 0]), $form],
+            [false, $xml, '', null, new Registry(['testfield'           => 'testvalue']), $form],
+            [false, $xml, 'testvaluegroup', 'a', new Registry(['user'   => ['testfield' => 'testvaluegroup']]), $form],
+            [false, $xml, 'a', null, new Registry(['testfield'          => 0]), $form],
             [\InvalidArgumentException::class, $xml, '', null, null, null],
             [\InvalidArgumentException::class, $xml, '', null, new Registry(), null],
             [\InvalidArgumentException::class, $xml, '', null, null, $form],
diff --git a/tests/Unit/Libraries/Cms/Form/Rule/NotequalsRuleTest.php b/tests/Unit/Libraries/Cms/Form/Rule/NotequalsRuleTest.php
index 9471162b6ce5e..21205250c2bc3 100644
--- a/tests/Unit/Libraries/Cms/Form/Rule/NotequalsRuleTest.php
+++ b/tests/Unit/Libraries/Cms/Form/Rule/NotequalsRuleTest.php
@@ -45,25 +45,25 @@ public function dataTest(): array
 
         return [
             [true, $xml, 'testvalue', null, new Registry(), null],
-            [true, $xml, 'testvalue', null, new Registry(['testfield' => '']), null],
-            [true, $xml, 'TESTVALUE', null, new Registry(['testfield' => 'testvalue']), null],
-            [true, $xml, 'testvalue2', null, new Registry(['testfield' => 'testvalue']), null],
-            [true, $xml, '', null, new Registry(['testfield' => 'testvalue']), null],
+            [true, $xml, 'testvalue', null, new Registry(['testfield'   => '']), null],
+            [true, $xml, 'TESTVALUE', null, new Registry(['testfield'   => 'testvalue']), null],
+            [true, $xml, 'testvalue2', null, new Registry(['testfield'  => 'testvalue']), null],
+            [true, $xml, '', null, new Registry(['testfield'            => 'testvalue']), null],
             [true, $xml, 'testvaluegroup', 'user', new Registry(['user' => ['testfield' => 'testvaluegroup']]), null],
-            [true, $xml, 'testvaluegroup', 'a', new Registry(['user' => ['testfield' => 'testvaluegroup']]), null],
-            [true, $xml, 'a', null, new Registry(['testfield' => 0]), null],
-            [false, $xml, 'testvalue', null, new Registry(['testfield' => 'testvalue']), null],
-            [false, $xml, 'testvalue', '', new Registry(['testfield' => 'testvalue']), null],
+            [true, $xml, 'testvaluegroup', 'a', new Registry(['user'    => ['testfield' => 'testvaluegroup']]), null],
+            [true, $xml, 'a', null, new Registry(['testfield'           => 0]), null],
+            [false, $xml, 'testvalue', null, new Registry(['testfield'  => 'testvalue']), null],
+            [false, $xml, 'testvalue', '', new Registry(['testfield'    => 'testvalue']), null],
             [false, $xml, '', null, new Registry(), null],
-            [false, $xml, '1', null, new Registry(['testfield' => '1']), null],
-            [false, $xml, '2', null, new Registry(['testfield' => '02']), null],
-            [false, $xml, '3', null, new Registry(['testfield' => 3]), null],
+            [false, $xml, '1', null, new Registry(['testfield'  => '1']), null],
+            [false, $xml, '2', null, new Registry(['testfield'  => '02']), null],
+            [false, $xml, '3', null, new Registry(['testfield'  => 3]), null],
             [false, $xml, '04', null, new Registry(['testfield' => '4']), null],
-            [false, $xml, '5', null, new Registry(['testfield' => 5]), null],
-            [false, $xml, 6, null, new Registry(['testfield' => '6']), null],
-            [false, $xml, '0', null, new Registry(['testfield' => false]), null],
-            [false, $xml, 0, null, new Registry(['testfield' => false]), null],
-            [false, $xml, 4, null, new Registry(['testfield' => true]), null],
+            [false, $xml, '5', null, new Registry(['testfield'  => 5]), null],
+            [false, $xml, 6, null, new Registry(['testfield'    => '6']), null],
+            [false, $xml, '0', null, new Registry(['testfield'  => false]), null],
+            [false, $xml, 0, null, new Registry(['testfield'    => false]), null],
+            [false, $xml, 4, null, new Registry(['testfield'    => true]), null],
             [\InvalidArgumentException::class, $xml, '', null, null, null],
             [\UnexpectedValueException::class, $xml2, '', null, null, null],
         ];
diff --git a/tests/Unit/Libraries/Cms/Image/ImageTest.php b/tests/Unit/Libraries/Cms/Image/ImageTest.php
index 916d7b297830f..a7edbda6288cf 100644
--- a/tests/Unit/Libraries/Cms/Image/ImageTest.php
+++ b/tests/Unit/Libraries/Cms/Image/ImageTest.php
@@ -884,19 +884,19 @@ public function testGenerateThumbs()
     }
 
     /**
-     * Test the Image::createThumbs method without a loaded image.
+     * Test the Image::createThumbnails method without a loaded image.
      *
      * @return  void
      *
-     * @covers  \Joomla\CMS\Image\Image::createThumbs
+     * @covers  \Joomla\CMS\Image\Image::createThumbnails
      *
      * @since   1.1.3
      */
-    public function testCreateThumbsWithoutLoadedImage()
+    public function testcreateThumbnailsWithoutLoadedImage()
     {
         $this->expectException(\LogicException::class);
 
-        $thumbs = $this->instance->createThumbs('50x38');
+        $thumbs = $this->instance->createThumbnails('50x38');
     }
 
     /**
@@ -904,7 +904,7 @@ public function testCreateThumbsWithoutLoadedImage()
      *
      * @return  void
      *
-     * @covers  \Joomla\CMS\Image\Image::createThumbs
+     * @covers  \Joomla\CMS\Image\Image::createThumbnails
      *
      * @since   1.1.3
      */
@@ -913,23 +913,23 @@ public function testGenerateThumbsWithInvalidFolder()
         $this->expectException(\InvalidArgumentException::class);
 
         $this->instance->loadFile($this->testFile);
-        $this->instance->createThumbs('50x38', Image::SCALE_INSIDE, '/foo/bar');
+        $this->instance->createThumbnails('50x38', Image::SCALE_INSIDE, '/foo/bar');
     }
 
     /**
-     * Test the Image::createThumbs method.
+     * Test the Image::createThumbnails method.
      *
      * @return  void
      *
-     * @covers  \Joomla\CMS\Image\Image::createThumbs
+     * @covers  \Joomla\CMS\Image\Image::createThumbnails
      *
      * @since   1.1.3
      */
-    public function testCreateThumbs()
+    public function testcreateThumbnails()
     {
         $this->instance->loadFile($this->testFile);
 
-        $thumbs     = $this->instance->createThumbs('50x38', Image::CROP);
+        $thumbs     = $this->instance->createThumbnails('50x38', Image::CROP);
         $outFileGif = TestHelper::getValue($thumbs[0], 'path');
 
         $a = Image::getImageFileProperties($this->testFile);
diff --git a/tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php b/tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php
index 19c8693e6b22d..7915635164e30 100644
--- a/tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php
+++ b/tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php
@@ -13,7 +13,6 @@
 use Exception;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-use Joomla\CMS\MVC\Model\DatabaseAwareTrait;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\User\User;
 use Joomla\Database\DatabaseInterface;
@@ -130,7 +129,7 @@ public function testGetListFromString()
     {
         $db = $this->createStub(DatabaseInterface::class);
         $db->method('loadObjectList')->willReturn([1]);
-        $db->method('getQuery')->willReturn($this->getQueryStub($db));
+        $db->method('createQuery')->willReturn($this->getQueryStub($db));
 
         $model = new class (['dbo' => $db], $this->createStub(MVCFactoryInterface::class)) extends BaseDatabaseModel {
             public function _getList($query, $limitstart = 0, $limit = 0)
@@ -303,49 +302,4 @@ public function testCheckedOutWitFieldEmptyUserSet()
 
         $this->assertTrue($model->isCheckedOut((object)['checked_out' => 1]));
     }
-
-    /**
-     * @testdox  still can use the old trait
-     *
-     * @return  void
-     *
-     * @since   4.2.0
-     *
-     * @deprecated  5.0 Must be removed when trait gets deleted
-     */
-    public function testUseOldMVCTrait()
-    {
-        $db = $this->createStub(DatabaseInterface::class);
-
-        $model = new class (['dbo' => $db], $this->createStub(MVCFactoryInterface::class)) extends BaseDatabaseModel {
-            use DatabaseAwareTrait;
-        };
-
-        $this->assertEquals($db, $model->getDbo());
-    }
-
-    /**
-     * @testdox  operates normally even when no variable is declared
-     *
-     * @return  void
-     *
-     * @since   4.2.0
-     *
-     * @deprecated  5.0 This has to be removed when we do not support the MVC Trait anymore
-     */
-    public function testNotDeclaredVariable()
-    {
-        $model = new class (['dbo' => $this->createStub(DatabaseInterface::class)], $this->createStub(MVCFactoryInterface::class)) extends BaseDatabaseModel {
-            public function cache($key, $value)
-            {
-                if (!isset($this->test[$key])) {
-                    $this->test[$key] = $value;
-                }
-
-                return $this->test[$key];
-            }
-        };
-
-        $this->assertEquals('test', $model->cache(1, 'test'));
-    }
 }
diff --git a/tests/Unit/Libraries/Cms/Updater/ConstraintCheckerTest.php b/tests/Unit/Libraries/Cms/Updater/ConstraintCheckerTest.php
index e14bb25494ce4..c913606dc343b 100644
--- a/tests/Unit/Libraries/Cms/Updater/ConstraintCheckerTest.php
+++ b/tests/Unit/Libraries/Cms/Updater/ConstraintCheckerTest.php
@@ -197,11 +197,11 @@ protected function targetplatformDataProvider()
             [(array) ["name" => "foobar", "version" => "4.*"], false],
             [(array) ["name" => "joomla", "version" => "1.*"], false],
             [(array) ["name" => "joomla", "version" => "3.1.2"], false],
-            [(array) ["name" => "joomla", "version" => "6.*"], false],
+            [(array) ["name" => "joomla", "version" => "6.*"], true],
             [(array) ["name" => "joomla", "version" => ""], true],
             [(array) ["name" => "joomla", "version" => ".*"], true],
             [(array) ["name" => "joomla", "version" => JVERSION], true],
-            [(array) ["name" => "joomla", "version" => "5.*"], true],
+            [(array) ["name" => "joomla", "version" => "5.*"], false],
         ];
     }
 
diff --git a/tests/Unit/Plugin/Authentication/Ldap/LdapPluginTest.php b/tests/Unit/Plugin/Authentication/Ldap/LdapPluginTest.php
index 35a60b75ea513..b5106254e3524 100644
--- a/tests/Unit/Plugin/Authentication/Ldap/LdapPluginTest.php
+++ b/tests/Unit/Plugin/Authentication/Ldap/LdapPluginTest.php
@@ -355,7 +355,7 @@ public function __construct(bool $failBind, bool $failQuery, bool $hasEntry)
                         $this->hasEntry  = $hasEntry;
                     }
 
-                    public function bind(?string $dn = null, ?string $password = null)
+                    public function bind(?string $dn = null, ?string $password = null): void
                     {
                         if ($this->failBind) {
                             throw new LdapException();
diff --git a/tests/Unit/Plugin/EditorsXtd/PageBreak/Extension/PageBreakTest.php b/tests/Unit/Plugin/EditorsXtd/PageBreak/Extension/PageBreakTest.php
index 526d616d9a847..34b6cc672b5cf 100644
--- a/tests/Unit/Plugin/EditorsXtd/PageBreak/Extension/PageBreakTest.php
+++ b/tests/Unit/Plugin/EditorsXtd/PageBreak/Extension/PageBreakTest.php
@@ -89,6 +89,7 @@ public function testInvalidPermissions()
         $user->method('getAuthorisedCategories')->willReturn([]);
 
         $app = $this->createStub(CMSWebApplicationInterface::class);
+        $app->method('getLanguage')->willReturn($this->createStub(Language::class));
         $app->method('getIdentity')->willReturn($user);
 
         $btnsReg = new ButtonsRegistry();
@@ -126,7 +127,9 @@ public function testInvalidApplication()
 
         $dispatcher = new Dispatcher();
         $plugin     = new PageBreak($dispatcher, ['name' => 'pagebreak', 'type' => 'editors-xtd', 'params' => []]);
-        $plugin->setApplication($this->createStub(CMSApplicationInterface::class));
+        $app        = $this->createStub(CMSApplicationInterface::class);
+        $app->method('getLanguage')->willReturn($this->createStub(Language::class));
+        $plugin->setApplication($app);
         $plugin->onEditorButtonsSetup($event);
 
         $button = $btnsReg->getAll()[0] ?? false;
diff --git a/tests/Unit/Plugin/Filesystem/Local/Extension/LocalPluginTest.php b/tests/Unit/Plugin/Filesystem/Local/Extension/LocalPluginTest.php
index 7bad2a7685ece..620c427cb1363 100644
--- a/tests/Unit/Plugin/Filesystem/Local/Extension/LocalPluginTest.php
+++ b/tests/Unit/Plugin/Filesystem/Local/Extension/LocalPluginTest.php
@@ -97,6 +97,7 @@ public function testAdapters()
     {
         $app = $this->createStub(CMSApplicationInterface::class);
         $app->method('getIdentity')->willReturn(new User());
+        $app->method('getLanguage')->willReturn($this->createStub(Language::class));
 
         $plugin   = new Local(['params' => ['directories' => '[{"directory": "tests"}]']], JPATH_ROOT);
         $plugin->setApplication($app);
diff --git a/tests/Unit/Plugin/Task/Requests/Extension/RequestsPluginTest.php b/tests/Unit/Plugin/Task/Requests/Extension/RequestsPluginTest.php
index 614c326930d56..c68dbec5e1e97 100644
--- a/tests/Unit/Plugin/Task/Requests/Extension/RequestsPluginTest.php
+++ b/tests/Unit/Plugin/Task/Requests/Extension/RequestsPluginTest.php
@@ -250,6 +250,83 @@ public static function isSupported()
         $this->assertEquals(['Authorization' => 'basic 123'], $transport->headers);
     }
 
+    /**
+     * @testdox  can perform a HTTP GET request with custom headers
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function testCustomHeadersRequest()
+    {
+        $transport = new class () implements TransportInterface {
+            public $headers;
+
+            public function request($method, UriInterface $uri, $data = null, array $headers = [], $timeout = null, $userAgent = null)
+            {
+                $this->headers = $headers;
+
+                $response = new Response('php://memory', 200);
+                $response->getBody()->write('test');
+
+                return $response;
+            }
+
+            public static function isSupported()
+            {
+                return true;
+            }
+        };
+
+        $http    = new Http([], $transport);
+        $factory = $this->createStub(HttpFactory::class);
+        $factory->method('getHttp')->willReturn($http);
+
+        $language = $this->createStub(Language::class);
+        $language->method('_')->willReturn('test');
+
+        $app = $this->createStub(CMSApplicationInterface::class);
+        $app->method('getLanguage')->willReturn($language);
+
+        $plugin = new Requests([], $factory, $this->tmpFolder);
+        $plugin->setApplication($app);
+
+        $task = $this->createStub(Task::class);
+        $task->method('get')->willReturnMap([['id', null, 1], ['type', null, 'plg_task_requests_task_get']]);
+
+        $event = new ExecuteTaskEvent(
+            'test',
+            [
+                'subject' => $task,
+                'params'  => (object)[
+                    'url'           => 'http://example.com',
+                    'timeout'       => 0,
+                    'auth'          => 1,
+                    'authType'      => 'basic',
+                    'authKey'       => '123',
+                    'customHeaders' => [
+                        ['name' => 'X-Custom-Header', 'value' => 'custom-value'],
+                        // Headers without a name are skipped
+                        ['name' => '   ', 'value' => 'no-name'],
+                        // Names are trimmed and empty values are allowed
+                        (object) ['name' => ' X-Empty-Header ', 'value' => ''],
+                    ],
+                ],
+            ]
+        );
+        $plugin->standardRoutineHandler($event);
+
+        $this->assertEquals(Status::OK, $event->getResultSnapshot()['status']);
+        $this->assertEquals(
+            [
+                'Authorization'   => 'basic 123',
+                'X-Custom-Header' => 'custom-value',
+                'X-Empty-Header'  => '',
+            ],
+            $transport->headers
+        );
+    }
+
     /**
      * @testdox  can handle an exception during the request
      *
diff --git a/tests/Unit/bootstrap.php b/tests/Unit/bootstrap.php
index c506928078569..bc296b8d08349 100644
--- a/tests/Unit/bootstrap.php
+++ b/tests/Unit/bootstrap.php
@@ -35,13 +35,6 @@
     \define('JPATH_ROOT', JPATH_BASE);
 }
 
-/**
- * @deprecated 4.4.0 will be removed in 6.0
- **/
-if (!\defined('JPATH_PLATFORM')) {
-    \define('JPATH_PLATFORM', JPATH_BASE . DIRECTORY_SEPARATOR . 'libraries');
-}
-
 if (!\defined('JPATH_LIBRARIES')) {
     \define('JPATH_LIBRARIES', JPATH_BASE . DIRECTORY_SEPARATOR . 'libraries');
 }